检验意见通知书剩余确认时间

build-uat/update.sql

@@ -1525,4 +1525,10 @@ COMMENT ON COLUMN "PRESSURE2_EQUIP_BOILER"."ANNOTATOR_NAME" IS '备注人名称'
 update system_menu set PARENT_ID = '0a148121ee6a5d745928e00b11c72e2b' where PARENT_ID = 'c3060cb5927de6ceaa25aec939057c3a';
 update system_menu set STATUS = 1 where ID = 'c3060cb5927de6ceaa25aec939057c3a'
 
+ALTER TABLE "PRESSURE2_PIPE_TASK_ORDER_ITEM_REPORT" ADD COLUMN "CONFIRMATION_TIME" DATE;
+COMMENT ON COLUMN "PRESSURE2_PIPE_TASK_ORDER_ITEM_REPORT"."CONFIRMATION_TIME" IS '检验意见通知书确认日期';
+
+ALTER TABLE "PRESSURE2_BOILER_TASK_ORDER_ITEM_REPORT" ADD COLUMN "CONFIRMATION_TIME" DATE;
+COMMENT ON COLUMN "PRESSURE2_BOILER_TASK_ORDER_ITEM_REPORT"."CONFIRMATION_TIME" IS '检验意见通知书确认日期';
+
 -- 0527以上已加

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/dataobject/boilertaskorderitemreport/BoilerTaskOrderItemReportDO.java

@@ -374,4 +374,6 @@ public class BoilerTaskOrderItemReportDO extends BaseDO {
     private Integer mpSendStatus;
 
     private LocalDateTime finishUploadTime;
+
+    private LocalDate confirmationTime;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/dataobject/pipetaskorderitemreport/PipeTaskOrderItemReportDO.java

@@ -370,4 +370,6 @@ public class PipeTaskOrderItemReportDO extends BaseDO {
     private Integer mpSendStatus;
 
     private LocalDateTime finishUploadTime;
+
+    private LocalDate confirmationTime;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/boilertaskorderitem/BoilerTaskOrderItemMapper.java

@@ -99,7 +99,7 @@ public interface BoilerTaskOrderItemMapper extends BaseMapperX<BoilerTaskOrderIt
                 selectAs(BoilerTaskOrderItemReportDO::getRecheckName,BoilerOrderItemPageRespVO::getRecheckName).
                 selectAs(BoilerTaskOrderItemReportDO::getIsReported,BoilerOrderItemPageRespVO::getIsReported).
                 selectAs(BoilerTaskOrderItemReportDO::getProcessInstanceId,BoilerOrderItemPageRespVO::getProcessInstanceId).
-                selectAs(BoilerTaskOrderItemReportDO::getCreateTime,BoilerOrderItemPageRespVO::getConfirmationTime).
+                selectAs(BoilerTaskOrderItemReportDO::getConfirmationTime,BoilerOrderItemPageRespVO::getConfirmationTime).
                 selectAs(BoilerTaskOrderItemReportDO::getRectificationStatus,BoilerOrderItemPageRespVO::getRectificationStatus).
                 selectAs(BoilerTaskOrderItemReportDO::getPrepareJson,BoilerOrderItemPageRespVO::getPrepareJson).
                 selectAs(BoilerTaskOrderItemReportDO::getRectificationUrl,BoilerOrderItemPageRespVO::getRectificationUrl).
@@ -258,7 +258,7 @@ public interface BoilerTaskOrderItemMapper extends BaseMapperX<BoilerTaskOrderIt
         }
 
         if (reqVO.getId() != null) {
-            recordDOMPJLambdaWrapper.eq(BoilerTaskOrderItemDO::getId, reqVO.getId());
+            recordDOMPJLambdaWrapper.eq(BoilerTaskOrderItemReportDO::getId, reqVO.getId());
         }
 
         if (CollUtil.isNotEmpty(reqVO.getRectificationStatusList())) {

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/pipetaskorderitem/PipeTaskOrderItemMapper.java

@@ -108,7 +108,7 @@ public interface PipeTaskOrderItemMapper extends BaseMapperX<PipeTaskOrderItemDO
                 selectAs(PipeTaskOrderItemReportDO::getRecheckName,PipeOrderItemPageRespVO::getRecheckName).
                 selectAs(PipeTaskOrderItemReportDO::getIsReported,PipeOrderItemPageRespVO::getIsReported).
                 selectAs(PipeTaskOrderItemReportDO::getProcessInstanceId,PipeOrderItemPageRespVO::getProcessInstanceId).
-                selectAs(PipeTaskOrderItemReportDO::getCreateTime,PipeOrderItemPageRespVO::getConfirmationTime).
+                selectAs(PipeTaskOrderItemReportDO::getConfirmationTime,PipeOrderItemPageRespVO::getConfirmationTime).
                 selectAs(PipeTaskOrderItemReportDO::getRectificationStatus,PipeOrderItemPageRespVO::getRectificationStatus).
                 selectAs(PipeTaskOrderItemReportDO::getPrepareJson,PipeOrderItemPageRespVO::getPrepareJson).
                 selectAs(PipeTaskOrderItemReportDO::getRectificationUrl,PipeOrderItemPageRespVO::getRectificationUrl).

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/framework/rpc/config/RpcConfiguration.java

@@ -13,6 +13,7 @@ import cn.start.tz.module.infra.api.sign.SignApi;
 import cn.start.tz.module.infra.api.sms.SmsApi;
 import cn.start.tz.module.member.api.templatesendlog.TemplateSendLogApi;
 import cn.start.tz.module.member.api.user.MemberUserApi;
+import cn.start.tz.module.system.api.calendar.CalendarApi;
 import cn.start.tz.module.system.api.clientunit.ClientUnitApi;
 import cn.start.tz.module.system.api.dept.DeptApi;
 import cn.start.tz.module.system.api.dept.PostApi;
@@ -37,7 +38,7 @@ import org.springframework.context.annotation.Configuration;
         ShortUrlApi.class, MailSendApi.class,
         TemplateInitDataApi.class,
         OrgContactApi.class,
-        AdminUserQualificationsApi.class,
+        AdminUserQualificationsApi.class, CalendarApi.class,
         // bpm模块
         BpmProcessInstanceApi.class, BpmTaskApi.class, BpmUserGroupApi.class,
         // member模块

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorder/BoilerTaskOrderServiceImpl.java

@@ -157,6 +157,7 @@ import cn.start.tz.module.pressure2.service.synchronization.SynchronizationServi
 import cn.start.tz.module.pressure2.service.synchronization.dto.ReportDto;
 import cn.start.tz.module.pressure2.service.userwallthicknesstemplate.UserWallThicknessTemplateService;
 import cn.start.tz.module.pressure2.util.*;
+import cn.start.tz.module.system.api.calendar.CalendarApi;
 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.dept.DeptApi;
@@ -435,6 +436,9 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
     @Resource
     private DeptApi deptApi;
 
+    @Resource
+    private CalendarApi calendarApi;
+
     @Resource
     private StandardTemplateApi standardTemplateApi;
 
@@ -2286,6 +2290,9 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
                     }
                 }
                 addReport.setReportType(reportTemplateDO.getTbType());
