二维码显示数据调整

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/platformEquip/vo/BoilerTaskOrderItemDetailsVO.java

@@ -32,9 +32,41 @@ public class BoilerTaskOrderItemDetailsVO {
     @Schema(description = "统一社会信用代码")
     private String socialCreditCode;
 
+    @Schema(description = "使用单位代码")
+    private String useUnitCode;
+
     @Schema(description = "使用单位名称")
     private String useUnitName;
 
+    @Schema(description = "检验项目")
+    private String checkProject;
+
+    @Schema(description = "任务单号")
+    private String orderNo;
+
+    @Schema(description = "记录编号")
+    private String recordNo;
+
+    @Schema(description = "主检验员")
+    private String mainChecker;
+
+    @Schema(description = "检验员")
+    private String checkers;
+
+    @Schema(description = "'审核员'")
+    private String approvalName;
+
+    @Schema(description = "'审核日期'")
+    @JsonFormat(pattern = "yyyy年MM月dd日")
+    private LocalDate approvalTime;
+
+    @Schema(description = "'审批员'")
+    private String ratifyName;
+
+    @Schema(description = "'审批日期'")
+    @JsonFormat(pattern = "yyyy年MM月dd日")
+    private LocalDate ratifyTime;
+
     @Schema(description = "使用登记证编号")
     private String useRegisterNo;
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/platformEquip/vo/PipeTaskOrderItemDetailsVO.java

@@ -27,9 +27,41 @@ public class PipeTaskOrderItemDetailsVO {
     @Schema(description = "统一社会信用代码")
     private String socialCreditCode;
 
+    @Schema(description = "使用单位代码")
+    private String useUnitCode;
+
     @Schema(description = "使用单位名称")
     private String useUnitName;
 
+    @Schema(description = "检验项目")
+    private String checkProject;
+
+    @Schema(description = "任务单号")
+    private String orderNo;
+
+    @Schema(description = "记录编号")
+    private String recordNo;
+
+    @Schema(description = "主检验员")
+    private String mainChecker;
+
+    @Schema(description = "检验员")
+    private String checkers;
+
+    @Schema(description = "'审核员'")
+    private String approvalName;
+
+    @Schema(description = "'审核日期'")
+    @JsonFormat(pattern = "yyyy年MM月dd日")
+    private LocalDate approvalTime;
+
+    @Schema(description = "'审批员'")
+    private String ratifyName;
+
+    @Schema(description = "'审批日期'")
+    @JsonFormat(pattern = "yyyy年MM月dd日")
+    private LocalDate ratifyTime;
+
     @Schema(description = "使用登记证编号")
     private String useRegisterNo;
 

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

@@ -7076,7 +7076,28 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
         if (equipBoilerDO.getNextOutCheckDate() != null){
             taskOrderItemDetailsVO.setNextOutCheckDate(LocalDate.from(equipBoilerDO.getNextOutCheckDate()));
         }
+
         taskOrderItemDetailsVO.setUseUnitName(taskOrderDO.getUseUnitName());
+        taskOrderItemDetailsVO.setUseUnitCode(taskOrderDO.getUnitCode());
+        taskOrderItemDetailsVO.setOrderNo(taskOrderDO.getOrderNo());
+
+        if (taskOrderItemDO.getMainChecker() != null){
+            AdminUserRespDTO manager = adminUserApi.getUser(taskOrderItemDO.getMainChecker()).getData();
+            if (manager != null){
+                taskOrderItemDetailsVO.setMainChecker(manager.getNickname());
+            }
+        }
+
+        List<BoilerTaskOrderUserDO> boilerTaskOrderUserDOS = boilerTaskOrderUserMapper.selectList(new LambdaQueryWrapperX<BoilerTaskOrderUserDO>()
+                .eq(BoilerTaskOrderUserDO::getOrderId,taskOrderDO.getId()));
+        if (!boilerTaskOrderUserDOS.isEmpty()){
+            List<String> uIds = boilerTaskOrderUserDOS.stream().map(BoilerTaskOrderUserDO::getUserId).toList();
+            List<AdminUserRespDTO> checkUsers = adminUserApi.getUserList(uIds).getData();
+            if (!checkUsers.isEmpty()){
+                taskOrderItemDetailsVO.setCheckers(checkUsers.stream().map(AdminUserRespDTO::getNickname).collect(Collectors.joining(",")));
+            }
+        }
+
         taskOrderItemDetailsVO.setCheckDate(taskOrderDO.getCheckDate());
         taskOrderItemDetailsVO.setCheckType(taskOrderDO.getCheckType());
         String checkTypeName = switch (taskOrderDO.getCheckType()) {
@@ -7089,12 +7110,35 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
         //主报告检验结论
         BoilerTaskOrderItemReportDO mainReport = taskOrderItemReportMapper.selectOne(new LambdaQueryWrapperX<BoilerTaskOrderItemReportDO>()
                 .eq(BoilerTaskOrderItemReportDO::getReportType, 100)
-                .eq(BoilerTaskOrderItemReportDO::getOrderId, taskOrderDO.getId())
+                .eq(BoilerTaskOrderItemReportDO::getOrderItemId, taskOrderItemDO.getId())
                 .eq(BoilerTaskOrderItemReportDO::getTaskStatus, 800), false);
         if (mainReport != null){
+
             taskOrderItemDetailsVO.setMainConclusion(mainReport.getReportConclusion());
             taskOrderItemDetailsVO.setReportNo(mainReport.getReportNo());
+            taskOrderItemDetailsVO.setRecordNo(mainReport.getReportNo());
+
+            taskOrderItemDetailsVO.setApprovalName(mainReport.getApprovalName());
+            if (mainReport.getApprovalTime() != null){
+                taskOrderItemDetailsVO.setApprovalTime(LocalDate.from(mainReport.getApprovalTime()));
+            }
+            taskOrderItemDetailsVO.setRatifyName(mainReport.getRatifyName());
+            if (mainReport.getRatifyTime() != null){
+                taskOrderItemDetailsVO.setRatifyTime(LocalDate.from(mainReport.getRatifyTime()));
+            }
+
         }
+
+        //检验项目
+        List<BoilerTaskOrderItemReportDO> reportDOList = taskOrderItemReportMapper.selectList(new LambdaQueryWrapperX<BoilerTaskOrderItemReportDO>()
+                .eq(BoilerTaskOrderItemReportDO::getOrderItemId, taskOrderItemDO.getId())
+                .eq(BoilerTaskOrderItemReportDO::getTaskStatus, 800)
+                .in(BoilerTaskOrderItemReportDO::getReportType, TaskOrderItemReportTypeEnum.MAIN_REPORT.getType(), TaskOrderItemReportTypeEnum.SUB_REPORT.getType(),
+                    TaskOrderItemReportTypeEnum.SOLO_TRIP_REPORT.getType()));
+        if (!reportDOList.isEmpty()){
+            taskOrderItemDetailsVO.setCheckProject(reportDOList.stream().map(BoilerTaskOrderItemReportDO::getReportName).collect(Collectors.joining(",")));
+        }
+
         //社会统一信用代码socialCreditCode
         if (equipBoilerDO.getUnitCode() != null){
             ClientUnitDTO clientUnit = clientUnitApi.getClientUnitByCode(equipBoilerDO.getUnitCode()).getData();

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

@@ -6271,7 +6271,27 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
         if (equipPipeDO.getNextYearCheckDate() != null){
             taskOrderItemDetailsVO.setNextYearCheckDate(LocalDate.from(equipPipeDO.getNextYearCheckDate()));
         }
+
         taskOrderItemDetailsVO.setUseUnitName(taskOrderDO.getUseUnitName());
+        taskOrderItemDetailsVO.setUseUnitCode(taskOrderDO.getUnitCode());
+        taskOrderItemDetailsVO.setOrderNo(taskOrderDO.getOrderNo());
+        if (taskOrderDO.getManagerId() != null){
+            AdminUserRespDTO manager = adminUserApi.getUser(taskOrderDO.getManagerId()).getData();
+            if (manager != null){
+                taskOrderItemDetailsVO.setMainChecker(manager.getNickname());
+            }
+        }
+
+        List<PipeTaskOrderUserDO> pipeTaskOrderUserDOS = pipeTaskOrderUserMapper.selectList(new LambdaQueryWrapperX<PipeTaskOrderUserDO>()
+                .eq(PipeTaskOrderUserDO::getOrderId,taskOrderDO.getId()));
+        if (!pipeTaskOrderUserDOS.isEmpty()){
+            List<String> uIds = pipeTaskOrderUserDOS.stream().map(PipeTaskOrderUserDO::getUserId).toList();
+            List<AdminUserRespDTO> checkUsers = adminUserApi.getUserList(uIds).getData();
+            if (!checkUsers.isEmpty()){
+                taskOrderItemDetailsVO.setCheckers(checkUsers.stream().map(AdminUserRespDTO::getNickname).collect(Collectors.joining(",")));
+            }
+        }
+
         taskOrderItemDetailsVO.setCheckDate(taskOrderDO.getCheckDate());
         taskOrderItemDetailsVO.setCheckType(taskOrderDO.getCheckType());
         String checkTypeName = switch (taskOrderDO.getCheckType()) {
@@ -6280,15 +6300,39 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
             default -> "";
         };
         taskOrderItemDetailsVO.setCheckTypeName(checkTypeName);
+
         //主报告检验结论
         PipeTaskOrderItemReportDO mainReport = taskOrderItemReportMapper.selectOne(new LambdaQueryWrapperX<PipeTaskOrderItemReportDO>()
                 .eq(PipeTaskOrderItemReportDO::getReportType, 100)
                 .eq(PipeTaskOrderItemReportDO::getOrderId, taskOrderDO.getId())
                 .eq(PipeTaskOrderItemReportDO::getTaskStatus, 800), false);
         if (mainReport != null){
+
             taskOrderItemDetailsVO.setMainConclusion(mainReport.getReportConclusion());
             taskOrderItemDetailsVO.setReportNo(mainReport.getReportNo());
+            taskOrderItemDetailsVO.setRecordNo(mainReport.getReportNo());
+
+            taskOrderItemDetailsVO.setApprovalName(mainReport.getApprovalName());
+            if (mainReport.getApprovalTime() != null){
+                taskOrderItemDetailsVO.setApprovalTime(LocalDate.from(mainReport.getApprovalTime()));
+            }
+            taskOrderItemDetailsVO.setRatifyName(mainReport.getRatifyName());
+            if (mainReport.getRatifyTime() != null){
+                taskOrderItemDetailsVO.setRatifyTime(LocalDate.from(mainReport.getRatifyTime()));
+            }
+
         }
+
+        //检验项目
+        List<PipeTaskOrderItemReportDO> reportDOList = taskOrderItemReportMapper.selectList(new LambdaQueryWrapperX<PipeTaskOrderItemReportDO>()
+                .eq(PipeTaskOrderItemReportDO::getOrderId, taskOrderDO.getId())
+                .eq(PipeTaskOrderItemReportDO::getTaskStatus, 800)
+                .in(PipeTaskOrderItemReportDO::getReportType, TaskOrderItemReportTypeEnum.MAIN_REPORT.getType(), TaskOrderItemReportTypeEnum.SUB_REPORT.getType(),
+                        TaskOrderItemReportTypeEnum.SOLO_TRIP_REPORT.getType()));
+        if (!reportDOList.isEmpty()){
+            taskOrderItemDetailsVO.setCheckProject(reportDOList.stream().map(PipeTaskOrderItemReportDO::getReportName).collect(Collectors.joining(",")));
+        }
+
         //社会统一信用代码socialCreditCode
         if (equipPipeDO.getUnitCode() != null){
             ClientUnitDTO clientUnit = clientUnitApi.getClientUnitByCode(equipPipeDO.getUnitCode()).getData();