From bc7d9c98bc1b23ef6ef29ed4a6313753f6900640 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 14 五月 2024 02:25:01 +0800
Subject: [PATCH] 费用统计查询修复; 检验下单字段调整; 下单进度查询修改; 执行优化去掉多余模板内容; 报告生成删除试验方法; 修改报告表格列宽; 修改报告删除列的统计方法

---
 inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java |   43 +++++++++++++++++++++++++++++++++++++------
 1 files changed, 37 insertions(+), 6 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 b5ac47c..623ecc0 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
@@ -1,16 +1,47 @@
 package com.yuanchu.mom.mapper;
 
-import com.yuanchu.mom.pojo.InsOrder;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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.SampleProductDto2;
+import com.yuanchu.mom.pojo.InsOrder;
+import com.yuanchu.mom.vo.SampleDefectsFatherVo;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
-* @author gaoaoy
-* @description 閽堝琛ㄣ�恑ns_order(妫�楠屼笅鍗�)銆戠殑鏁版嵁搴撴搷浣淢apper
-* @createDate 2024-03-07 16:07:54
-* @Entity com.yuanchu.mom.pojo.InsOrder
-*/
+ * @author gaoaoy
+ * @description 閽堝琛ㄣ�恑ns_order(妫�楠屼笅鍗�)銆戠殑鏁版嵁搴撴搷浣淢apper
+ * @createDate 2024-03-12 16:17:55
+ * @Entity com.yuanchu.mom.pojo.InsOrder
+ */
 public interface InsOrderMapper extends BaseMapper<InsOrder> {
 
+    //鑾峰彇妫�楠屼笅鍗曟暟鎹�
+    IPage<SampleOrderDto> selectInsOrderPage(IPage<InsOrder> page, QueryWrapper<SampleOrderDto> ew);
+
+    //淇敼妫�楠屼笅鍗曟暟鎹�
+    int upInsOrderParameter(InsOrder itemParameter);
+
+    String getLaboratoryCode(String name);
+
+    IPage<SampleProductDto2> selectSampleAndProductByOrderId(IPage<SampleProductDto2> page, QueryWrapper<SampleProductDto2> ew);
+
+    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);
+
+    Long getCount(String inspectionItems, String orderNumber);
+
+    String getEnumLabelByValue(String value);
+
+    String getStandardMethodCode(Integer id);
 }
 
 

--
Gitblit v1.9.3