试验管理修改

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

@@ -68,15 +68,6 @@ public class ExperimentalServiceImpl implements ExperimentalService {
                         JSONArray jsonArray = new JSONArray();
                         jsonArray.addAll(mapList);
                         sampleList = jsonArray.toJavaList(ExperimentalDetailVo.Sample.class);
-                        for (ExperimentalDetailVo.Sample sample : sampleList) {
-                            if(sample.getTestResult().contains(Constants.ERROR_RESULT) ||
-                                    sample.getTestResult().contains(Constants.ERROR_RESULT2)
-                            ){
-                                sample.setTestResult(Constants.ERROR_RESULT);
-                            }else{
-                                sample.setTestResult(Constants.SUCCESS_RESULT);
-                            }
-                        }
                     }
                     detailVo.setSampleList(sampleList);
                     detailVo.setSampleQuantity(sampleList.size());
@@ -153,15 +144,8 @@ public class ExperimentalServiceImpl implements ExperimentalService {
             mapper.addConfigBasis(vo.getBasisVos(), vo.getId());
             for (int i = 0; i < vo.getExperDevVos().size(); i++) {
                 ExperDevVo experDevVo = vo.getExperDevVos().get(i);
-                // 添加试验样品数据
+                experDevVo.setIsHg(setHgData(experDevVo.getDevData()));
-                /*if(experDevVo.getDevData().contains(Constants.ERROR_RESULT) ||
+                mapper.addExperDev(experDevVo, vo.getId());
-                        experDevVo.getDevData().contains(Constants.ERROR_RESULT2)
-                ){
-                    sample.setTestResult(Constants.ERROR_RESULT);
-                }else{
-                    sample.setTestResult(Constants.SUCCESS_RESULT);
-                }*/
-                mapper.addExperDev(vo.getExperDevVos().get(i), vo.getId());
                 if (i == 0) {
                     for (ConfigItemsVo configItemsVo : vo.getConfigItemsVos()) {
                         // 添加试验项数据
@@ -240,13 +224,13 @@ public class ExperimentalServiceImpl implements ExperimentalService {
             mapper.delExperDevItem(experDevItemsIds);
             // 修改试验信息数据
             mapper.updateExper(vo);
-            // 添加试验设备数据
-            mapper.addExperConfigDev(vo.getDeviceVos(), vo.getId());
             // 添加试验依据信息数据
             mapper.addConfigBasis(vo.getBasisVos(), vo.getId());
             for (int i = 0; i < vo.getExperDevVos().size(); i++) {
+                ExperDevVo experDevVo = vo.getExperDevVos().get(i);
+                experDevVo.setIsHg(setHgData(experDevVo.getDevData()));
                 // 添加试验样品数据
-                mapper.addExperDev(vo.getExperDevVos().get(i), vo.getId());
+                mapper.addExperDev(experDevVo, vo.getId());
                 List<ExperDevItemsVo> experDevItemsVos = setExperDevItemsList(vo.getExperDevVos().get(i), vo);
                 for (ExperDevItemsVo experDevItemsVo : experDevItemsVos) {
                     // 添加设备试验项信息
@@ -564,4 +548,21 @@ public class ExperimentalServiceImpl implements ExperimentalService {
             return null;
         }
     }
+
+    /**
+     * 设置试验设备数据是否合格
+     * @param value
+     * @return String
+     * @author cwchen
+     * @date 2024/7/23 15:25
+     */
+    public String setHgData(String value) {
+        if (value.contains(Constants.ERROR_RESULT) ||
+                value.contains(Constants.ERROR_RESULT2)
+        ) {
+            return "1";
+        } else {
+            return "0";
+        }
+    }
 }

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

@@ -120,6 +120,8 @@
             <if test="params.devData != null and params.devData != ''">dev_data,</if>
             <if test="params.amount != null and params.amount != ''">amount,</if>
             <if test="params.remarks != null and params.remarks != ''">remarks,</if>
+            <if test="params.devId != null">dev_id,</if>
+            <if test="params.isHg != null and params.isHg != ''">is_hg,</if>
             id
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -132,6 +134,8 @@
             <if test="params.devData != null and params.devData != ''">#{params.devData},</if>
             <if test="params.amount != null and params.amount != ''">#{params.amount},</if>
             <if test="params.remarks != null and params.remarks != ''">#{params.remarks},</if>
+            <if test="params.devId != null">#{params.devId},</if>
+            <if test="params.isHg != null and params.isHg != ''">#{params.isHg},</if>
             null
         </trim>
     </insert>
@@ -466,7 +470,9 @@
     <!--查询试验设备数量-->
     <select id="getExperDevItemsNum" resultType="java.util.Map">
         SELECT dev_code AS devCode,
-               dev_data AS testResult
+               case is_hg WHEN '1' THEN '不合格'
+                WHEN '0' THEN '合格'
+                ELSE '不合格' END AS testResult
         FROM tb_exper_dev
         WHERE exper_id = #{experId}
     </select>