管道提交报告bug

build-uat/update.sql

@@ -1537,4 +1537,10 @@ COMMENT ON COLUMN "PRESSURE2_BOILER_TASK_ORDER_ITEM_REPORT"."CONFIRMATION_TIME"
 ALTER TABLE "SYSTEM_OAUTH2_REFRESH_TOKEN" MODIFY "REFRESH_TOKEN" VARCHAR(36 CHAR) NOT NULL;
 ALTER TABLE "SYSTEM_OAUTH2_ACCESS_TOKEN" MODIFY "REFRESH_TOKEN" VARCHAR(36 CHAR) NOT NULL;
 
---已加
+--已加
+
+ALTER TABLE "PRESSURE_TASK_ORDER" ADD COLUMN "IS_SYNC" VARCHAR(50);
+COMMENT ON COLUMN "PRESSURE_TASK_ORDER"."IS_SYNC" IS '是否是同步数据';
+
+INSERT INTO "INFRA_CONFIG" ("ID","CATEGORY","TYPE","NAME","CONFIG_KEY","VALUE","VISIBLE","REMARK","CREATOR","CREATE_TIME","UPDATER","UPDATE_TIME","DELETED" ) VALUES ('f4f25ba4fa087abf9c67d75ba4a6c0ab','定时任务开关','2','是否定时查询非税记录的缴费状态并更新','is_enable_update_no_tax_status','false',1,'true:开启 false:关闭','1','2026-06-02 18:40:46','1','2026-06-02 19:05:59',0);
+-- 已加

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorderitemreport/BoilerTaskOrderItemReportServiceImpl.java

@@ -20,6 +20,7 @@ import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitemreportreco
 import cn.start.tz.module.pressure2.dal.dataobject.equipboiler.EquipBoilerDO;
 import cn.start.tz.module.pressure2.dal.dataobject.equipboilercheckhistory.EquipBoilerCheckHistoryDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitemreport.BoilerTaskOrderItemReportDO;
+import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitemreport.PipeTaskOrderItemReportDO;
 import cn.start.tz.module.pressure2.dal.dataobject.reporttemplate.ReportTemplateDO;
 import cn.start.tz.module.pressure2.dal.mysql.boilertaskorder.BoilerTaskOrderMapper;
 import cn.start.tz.module.pressure2.dal.mysql.boilertaskorderitem.BoilerTaskOrderItemMapper;
@@ -533,12 +534,25 @@ public class BoilerTaskOrderItemReportServiceImpl extends ServiceImpl<BoilerTask
                 .max(Comparator.comparing(ExternalOACommentInfoRes::getCreateDate))
                 .ifPresent(approval -> {
                     List<AdminUserRespDTO> userList = adminUserApi.getUserListByNickname(approval.getUserName()).getCheckedData();
+                    if (userList.isEmpty()) {
+                        AdminUserRespDTO checkedData = adminUserApi.getUserByEmployeeNo(approval.getUserName()).getCheckedData();
+                        if (checkedData == null) {
+                            if (userList.isEmpty()) {
+                                AdminUserRespDTO checkedData1 = adminUserApi.getUserByEmployeeNo(approval.getUserCode()).getCheckedData();
+                                if (checkedData1 != null) {
+                                    userList.add(checkedData1);
+                                }
+                            }
+                        } else {
+                            userList.add(checkedData);
+                        }
+                    }
                     if (!userList.isEmpty()) {
                         reportUpdateWrapper.set(BoilerTaskOrderItemReportDO::getApprovalId, userList.get(0).getId());
                         reportUpdateWrapper.set(BoilerTaskOrderItemReportDO::getApprovalTime, approval.getCreateDate());
-                        reportUpdateWrapper.set(BoilerTaskOrderItemReportDO::getTaskStatus, TaskOrderStatusEnum.REPORT_RATIFY.getStatus());
-                        needUpdateReport.set(true);
                     }
+                    reportUpdateWrapper.set(BoilerTaskOrderItemReportDO::getTaskStatus, TaskOrderStatusEnum.REPORT_RATIFY.getStatus());
+                    needUpdateReport.set(true);
                 });
 
         // 找最新的"审批人员"节点的【同意】或【已阅】评论
