打印发证关联受理单

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

@@ -357,6 +357,8 @@ public class BoilerTaskOrderRespVO {
     @Schema(description = "委托协议：服务单/受理单模版名称")
     private String templateName;
 
+    private String insId;
+
     @Schema(description = "发放人id")
     private String releaseId;
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/pipetaskorder/vo/PipeTaskOrderRespVO.java

@@ -360,6 +360,8 @@ public class PipeTaskOrderRespVO {
     @Schema(description = "委托协议：服务单/受理单模版名称")
     private String templateName;
 
+    private String insId;
+
     @Schema(description = "发放人id")
     private String releaseId;
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorderissuereport/BoilerTaskOrderIssueReportServiceImpl.java

@@ -51,6 +51,7 @@ import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderuser.BoilerTas
 import cn.start.tz.module.pressure2.dal.dataobject.dynamictb.DynamicTbDO;
 import cn.start.tz.module.pressure2.dal.dataobject.dynamictbins.DynamicTbInsDO;
 import cn.start.tz.module.pressure2.dal.dataobject.equipboiler.EquipBoilerDO;
+import cn.start.tz.module.pressure2.dal.dataobject.orderreport.OrderReportDO;
 import cn.start.tz.module.pressure2.dal.dataobject.reporttemplate.ReportTemplateDO;
 import cn.start.tz.module.pressure2.dal.dataobject.usesignreport.UseSignReportDO;
 import cn.start.tz.module.pressure2.dal.mysql.boilerconnecttbservice.BoilerConnectTbServiceMapper;
@@ -66,6 +67,7 @@ import cn.start.tz.module.pressure2.dal.mysql.boilertaskorderitemuser.BoilerTask
 import cn.start.tz.module.pressure2.dal.mysql.boilertaskorderuser.BoilerTaskOrderUserMapper;
 import cn.start.tz.module.pressure2.dal.mysql.dynamictb.DynamicTbMapper;
 import cn.start.tz.module.pressure2.dal.mysql.equipboiler.EquipBoilerMapper;
+import cn.start.tz.module.pressure2.dal.mysql.orderreport.OrderReportMapper;
 import cn.start.tz.module.pressure2.dal.mysql.reporttemplate.ReportTemplateMapper;
 import cn.start.tz.module.pressure2.dal.mysql.usesignreport.UseSignReportMapper;
 import cn.start.tz.module.pressure2.framework.thread.CommonThread;
@@ -241,6 +243,9 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
     @Resource
     private PdfService pdfService;
 
+    @Resource
+    private OrderReportMapper orderReportMapper;
+
     @Resource
     private MailSendApi mailSendApi;
 
@@ -2333,12 +2338,6 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
             }
         }
 
-        //获取服务单/受理单模版信息
-//        List<ReportTemplateDO> reportTemplates = reportTemplateMapper.selectList(new LambdaQueryWrapper<ReportTemplateDO>().in(ReportTemplateDO::getId, cn.start.tz.module.pressure.constant.TemplateIdConstants.D_Q_J_Y_F_W_D, cn.start.tz.module.pressure.constant.TemplateIdConstants.N_D_J_C_F_W_D));
-
-        List<DynamicTbDO> reportTemplates = dynamicTbMapper.selectList(new LambdaUpdateWrapper<DynamicTbDO>()
-                .in(DynamicTbDO::getId, TemplateIdConstants.D_Q_J_Y_F_W_D));
-
         //获取部门信息
         List<String> deptIds = taskOrderRespVOPageResult.getList().stream().map(BoilerTaskOrderRespVO::getDeptId).toList();
         List<DeptRespDTO> depts = new ArrayList<>();
@@ -2359,17 +2358,15 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
                 x.setNextCheckDate(x.getNextPressureCheckDate());
             }
 
+            List<OrderReportDO> orderReportDOS = orderReportMapper.selectList(new LambdaUpdateWrapper<OrderReportDO>()
+                    .eq(OrderReportDO::getTaskOrderId,x.getOrderId()));
             //获取服务单/受理单模版信息
