Merge remote-tracking branch 'origin/dev' into dev

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorder/BoilerTaskOrderInspectionServiceImpl.java

@@ -339,7 +339,7 @@ public class BoilerTaskOrderInspectionServiceImpl implements BoilerTaskOrderInsp
                 boilerOpinionReportedExcelVo.setSendTime(item.getSendTime());
                 boilerOpinionReportedExcelVo.setSignTime(item.getSignTime());
                 boilerOpinionReportedExcelVo.setRectificationTime(item.getRectificationTime());
-                boilerOpinionReportedExcelVo.setCheckUserName(item.getCheckUsers().get(0).getNickname());
+                boilerOpinionReportedExcelVo.setCheckUserName(item.getCheckUsers()==null?"" :item.getCheckUsers().get(0).getNickname());
                 boilerOpinionReportedExcelVo.setRectificationStatusName(rectificationStatusMap.get(item.getRectificationStatus()));
                 if (item.getRectificationStatus() == 0){
                     boilerOpinionReportedExcelVo.setConfirmationTimeStr(item.getConfirmationTimeStr());
@@ -357,9 +357,9 @@ public class BoilerTaskOrderInspectionServiceImpl implements BoilerTaskOrderInsp
                                 .map(DictDataRespDTO::getLabel)
                                 .findFirst()
                                 .orElse(""));
-                boilerOpinionReportedExcelVo.setCheckDate(item.getCheckDate().getYear()+"-"+item.getCheckDate().getMonthValue()+"-"+item.getCheckDate().getDayOfMonth());
+                boilerOpinionReportedExcelVo.setCheckDate(item.getCheckDate()==null||item.getCheckDate().getYear()==0?"":item.getCheckDate().getYear()+"-"+item.getCheckDate().getMonthValue()+"-"+item.getCheckDate().getDayOfMonth());
                 boilerOpinionReportedExcelVo.setDeptName(item.getDeptName());
-                boilerOpinionReportedExcelVo.setHandleUserNickname(item.getHandlerUserList().get(0).getNickname());
+                boilerOpinionReportedExcelVo.setHandleUserNickname(item.getHandlerUserList()==null? "":item.getHandlerUserList().get(0).getNickname());
                 list.add(boilerOpinionReportedExcelVo);
             }
         }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorder/BoilerTaskOrderServiceImpl.java

@@ -6600,7 +6600,7 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
             } else {
                 item.setIsCloseReportedStr("是");
             }
-            if(!item.getReporterUserList().isEmpty()){
+            if(item.getReporterUserList()!=null){
                 item.setHandleUserNickName(item.getReporterUserList().get(0).getNickname());
             }
         });

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

@@ -78,31 +78,17 @@ public class QC10021_202400ReportOFData implements IDynamicOFData {
 
             //根据记录字段动态生成报告字段
             result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(),ruleVO.getTemplateId(),refId);
-//            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
 
             String orderItemId = itemReportDO.getOrderItemId();
             BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
             EquipBoilerReportVO equipBoilerDO = equipBoilerMapper.selectDetailsById(itemDO.getEquipId());
             if (equipBoilerDO != null){
                 //设备信息
-//                result.put("boilerModel",equipBoilerDO.getBoilerModel());
-            }
-
-            result.put("reportNo",itemReportDO.getReportNo());
 
-            //审核人员信息
-            AdminUserRespDTO userInfo = adminUserApi.getUser(itemReportDO.getApprovalId()).getData();
-            if (userInfo != null){
-                if (userInfo.getSignUrl() != null){
-                    result.put("approvalName",userInfo.getSignUrl());
-                }else{
-                    result.put("approvalName",itemReportDO.getApprovalName());
-                }
-            }
-            if (itemReportDO.getApprovalTime() != null){
-                result.put("approvalTime",itemReportDO.getApprovalTime().format(dateFormat));
             }
 
+
         }
 
         return result;

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

