报表调整

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskorder/vo/BoilerRecheckUserPageReqVO.java

@@ -53,4 +53,6 @@ public class BoilerRecheckUserPageReqVO extends PageParam {
     @Schema(description = "任务单ID")
     private String orderId;
 
+    private String orderItemId;
+
 }

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

@@ -5707,6 +5707,17 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
             ArrayList<AdminUserRespDTO> adminUserRespDTOS = new ArrayList<>(userList);
             adminUserRespDTOS.add(userRespDTO);
 
+            //主检人
+            if (pageReqVO.getOrderItemId() != null){
+                BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(pageReqVO.getOrderItemId());
+                if (itemDO != null && itemDO.getMainChecker() != null){
+                    if (!uIds.contains(itemDO.getMainChecker())){
+                        AdminUserRespDTO mainChecker = adminUserApi.getUser(itemDO.getMainChecker()).getCheckedData();
+                        adminUserRespDTOS.add(mainChecker);
+                    }
+                }
+            }
+
             pageResult.setList(adminUserRespDTOS);
             pageResult.setTotal((long) adminUserRespDTOS.size());
 

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

@@ -0,0 +1,91 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
+
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitemreport.BoilerTaskOrderItemReportDO;
+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.GenerateReportJsonService;
+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 jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+import java.time.format.DateTimeFormatter;
+
+/**
+ * 整装锅炉安装监督检验项目表报告
+ * */
+@Service("QC10009_202401ReportOFData")
+public class QC10009_202401ReportOFData implements IDynamicOFData {
+
+    @Resource
+    private EquipBoilerMapper equipBoilerMapper;
+
+    @Resource
+    private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
+
+    @Resource
+    private BoilerTaskOrderMapper boilerTaskOrderMapper;
+
+    @Resource
+    private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
+
+    @Resource
+    private AdminUserApi adminUserApi;
+
+    @Resource
+    private DynamicTbColService dynamicTbColService;
+
+    @Resource
+    private DynamicTbValService dynamicTbValService;
+
+    @Resource
+    private GenerateReportJsonService generateReportJsonService;
+
+    @Override
+    public JSONObject getOFData(JSONObject params) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+        //日期格式
+        DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy年MM月dd日");
+
+        //设备报表ID
+        String refId = ruleVO.getRefId();
+
+        JSONObject result = new JSONObject();
+        BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
+
+        if (itemReportDO != null){
+
+            //根据记录字段动态生成报告字段
+            result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(),ruleVO.getTemplateId(),refId);
+
+            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/QC10021_202400ReportOFData.java

@@ -78,14 +78,14 @@ 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("boilerModel",equipBoilerDO.getBoilerModel());
             }
 
             result.put("reportNo",itemReportDO.getReportNo());
@@ -101,7 +101,7 @@ public class QC10021_202400ReportOFData implements IDynamicOFData {
             }
             if (itemReportDO.getApprovalTime() != null){
                 result.put("approvalTime",itemReportDO.getApprovalTime().format(dateFormat));
-            }*/
+            }
 
         }
 

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

@@ -2,8 +2,6 @@ package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
 
 import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitemreport.BoilerTaskOrderItemReportDO;
-import cn.start.tz.module.pressure2.dal.dataobject.dynamictbcol.DynamicTbColDO;
-import cn.start.tz.module.pressure2.dal.dataobject.dynamictbval.DynamicTbValDO;
 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;
@@ -19,13 +17,12 @@ import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
 import java.time.format.DateTimeFormatter;
-import java.util.List;
 
 /**
  * 工业锅炉外部检验报告
  * */
