PSSR bugfix

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

@@ -119,17 +119,18 @@ public class TPssrAboveallController extends BaseController {
 
         String userId = getUserId().toString();
         //新增子表数据
-        new Thread(() -> {
-            for (TPssrSubcontent subcontent : tPssrAboveall.getSubcontents()) {
-                if (subcontent.getStatus() == 1) {
-                    subcontent.setAboveallId(tPssrAboveall.getId());//主表id
-                    subcontent.setRegion(tPssrAboveall.getRegion());
-                    subcontent.setUnit(tPssrAboveall.getUnit());
-                    subcontent.setUnitDes(tPssrAboveall.getUnitDes());
-                    subcontent.setApproveStatus(0L);
-                    subcontent.setCreatedate(new Date());
-                    subcontent.setCreaterCode(userId);
-                    tPssrSubcontentService.insertTPssrSubcontent(subcontent);
+        for (TPssrSubcontent subcontent : tPssrAboveall.getSubcontents()) {
+            if (subcontent.getStatus() == 1) {
+                subcontent.setAboveallId(tPssrAboveall.getId());//主表id
+                subcontent.setRegion(tPssrAboveall.getRegion());
+                subcontent.setUnit(tPssrAboveall.getUnit());
+                subcontent.setUnitDes(tPssrAboveall.getUnitDes());
+                subcontent.setApproveStatus(0L);
+                subcontent.setCreatedate(new Date());
+                subcontent.setCreaterCode(userId);
+                tPssrSubcontentService.insertTPssrSubcontent(subcontent);
+
+                new Thread(() -> {
                     if (subcontent.getForShort().equals("xqf")) {
 
                         List<TPssrPatrol> tPssrPatrols = new ArrayList<>();
@@ -235,9 +236,9 @@ public class TPssrAboveallController extends BaseController {
                     } else if (subcontent.getForShort().equals("rsfh")) {
                         genRsfh(subcontent.getId(), userId);
                     }
-                }
+                }, "新增子表数据").start();
             }
-        }, "新增子表数据").start();
+        }
         return AjaxResult.success();
     }
 
@@ -373,14 +374,14 @@ public class TPssrAboveallController extends BaseController {
      * 生成公用工程数据
      */
     private void genGygc(Long subId, String userId) {
-        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统N2已投用或具备投用条件。","界区阀已打开，N2总管压力390PI9114压力达    kpa。","N2总管压力390PI9114压力达    kpa。", userId, new Date()));
-        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统IA已投用或具备投用条件：","界区阀已打开，IA管压力PI3901压力达    kpa。","IA管压力PI3901压力达    kpa。", userId, new Date()));
-        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统PA已投用或具备投用条件。","界区阀已打开，PA管压力PI3902压力达    kpa。","PA管压力PI3902压力达    kpa。", userId, new Date()));
-        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统CW已投用或具备投用条件。","界区阀已打开，CW进出口压差达    kpa。","CW进出口压差达    kap。", userId, new Date()));
-        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统高压蒸汽已投用或具备投用条件。","界区阀已打开，PC9112压力达    Mpa，TI9061温度达    ℃。","PC9112压力达    Mpa，TI9061温度达    ℃。", userId, new Date()));
-        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统中压蒸汽已投用或具备投用条件。","界区阀已打开，PC9081压力达    Mpa，TI9081温度达    ℃。","PC9081压力达    Mpa，TI9081温度达    ℃。", userId, new Date()));
-        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统低压蒸汽已投用或具备投用条件。","界区阀已打开，PY9109压力达    Mpa，TI9115温度达    ℃。","PY9109压力达    Mpa，TI9115温度达    ℃。", userId, new Date()));
-        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统精制凝液已投用或具备投用条件。","界区阀已打开，P3505A/B/C压力达    Mpa。","P3505A/B/C压力达    Mpa。", userId, new Date()));
+        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统N2已投用或具备投用条件。", "界区阀已打开，N2总管压力390PI9114压力达    kpa。", "N2总管压力390PI9114压力达    kpa。", userId, new Date()));
+        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统IA已投用或具备投用条件：", "界区阀已打开，IA管压力PI3901压力达    kpa。", "IA管压力PI3901压力达    kpa。", userId, new Date()));
+        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统PA已投用或具备投用条件。", "界区阀已打开，PA管压力PI3902压力达    kpa。", "PA管压力PI3902压力达    kpa。", userId, new Date()));
+        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统CW已投用或具备投用条件。", "界区阀已打开，CW进出口压差达    kpa。", "CW进出口压差达    kap。", userId, new Date()));
+        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统高压蒸汽已投用或具备投用条件。", "界区阀已打开，PC9112压力达    Mpa，TI9061温度达    ℃。", "PC9112压力达    Mpa，TI9061温度达    ℃。", userId, new Date()));
+        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统中压蒸汽已投用或具备投用条件。", "界区阀已打开，PC9081压力达    Mpa，TI9081温度达    ℃。", "PC9081压力达    Mpa，TI9081温度达    ℃。", userId, new Date()));
+        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统低压蒸汽已投用或具备投用条件。", "界区阀已打开，PY9109压力达    Mpa，TI9115温度达    ℃。", "PY9109压力达    Mpa，TI9115温度达    ℃。", userId, new Date()));
+        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统精制凝液已投用或具备投用条件。", "界区阀已打开，P3505A/B/C压力达    Mpa。", "P3505A/B/C压力达    Mpa。", userId, new Date()));
     }
 
     /**

master/src/main/java/com/ruoyi/project/pssr/service/impl/TPssrPatrolServiceImpl.java

@@ -76,6 +76,7 @@ public class TPssrPatrolServiceImpl implements ITPssrPatrolService {
             planId = plan.getId();
             approveStatus = plan.getStatus() == 1 ? 2L : 0L;
             tPssrPatrol.setConfirmer(plan.getConfirmed());
+            tPssrPatrol.setConfirmDate(plan.getConfirmDate());
         } else {
             //否则生成新的临时计划
             tPatrolPlan.setPlanName(getPlanName(tPssrPatrol.getPlanType().toString(), calendar));