@@ -551,6 +565,19 @@ public class BoilerTaskOrderItemReportServiceImpl extends ServiceImpl<BoilerTask
                 .max(Comparator.comparing(ExternalOACommentInfoRes::getCreateDate))
                 .ifPresent(ratify -> {
                     List<AdminUserRespDTO> userList = adminUserApi.getUserListByNickname(ratify.getUserName()).getCheckedData();
+                    if (userList.isEmpty()) {
+                        AdminUserRespDTO checkedData = adminUserApi.getUserByEmployeeNo(ratify.getUserName()).getCheckedData();
+                        if (checkedData == null) {
+                            if (userList.isEmpty()) {
+                                AdminUserRespDTO checkedData1 = adminUserApi.getUserByEmployeeNo(ratify.getUserCode()).getCheckedData();
+                                if (checkedData1 != null) {
+                                    userList.add(checkedData1);
+                                }
+                            }
+                        } else {
+                            userList.add(checkedData);
+                        }
+                    }
                     if (!userList.isEmpty()) {
                         reportUpdateWrapper.set(BoilerTaskOrderItemReportDO::getRatifyId, userList.get(0).getId());
                         reportUpdateWrapper.set(BoilerTaskOrderItemReportDO::getRatifyTime, ratify.getCreateDate());

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorderitemreport/PipeTaskOrderItemReportServiceImpl.java

@@ -320,12 +320,25 @@ public class PipeTaskOrderItemReportServiceImpl extends ServiceImpl<PipeTaskOrde
                 .max(Comparator.comparing(ExternalOACommentInfoRes::getCreateDate))
                 .ifPresent(approval -> {
                     List<AdminUserRespDTO> userList = adminUserApi.getUserListByNickname(approval.getUserName()).getCheckedData();
+                    if (userList.isEmpty()) {
+                        AdminUserRespDTO checkedData = adminUserApi.getUserByEmployeeNo(approval.getUserName()).getCheckedData();
+                        if (checkedData == null) {
+                            if (userList.isEmpty()) {
+                                AdminUserRespDTO checkedData1 = adminUserApi.getUserByEmployeeNo(approval.getUserCode()).getCheckedData();
+                                if (checkedData1 != null) {
+                                    userList.add(checkedData1);
+                                }
+                            }
+                        } else {
+                            userList.add(checkedData);
+                        }
+                    }
                     if (!userList.isEmpty()) {
                         reportUpdateWrapper.set(PipeTaskOrderItemReportDO::getApprovalId, userList.get(0).getId());
                         reportUpdateWrapper.set(PipeTaskOrderItemReportDO::getApprovalTime, approval.getCreateDate());
-                        reportUpdateWrapper.set(PipeTaskOrderItemReportDO::getTaskStatus, TaskOrderStatusEnum.REPORT_RATIFY.getStatus());
-                        needUpdateReport.set(true);
                     }
+                    reportUpdateWrapper.set(PipeTaskOrderItemReportDO::getTaskStatus, TaskOrderStatusEnum.REPORT_RATIFY.getStatus());
+                    needUpdateReport.set(true);
                 });
 
         // 找最新的"审批人员"节点的【同意】或【已阅】评论
@@ -338,6 +351,19 @@ public class PipeTaskOrderItemReportServiceImpl extends ServiceImpl<PipeTaskOrde
                 .max(Comparator.comparing(ExternalOACommentInfoRes::getCreateDate))
                 .ifPresent(ratify -> {
                     List<AdminUserRespDTO> userList = adminUserApi.getUserListByNickname(ratify.getUserName()).getCheckedData();
+                    if (userList.isEmpty()) {
+                        AdminUserRespDTO checkedData = adminUserApi.getUserByEmployeeNo(ratify.getUserName()).getCheckedData();
+                        if (checkedData == null) {
+                            if (userList.isEmpty()) {
+                                AdminUserRespDTO checkedData1 = adminUserApi.getUserByEmployeeNo(ratify.getUserCode()).getCheckedData();
+                                if (checkedData1 != null) {
+                                    userList.add(checkedData1);
+                                }
+                            }
+                        } else {
+                            userList.add(checkedData);
+                        }
+                    }
                     if (!userList.isEmpty()) {
                         reportUpdateWrapper.set(PipeTaskOrderItemReportDO::getRatifyId, userList.get(0).getId());
                         reportUpdateWrapper.set(PipeTaskOrderItemReportDO::getRatifyTime, ratify.getCreateDate());
@@ -504,13 +530,13 @@ public class PipeTaskOrderItemReportServiceImpl extends ServiceImpl<PipeTaskOrde
                     .orElse(null);
 
             if (approval != null) {
-                if (approval.getUserCode() != null){
+                if (approval.getUserCode() != null) {
                     AdminUserRespDTO userRespDTO = adminUserApi.getUserByEmployeeNo(approval.getUserCode()).getCheckedData();
                     if (userRespDTO != null) {
                         approvalId = userRespDTO.getId();
                         approvalName = userRespDTO.getNickname();
                         approvalTime = approval.getCreateDate();
-                    }else {
+                    } else {
                         List<AdminUserRespDTO> userListByNickname = adminUserApi.getUserListByNickname(approval.getUserName()).getCheckedData();
                         if (!userListByNickname.isEmpty()) {
                             AdminUserRespDTO approvalUser = userListByNickname.get(0);
@@ -519,7 +545,7 @@ public class PipeTaskOrderItemReportServiceImpl extends ServiceImpl<PipeTaskOrde
                             approvalTime = approval.getCreateDate();
                         }
                     }
-                }else {
+                } else {
                     List<AdminUserRespDTO> userListByNickname = adminUserApi.getUserListByNickname(approval.getUserName()).getCheckedData();
                     if (!userListByNickname.isEmpty()) {
                         AdminUserRespDTO approvalUser = userListByNickname.get(0);
@@ -531,13 +557,13 @@ public class PipeTaskOrderItemReportServiceImpl extends ServiceImpl<PipeTaskOrde
             }
 
             if (ratify != null) {
-                if (ratify.getUserCode() != null){
+                if (ratify.getUserCode() != null) {
                     AdminUserRespDTO userRespDTO = adminUserApi.getUserByEmployeeNo(ratify.getUserCode()).getCheckedData();
                     if (userRespDTO != null) {
                         ratifyId = userRespDTO.getId();
                         ratifyName = userRespDTO.getNickname();
                         ratifyTime = ratify.getCreateDate();
-                    }else {
+                    } else {
                         List<AdminUserRespDTO> userListByNickname = adminUserApi.getUserListByNickname(ratify.getUserName()).getCheckedData();
                         if (!userListByNickname.isEmpty()) {
                             AdminUserRespDTO ratifyUser = userListByNickname.get(0);
@@ -546,7 +572,7 @@ public class PipeTaskOrderItemReportServiceImpl extends ServiceImpl<PipeTaskOrde
                             ratifyTime = ratify.getCreateDate();
                         }
                     }
-                }else {
+                } else {
                     List<AdminUserRespDTO> userListByNickname = adminUserApi.getUserListByNickname(ratify.getUserName()).getCheckedData();
                     if (!userListByNickname.isEmpty()) {
                         AdminUserRespDTO ratifyUser = userListByNickname.get(0);