fix: 将报批日期改为当天0点

This commit is contained in:
2024-09-20 08:00:53 +08:00
parent 388ed6f051
commit 346e6d04b5
@@ -1,5 +1,6 @@
package com.jero.modules.activiti.process.esRevision.service.impl; package com.jero.modules.activiti.process.esRevision.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
@@ -1018,6 +1019,8 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
if (approvalRecordMap.containsKey(MAIN_DRAFT_USER_UPLOAD)) { if (approvalRecordMap.containsKey(MAIN_DRAFT_USER_UPLOAD)) {
ProcessApprovalRecord approvalRecord = approvalRecordMap.get(MAIN_DRAFT_USER_UPLOAD).get(0); ProcessApprovalRecord approvalRecord = approvalRecordMap.get(MAIN_DRAFT_USER_UPLOAD).get(0);
Date approvalDate = approvalRecord.getEndTime(); Date approvalDate = approvalRecord.getEndTime();
// 将approvalDate改为当天0点
approvalDate = DateUtil.beginOfDay(approvalDate);
esp.setApprovalDate(approvalDate); esp.setApprovalDate(approvalDate);
if (planApprovalDate.before(approvalDate)) { if (planApprovalDate.before(approvalDate)) {
esp.setProjectStatus(ESPProjectStatus.OVERDUE_COMPLETED.getValue()); esp.setProjectStatus(ESPProjectStatus.OVERDUE_COMPLETED.getValue());