-            if (CollUtil.isNotEmpty(reportTemplates)) {
-                List<DynamicTbDO> list = new ArrayList<>();
-                if (Integer.valueOf(100).equals(x.getCheckType()) || Integer.valueOf(300).equals(x.getCheckType())) {
-                    list = reportTemplates.stream().filter(dynamicTbDO -> dynamicTbDO.getId().equals(TemplateIdConstants.D_Q_J_Y_F_W_D)).toList();
-                } else if (Integer.valueOf(200).equals(x.getCheckType())) {
-                    list = reportTemplates.stream().filter(dynamicTbDO -> dynamicTbDO.getId().equals(TemplateIdConstants.N_D_J_C_F_W_D)).toList();
-                }
-                if (CollUtil.isNotEmpty(list)) {
-                    x.setTemplateId(list.get(0).getId());
-                    x.setTemplateName(list.get(0).getTbName());
+            if (CollUtil.isNotEmpty(orderReportDOS)) {
+                DynamicTbDO dynamicTbDO = dynamicTbMapper.selectById(orderReportDOS.get(0).getTemplateId());
+                if (dynamicTbDO != null) {
+                    x.setTemplateId(dynamicTbDO.getId());
+                    x.setTemplateName(dynamicTbDO.getTbName());
+                    x.setInsId(orderReportDOS.get(0).getInsId());
                 }
             }
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorderissuereport/PipeTaskOrderIssueReportServiceImpl.java

@@ -24,9 +24,11 @@ import cn.start.tz.module.member.api.user.dto.MemberUserReqVo;
 import cn.start.tz.module.member.api.user.dto.MemberUserRespDTO;
 import cn.start.tz.module.member.api.user.dto.SendAppMpMessageReqDTO;
 import cn.start.tz.module.member.api.user.dto.WxMpTemplateDataReqDto;
-import cn.start.tz.module.pressure.constant.TemplateIdConstants;
-import cn.start.tz.module.pressure.enums.TaskOrderItemReportTypeEnum;
-import cn.start.tz.module.pressure.enums.TaskOrderStatusEnum;
+import cn.start.tz.module.pressure2.constant.TemplateIdConstants;
+import cn.start.tz.module.pressure2.dal.dataobject.orderreport.OrderReportDO;
+import cn.start.tz.module.pressure2.dal.mysql.orderreport.OrderReportMapper;
+import cn.start.tz.module.pressure2.enums.TaskOrderItemReportTypeEnum;
+import cn.start.tz.module.pressure2.enums.TaskOrderStatusEnum;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.BoilerTaskOrderArchiveDetailRespVO;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.BoilerTaskOrderPageReqVO;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskordersignfile.vo.BoilerTaskOrderSignFilePageReqVO;
@@ -179,6 +181,9 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
     @Resource
     private PipeTaskOrderItemUserMapper taskOrderItemUserMapper;
 
+    @Resource
+    private OrderReportMapper orderReportMapper;
+
     @Resource
     private PipeTaskOrderInputMapper pipeTaskOrderInputMapper;
 
@@ -2361,12 +2366,6 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
             }
         }
 
-        //获取服务单/受理单模版信息
-//        List<ReportTemplateDO> reportTemplates = reportTemplateMapper.selectList(new LambdaQueryWrapper<ReportTemplateDO>().in(ReportTemplateDO::getId, cn.start.tz.module.pressure.constant.TemplateIdConstants.D_Q_J_Y_F_W_D, cn.start.tz.module.pressure.constant.TemplateIdConstants.N_D_J_C_F_W_D));
-
-        List<DynamicTbDO> reportTemplates = dynamicTbMapper.selectList(new LambdaUpdateWrapper<DynamicTbDO>()
-                .in(DynamicTbDO::getId, TemplateIdConstants.D_Q_J_Y_F_W_D));
-
         //获取部门信息
         List<String> deptIds = taskOrderRespVOPageResult.getList().stream().map(PipeTaskOrderRespVO::getDeptId).toList();
         List<DeptRespDTO> depts = new ArrayList<>();
@@ -2385,17 +2384,16 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
                 x.setNextCheckDate(x.getNextYearCheckDate());
             }
 
+
+            List<OrderReportDO> orderReportDOS = orderReportMapper.selectList(new LambdaUpdateWrapper<OrderReportDO>()
+                    .eq(OrderReportDO::getTaskOrderId,x.getOrderId()));
             //获取服务单/受理单模版信息
-            if (CollUtil.isNotEmpty(reportTemplates)) {
-                List<DynamicTbDO> list = new ArrayList<>();
-                if (Integer.valueOf(100).equals(x.getCheckType()) || Integer.valueOf(300).equals(x.getCheckType())) {
-                    list = reportTemplates.stream().filter(dynamicTbDO -> dynamicTbDO.getId().equals(TemplateIdConstants.D_Q_J_Y_F_W_D)).toList();
-                } else if (Integer.valueOf(200).equals(x.getCheckType())) {
-                    list = reportTemplates.stream().filter(dynamicTbDO -> dynamicTbDO.getId().equals(TemplateIdConstants.N_D_J_C_F_W_D)).toList();
-                }
-                if (CollUtil.isNotEmpty(list)) {
-                    x.setTemplateId(list.get(0).getId());
-                    x.setTemplateName(list.get(0).getTbName());
+            if (CollUtil.isNotEmpty(orderReportDOS)) {
+                DynamicTbDO dynamicTbDO = dynamicTbMapper.selectById(orderReportDOS.get(0).getTemplateId());
+                if (dynamicTbDO != null) {
+                    x.setTemplateId(dynamicTbDO.getId());
+                    x.setTemplateName(dynamicTbDO.getTbName());
+                    x.setInsId(orderReportDOS.get(0).getInsId());
                 }
             }