报表调整

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/boiler/QC10033_202400ReportOFData.java

@@ -113,28 +113,28 @@ public class QC10033_202400ReportOFData implements IDynamicOFData {
                     result.put("pressure",equipBoilerDO.getWorkpressure());
                     result.put("medium",equipBoilerDO.getTestmedium());
                     result.put("temperature",equipBoilerDO.getRatedExportTemperature());
+                }
+
+                //下次外检日期
+                if (taskOrderDO != null && taskOrderDO.getCheckDate() != null){
+                    LocalDate nextYearCheckDate = taskOrderDO.getCheckDate().plusYears(1).minusDays(1);
+                    result.put("nextOutCheckDate1_yearMonth",nextYearCheckDate.format(dateFormatMonthYear));
+                }
+
+                //下次内检日期
+                if (equipBoilerDO.getNextInCheckDate() != null){
+                    result.put("nextInCheckDate1_yearMonth",equipBoilerDO.getNextInCheckDate().format(dateFormatMonthYear));
+                }
 
-                    //下次外检日期
-                    if (taskOrderDO != null && taskOrderDO.getCheckDate() != null){
-                        LocalDate nextYearCheckDate = taskOrderDO.getCheckDate().plusYears(1).minusDays(1);
-                        result.put("nextOutCheckDate1_yearMonth",nextYearCheckDate.format(dateFormatMonthYear));
-                    }
-
-                    //下次内检日期
-                    if (equipBoilerDO.getNextInCheckDate() != null){
-                        result.put("nextInCheckDate1_yearMonth",equipBoilerDO.getNextInCheckDate().format(dateFormatMonthYear));
-                    }
-
-                    //下次耐压检验日期
-                    if (equipBoilerDO.getNextPressureCheckDate() != null){
-                        result.put("nextPressureCheckDate1_yearMonth",equipBoilerDO.getNextPressureCheckDate().format(dateFormatMonthYear));
-                    }
+                //下次耐压检验日期
+                if (equipBoilerDO.getNextPressureCheckDate() != null){
+                    result.put("nextPressureCheckDate1_yearMonth",equipBoilerDO.getNextPressureCheckDate().format(dateFormatMonthYear));
                 }
 
             }
 
             if (taskOrderDO != null){
-                String checkDateStr = taskOrderDO.getCheckDate().format(dateFormat);
+                String checkDateStr = taskOrderDO.getCheckDate() != null ? taskOrderDO.getCheckDate().format(dateFormat) : "";
                 if (itemDO.getEndCheckDate() != null){
                     checkDateStr += " 至 " + itemDO.getEndCheckDate().format(dateFormat);
                 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/boiler/QC10098_202400RecordOFData.java

@@ -89,6 +89,10 @@ public class QC10098_202400RecordOFData implements IDynamicOFData {
                 if (firstInsDO == null) {
                     result.put("other"," - ");
                     result.put("refluxTemperature",equipBoilerDO.getOilEquipBackTemp());
+
+                    result.put("unitName_edit",equipBoilerDO.getUnitName());
+                    result.put("lstOutCheckProblem_edit",equipBoilerDO.getLastOutCheckProblem());
+
                 }
 
                 //设备信息

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

@@ -6,6 +6,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.boilertaskorderitemreportuser.BoilerTaskOrderItemReportUserDO;
+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.equippipedetail.EquipPipeDetailDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorder.PipeTaskOrderDO;
@@ -26,6 +27,7 @@ import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderitemreportuser.PipeTa
 import cn.start.tz.module.pressure2.service.dynamicOFData.IDynamicOFData;
 import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
 import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataPipeService;
+import cn.start.tz.module.pressure2.service.dynamictbins.DynamicTbInsService;
 import cn.start.tz.module.pressure2.service.synchronization.dto.PipeDetailDto;
 import cn.start.tz.module.system.api.dict.DictDataApi;
 import cn.start.tz.module.system.api.dict.dto.DictDataRespDTO;
@@ -69,6 +71,9 @@ public class QC47037_202400RecordOFData implements IDynamicOFData {
     @Resource
     private AutoDataPipeService autoDataPipeService;
 
+    @Resource
+    private DynamicTbInsService dynamicTbInsService;
+
     @Override
     public JSONObject getOFData(JSONObject params) {
         return null;
@@ -101,7 +106,7 @@ public class QC47037_202400RecordOFData implements IDynamicOFData {
 
                 // 设置设备编码
                 if (equipBoilerDO != null){
-                    result.put("equipCode",(equipBoilerDO.getFactoryCode() == null ? " - " : equipBoilerDO.getFactoryCode())
+                    result.put("equipCode_edit",(equipBoilerDO.getFactoryCode() == null ? " - " : equipBoilerDO.getFactoryCode())
                             + "/" + (equipBoilerDO.getEquipCode() == null ? " - " : equipBoilerDO.getEquipCode()));
                 }
 
@@ -118,19 +123,26 @@ public class QC47037_202400RecordOFData implements IDynamicOFData {
                 List<PipeTaskOrderItemDO> itemDOList = pipeTaskOrderItemMapper.selectList(new LambdaQueryWrapper<PipeTaskOrderItemDO>()
                         .eq(PipeTaskOrderItemDO::getOrderId, itemReportDO.getOrderId()));
                 if (!itemDOList.isEmpty()){
+
                     //设备信息
                     EquipPipeDO equipDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
+
+                    //只需第一次初始化的数据
+                    DynamicTbInsDO firstInsDO = dynamicTbInsService.getDynamicRefId(refId);
+                    if (firstInsDO == null) {
+                        if (itemDOList.size() > 1){
+                            result.put("equipCode_edit","见一览表");
+                        }else {
+                            if (equipDO != null) {
+                                result.put("equipCode_edit", equipDO.getProjectNo());
+                            }
+                        }
+                    }
+
                     if (equipDO != null){
                         result.put("unitName",equipDO.getUnitName());
                     }
 
-                    if (itemDOList.size() > 1){
-                        result.put("equipCode","见一览表");
-                    }else {
-                        if (equipDO != null) {
-                            result.put("equipCode", equipDO.getProjectNo());
-                        }
-                    }
                 }
 
             }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/pipe/QC12133_202400RecordOFData.java

@@ -1,6 +1,7 @@
 package cn.start.tz.module.pressure2.service.dynamicOFData.pipe;
 
 import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+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.equippipedetail.EquipPipeDetailDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorder.PipeTaskOrderDO;
@@ -13,7 +14,9 @@ import cn.start.tz.module.pressure2.dal.mysql.pipetaskorder.PipeTaskOrderMapper;
 import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderitem.PipeTaskOrderItemMapper;
 import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderitemreport.PipeTaskOrderItemReportMapper;
 import cn.start.tz.module.pressure2.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataPipeService;
 import cn.start.tz.module.pressure2.service.dynamictbcol.DynamicTbColService;
+import cn.start.tz.module.pressure2.service.dynamictbins.DynamicTbInsService;
 import cn.start.tz.module.pressure2.service.dynamictbval.DynamicTbValService;
 import cn.start.tz.module.pressure2.service.pipetaskorderitemdetail.PipeTaskOrderItemDetailService;
 import cn.start.tz.module.system.api.user.AdminUserApi;
@@ -45,19 +48,10 @@ public class QC12133_202400RecordOFData implements IDynamicOFData {
     private PipeTaskOrderItemDetailService pipeTaskOrderItemDetailService;
 
     @Resource
-    private EquipPipeDetailMapper equipPipeDetailMapper;
+    private AutoDataPipeService autoDataPipeService;
 
     @Resource
-    private PipeTaskOrderMapper pipeTaskOrderMapper;
-
-    @Resource
-    private DynamicTbColService dynamicTbColService;
-
-    @Resource
-    private DynamicTbValService dynamicTbValService;
-
-    @Resource
-    private AdminUserApi adminUserApi;
+    private DynamicTbInsService dynamicTbInsService;
 
     @Override
     public JSONObject getOFData(JSONObject params) {
@@ -67,69 +61,43 @@ public class QC12133_202400RecordOFData implements IDynamicOFData {
     @Override
     public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
 
-        //日期格式
-        DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy年MM月dd日");
-
         //设备报表ID
         String refId = ruleVO.getRefId();
-        //检验员ID
-        String checkUserId = ruleVO.getParams().getString("checkUserId");
 
-        JSONObject result = new JSONObject();
+        JSONObject result = autoDataPipeService.autoGeneratePipeRecordData(new JSONObject(), refId);
         PipeTaskOrderItemReportDO itemReportDO = pipeTaskOrderItemReportMapper.selectById(refId);
 
-        if (itemReportDO != null){
+        if (itemReportDO != null) {
 
             List<PipeTaskOrderItemDO> itemDOList = pipeTaskOrderItemMapper.selectList(new LambdaQueryWrapper<PipeTaskOrderItemDO>()
                     .eq(PipeTaskOrderItemDO::getOrderId, itemReportDO.getOrderId()));
-            if (!itemDOList.isEmpty()){
+            if (!itemDOList.isEmpty()) {
                 //设备信息
-                if (itemDOList.size() > 1){
-                    result.put("projectNo","见一览表");
-                    result.put("certificateNo","见一览表");
-                }else {
+                if (itemDOList.size() > 1) {
+                    result.put("projectNo", "见一览表");
+                    result.put("projectName", "见一览表");
+                    result.put("certificateNo", "见一览表");
+                } else {
                     EquipPipeDO equipPipeDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
-                    if (equipPipeDO != null){
-                        result.put("projectNo",equipPipeDO.getProjectNo());
-                        result.put("certificateNo",equipPipeDO.getCertificateNo());
+                    if (equipPipeDO != null) {
+                        result.put("projectNo", equipPipeDO.getProjectNo());
+                        result.put("projectName", equipPipeDO.getProjectName());
+                        result.put("certificateNo", equipPipeDO.getCertificateNo());
                     }
                 }
-            }
 
-            //管线信息
-            List<PipeTaskOrderItemDetailDO> details = pipeTaskOrderItemDetailService.lambdaQuery().eq(PipeTaskOrderItemDetailDO::getOrderId,itemReportDO.getOrderId()).list();
-            if (!details.isEmpty()) {
-                List<EquipPipeDetailDO> pipeDetails = equipPipeDetailMapper.selectByIds(details.stream().map(PipeTaskOrderItemDetailDO::getEquipDetailId).toList());
-                if (!pipeDetails.isEmpty()) {
-                    for (int i = 0; i < pipeDetails.size(); i++) {
-                        EquipPipeDetailDO pipeDetail = pipeDetails.get(i);
-                        result.put("pipeNo_" + (i + 1), pipeDetail.getPipeNo());
-                    }
-                }
-            }
+                //只需第一次初始化的数据
+                DynamicTbInsDO firstInsDO = dynamicTbInsService.getDynamicRefId(refId);
+                if (firstInsDO == null) {
 
-            result.put("reportNo",itemReportDO.getReportNo());
+                    int index = 1;
+                    List<EquipPipeDetailDO> equipPipeDetailDOS = pipeTaskOrderItemDetailService.getPipeTaskOrderItemDetailList(itemReportDO.getOrderId());
 
-            //检验员信息
-            String orderId = itemReportDO.getOrderId();
-            PipeTaskOrderDO taskOrderDO =  pipeTaskOrderMapper.selectById(orderId);
-            if (taskOrderDO != null){
-                result.put("checkDate",taskOrderDO.getCheckDate().format(dateFormat));
-            }
-            AdminUserRespDTO userInfo = adminUserApi.getUser(checkUserId).getData();
-            if (userInfo != null){
-                result.put("checkName",userInfo.getSignUrl());
-            }
+                    for (EquipPipeDetailDO equipPipeDetailDO : equipPipeDetailDOS) {
+                        result.put("pipeNo_" + index++, equipPipeDetailDO.getPipeNo());
+                    }
+                }
 
-            //校验人员信息
-            userInfo = adminUserApi.getUser(itemReportDO.getRecheckId()).getData();
-            if (userInfo != null){
-                result.put("recheckName",userInfo.getSignUrl());
-            }else{
-                result.put("recheckName",itemReportDO.getRecheckName());
-            }
-            if (itemReportDO.getRecheckDate() != null){
-                result.put("recheckDate",itemReportDO.getRecheckDate().format(dateFormat));
             }
 
         }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/pipe/QC12133_202401RecordOFData.java

@@ -1,6 +1,7 @@
 package cn.start.tz.module.pressure2.service.dynamicOFData.pipe;
 
 import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+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.equippipedetail.EquipPipeDetailDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorder.PipeTaskOrderDO;
@@ -16,6 +17,7 @@ import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderitemreport.PipeTaskOr
 import cn.start.tz.module.pressure2.service.dynamicOFData.IDynamicOFData;
 import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataPipeService;
 import cn.start.tz.module.pressure2.service.dynamictbcol.DynamicTbColService;
+import cn.start.tz.module.pressure2.service.dynamictbins.DynamicTbInsService;
 import cn.start.tz.module.pressure2.service.dynamictbval.DynamicTbValService;
 import cn.start.tz.module.pressure2.service.pipetaskorderitemdetail.PipeTaskOrderItemDetailService;
 import cn.start.tz.module.system.api.user.AdminUserApi;
@@ -51,16 +53,7 @@ public class QC12133_202401RecordOFData implements IDynamicOFData {
     private EquipPipeDetailMapper equipPipeDetailMapper;
 
     @Resource
-    private PipeTaskOrderMapper pipeTaskOrderMapper;
-
-    @Resource
-    private DynamicTbColService dynamicTbColService;
-
-    @Resource
-    private DynamicTbValService dynamicTbValService;
-
-    @Resource
-    private AdminUserApi adminUserApi;
+    private DynamicTbInsService dynamicTbInsService;
 
     @Resource
     private AutoDataPipeService autoDataPipeService;
@@ -73,13 +66,8 @@ public class QC12133_202401RecordOFData implements IDynamicOFData {
     @Override
     public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
 
-        //日期格式
-        DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy年MM月dd日");
-
         //设备报表ID
         String refId = ruleVO.getRefId();
-        //检验员ID
-        String checkUserId = ruleVO.getParams().getString("checkUserId");
 
         JSONObject result = autoDataPipeService.autoGeneratePipeRecordData(new JSONObject(), refId);
         PipeTaskOrderItemReportDO itemReportDO = pipeTaskOrderItemReportMapper.selectById(refId);
@@ -93,28 +81,26 @@ public class QC12133_202401RecordOFData implements IDynamicOFData {
                 if (itemDOList.size() > 1) {
                     result.put("projectNo", "见一览表");
                     result.put("projectName", "见一览表");
+                    result.put("certificateNo", "见一览表");
                 } else {
                     EquipPipeDO equipPipeDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
                     if (equipPipeDO != null) {
                         result.put("projectNo", equipPipeDO.getProjectNo());
                         result.put("projectName", equipPipeDO.getProjectName());
+                        result.put("certificateNo", equipPipeDO.getCertificateNo());
                     }
                 }
-                result.put("certificateNo", "见一览表");
-                int index = 1;
-                /*for (PipeTaskOrderItemDO pipeTaskOrderItemDO : itemDOList) {
-                    EquipPipeDO equipPipeDO = equipPipeMapper.selectById(pipeTaskOrderItemDO.getEquipId());
-                    if (equipPipeDO != null) {
-                        List<EquipPipeDetailDO> equipPipeDetailDOS = equipPipeDetailMapper.selectList(EquipPipeDetailDO::getEquipPipeId, equipPipeDO.getId());
-                        for (EquipPipeDetailDO equipPipeDetailDO : equipPipeDetailDOS) {
-                            result.put("pipeNo_" + index++, equipPipeDetailDO.getPipeNo());
-                        }
-                    }
-                }*/
-                List<EquipPipeDetailDO> equipPipeDetailDOS = pipeTaskOrderItemDetailService.getPipeTaskOrderItemDetailList(itemReportDO.getOrderId());
 
-                for (EquipPipeDetailDO equipPipeDetailDO : equipPipeDetailDOS) {
-                    result.put("pipeNo_" + index++, equipPipeDetailDO.getPipeNo());
+                //只需第一次初始化的数据
+                DynamicTbInsDO firstInsDO = dynamicTbInsService.getDynamicRefId(refId);
+                if (firstInsDO == null) {
+
+                    int index = 1;
+                    List<EquipPipeDetailDO> equipPipeDetailDOS = pipeTaskOrderItemDetailService.getPipeTaskOrderItemDetailList(itemReportDO.getOrderId());
+
+                    for (EquipPipeDetailDO equipPipeDetailDO : equipPipeDetailDOS) {
+                        result.put("pipeNo_" + index++, equipPipeDetailDO.getPipeNo());
+                    }
                 }
 
             }