测试签名

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

@@ -5,11 +5,15 @@ import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInsta
 import cn.start.tz.module.pressure2.dal.dataobject.acceptorder.AcceptOrderDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boileracceptorderitem.BoilerAcceptOrderItemDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boileracceptorderuser.BoilerAcceptOrderUserDO;
+import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorder.BoilerTaskOrderDO;
+import cn.start.tz.module.pressure2.dal.dataobject.boilertaskordersignfile.BoilerTaskOrderSignFileDO;
 import cn.start.tz.module.pressure2.dal.dataobject.equipboiler.EquipBoilerDO;
 import cn.start.tz.module.pressure2.dal.mysql.acceptorder.AcceptOrderMapper;
 import cn.start.tz.module.pressure2.dal.mysql.boileracceptorderitem.BoilerAcceptOrderItemMapper;
 import cn.start.tz.module.pressure2.dal.mysql.equipboiler.EquipBoilerMapper;
 import cn.start.tz.module.pressure2.dal.mysql.boileracceptorderuser.BoilerAcceptOrderUserMapper;
+import cn.start.tz.module.pressure2.service.boilertaskorder.BoilerTaskOrderService;
+import cn.start.tz.module.pressure2.service.boilertaskordersignfile.BoilerTaskOrderSignFileService;
 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;
@@ -43,7 +47,10 @@ public class QR0405_202400ReportOFData implements IDynamicOFData {
 
     @Resource
     private AdminUserApi adminUserApi;
-
+    @Resource
+    private BoilerTaskOrderSignFileService boilerTaskOrderSignFileService;
+    @Resource
+    private BoilerTaskOrderService boilerTaskOrderService;
     @Override
     public JSONObject getOFData(JSONObject params) {
         return null;
@@ -68,7 +75,15 @@ public class QR0405_202400ReportOFData implements IDynamicOFData {
         result.put("unitAddress", acceptOrderDO.getUnitAddress());
         result.put("unitCode", acceptOrderDO.getUnitCode());
         result.put("zipCode", acceptOrderDO.getZipCode());
-        result.put("contact", acceptOrderDO.getUnitContact());
+//        result.put("contact", acceptOrderDO.getUnitContact());
+        // 填充签名
+        BoilerTaskOrderDO one = boilerTaskOrderService.getOne(new LambdaQueryWrapper<BoilerTaskOrderDO>().eq(BoilerTaskOrderDO::getAcceptOrderId, refId));
+        if (one != null){
+            BoilerTaskOrderSignFileDO boilerTaskOrderSignFileDO = boilerTaskOrderSignFileService.selectLastOneByOrderIdAndBusinessType(one.getId(), 100);
+            if (boilerTaskOrderSignFileDO != null){
+                result.put("contact", boilerTaskOrderSignFileDO.getSignUrl());
+            }
+        }
         result.put("contactPhone", acceptOrderDO.getUnitPhone());
         result.put("applicationDate", acceptOrderDO.getCreateTime().format(dateFormat));
         result.put("checkDate", acceptOrderDO.getAppointmentDate().format(dateFormat));

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/pipe/QR0413_202400ReportOFData.java

@@ -3,6 +3,8 @@ package cn.start.tz.module.pressure2.service.dynamicOFData.pipe;
 import cn.start.tz.framework.common.pojo.CommonResult;
 import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
 import cn.start.tz.module.pressure2.dal.dataobject.acceptorder.AcceptOrderDO;
+import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorder.BoilerTaskOrderDO;
+import cn.start.tz.module.pressure2.dal.dataobject.boilertaskordersignfile.BoilerTaskOrderSignFileDO;
 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.dataobject.equippipe.EquipPipeDO;
@@ -18,6 +20,8 @@ import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderitem.PipeTaskOrderIte
 import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderitemreport.PipeTaskOrderItemReportMapper;
 import cn.start.tz.module.pressure2.service.acceptorder.AcceptOrderService;
 import cn.start.tz.module.pressure2.service.acceptorder.PipeAcceptOrderService;
+import cn.start.tz.module.pressure2.service.boilertaskorder.BoilerTaskOrderService;
+import cn.start.tz.module.pressure2.service.boilertaskordersignfile.BoilerTaskOrderSignFileService;
 import cn.start.tz.module.pressure2.service.dynamicOFData.IDynamicOFData;
 import cn.start.tz.module.pressure2.service.dynamictbcol.DynamicTbColService;
 import cn.start.tz.module.pressure2.service.dynamictbval.DynamicTbValService;
@@ -54,7 +58,10 @@ public class QR0413_202400ReportOFData implements IDynamicOFData {
 
     @Resource
     private AdminUserApi adminUserApi;
-
+    @Resource
+    private BoilerTaskOrderSignFileService boilerTaskOrderSignFileService;
+    @Resource
+    private BoilerTaskOrderService boilerTaskOrderService;
     @Override
     public JSONObject getOFData(JSONObject params) {
         return null;
@@ -79,7 +86,15 @@ public class QR0413_202400ReportOFData implements IDynamicOFData {
         result.put("unitAddress", acceptOrderDO.getUnitAddress());
         result.put("unitCode", acceptOrderDO.getUnitCode());
         result.put("zipCode", acceptOrderDO.getZipCode());
-        result.put("contact", acceptOrderDO.getUnitContact());
+//        result.put("contact", acceptOrderDO.getUnitContact());
+        // 填充签名
+        BoilerTaskOrderDO one = boilerTaskOrderService.getOne(new LambdaQueryWrapper<BoilerTaskOrderDO>().eq(BoilerTaskOrderDO::getAcceptOrderId, refId));
+        if (one != null){
+            BoilerTaskOrderSignFileDO boilerTaskOrderSignFileDO = boilerTaskOrderSignFileService.selectLastOneByOrderIdAndBusinessType(one.getId(), 100);
+            if (boilerTaskOrderSignFileDO != null){
+                result.put("contact", boilerTaskOrderSignFileDO.getSignUrl());
+            }
+        }
         result.put("contactPhone", acceptOrderDO.getUnitPhone());
         result.put("applicationDate", acceptOrderDO.getCreateTime().format(dateFormat));
         result.put("checkDate", acceptOrderDO.getAppointmentDate().format(dateFormat));

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/pipe/QR0424_202403ReportOFData.java

@@ -81,7 +81,9 @@ public class QR0424_202403ReportOFData implements IDynamicOFData {
         BoilerTaskOrderDO one = boilerTaskOrderService.getOne(new LambdaQueryWrapper<BoilerTaskOrderDO>().eq(BoilerTaskOrderDO::getAcceptOrderId, refId));
         if (one != null){
             BoilerTaskOrderSignFileDO boilerTaskOrderSignFileDO = boilerTaskOrderSignFileService.selectLastOneByOrderIdAndBusinessType(one.getId(), 100);
-            result.put("contact", boilerTaskOrderSignFileDO.getSignUrl());
+            if (boilerTaskOrderSignFileDO != null){
+                result.put("contact", boilerTaskOrderSignFileDO.getSignUrl());
+            }
         }
         result.put("contactPhone", acceptOrderDO.getUnitPhone());
         result.put("applicationDate", acceptOrderDO.getCreateTime().format(dateFormat));