+                if (Integer.valueOf(400).equals(reportTemplateDO.getTbType())) {
+                    addReport.setConfirmationTime(calendarApi.getCalendarDateByParam(LocalDate.now(), 3).getCheckedData());
+                }
 //                addReport.setIsApproval(reportTemplateDO.getIsApproval());
 //                addReport.setIsRatify(reportTemplateDO.getIsRatify());
 //                addReport.setIsRecheck(reportTemplateDO.getIsRecheck());
@@ -6098,11 +6105,10 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
             }
 
             //计算客户剩余确认时间（意见通知书创建时间）
-            LocalDate localDate2 = item.getConfirmationTime().toLocalDate().plusDays(1);
-            if (now().isAfter(localDate2)) {
-                item.setConfirmationTimeStr("已超期");
-            } else {
-                item.setConfirmationTimeStr("1");
+            if (item.getConfirmationTime() != null) {
+                LocalDate confirmDate = LocalDate.from(item.getConfirmationTime());
+                Integer diff = calendarApi.calculateWorkdayInfo(confirmDate, LocalDate.now()).getCheckedData();
+                item.setConfirmationTimeStr(diff + "天");
             }
             //获取最新的一条公众号推送状态
             item.setMpSendStatus(4);

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorder/PipeTaskOrderServiceImpl.java

@@ -156,6 +156,7 @@ import cn.start.tz.module.pressure2.util.ConversionUtil;
 import cn.start.tz.module.pressure2.util.DeptDataPermissionUtil;
 import cn.start.tz.module.pressure2.util.JsonArrayUtil;
 import cn.start.tz.module.pressure2.util.JsonDiffTool;
+import cn.start.tz.module.system.api.calendar.CalendarApi;
 import cn.start.tz.module.system.api.clientunit.ClientUnitApi;
 import cn.start.tz.module.system.api.dept.DeptApi;
 import cn.start.tz.module.system.api.dept.dto.DeptRespDTO;
@@ -404,6 +405,9 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
     @Resource
     private DeptApi deptApi;
 
+    @Resource
+    private CalendarApi calendarApi;
+
     @Resource
     private BoilerTaskOrderSignFileMapper taskOrderSignFileMapper;
 
@@ -1459,6 +1463,9 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
                     }
 
                     addReport.setReportType(reportTemplateDO.getTbType());
+                    if (Integer.valueOf(400).equals(reportTemplateDO.getTbType())) {
+                        addReport.setConfirmationTime(calendarApi.getCalendarDateByParam(LocalDate.now(), 3).getCheckedData());
+                    }
 //                addReport.setIsApproval(reportTemplateDO.getIsApproval());
 //                addReport.setIsRatify(reportTemplateDO.getIsRatify());
 //                addReport.setIsRecheck(reportTemplateDO.getIsRecheck());
@@ -5300,11 +5307,10 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
             }
 
             //计算客户剩余确认时间（意见通知书创建时间）
-            LocalDate localDate2 = item.getConfirmationTime().toLocalDate().plusDays(1);
-            if (now().isAfter(localDate2)) {
-                item.setConfirmationTimeStr("已超期");
-            } else {
-                item.setConfirmationTimeStr("1");
+            if (item.getConfirmationTime() != null) {
+                LocalDate confirmDate = LocalDate.from(item.getConfirmationTime());
+                Integer diff = calendarApi.calculateWorkdayInfo(confirmDate, LocalDate.now()).getCheckedData();
+                item.setConfirmationTimeStr(diff + "天");
             }
             //获取最新的一条公众号推送状态
             item.setMpSendStatus(4);