From e44da3a342bad6552b6a6998b9ead44c540c2e47 Mon Sep 17 00:00:00 2001 From: JYW <2013732181@qq.com> Date: 星期五, 26 四月 2024 09:14:10 +0800 Subject: [PATCH] 2024-04-25 资质凭证bug和印章管理将实验室id改为实验室名称 --- inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java index bd725d6..55256da 100644 --- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java +++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java @@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.yuanchu.mom.common.GetLook; import com.yuanchu.mom.common.PrintChina; @@ -16,6 +17,7 @@ import com.yuanchu.mom.service.StandardTemplateService; import com.yuanchu.mom.utils.GiveCode; import com.yuanchu.mom.utils.QueryWrappers; +import com.yuanchu.mom.vo.SampleDefectsFatherVo; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -48,6 +50,9 @@ private InsSampleUserMapper insSampleUserMapper; private InsOrderStateMapper insOrderStateMapper; + + + //鑾峰彇妫�楠屼笅鍗曟暟鎹� @Override @@ -159,6 +164,15 @@ map.put("body", insOrderMapper.selectCostStatistics(page, QueryWrappers.queryWrappers(costStatisticsDto))); return map; } + @Override + public Map<String, Object> selectSampleDefects(Page page, String inspectionItems, String orderNumber) { + List<SampleDefectsFatherVo> sampleDefectsFatherVos = insOrderMapper.selectSampleDefects(page, inspectionItems, orderNumber); + Map<String, Object> map = new HashMap<>(); + map.put("records", sampleDefectsFatherVos); + Long aLong = insOrderMapper.getCount(inspectionItems, orderNumber); + map.put("total", aLong); + return map; + } } -- Gitblit v1.9.3