调整

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

@@ -940,7 +940,7 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
                         syncReportVO.setReportType("report");
                     }
                     com.alibaba.fastjson2.JSONObject params = new com.alibaba.fastjson2.JSONObject();
-                    params.put("checkUserId",getLoginUserId());
+                    //params.put("checkUserId",getLoginUserId());
                     syncReportVO.setParams(params);
                     syncReportData(syncReportVO);
 

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

@@ -87,6 +87,13 @@ public class QC10023_202400ReportOFData implements IDynamicOFData {
             //主报告二维码
             result.put("qrCode",itemReportDO.getQrCodeUrl());
 
+            if (result.get("inspectionConclusion1") != null && result.get("inspectionConclusion1").equals("true")){
+                result.put("checkConclusion", "合格");
+            }
+            if(result.get("inspectionConclusion2") != null && result.get("inspectionConclusion2").equals("true")){
+                result.put("checkConclusion", "不合格");
+            }
+
         }
 
         return result;

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

@@ -17,6 +17,8 @@ import cn.start.tz.module.pressure2.service.pipetaskorderinput.PipeTaskOrderInpu
 import cn.start.tz.module.system.api.clientunit.ClientUnitApi;
 import cn.start.tz.module.system.api.clientunit.dto.ClientUnitDTO;
 import cn.start.tz.module.system.api.clientunit.dto.ClientUnitPageDTO;
+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 jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
@@ -50,6 +52,9 @@ public class QC10099_202401ReportOFData implements IDynamicOFData {
     @Resource
     private ClientUnitApi clientUnitApi;
 
+    @Resource
+    private AdminUserApi adminUserApi;
+
     @Override
     public JSONObject getOFData(JSONObject params) {
         return null;
@@ -74,6 +79,14 @@ public class QC10099_202401ReportOFData implements IDynamicOFData {
             result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
             result = autoDataBoilerService.autoGenerateBoilerRecordData(result, refId);
 
+            //检验员
+            if (itemDO.getMainChecker() != null){
+                AdminUserRespDTO userInfo = adminUserApi.getUser(itemDO.getMainChecker()).getData();
+                if (userInfo != null) {
+                    result.put("checkName", userInfo.getSignUrl());
+                }
+            }
+
             EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(itemDO.getEquipId());
             BoilerTaskOrderDO taskOrderDO = boilerTaskOrderMapper.selectById(itemReportDO.getOrderId());
             if (equipBoilerDO != null) {

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/util/GenerateReportJsonService.java

@@ -41,23 +41,24 @@ public class GenerateReportJsonService {
         //是否第一次生成
         String[] prefixes = {"", "record_", "report_", "result_"};
         String ownRefId = prefixes[reportType] + refId;
-        DynamicTbInsDO firstInsDO = dynamicTbInsService.getDynamicRefId(ownRefId);
-        if (firstInsDO == null) {
-            //根据记录字段动态生成报告字段
-            List<DynamicTbValDO> valList = dynamicTbValService.getDynamicTbValByRefId(refId);
-            if (valList != null && !valList.isEmpty()){
-                List<DynamicTbColDO> ColsList = dynamicTbColService.lambdaQuery()
-                        .eq(DynamicTbColDO::getTbId, templateId)
-                        .or().eq(DynamicTbColDO::getColRound, 3).list();
-                ColsList.forEach(v -> {
-                    String colCode = v.getColCode();
-                    valList.forEach(val -> {
-                        if (val.getColCode() != null && val.getColCode().equals(colCode)){
-                            result.put(colCode, val.getValValue());
-                        }
-                    });
+//        DynamicTbInsDO firstInsDO = dynamicTbInsService.getDynamicRefId(ownRefId);
+//        if (firstInsDO == null) {
+//
+//        }
+        //根据记录字段动态生成报告字段
+        List<DynamicTbValDO> valList = dynamicTbValService.getDynamicTbValByRefId(refId);
+        if (valList != null && !valList.isEmpty()){
+            List<DynamicTbColDO> ColsList = dynamicTbColService.lambdaQuery()
+                    .eq(DynamicTbColDO::getTbId, templateId)
+                    .or().eq(DynamicTbColDO::getColRound, 3).list();
+            ColsList.forEach(v -> {
+                String colCode = v.getColCode();
+                valList.forEach(val -> {
+                    if (val.getColCode() != null && val.getColCode().equals(colCode)){
+                        result.put(colCode, val.getValValue());
+                    }
                 });
-            }
+            });
         }
 
         return result;

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

@@ -910,7 +910,7 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
                         syncReportVO.setReportType("report");
                     }
                     com.alibaba.fastjson2.JSONObject params = new com.alibaba.fastjson2.JSONObject();
-                    params.put("checkUserId",getLoginUserId());
+                    //params.put("checkUserId",getLoginUserId());
                     params.put("orderItemId",item.getOrderItemId());
                     syncReportVO.setParams(params);
                     syncReportData(syncReportVO);