检验通知书调整

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/comm/QC01006_202400OFData.java

@@ -9,6 +9,7 @@ import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorder.BoilerTaskOrd
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitem.BoilerTaskOrderItemDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitemreport.BoilerTaskOrderItemReportDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskordersignfile.BoilerTaskOrderSignFileDO;
+import cn.start.tz.module.pressure2.dal.dataobject.dynamictbins.DynamicTbInsDO;
 import cn.start.tz.module.pressure2.dal.dataobject.equippipe.EquipPipeDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorder.PipeTaskOrderDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitem.PipeTaskOrderItemDO;
@@ -23,6 +24,7 @@ import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderitemreport.PipeTaskOr
 import cn.start.tz.module.pressure2.service.boilertaskorder.BoilerTaskOrderService;
 import cn.start.tz.module.pressure2.service.boilertaskordersignfile.BoilerTaskOrderSignFileService;
 import cn.start.tz.module.pressure2.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.dynamictbins.DynamicTbInsService;
 import cn.start.tz.module.pressure2.service.pipetaskorder.PipeTaskOrderService;
 import cn.start.tz.module.system.api.calendar.CalendarApi;
 import cn.start.tz.module.system.api.clientunit.ClientUnitApi;
@@ -88,6 +90,9 @@ public class QC01006_202400OFData implements IDynamicOFData {
     @Resource
     private DictDataApi dictDataApi;
 
+    @Resource
+    private DynamicTbInsService dynamicTbInsService;
+
     @Resource
     private CalendarApi calendarApi;
 
@@ -151,6 +156,15 @@ public class QC01006_202400OFData implements IDynamicOFData {
                         result.put("contactPhone",equipBoilerDO.getContactPhone());
                         result.put("unitAddress",equipBoilerDO.getUnitAddress());
 //                        result.put("zipCode",equipBoilerDO.getZipCode());
+
+                        //第一次生成记录由上次记录生成
+                        DynamicTbInsDO firstInsDO = dynamicTbInsService.getDynamicRefId(refId);
+                        //是否第一次生成
+                        if (firstInsDO == null) {
+                            result.put("contact_edit",equipBoilerDO.getContact());
+                            result.put("contactPhone_edit",equipBoilerDO.getContactPhone());
+                        }
+
                     }
                 }
 
@@ -196,6 +210,15 @@ public class QC01006_202400OFData implements IDynamicOFData {
                             result.put("contactPhone",equipPipeDO.getContactPhone());
                             result.put("unitAddress",equipPipeDO.getUnitAddress());
 //                            result.put("zipCode",equipPipeDO.getPostalCode());
+
+                            //第一次生成记录由上次记录生成
+                            DynamicTbInsDO firstInsDO = dynamicTbInsService.getDynamicRefId(refId);
+                            //是否第一次生成
+                            if (firstInsDO == null) {
+                                result.put("contact_edit",equipPipeDO.getContact());
+                                result.put("contactPhone_edit",equipPipeDO.getContactPhone());
+                            }
+
                         }
                     }
                     result.put("reportNo",itemReportDO.getReportNo());

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/comm/QC01007_202400OFData.java

@@ -7,6 +7,7 @@ import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorder.BoilerTaskOrd
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitem.BoilerTaskOrderItemDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitemreport.BoilerTaskOrderItemReportDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskordersignfile.BoilerTaskOrderSignFileDO;
+import cn.start.tz.module.pressure2.dal.dataobject.dynamictbins.DynamicTbInsDO;
 import cn.start.tz.module.pressure2.dal.dataobject.equippipe.EquipPipeDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorder.PipeTaskOrderDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitem.PipeTaskOrderItemDO;
@@ -21,6 +22,7 @@ import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderitemreport.PipeTaskOr
 import cn.start.tz.module.pressure2.service.boilertaskorder.BoilerTaskOrderService;
 import cn.start.tz.module.pressure2.service.boilertaskordersignfile.BoilerTaskOrderSignFileService;
 import cn.start.tz.module.pressure2.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.dynamictbins.DynamicTbInsService;
 import cn.start.tz.module.pressure2.service.pipetaskorder.PipeTaskOrderService;
 import cn.start.tz.framework.common.pojo.CommonResult;
 import cn.start.tz.module.system.api.calendar.CalendarApi;