@@ -5,12 +5,14 @@ import cn.start.tz.module.pressure2.controller.admin.equipboiler.vo.EquipBoilerR
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorder.BoilerTaskOrderDO;
 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.boilertaskorderuser.BoilerTaskOrderUserDO;
 import cn.start.tz.module.pressure2.dal.mysql.boilertaskorder.BoilerTaskOrderMapper;
 import cn.start.tz.module.pressure2.dal.mysql.boilertaskorderitem.BoilerTaskOrderItemMapper;
 import cn.start.tz.module.pressure2.dal.mysql.boilertaskorderitemreport.BoilerTaskOrderItemReportMapper;
 import cn.start.tz.module.pressure2.dal.mysql.equipboiler.EquipBoilerMapper;
 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.InspectorInfoUtil;
 import cn.start.tz.module.system.api.user.AdminUserApi;
 import cn.start.tz.module.system.api.user.dto.AdminUserRespDTO;
 import com.alibaba.fastjson2.JSONObject;
@@ -18,6 +20,7 @@ import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
 import java.time.format.DateTimeFormatter;
+import java.util.List;
 
 /**
  * 锅炉内部检验记录
@@ -50,8 +53,7 @@ public class QC10086_202400RecordOFData implements IDynamicOFData {
 
     @Override
     public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
-        return autoDataBoilerService.autoGenerateBoilerRecordData(new JSONObject(), ruleVO.getRefId());
-        /*
+
         //日期格式
         DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy年MM月dd日");
 
@@ -65,24 +67,15 @@ public class QC10086_202400RecordOFData implements IDynamicOFData {
 
         if (itemReportDO != null){
 
+            result = autoDataBoilerService.autoGenerateBoilerRecordData(result, refId);
+
             String orderItemId = itemReportDO.getOrderItemId();
             BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
             EquipBoilerReportVO equipBoilerDO = equipBoilerMapper.selectDetailsById(itemDO.getEquipId());
             if (equipBoilerDO != null){
                 //设备信息
-                result.put("useUnitName",equipBoilerDO.getUnitName());
-                result.put("contactPhone",equipBoilerDO.getContactPhone());
-                result.put("boilerModel",equipBoilerDO.getBoilerModel());
-                result.put("ratedPressure",equipBoilerDO.getRatedPressure());
                 result.put("workPressure",equipBoilerDO.getWorkpressure());
-                result.put("unitInternalCode",equipBoilerDO.getUnitInternalCode());
-                if (equipBoilerDO.getMadeTime() != null){
-                    result.put("madeTime",equipBoilerDO.getMadeTime().format(dateFormat));
-                }
-                result.put("productCode",equipBoilerDO.getProductCode());
-                result.put("equipCode",equipBoilerDO.getEquipCode());
-                result.put("makeUnit",equipBoilerDO.getMakeUnit());
-                result.put("unitCode",equipBoilerDO.getUnitCode());
+
                 if (equipBoilerDO.getNextInCheckDate() != null){
                     result.put("nextInCheckDate",equipBoilerDO.getNextInCheckDate().format(dateFormat));
                 }
@@ -92,50 +85,31 @@ public class QC10086_202400RecordOFData implements IDynamicOFData {
                 if (equipBoilerDO.getNextPressureCheckDate() != null){
                     result.put("nextPressureCheckDate",equipBoilerDO.getNextPressureCheckDate().format(dateFormat));
                 }
-                result.put("installUnit",equipBoilerDO.getInstallUnit());
-                result.put("designWorkPressure",equipBoilerDO.getDesignWorkPressure());
-                result.put("unitAddress",equipBoilerDO.getUnitAddress());
-                result.put("useRegisterNo",equipBoilerDO.getUseRegisterNo());
-                result.put("lastRepairReformContent",equipBoilerDO.getLastRepairReformContent());
-                result.put("ratedExportTemperature",equipBoilerDO.getRatedExportTemperature());
-                result.put("useOutletTemperature",equipBoilerDO.getUseOutletTemperature());
-                result.put("unitName",equipBoilerDO.getUnitName());
-                result.put("zipCode",equipBoilerDO.getZipCode());
-                result.put("ratedOutput",equipBoilerDO.getRatedOutput());
-                result.put("contact",equipBoilerDO.getContact());
-                if (equipBoilerDO.getUseTime() != null){
-                    result.put("useTime",(equipBoilerDO.getUseTime()).format(dateFormat));
+                if (equipBoilerDO.getLastAllDate() != null){
+                    result.put("lastAllDate",equipBoilerDO.getLastAllDate().format(dateFormat));
+                }
+                if (equipBoilerDO.getLastYearDate() != null){
+                    result.put("lastYearDate",equipBoilerDO.getLastYearDate().format(dateFormat));
+                }
+                if (equipBoilerDO.getLastPressureDate() != null){
+                    result.put("lastPressureCheckDate",equipBoilerDO.getLastPressureDate().format(dateFormat));
                 }
-            }
-
-            result.put("reportNo",itemReportDO.getReportNo());
 
-            //检验员信息
-            String orderId = itemReportDO.getOrderId();
-            BoilerTaskOrderDO taskOrderDO =  boilerTaskOrderMapper.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());
             }
 
-            //校验人员信息
-            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));
+            //检验员
+            if (itemDO.getMainChecker() != null){
+                AdminUserRespDTO userInfo = adminUserApi.getUser(itemDO.getMainChecker()).getData();
+                if (userInfo != null) {
+                    result.put("checkName", userInfo.getSignUrl());
+                }
             }
 
+
         }
 
         return result;
-*/
+
 
     }
 }

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

