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

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

@@ -125,6 +125,7 @@ public class FSJFTZSOFData implements IDynamicOFData {
                 result.put("ZNJSX", "0");
                 result.put("QJTS", "-");
                 result.put("JMYY", "-");
+                result.put("JKSBM", taskOrderNonTaxRecordDO.getPaymentInstructionNo());
 
                 String payAmount = "";
                 payAmount += taskOrderNonTaxRecordDO.getActualAmount().setScale(2);

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

@@ -71,6 +71,15 @@ public class QC12017_202401ReportOFData implements IDynamicOFData {
             result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
             result = autoDataPipeService.autoGeneratePipeReportData(result, refId);
 
+            //审核人员信息
+            AdminUserRespDTO userInfo = adminUserApi.getUser(itemReportDO.getApprovalId()).getData();
+            if (userInfo != null) {
+                result.put("approvalName", userInfo.getSignUrl() != null ? userInfo.getSignUrl() : 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/pipe/QC12024_202403ReportOFData.java

@@ -24,6 +24,7 @@ import cn.start.tz.module.system.api.user.dto.AdminUserRespDTO;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import jakarta.annotation.Resource;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.time.format.DateTimeFormatter;
@@ -136,6 +137,15 @@ public class QC12024_202403ReportOFData implements IDynamicOFData {
                     result.put("checkDate2", orderInputDO.getEndCheckDate().format(dateFormat));
                 }
                 result.put("checkDateEnd", checkDateStr);
+
+                String checkTypeName = switch (taskOrderDO.getCheckType()) {
+                    case 100 -> "定期检验";
+                    case 200 -> "年度检查";
+                    default -> "";
+                };
+                if (!StringUtils.isEmpty(checkTypeName)){
+                    result.put("checkType",checkTypeName);
+                }
             }
 
             //二维码

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

@@ -93,6 +93,8 @@ public class QC12123_202402RecordOFData implements IDynamicOFData {
 
         if (itemReportDO != null) {
 
+            PipeTaskOrderDO taskOrderDO = pipeTaskOrderMapper.selectById(itemReportDO.getOrderId());
+
             List<PipeTaskOrderItemDO> itemDOList = pipeTaskOrderItemMapper.selectList(new LambdaQueryWrapper<PipeTaskOrderItemDO>()
                     .eq(PipeTaskOrderItemDO::getOrderId, itemReportDO.getOrderId()));
             if (!itemDOList.isEmpty()) {
@@ -126,6 +128,7 @@ public class QC12123_202402RecordOFData implements IDynamicOFData {
                     result.put("layingMode", "见一览表");
                     result.put("lastLegalPeriodicalInspectionReportNo", "见一览表");
                     result.put("lastYearReportNo", "见一览表");
+//                    result.put("lastConclusion","见一览表");
                 } else {
                     EquipPipeDO equipPipeDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
                     if (equipPipeDO != null) {
@@ -139,6 +142,14 @@ public class QC12123_202402RecordOFData implements IDynamicOFData {
                         //埋地长度（米）undergroundLength
                         result.put("lastLegalPeriodicalInspectionReportNo", equipPipeDO.getLastLegalPeriodicalInspectionReportNo());
                         result.put("lastYearReportNo", equipPipeDO.getLastYearReportNo());
+//                        if (taskOrderDO.getCheckType() == 100){
+//                            //定检上次结论
+//                            result.put("lastConclusion",equipPipeDO.getLastLegalConclusion());
+//                        }else if (taskOrderDO.getCheckType() == 200){
+//                            //年检上次结论
+//                            result.put("lastConclusion",equipPipeDO.getLastYearConclusion());
+//                        }
+
                     }
 
                 }

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

@@ -16,6 +16,7 @@ import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataPipeServi
 import cn.start.tz.module.pressure2.service.dynamictbcol.DynamicTbColService;
 import cn.start.tz.module.pressure2.service.dynamictbval.DynamicTbValService;
 import cn.start.tz.module.system.api.user.AdminUserApi;
+import cn.start.tz.module.system.api.user.dto.AdminUserRespDTO;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import jakarta.annotation.Resource;
@@ -107,6 +108,15 @@ public class QC12184_202401JRecordOFData implements IDynamicOFData {
 
             result.put("reportNo",itemReportDO.getReportNo());
 
+            //审核人员信息
+            AdminUserRespDTO userInfo = adminUserApi.getUser(itemReportDO.getApprovalId()).getData();
+            if (userInfo != null) {
+                result.put("approvalName", userInfo.getSignUrl() != null ? userInfo.getSignUrl() : itemReportDO.getApprovalName());
+            }
+            if (itemReportDO.getApprovalTime() != null) {
+                result.put("approvalTime", itemReportDO.getApprovalTime().format(dateFormat));
+            }
+
         }
 
         return result;