-@Service("QC10022_202400ReportOFData")
-public class QC10022_202400ReportOFData implements IDynamicOFData {
+@Service("QC10022_202401ReportOFData")
+public class QC10022_202401ReportOFData implements IDynamicOFData {
 
     @Resource
     private EquipBoilerMapper equipBoilerMapper;

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

@@ -4,8 +4,6 @@ import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInsta
 import cn.start.tz.module.pressure2.controller.admin.equipboiler.vo.EquipBoilerReportVO;
 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.dynamictbcol.DynamicTbColDO;
-import cn.start.tz.module.pressure2.dal.dataobject.dynamictbval.DynamicTbValDO;
 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;
@@ -21,13 +19,12 @@ import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
 import java.time.format.DateTimeFormatter;
-import java.util.List;
 
 /**
  * 有机热载体炉外部检验报告
  * */
-@Service("QC10024_202400ReportOFData")
-public class QC10024_202400ReportOFData implements IDynamicOFData {
+@Service("QC10024_202401ReportOFData")
+public class QC10024_202401ReportOFData implements IDynamicOFData {
 
     @Resource
     private EquipBoilerMapper equipBoilerMapper;
@@ -80,7 +77,7 @@ public class QC10024_202400ReportOFData implements IDynamicOFData {
             EquipBoilerReportVO equipBoilerDO = equipBoilerMapper.selectDetailsById(itemDO.getEquipId());
             if (equipBoilerDO != null){
                 //设备信息
-                result.put("boilerModel",equipBoilerDO.getBoilerModel());
+//                result.put("boilerModel",equipBoilerDO.getBoilerModel());
             }
 
             result.put("reportNo",itemReportDO.getReportNo());

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

@@ -0,0 +1,131 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
+
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+import cn.start.tz.module.pressure2.controller.admin.equipboiler.vo.EquipBoilerReportVO;
+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.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.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;
+
+import java.time.format.DateTimeFormatter;
+
+/**
+ * 整装锅炉安装监督检验记录
+ * */
+@Service("QC10067_202402RecordOFData")
+public class QC10067_202402RecordOFData implements IDynamicOFData {
+
+    @Resource
+    private EquipBoilerMapper equipBoilerMapper;
+
+    @Resource
+    private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
+
+    @Resource
+    private BoilerTaskOrderMapper boilerTaskOrderMapper;
+
+    @Resource
+    private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
+
+    @Resource
+    private AdminUserApi adminUserApi;
+
+    @Override
+    public JSONObject getOFData(JSONObject params) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+
+        //日期格式
+        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){
+
+            String orderItemId = itemReportDO.getOrderItemId();
+            BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
+            EquipBoilerReportVO equipBoilerDO = equipBoilerMapper.selectDetailsById(itemDO.getEquipId());
+            if (equipBoilerDO != null){
+                //设备信息
+                result.put("useNo",equipBoilerDO.getUseRegisterNo());
+                result.put("contact",equipBoilerDO.getContact());
+                result.put("unitName",equipBoilerDO.getUnitName());
+                result.put("zipCode",equipBoilerDO.getZipCode());
+                result.put("unitAddress",equipBoilerDO.getUnitAddress());
+                result.put("unitCode",equipBoilerDO.getUnitCode());
+                result.put("contactPhone",equipBoilerDO.getContactPhone());
+                result.put("boilerModel",equipBoilerDO.getBoilerModel());
+                result.put("equipName",equipBoilerDO.getEquipName());
+                result.put("productCode",equipBoilerDO.getProductCode());
+                result.put("equipCode",equipBoilerDO.getEquipCode());
+                result.put("SGDW",equipBoilerDO.getUnitName());
+                result.put("installAddress",equipBoilerDO.getUnitAddress());
+                result.put("makeUnit",equipBoilerDO.getMakeUnit());
+                result.put("makeTime",equipBoilerDO.getMadeTime());
+                result.put("buringMethod",equipBoilerDO.getBuringMethod());
+
+                result.put("outPressure",equipBoilerDO.getSuperheaterOutletPressure());
+                result.put("testPressure",equipBoilerDO.getHydraulicTestPressure());
+                result.put("installTime",equipBoilerDO.getCompleteInstallTime());
+                result.put("checkStartTime",equipBoilerDO.getOverseeCheckBeginDate());
+                result.put("checkEndTime",equipBoilerDO.getOverseeCheckEndDate());
+                result.put("exportTemperature",equipBoilerDO.getRatedExportTemperature());
+
+                if (equipBoilerDO.getType().equals("3")){
+                    result.put("ZQGL",true);
+                }else if (equipBoilerDO.getType().equals("4")){
+                    result.put("RSGL",true);
+                }else if (equipBoilerDO.getType().equals("6")){
+                    result.put("YJRZTGL",true);
+                }
+            }
+
+            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));
+            }
+
+        }
+
+        return result;
+
+
+    }
+}

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

