受理单签名

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

@@ -20,6 +20,7 @@ import cn.start.tz.module.pressure2.service.orderreport.OrderReportService;
 import cn.start.tz.module.system.api.dict.DictDataApi;
 import cn.start.tz.module.system.api.dict.dto.DictDataRespDTO;
 import cn.start.tz.module.system.api.user.AdminUserApi;
+import cn.start.tz.module.system.api.user.dto.AdminUserRespDTO;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -91,13 +92,7 @@ public class QR0405_202402ReportOFData implements IDynamicOFData {
         result.put("unitCode", acceptOrderDO.getUnitCode());
         result.put("zipCode", acceptOrderDO.getZipCode());
         result.put("contact", acceptOrderDO.getUnitContact());
-        // 检验员签名
-        String orderReportDOId = ruleVO.getParams().getString("orderReportDOId");
-        if (orderReportDOId != null){
-            OrderReportDO orderReportDO = orderReportService.getById(orderReportDOId);
-            result.put("confirmPerson", orderReportDO.getSignUrl());
-            result.put("confirmPersonDate", orderReportDO.getSignDate());
-        }
+
         // 填充客户签名
         BoilerTaskOrderDO taskOrderDO = boilerTaskOrderService.getOne(new LambdaQueryWrapper<BoilerTaskOrderDO>().eq(BoilerTaskOrderDO::getAcceptOrderId, refId));
         if (taskOrderDO != null){
@@ -180,6 +175,14 @@ public class QR0405_202402ReportOFData implements IDynamicOFData {
         }
 
         if (taskOrderDO != null){
+            String managerId = taskOrderDO.getManagerId();
+            if (managerId != null) {
+                AdminUserRespDTO checkedData = adminUserApi.getUser(managerId).getCheckedData();
+                if (checkedData != null) {
+                    result.put("confirmPerson", checkedData.getSignUrl());
+                    result.put("confirmPersonDate", taskOrderDO.getConfirmDate());
+                }
+            }
 
             result.put("recipient", taskOrderDO.getRecipient());
             result.put("recipientPhone", taskOrderDO.getRecipientPhone());

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

@@ -15,8 +15,10 @@ import cn.start.tz.module.pressure2.service.boilertaskordersignfile.BoilerTaskOr
 import cn.start.tz.module.pressure2.service.dynamicOFData.IDynamicOFData;
 import cn.start.tz.module.pressure2.service.orderreport.OrderReportService;
 import cn.start.tz.module.pressure2.service.pipetaskorder.PipeTaskOrderService;
+import cn.start.tz.module.pressure2.service.pipetaskorderitemreportuser.PipeTaskOrderItemReportUserService;
 import cn.start.tz.module.system.api.dict.DictDataApi;
 import cn.start.tz.module.system.api.user.AdminUserApi;
+import cn.start.tz.module.system.api.user.dto.AdminUserRespDTO;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -86,13 +88,7 @@ public class QR0413_0415ReportOFData implements IDynamicOFData {
         result.put("unitCode", acceptOrderDO.getUnitCode());
         result.put("zipCode", acceptOrderDO.getZipCode());
         result.put("contact", acceptOrderDO.getUnitContact());
-        // 检验员签名
-        String orderReportDOId = ruleVO.getParams().getString("orderReportDOId");
-        if (orderReportDOId != null){
-            OrderReportDO orderReportDO = orderReportService.getById(orderReportDOId);
-            result.put("confirmPerson", orderReportDO.getSignUrl());
-            result.put("confirmPersonDate", orderReportDO.getSignDate());
-        }
+
         // 填充客户签名
         PipeTaskOrderDO taskOrderDO = pipeTaskOrderService.getOne(new LambdaQueryWrapper<PipeTaskOrderDO>().eq(PipeTaskOrderDO::getAcceptOrderId, refId));
         if (taskOrderDO != null){
@@ -157,6 +153,14 @@ public class QR0413_0415ReportOFData implements IDynamicOFData {
         }
 
         if (taskOrderDO != null){
+            String managerId = taskOrderDO.getManagerId();
+            if (managerId != null) {
+                AdminUserRespDTO checkedData = adminUserApi.getUser(managerId).getCheckedData();
+                if (checkedData != null) {
+                    result.put("confirmPerson", checkedData.getSignUrl());
+                    result.put("confirmPersonDate", taskOrderDO.getConfirmDate());
+                }
+            }
 
             result.put("recipient", taskOrderDO.getRecipient());
             result.put("recipientPhone", taskOrderDO.getRecipientPhone());

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

@@ -20,6 +20,7 @@ import cn.start.tz.module.pressure2.service.orderreport.OrderReportService;
 import cn.start.tz.module.pressure2.service.pipetaskorder.PipeTaskOrderService;
 import cn.start.tz.module.system.api.dict.DictDataApi;
 import cn.start.tz.module.system.api.user.AdminUserApi;
+import cn.start.tz.module.system.api.user.dto.AdminUserRespDTO;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -91,13 +92,7 @@ public class QR0424_202404ReportOFData implements IDynamicOFData {
         result.put("unitCode", acceptOrderDO.getUnitCode());
         result.put("zipCode", acceptOrderDO.getZipCode());
         result.put("contact", acceptOrderDO.getUnitContact());
-        // 检验员签名
-        String orderReportDOId = ruleVO.getParams().getString("orderReportDOId");
-        if (orderReportDOId != null){
-            OrderReportDO orderReportDO = orderReportService.getById(orderReportDOId);
-            result.put("confirmPerson", orderReportDO.getSignUrl());
-            result.put("confirmPersonDate", orderReportDO.getSignDate());
-        }
+
         // 填充客户签名
         PipeTaskOrderDO taskOrderDO = pipeTaskOrderService.getOne(new LambdaQueryWrapper<PipeTaskOrderDO>().eq(PipeTaskOrderDO::getAcceptOrderId, refId));
         if (taskOrderDO != null){
@@ -148,6 +143,14 @@ public class QR0424_202404ReportOFData implements IDynamicOFData {
         result.put("table",voList.toJSONString());
 
         if (taskOrderDO != null){
+            String managerId = taskOrderDO.getManagerId();
+            if (managerId != null) {
+                AdminUserRespDTO checkedData = adminUserApi.getUser(managerId).getCheckedData();
+                if (checkedData != null) {
+                    result.put("confirmPerson", checkedData.getSignUrl());
+                    result.put("confirmPersonDate", taskOrderDO.getConfirmDate());
+                }
+            }
 
             result.put("recipient", taskOrderDO.getRecipient());
             result.put("recipientPhone", taskOrderDO.getRecipientPhone());