@@ -49,51 +49,26 @@ public class QC10087_202400RecordOFData implements IDynamicOFData {
 
     @Override
     public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
-//        return autoDataBoilerService.autoGenerateBoilerRecordData(new JSONObject(), ruleVO.getRefId());
+
         //日期格式
         DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy年MM月dd日");
 
         //设备报表ID
         String refId = ruleVO.getRefId();
-        //检验员ID
-        String checkUserId = ruleVO.getParams().getString("checkUserId");
 
         JSONObject result = new JSONObject();
         BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
 
         if (itemReportDO != null){
 
+            result = autoDataBoilerService.autoGenerateBoilerRecordData(result, refId);
+
             String orderItemId = itemReportDO.getOrderItemId();
             BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
             EquipBoilerReportVO equipBoilerDO = equipBoilerMapper.selectDetailsById(itemDO.getEquipId());
             if (equipBoilerDO != null){
                 //设备信息
-                result.put("productCode",equipBoilerDO.getProductCode());
-                result.put("boilerModel",equipBoilerDO.getBoilerModel());
-            }
-
-            result.put("reportNo",itemReportDO.getReportNo());
 
-            //检验员信息
-            String orderId = itemReportDO.getOrderId();
-            BoilerTaskOrderDO taskOrderDO =  boilerTaskOrderMapper.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());
-            }
-
-            //校验人员信息
-            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/QC12024_202403JRecordOFData.java

