From 8ebf5bc4bf1cc2b70b6aa9dc295eaa9d86c95245 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期二, 02 七月 2024 13:17:26 +0800 Subject: [PATCH] 委托编号生成规则修改+用户默认密码更改+温度循环项目新增逻辑+检验任务模版切换 --- inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java index 0158ffb..04ae100 100644 --- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java +++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java @@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yuanchu.mom.dto.CostStatisticsDto; import com.yuanchu.mom.dto.SampleOrderDto; -import com.yuanchu.mom.dto.SampleProductDto; import com.yuanchu.mom.dto.SampleProductDto2; import com.yuanchu.mom.pojo.InsOrder; import com.yuanchu.mom.vo.SampleDefectsFatherVo; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -36,11 +36,17 @@ IPage<CostStatisticsDto> selectCostStatistics(IPage<CostStatisticsDto> page, QueryWrapper<CostStatisticsDto> ew); List<Map<String, String>> selectDeviceList(Set<String> names); - List<SampleDefectsFatherVo> selectSampleDefects(Page page, String inspectionItems, String orderNumber); + List<SampleDefectsFatherVo> selectSampleDefects(Page page, @Param("inspectionItems") String inspectionItems, @Param("orderNumber") String orderNumber); - Long getCount(String inspectionItems, String orderNumber); -} + Long getCount(@Param("inspectionItems") String inspectionItems, @Param("orderNumber") String orderNumber); + String getEnumLabelByValue(String value); + String getStandardMethodCode(Integer id); + int updateStatus( Integer id); + String selLaboratoryCode(String laboratory); + + List<Map<Integer, Object>> selectReportModelByOrderId(@Param("id") Integer id, @Param("laboratory") String laboratory); +} \ No newline at end of file -- Gitblit v1.9.3