@@ -89,6 +91,9 @@ public class QC01007_202400OFData implements IDynamicOFData {
     @Resource
     private CalendarApi calendarApi;
 
+    @Resource
+    private DynamicTbInsService dynamicTbInsService;
+
     @Override
     public JSONObject getOFData(JSONObject params) {
         return null;
@@ -153,6 +158,15 @@ public class QC01007_202400OFData implements IDynamicOFData {
                         result.put("contactPhone",equipBoilerDO.getContactPhone());
                         result.put("unitAddress",equipBoilerDO.getUnitAddress());
 //                        result.put("zipCode",equipBoilerDO.getZipCode());
+
+                        //第一次生成记录由上次记录生成
+                        DynamicTbInsDO firstInsDO = dynamicTbInsService.getDynamicRefId(refId);
+                        //是否第一次生成
+                        if (firstInsDO == null) {
+                            result.put("contact_edit",equipBoilerDO.getContact());
+                            result.put("contactPhone_edit",equipBoilerDO.getContactPhone());
+                        }
+
                     }
                 }
 
@@ -228,6 +242,15 @@ public class QC01007_202400OFData implements IDynamicOFData {
                             result.put("contactPhone",equipPipeDO.getContactPhone());
                             result.put("unitAddress",equipPipeDO.getUnitAddress());
 //                            result.put("zipCode",equipPipeDO.getPostalCode());
+
+                            //第一次生成记录由上次记录生成
+                            DynamicTbInsDO firstInsDO = dynamicTbInsService.getDynamicRefId(refId);
+                            //是否第一次生成
+                            if (firstInsDO == null) {
+                                result.put("contact_edit",equipPipeDO.getContact());
+                                result.put("contactPhone_edit",equipPipeDO.getContactPhone());
+                            }
+
                         }
                     }
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/util/AutoDataBoilerService.java

@@ -172,11 +172,16 @@ public class AutoDataBoilerService {
 
         // 获取参与检验的人员列表
         List<BoilerTaskOrderItemReportUserDO> itemReportUserDOS = boilerTaskOrderItemReportUserMapper.selectList(BoilerTaskOrderItemReportUserDO::getReportId, boilerTaskOrderItemReportDOId);
-        if (taskOrderDO != null) {
-            jsonObject.put("checkDate", taskOrderDO.getCheckDate().format(dateFormat));
-        } else {
-            jsonObject.put("checkDate", "-");
+
+        //是否第一次生成
+        if (firstInsDO == null) {
+            if (taskOrderDO != null) {
+                jsonObject.put("checkDate", taskOrderDO.getCheckDate().format(dateFormat));
+            } else {
+                jsonObject.put("checkDate", "-");
+            }
         }
+
         if (!itemReportUserDOS.isEmpty()) {
             AdminUserRespDTO userInfo = adminUserApi.getUser(itemReportUserDOS.get(0).getUserId()).getData();
             if (userInfo != null) {

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/util/AutoDataPipeService.java

@@ -117,11 +117,16 @@ public class AutoDataPipeService {
         jsonObject.put("reportNo", itemReportDO.getReportNo());
 
         List<PipeTaskOrderItemReportUserDO> itemReportUserDOS = pipeTaskOrderItemReportUserMapper.selectList(PipeTaskOrderItemReportUserDO::getReportId, pipeTaskOrderItemReportDOId);
-        if (taskOrderDO != null) {
-            jsonObject.put("checkDate", taskOrderDO.getCheckDate().format(dateFormat));
-        } else {
-            jsonObject.put("checkDate", "-");
+
+        //是否第一次生成
+        if (firstInsDO == null) {
+            if (taskOrderDO != null) {
+                jsonObject.put("checkDate", taskOrderDO.getCheckDate().format(dateFormat));
+            } else {
+                jsonObject.put("checkDate", "-");
+            }
         }
+
         if (!itemReportUserDOS.isEmpty()) {
             AdminUserRespDTO userInfo = adminUserApi.getUser(itemReportUserDOS.get(0).getUserId()).getData();
             if (userInfo != null) {