@@ -49,8 +49,8 @@ public class QC10087_202400RecordOFData implements IDynamicOFData {
 
     @Override
     public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
-        return autoDataBoilerService.autoGenerateBoilerRecordData(new JSONObject(), ruleVO.getRefId());
-       /* //日期格式
+//        return autoDataBoilerService.autoGenerateBoilerRecordData(new JSONObject(), ruleVO.getRefId());
+        //日期格式
         DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy年MM月dd日");
 
         //设备报表ID
@@ -69,6 +69,7 @@ public class QC10087_202400RecordOFData implements IDynamicOFData {
             if (equipBoilerDO != null){
                 //设备信息
                 result.put("productCode",equipBoilerDO.getProductCode());
+                result.put("boilerModel",equipBoilerDO.getBoilerModel());
             }
 
             result.put("reportNo",itemReportDO.getReportNo());
@@ -81,7 +82,6 @@ public class QC10087_202400RecordOFData implements IDynamicOFData {
             }
             AdminUserRespDTO userInfo = adminUserApi.getUser(checkUserId).getData();
             if (userInfo != null){
-//                result.put("checkName",userInfo.getNickname());
                 result.put("checkName",userInfo.getSignUrl());
             }
 
@@ -98,7 +98,7 @@ public class QC10087_202400RecordOFData implements IDynamicOFData {
 
         }
 
-        return result;*/
+        return result;
 
 
     }

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

@@ -5,7 +5,6 @@ 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.pipetaskorder.PipeTaskOrderDO;
 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;
@@ -21,8 +20,8 @@ import java.time.format.DateTimeFormatter;
 /**
  * 工业锅炉外部检验记录
  * */
-@Service("QC10088_202400RecordOFData")
-public class QC10088_202400RecordOFData implements IDynamicOFData {
+@Service("QC10088_202401RecordOFData")
+public class QC10088_202401RecordOFData implements IDynamicOFData {
 
     @Resource
     private EquipBoilerMapper equipBoilerMapper;

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

@@ -21,8 +21,8 @@ import java.time.format.DateTimeFormatter;
 /**
  * 有机热载体炉外部检验记录
  * */
-@Service("QC10090_202400RecordOFData")
-public class QC10090_202400RecordOFData implements IDynamicOFData {
+@Service("QC10090_202401RecordOFData")
+public class QC10090_202401RecordOFData implements IDynamicOFData {
 
     @Resource
     private EquipBoilerMapper equipBoilerMapper;
@@ -66,6 +66,7 @@ public class QC10090_202400RecordOFData implements IDynamicOFData {
             if (equipBoilerDO != null){
                 //设备信息
                 result.put("productCode",equipBoilerDO.getProductCode());
+                result.put("boilerModel",equipBoilerDO.getBoilerModel());
             }
 
             result.put("reportNo",itemReportDO.getReportNo());

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

@@ -66,6 +66,7 @@ public class QC10091_202400RecordOFData implements IDynamicOFData {
             if (equipBoilerDO != null){
                 //设备信息
                 result.put("productCode",equipBoilerDO.getProductCode());
+                result.put("boilerModel",equipBoilerDO.getBoilerModel());
             }
 
             result.put("reportNo",itemReportDO.getReportNo());