报表修改

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/comm/QC01010_202402OFData.java

@@ -6,23 +6,28 @@ 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.boilertaskorderitemreportuser.BoilerTaskOrderItemReportUserDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskordersignfile.BoilerTaskOrderSignFileDO;
 import cn.start.tz.module.pressure2.dal.dataobject.equippipe.EquipPipeDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitem.PipeTaskOrderItemDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitemreport.PipeTaskOrderItemReportDO;
+import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitemreportuser.PipeTaskOrderItemReportUserDO;
 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.boilertaskorderitemreportuser.BoilerTaskOrderItemReportUserMapper;
 import cn.start.tz.module.pressure2.dal.mysql.equipboiler.EquipBoilerMapper;
 import cn.start.tz.module.pressure2.dal.mysql.equippipe.EquipPipeMapper;
 import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderitem.PipeTaskOrderItemMapper;
 import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderitemreport.PipeTaskOrderItemReportMapper;
+import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderitemreportuser.PipeTaskOrderItemReportUserMapper;
 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.clientunit.ClientUnitApi;
 import cn.start.tz.module.system.api.clientunit.dto.ClientUnitDTO;
 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 com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import jakarta.annotation.Resource;
@@ -45,10 +50,15 @@ public class QC01010_202402OFData implements IDynamicOFData {
 
     @Resource
     private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
+    @Resource
+    private BoilerTaskOrderItemReportUserMapper boilerTaskOrderItemReportUserMapper;
 
     @Resource
     private PipeTaskOrderItemReportMapper pipeTaskOrderItemReportMapper;
 
+    @Resource
+    private PipeTaskOrderItemReportUserMapper pipeTaskOrderItemReportUserMapper;
+
     @Resource
     private BoilerTaskOrderMapper boilerTaskOrderMapper;
 
@@ -97,6 +107,18 @@ public class QC01010_202402OFData implements IDynamicOFData {
                     BoilerTaskOrderSignFileDO boilerTaskOrderSignFileDO = boilerTaskOrderSignFileService.selectLastOneByOrderIdAndBusinessType(one.getId(), 400);
                     if (boilerTaskOrderSignFileDO != null){
                         result.put("value22", boilerTaskOrderSignFileDO.getSignUrl());
+                        result.put("value23", boilerTaskOrderSignFileDO.getSignDate());
+                    }
+                }
+                BoilerTaskOrderItemReportUserDO boilerTaskOrderItemReportUserDO = boilerTaskOrderItemReportUserMapper.selectOne(BoilerTaskOrderItemReportUserDO::getReportId, itemReportDO.getId());
+                if (boilerTaskOrderItemReportUserDO != null) {
+                    //用户信息
+                    String userId = boilerTaskOrderItemReportUserDO.getUserId();
+                    if (userId != null) {
+                        AdminUserRespDTO checkedData = adminUserApi.getUser(userId).getCheckedData();
+                        result.put("value24", checkedData.getSignUrl());
+                        result.put("value25", itemReportDO.getCheckDate());
+                        result.put("value26", checkedData.getMobile());
                     }
                 }
 
@@ -134,6 +156,18 @@ public class QC01010_202402OFData implements IDynamicOFData {
                     BoilerTaskOrderSignFileDO boilerTaskOrderSignFileDO = boilerTaskOrderSignFileService.selectLastOneByOrderIdAndBusinessType(one.getId(), 400);
                     if (boilerTaskOrderSignFileDO != null){
                         result.put("value22", boilerTaskOrderSignFileDO.getSignUrl());
+                        result.put("value23", boilerTaskOrderSignFileDO.getSignDate());
+                    }
+                }
+                PipeTaskOrderItemReportUserDO pipeTaskOrderItemReportUserDO = pipeTaskOrderItemReportUserMapper.selectOne(PipeTaskOrderItemReportUserDO::getReportId, itemReportDO.getId());
+                if (pipeTaskOrderItemReportUserDO != null) {
+                    //用户信息
+                    String userId = pipeTaskOrderItemReportUserDO.getUserId();
+                    if (userId != null) {
+                        AdminUserRespDTO checkedData = adminUserApi.getUser(userId).getCheckedData();
+                        result.put("value24", checkedData.getSignUrl());
+                        result.put("value25", itemReportDO.getCheckDate());
+                        result.put("value26", checkedData.getMobile());
                     }
                 }
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/comm/QC01012_202500OFData.java

@@ -122,11 +122,19 @@ public class QC01012_202500OFData implements IDynamicOFData {
 
             NotificationformReportDO formReportDO = notificationformReportMapper.selectById(refId);
             if (formReportDO != null){
-                result.put("checkName",formReportDO.getSignUrl());
-                result.put("enterDate",formReportDO.getSignDate());
+//                result.put("checkName",formReportDO.getSignUrl());
+//                result.put("enterDate",formReportDO.getSignDate());
 
                 String orderId = formReportDO.getTaskOrderId();
                 BoilerTaskOrderDO taskOrderDO = boilerTaskOrderMapper.selectById(orderId);
+                String managerId = taskOrderDO.getManagerId();
+                if (managerId != null) {
+                    AdminUserRespDTO checkedData = adminUserApi.getUser(managerId).getCheckedData();
+                    if (checkedData != null) {
+                        result.put("checkName", checkedData.getSignUrl());
+                        result.put("enterDate", taskOrderDO.getConfirmDate());
+                    }
+                }
                 List<BoilerTaskOrderItemDO> itemDOS = boilerTaskOrderItemMapper.selectList(new LambdaQueryWrapper<BoilerTaskOrderItemDO>()
                         .eq(BoilerTaskOrderItemDO::getOrderId, orderId)
                 );
@@ -269,10 +277,18 @@ public class QC01012_202500OFData implements IDynamicOFData {
 
             NotificationformReportDO formReportDO = notificationformReportMapper.selectById(refId);
             if (formReportDO != null){
-                result.put("checkName",formReportDO.getSignUrl());
-                result.put("enterDate",formReportDO.getSignDate());
+//                result.put("checkName",formReportDO.getSignUrl());
+//                result.put("enterDate",formReportDO.getSignDate());
                 String orderId = formReportDO.getTaskOrderId();
                 PipeTaskOrderDO taskOrderDO = pipeTaskOrderMapper.selectById(orderId);
+                String managerId = taskOrderDO.getManagerId();
+                if (managerId != null) {
+                    AdminUserRespDTO checkedData = adminUserApi.getUser(managerId).getCheckedData();
+                    if (checkedData != null) {
+                        result.put("checkName", checkedData.getSignUrl());
+                        result.put("enterDate", taskOrderDO.getConfirmDate());
+                    }
+                }
                 List<PipeTaskOrderItemDO> itemDOS = pipeTaskOrderItemMapper.selectList(new LambdaQueryWrapper<PipeTaskOrderItemDO>()
                         .eq(PipeTaskOrderItemDO::getOrderId, orderId)
                 );