From 085e4b6b0a97c9a20a5b92a6d6f5756ba98144f3 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期五, 19 七月 2024 17:41:39 +0800 Subject: [PATCH] 费用统计导出+工时展示 --- inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java index 720b72f..69723bd 100644 --- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java +++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java @@ -5,13 +5,17 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yuanchu.mom.dto.InsOrderPlanDTO; -import com.yuanchu.mom.dto.SampleOrderDto; import com.yuanchu.mom.dto.SampleProductDto; +import com.yuanchu.mom.dto.SampleProductDto3; +import com.yuanchu.mom.pojo.InsProduct; import com.yuanchu.mom.pojo.InsSample; +import com.yuanchu.mom.vo.InsOrderPlanTaskSwitchVo; import com.yuanchu.mom.vo.InsOrderPlanVO; +import com.yuanchu.mom.vo.SampleVo; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * @author Administrator @@ -23,8 +27,27 @@ IPage<InsOrderPlanVO> findInsSampleAndOrder(Page page, QueryWrapper<InsOrderPlanDTO> ew, Integer userId); + IPage<InsOrderPlanTaskSwitchVo> inspectionOrderDetailsTaskSwitching(Page page, QueryWrapper<InsOrderPlanDTO> ew, Integer userId); + List<SampleProductDto> selectSampleProductListByOrderId(Integer id); + List<SampleProductDto> selectSampleProductListByOrderId2(Integer id); + + List<SampleProductDto3> selectSampleProductListByOrderId3(List<Integer> ids); + + List<SampleProductDto> getInsOrderAndSample(Integer id, String laboratory); + + String getSampleEn(String sample); + + List<InsProduct> getInsProduct1(Integer id, String laboratory); + + List<InsProduct> getInsProduct2(Integer id); + + List<InsProduct> getInsProduct3(Integer id); + + List<Map<String, Object>> getReportModel(@Param("orderId") Integer orderId, @Param("id") Integer id, @Param("laboratory") String laboratory); + + SampleVo getDetailById(Integer sampleId); } -- Gitblit v1.9.3