试验管理修改

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);
 }

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);
             // 更新试验表中数据为待审阅

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>

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();
 }
 
 /**详情*/