试验管理修改

src/main/java/com/bonus/aqgqj/basis/dao/ExperimentalMapper.java

@@ -425,4 +425,22 @@ public interface ExperimentalMapper {
      * @date 2024/9/4 10:22
      */
     Integer getNotFilledDevs(Long sampleId);
+
+    /**
+     * 判断提交审查前是否添加了试验设备
+     * @param detailVo
+     * @return Integer
+     * @author cwchen
+     * @date 2024/9/4 12:40
+     */
+    Integer getHasAddDevs(ExperimentalDetailVo detailVo);
+
+    /**
+     * 更新试验状态为待试验
+     * @param detailVo
+     * @return void
+     * @author cwchen
+     * @date 2024/9/4 12:46
+     */
+    void updateExperStatus2(ExperimentalDetailVo detailVo);
 }

src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentalServiceImpl.java

@@ -63,6 +63,11 @@ public class ExperimentalServiceImpl implements ExperimentalService {
             list = mapper.getDetailList(dto);
             if (CollectionUtils.isNotEmpty(list)) {
                 for (ExperimentalDetailVo detailVo : list) {
+                    // 判断提交审查前是否添加了试验设备
+                    Integer hasAddDevs = mapper.getHasAddDevs(detailVo);
+                    if(!Objects.equals(detailVo,Constants.DSY) && hasAddDevs > 0){
+                        mapper.updateExperStatus2(detailVo);
+                    }
                     // 样品试验结果、样品数量、送样总数
                     List<ExperimentalDetailVo.Sample> sampleList = new ArrayList<>();
                     if (detailVo.getExperId() != null) {
@@ -338,6 +343,7 @@ public class ExperimentalServiceImpl implements ExperimentalService {
             experDevVos = mapper.getExperDev(dto);
             // 查询新增的试验设备信息
             dto.setSampleId(testVo.getSampleId());
+            dto.setDevTypeCode(testVo.getDevTypeCode());
             List<ExperDevVo> lsExperDevs = mapper.getLsExperDevs(dto);
             if(CollectionUtils.isNotEmpty(lsExperDevs)){
                 experDevVos.addAll(lsExperDevs);

src/main/java/com/bonus/aqgqj/webResult/Constants.java

@@ -159,6 +159,8 @@ public class Constants
     /**综合班组成员-收样权限*/
     public static final String INTEGRATEDTEAMMEMBER = "integratedTeamMember";
 
+    public static final String DSY = "待试验";
+
     /**审查通过*/
     public static final Integer PASS = 1;
     /**审查不通过*/

src/main/resources/mappers/basis/ExperimentalMapper.xml

@@ -210,6 +210,10 @@
     <update id="updateExperMony">
         UPDATE tb_exper SET amount = #{allMoney} WHERE id = #{id}
     </update>
+    <!--更新试验状态为待试验-->
+    <update id="updateExperStatus2">
+        UPDATE tb_exper SET status = null,audit_status = null WHERE id = #{experId}
+    </update>
     <!--删除试验依据-->
     <delete id="delConfigBasis">
         DELETE FROM tb_config_basis WHERE exper_id = #{id}
@@ -566,7 +570,7 @@
                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
+        WHERE tsd.sample_id = #{sampleId} AND tsd.dev_type_code = #{devTypeCode} AND tsd.del_falg = 0 AND ted.id IS NULL
         ORDER BY tsd.id
     </select>
     <!--判断提交审查数据中是否存在新增试验设备-->
@@ -576,4 +580,11 @@
         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>
+    <!--判断提交审查前是否添加了试验设备-->
+    <select id="getHasAddDevs" resultType="java.lang.Integer">
+        SELECT COUNT(*)
+        FROM tb_sample_device tsd
+        LEFT JOIN tb_exper_dev ted ON tsd.id = ted.dev_id AND ted.exper_id = #{experId}
+        WHERE tsd.sample_id = #{sampleId} AND tsd.dev_type_code = #{devTypeCode} AND tsd.del_falg = 0 AND ted.id IS NULL
+    </select>
 </mapper>