From 487500e6b6898e54430d808bf7d6d41ba815977d Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 10 Jul 2024 15:08:11 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20UAT=20=E5=BE=81=E6=B1=82=E6=84=8F?= =?UTF-8?q?=E8=A7=81=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/prod/2024-3-18-变更.sql | 3 ++ .../esRevision/entity/ProcessEsRevision.java | 27 +++++++------- .../service/impl/EsRevisionServiceImpl.java | 36 ++++++++----------- 3 files changed, 29 insertions(+), 37 deletions(-) diff --git a/db/prod/2024-3-18-变更.sql b/db/prod/2024-3-18-变更.sql index 261d37a7..7aef55ab 100644 --- a/db/prod/2024-3-18-变更.sql +++ b/db/prod/2024-3-18-变更.sql @@ -178,3 +178,6 @@ update sys_depart set es_select_flag = 1 where parent_id = '1000000000'; # 汽车研究总院 update sys_depart set es_select_flag = 1 where parent_id = '1005000000'; +-- 2024-07-10 征求意见截止时间 +ALTER TABLE `process_es_revision` + ADD COLUMN `total_advice_deadline` datetime NULL COMMENT '征求意见总截至日期' AFTER `review_user`; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java index d3e21988..478b27cb 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java @@ -5,10 +5,6 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.util.Date; -import java.util.List; - import com.fasterxml.jackson.annotation.JsonFormat; import com.jero.common.aspect.annotation.Dict; import com.jero.modules.activiti.process.esRevision.entity.vo.InspectContentVO; @@ -18,6 +14,10 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import java.io.Serializable; +import java.util.Date; +import java.util.List; + /** * * @TableName process_es_revision @@ -315,6 +315,14 @@ public class ProcessEsRevision implements Serializable { @ApiModelProperty(value = "意见汇总") private String commentsSummary; + /** + * 征求意见截止日期 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "征求意见截止日期") + private Date totalAdviceDeadline; + /** * 自动发起标识 */ @@ -322,17 +330,6 @@ public class ProcessEsRevision implements Serializable { @ApiModelProperty(value = "自动发起标识") private boolean autoStartFlag; - public void setOtherDrafterUploadFileJson(String otherDrafterUploadFileJson) { - this.otherDrafterUploadFileJson = otherDrafterUploadFileJson; - } - - public void setInspectContentJson(String inspectContentJson) { - this.inspectContentJson = inspectContentJson; - } - - public void setReviewMeetingDetailJson(String reviewMeetingDetailJson) { - this.reviewMeetingDetailJson = reviewMeetingDetailJson; - } public void setOtherDrafterUploadFileJson(List otherDraftUserVOS) { this.otherDrafterUploadFileJson = JSON.toJSONString(otherDraftUserVOS); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java index 7414d1d9..eae2db14 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java @@ -20,7 +20,6 @@ import com.jero.modules.activiti.enums.FinishFlagEnum; import com.jero.modules.activiti.enums.ProcessTypeEnum; import com.jero.modules.activiti.process.common.common.DraftCommon; import com.jero.modules.activiti.process.common.entity.CommonVO; -import com.jero.modules.activiti.process.common.entity.CounterSignNodeNameConstants; import com.jero.modules.activiti.process.common.entity.ProcessDraft; import com.jero.modules.activiti.process.common.enums.ProcessType; import com.jero.modules.activiti.process.common.service.ActFlowCommonService; @@ -28,13 +27,13 @@ import com.jero.modules.activiti.process.common.service.ProcessDraftService; import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPProjectStatus; import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPRevisionType; import com.jero.modules.activiti.process.esRevision.entity.*; +import com.jero.modules.activiti.process.esRevision.entity.vo.ESRevisionDataVO; import com.jero.modules.activiti.process.esRevision.entity.vo.InspectContentVO; import com.jero.modules.activiti.process.esRevision.entity.vo.OtherDraftUserVO; -import com.jero.modules.activiti.process.esRevision.entity.vo.ESRevisionDataVO; import com.jero.modules.activiti.process.esRevision.entity.vo.ReviewMeetingDetailVO; +import com.jero.modules.activiti.process.esRevision.mapper.EsRevisionMapper; import com.jero.modules.activiti.process.esRevision.service.EsRevisionAdviceService; import com.jero.modules.activiti.process.esRevision.service.EsRevisionService; -import com.jero.modules.activiti.process.esRevision.mapper.EsRevisionMapper; import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO; import com.jero.modules.activiti.process.fb.service.IProcessHandleService; import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; @@ -509,6 +508,8 @@ public class EsRevisionServiceImpl extends ServiceImpl contactUserList = Arrays.asList(data.getContactUser().split(",")); taskService.setVariable(taskId, "contactUserList", contactUserList); taskService.setVariable(taskId, "open", true); @@ -524,10 +525,19 @@ public class EsRevisionServiceImpl extends ServiceImpl totalAdviceDeadline.getTime()) { + log.error("总截止时间:{} 当前提交征求意见截止时间{}", totalAdviceDeadline, adviceDeadline); + throw new JeroBootException("各部门联络人设置的截止时间不能晚于标准化设置的征求意见截止时间！"); + } + } String workGroup = data.getWorkGroup(); List adviceUserList = Arrays.asList(workGroup.split(",")); runtimeService.setVariableLocal(executionId, "adviceUserList", adviceUserList); - runtimeService.setVariable(executionId, executionId + "-adviceDeadline", data.getAdviceDeadline()); + runtimeService.setVariable(executionId, executionId + "-adviceDeadline", adviceDeadline); runtimeService.setVariable(executionId, "contactExecutionId", executionId); userMap.put("adviceUserList", workGroup); processNodeLinkService.incrementSaveNodeUserLink(processDefinitionId, processInstanceId, userMap); @@ -620,24 +630,6 @@ public class EsRevisionServiceImpl extends ServiceImpl