调整

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

@@ -15,6 +15,7 @@ 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.GenerateReportJsonService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.InspectorInfoUtil;
 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;
@@ -91,75 +92,15 @@ public class QC10020_202400ReportOFData implements IDynamicOFData {
             EquipBoilerReportVO equipBoilerDO = equipBoilerMapper.selectDetailsById(itemDO.getEquipId());
             if (equipBoilerDO != null){
                 //设备信息
-                if (equipBoilerDO.getNextInCheckDate() != null){
-                    result.put("nextInCheckDate1", equipBoilerDO.getNextInCheckDate()
-                            .plusYears(1)
-                            .minusDays(1)
-                            .format(dateFormat));
-                }
-
-                if (equipBoilerDO.getNextOutCheckDate() != null){
-                    result.put("nextOutCheckDate1", equipBoilerDO.getNextOutCheckDate()
-                            .plusYears(1)
-                            .minusDays(1)
-                            .format(dateFormat));
-                }
+
             }
 
-//            result.put("reportNo",itemReportDO.getReportNo());
+            //二维码
+            result.put("qrCode", itemReportDO.getQrCodeUrl());
 
             //检验员信息
             List<BoilerTaskOrderUserDO> checkUserList = boilerTaskOrderUserMapper.selectList(BoilerTaskOrderUserDO::getOrderId,itemReportDO.getOrderId());
-            if (!checkUserList.isEmpty()){
-                List<AdminUserRespDTO> userList = adminUserApi.getUserList(checkUserList.stream().map(BoilerTaskOrderUserDO::getUserId).toList()).getData();
-                if (!userList.isEmpty()){
-                    String checkNames = userList.stream()
-                            .map(AdminUserRespDTO::getSignUrl)
-                            .filter(Objects::nonNull) // 过滤掉null值
-                            .filter(signUrl -> !signUrl.isEmpty()) // 过滤掉空字符串
-                            .collect(Collectors.joining(","));
-                    result.put("checkNames",checkNames);
-                }
-            }
-
-            //编制人员信息
-            /*AdminUserRespDTO userInfo = adminUserApi.getUser(itemReportDO.getPrepareId()).getData();
-            if (userInfo != null){
-                if (userInfo.getSignUrl() != null){
-                    result.put("prepareName",userInfo.getSignUrl());
-                }else{
-                    result.put("prepareName",itemReportDO.getPrepareName());
-                }
-            }
-            if (itemReportDO.getPrepareTime() != null){
-                result.put("prepareTime",itemReportDO.getPrepareTime().format(dateFormat));
-            }
-
-            //审核人员信息
-            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));
-            }
-
-            //批准人员信息
-            userInfo = adminUserApi.getUser(itemReportDO.getRatifyId()).getData();
-            if (userInfo != null){
-                if (userInfo.getSignUrl() != null){
-                    result.put("ratifyName",userInfo.getSignUrl());
-                }else{
-                    result.put("ratifyName",itemReportDO.getRatifyName());
-                }
-            }
-            if (itemReportDO.getRatifyTime() != null){
-                result.put("ratifyTime",itemReportDO.getRatifyTime().format(dateFormat));
-            }*/
+            InspectorInfoUtil.fillInspectorSignatures(result, checkUserList, itemDO.getMainChecker(), adminUserApi);
 
         }
 

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

@@ -77,6 +77,9 @@ public class QC10035_202401ReportOFData implements IDynamicOFData {
                 result.put("factoryCode", equipBoilerDO.getFactoryCode());
             }
 
+            //二维码
+            result.put("qrCode", itemReportDO.getQrCodeUrl());
+
             //检验员信息
             List<BoilerTaskOrderUserDO> checkUserList = boilerTaskOrderUserMapper.selectList(BoilerTaskOrderUserDO::getOrderId,itemReportDO.getOrderId());
             InspectorInfoUtil.fillInspectorSignatures(result, checkUserList, itemDO.getMainChecker(), adminUserApi);