From 123f6198dcadf399bf1d4fc059a939749c6cab3b Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Wed, 4 Sep 2024 10:35:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E9=AA=8C=E7=AE=A1=E7=90=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aqgqj/basis/dao/ExperimentalMapper.java    | 18 ++++++++++++++++++
 .../service/impl/ExperimentalServiceImpl.java  | 15 ++++++++++++++-
 .../mappers/basis/ExperimentalMapper.xml       | 18 ++++++++++++++++++
 .../js/primaryData/child/viewOriginalRecord.js |  2 +-
 4 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/bonus/aqgqj/basis/dao/ExperimentalMapper.java b/src/main/java/com/bonus/aqgqj/basis/dao/ExperimentalMapper.java
index c3ba2c7..3bd01e3 100644
--- a/src/main/java/com/bonus/aqgqj/basis/dao/ExperimentalMapper.java
+++ b/src/main/java/com/bonus/aqgqj/basis/dao/ExperimentalMapper.java
@@ -407,4 +407,22 @@ public interface ExperimentalMapper {
      * @param vo
      */
     void updateExperMony(TestVo vo);
+
+    /**
+     * 查询新增的试验设备
+     * @param dto
+     * @return List<ExperDevVo>
+     * @author cwchen
+     * @date 2024/9/4 9:07
+     */
+    List<ExperDevVo> getLsExperDevs(ParamsDto dto);
+
+    /**
+     * 判断提交审查数据中是否存在新增试验设备
+     * @param sampleId
+     * @return Integer
+     * @author cwchen
+     * @date 2024/9/4 10:22
+     */
+    Integer getNotFilledDevs(Long sampleId);
 }
diff --git a/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentalServiceImpl.java b/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentalServiceImpl.java
index 74dae3b..799fdaf 100644
--- a/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentalServiceImpl.java
+++ b/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentalServiceImpl.java
@@ -334,7 +334,14 @@ public class ExperimentalServiceImpl implements ExperimentalService {
                 List<ConfigItemVo> configItemVos = mapper.getExperItem(configItemsVo.getId());
                 configItemsVo.setItemList(configItemVos);
             }
-            List<ExperDevVo> experDevVos = mapper.getExperDev(dto);
+            List<ExperDevVo> experDevVos = new ArrayList<>();
+            experDevVos = mapper.getExperDev(dto);
+            // 查询新增的试验设备信息
+            dto.setSampleId(testVo.getSampleId());
+            List<ExperDevVo> lsExperDevs = mapper.getLsExperDevs(dto);
+            if(CollectionUtils.isNotEmpty(lsExperDevs)){
+                experDevVos.addAll(lsExperDevs);
+            }
             testVo.setMainDeviceVos(configMainDevVos);
             testVo.setBasisVos(experBasisVos);
             testVo.setConfigItemsVos(configItemsVos);
@@ -363,6 +370,12 @@ public class ExperimentalServiceImpl implements ExperimentalService {
             if (result > 0) {
                 return ServerResponse.createByErrorMsg(HttpStatus.ERROR, "提交数据中存在待试验项或处于审核流程或已试验结束");
             }
+            for (Long sampleId : list) {
+                Integer notFilledDevsNum = mapper.getNotFilledDevs(sampleId);
+                if(notFilledDevsNum > 0){
+                    return ServerResponse.createByErrorMsg(HttpStatus.ERROR, "提交的数据中已添加新的试验设备，请先填写试验信息");
+                }
+            }
             // 更新收样表中的状态为待审阅
             mapper.updateSampleStatus(list);
             // 更新试验表中数据为待审阅
diff --git a/src/main/resources/mappers/basis/ExperimentalMapper.xml b/src/main/resources/mappers/basis/ExperimentalMapper.xml
index aa094e8..7002759 100644
--- a/src/main/resources/mappers/basis/ExperimentalMapper.xml
+++ b/src/main/resources/mappers/basis/ExperimentalMapper.xml
@@ -558,4 +558,22 @@
     <select id="getRecordNum" resultType="java.lang.Long">
         SELECT id FROM tb_exper WHERE (id = #{id} OR DATE_FORMAT(exper_time, '%Y-%m-%d') = #{experTime}) AND del_flag = 0 ORDER BY id
     </select>
+    <!--查询新增的试验设备信息-->
+    <select id="getLsExperDevs" resultType="com.bonus.aqgqj.basis.entity.vo.ExperDevVo">
+        SELECT tsd.id,
+               tsd.dev_code AS devCode,
+               tsd.dev_module AS devModule,
+               tsd.department_id AS departmentId
+        FROM tb_sample_device tsd
+        LEFT JOIN tb_exper_dev ted ON tsd.id = ted.dev_id AND ted.exper_id = #{id}
+        WHERE tsd.sample_id = #{sampleId} AND tsd.del_falg = 0 AND ted.id IS NULL
+        ORDER BY tsd.id
+    </select>
+    <!--判断提交审查数据中是否存在新增试验设备-->
+    <select id="getNotFilledDevs" resultType="java.lang.Integer">
+        SELECT COUNT(*)
+        FROM tb_sample_device tsd
+        LEFT JOIN tb_exper_dev ted ON tsd.id = ted.dev_id
+        WHERE tsd.sample_id = #{sampleId} AND tsd.del_falg = 0 AND ted.id IS NULL
+    </select>
 </mapper>
diff --git a/src/main/resources/static/js/primaryData/child/viewOriginalRecord.js b/src/main/resources/static/js/primaryData/child/viewOriginalRecord.js
index 916614f..b65ca19 100644
--- a/src/main/resources/static/js/primaryData/child/viewOriginalRecord.js
+++ b/src/main/resources/static/js/primaryData/child/viewOriginalRecord.js
@@ -8,8 +8,8 @@ function setParams(params) {
         form = layui.form;
         layer = layui.layer;
         table = layui.table;
+        getDataById();
     })
-    getDataById();
 }
 
 /**详情*/