@@ -148,13 +148,23 @@ public class QC12024_202403JRecordOFData implements IDynamicOFData {
                     List<EquipPipeDetailDO> equipPipeDetailDOList = equipPipeDetailMapper.selectList(new LambdaQueryWrapper<EquipPipeDetailDO>()
                             .in(EquipPipeDetailDO::getId, allDetailDOS.stream().map(PipeTaskOrderItemDetailDO::getEquipDetailId).toList()));
                     if (equipPipeDetailDOList.size() > 1){
-                        result.put("pipeName","见一览表" );
                         result.put("designLifeYears", "-");
                     }else if (equipPipeDetailDOList.size() == 1){
-                        result.put("pipeName", equipPipeDetailDOList.get(0).getPipeName());
                         result.put("designLifeYears", equipPipeDetailDOList.get(0).getDesignLifeYears());
                     }
 
+                    if (!equipPipeDetailDOList.isEmpty()) {
+                        // 判断pipeName是否相同
+                        String pipeNameValue;
+                        Set<String> pipeNames = equipPipeDetailDOList.stream()
+                                .map(EquipPipeDetailDO::getPipeName)
+                                .filter(Objects::nonNull)
+                                .collect(Collectors.toSet());
+                        // 如果只有一个唯一的pipeName值，则使用该值；否则设置为"见一览表"
+                        pipeNameValue = pipeNames.size() == 1 ? pipeNames.iterator().next() : "见一览表";
+                        result.put("pipeName", pipeNameValue);
+                    }
+
                     if (!equipPipeDetailDOList.isEmpty()) {
                         // 判断pipeLevel是否相同
                         String pipeLevelValue;
@@ -175,9 +185,11 @@ public class QC12024_202403JRecordOFData implements IDynamicOFData {
                     result.put("projectName", "见一览表");
                     result.put("layingMode", "-");
                 } else {
-                    result.put("layingMode", equipPipeDO.getLayingMode());
-                    result.put("projectNo", equipPipeDO.getProjectNo());
-                    result.put("projectName", equipPipeDO.getProjectName());
+                    if (equipPipeDO != null) {
+                        result.put("projectNo", equipPipeDO.getProjectNo());
+                        result.put("projectName", equipPipeDO.getProjectName());
+                        result.put("layingMode", equipPipeDO.getLayingMode());
+                    }
                 }
 
             }
@@ -192,10 +204,6 @@ public class QC12024_202403JRecordOFData implements IDynamicOFData {
                 List<PipeTaskOrderUserDO> checkUserList = pipeTaskOrderUserMapper.selectList(PipeTaskOrderUserDO::getOrderId,itemReportDO.getOrderId());
                 InspectorInfoPipeUtil.fillInspectorSignatures(result, checkUserList, taskOrderDO.getManagerId(), adminUserApi);
 
-//                AdminUserRespDTO userInfo = adminUserApi.getUser(taskOrderDO.getManagerId()).getData();
-//                if (userInfo != null) {
-//                    result.put("checkName", userInfo.getSignUrl());
-//                }
             }
 
             //审核人员信息

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorder/PipeTaskOrderInspectionServiceImpl.java

@@ -349,7 +349,7 @@ public class PipeTaskOrderInspectionServiceImpl implements PipeTaskOrderInspecti
                 pipeOpinionReportedExcelVo.setSendTime(item.getSendTime());
                 pipeOpinionReportedExcelVo.setSignTime(item.getSignTime());
                 pipeOpinionReportedExcelVo.setRectificationTime(item.getRectificationTime());
-                pipeOpinionReportedExcelVo.setCheckUserName(item.getCheckUsers().get(0).getNickname());
+                pipeOpinionReportedExcelVo.setCheckUserName(item.getCheckUsers()==null?"":item.getCheckUsers().get(0).getNickname());
                 pipeOpinionReportedExcelVo.setRectificationStatusName(rectificationStatusMap.get(item.getRectificationStatus()));
                 if (item.getRectificationStatus() == 0){
                     pipeOpinionReportedExcelVo.setConfirmationTimeStr(item.getConfirmationTimeStr());
@@ -367,9 +367,9 @@ public class PipeTaskOrderInspectionServiceImpl implements PipeTaskOrderInspecti
                         .map(DictDataRespDTO::getLabel)
                         .findFirst()
                         .orElse(""));
-                pipeOpinionReportedExcelVo.setCheckDate(item.getCheckDate().getYear()+"-"+item.getCheckDate().getMonthValue()+"-"+item.getCheckDate().getDayOfMonth());
+                pipeOpinionReportedExcelVo.setCheckDate(item.getCheckDate()==null||item.getCheckDate().getYear()==0?"":item.getCheckDate().getYear()+"-"+item.getCheckDate().getMonthValue()+"-"+item.getCheckDate().getDayOfMonth());
                 pipeOpinionReportedExcelVo.setDeptName(item.getDeptName());
-                pipeOpinionReportedExcelVo.setHandleUserNickname(item.getHandlerUserList().get(0).getNickname());
+                pipeOpinionReportedExcelVo.setHandleUserNickname(item.getHandlerUserList()==null?"":item.getHandlerUserList().get(0).getNickname());
                 list.add(pipeOpinionReportedExcelVo);
             }
         }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorder/PipeTaskOrderServiceImpl.java

@@ -5854,7 +5854,7 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
             } else {
                 item.setIsCloseReportedStr("是");
             }
-            if(!item.getReporterUserList().isEmpty()){
+            if(item.getReporterUserList()!=null){
                 item.setHandleUserNickName(item.getReporterUserList().get(0).getNickname());
             }
         });