PSSR代码逻辑及SQL优化

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMocController.java

@@ -211,9 +211,9 @@ public class TPssrMocController extends BaseController {
             pssrMoc.setRegion(sysDictDataService.selectDictLabel("MOC_AREA", moc.getArea()));
             pssrMoc.setMocNo(moc.getCompanyMocNo());
             pssrMoc.setTitle(moc.getTitle());
-            pssrMoc.setDocUpdate(StringUtils.isNotEmpty(moc.getDocUpdate()) ? "Y" : "N");
-            pssrMoc.setTraining(StringUtils.isNotEmpty(moc.getIsTraining()) ? "Y" : "N");
-            pssrMoc.setPssr(StringUtils.isNotEmpty(moc.getIsPssr()) ? "Y" : "N");
+            pssrMoc.setDocUpdate(!Objects.isNull(moc.getDocUpdate()) ? "Y" : "N");
+            pssrMoc.setTraining(!Objects.isNull(moc.getTraining()) ? "Y" : "N");
+            pssrMoc.setPssr(!Objects.isNull(moc.getPssr()) ? "Y" : "N");
             pssrMoc.setCreaterCode(getUserId().toString());
             pssrMoc.setCreatedate(new Date());
             pssrMoc.setApproveStatus(0L);

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrSafetyValve.java

@@ -80,6 +80,7 @@ public class TPssrSafetyValve extends BaseEntity
 
     /** 时间 */
     @Excel(name = "时间")
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date confirmationTime;
 
     /** 删除状态 */

master/src/main/resources/mybatis/pssr/TPssrPumpCleaningMapper.xml

@@ -39,9 +39,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectNoConfirmCount"  parameterType="Long" resultType="int">
         select
-            (select count(1) from T_PSSR_PUMP_CLEANING where sub_id = #{subId} and (confirmer1 is null or confirmer2 is null)  and d.del_flag = 0)+
-            (select count(1) from T_PSSR_PUMP_FILL where sub_id = #{subId} and (confirmer1 is null or confirmer2 is null)  and d.del_flag = 0)+
-            (select count(1) from T_PSSR_PUMP_OVERHAUL where sub_id = #{subId} and (confirmer1 is null or confirmer2 is null  and d.del_flag = 0))
+            (select count(1) from T_PSSR_PUMP_CLEANING where sub_id = #{subId} and (confirmer1 is null or confirmer2 is null)  and del_flag = 0)+
+            (select count(1) from T_PSSR_PUMP_FILL where sub_id = #{subId} and (confirmer1 is null or confirmer2 is null)  and del_flag = 0)+
+            (select count(1) from T_PSSR_PUMP_OVERHAUL where sub_id = #{subId} and (confirmer1 is null or confirmer2 is null  and del_flag = 0))
         from dual
     </select>
 

master/src/main/resources/mybatis/pssr/TPssrSafetyBleedMapper.xml

@@ -43,11 +43,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectNoConfirmCount"  parameterType="Long" resultType="int">
         select
-            (select count(1) from T_PSSR_SAFETY_BLEED where sub_id = #{subId} and (confirmer1 is null or confirmer2 is null)  and d.del_flag = 0)+
-            (select count(1) from T_PSSR_SAFETY_BREATH where sub_id = #{subId} and (confirmer1 is null or confirmer2 is null)  and d.del_flag = 0)+
-            (select count(1) from T_PSSR_SAFETY_BRUST where sub_id = #{subId} and (confirmer1 is null or confirmer2 is null)  and d.del_flag = 0)+
-            (select count(1) from T_PSSR_SAFETY_FLAMEARRESTER where sub_id = #{subId} and (confirmer1 is null or confirmer2 is null)  and d.del_flag = 0)+
-            (select count(1) from T_PSSR_SAFETY_VALVE where sub_id = #{subId} and (confirmer1 is null or confirmer2 is null)  and d.del_flag = 0)
+            (select count(1) from T_PSSR_SAFETY_BLEED where sub_id = #{subId} and (confirmer1 is null or confirmer2 is null)  and del_flag = 0)+
+            (select count(1) from T_PSSR_SAFETY_BREATH where sub_id = #{subId} and (confirmer1 is null or confirmer2 is null)  and del_flag = 0)+
+            (select count(1) from T_PSSR_SAFETY_BRUST where sub_id = #{subId} and (confirmer1 is null or confirmer2 is null)  and del_flag = 0)+
+            (select count(1) from T_PSSR_SAFETY_FLAMEARRESTER where sub_id = #{subId} and (confirmer1 is null or confirmer2 is null)  and del_flag = 0)+
+            (select count(1) from T_PSSR_SAFETY_VALVE where sub_id = #{subId} and (confirmer1 is null or confirmer2 is null)  and del_flag = 0)
         from dual
     </select>