From 2773e310972c7647de788fb9eb9fcddbfac3bc93 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 20 Dec 2023 15:34:58 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B9=B4=E5=BA=A6=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=20=E6=A0=87=E5=87=86=E5=8C=96=E5=8F=91=E8=B5=B7?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=20=E4=B8=89=E4=B8=AA=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=98=AF=E5=90=A6=E5=8F=AF=E4=BB=A5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=A0=87=E8=AF=86=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/ProcessEsAnnualInit.java | 30 +++++++++++++++++++ .../impl/ProcessEsAnnualInitServiceImpl.java | 9 ++++-- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java index cc9a330c..9c76bcde 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java @@ -1,5 +1,6 @@ package com.jero.modules.activiti.process.esAnnualInit.entity; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -9,6 +10,7 @@ import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.jero.common.aspect.annotation.Dict; +import com.jero.common.constant.enums.YesOrNoEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -196,6 +198,9 @@ public class ProcessEsAnnualInit implements Serializable { @TableField(exist = false) private String draftPlannedCompleteDateString; + @ApiModelProperty(value = "草稿计划完成日期是否可以编辑") + private String draftPlannedCompleteDateEditFlag; + /** * 征求意见稿计划完成日期 */ @@ -208,6 +213,9 @@ public class ProcessEsAnnualInit implements Serializable { @TableField(exist = false) private String solicitationDraftPlanCompleteDateString; + @ApiModelProperty(value = "征求意见稿计划完成日期是否可以编辑") + private String solicitationDraftPlanCompleteDateEditFlag; + /** * 计划报批日期 */ @@ -220,6 +228,9 @@ public class ProcessEsAnnualInit implements Serializable { @TableField(exist = false) private String planApprovalDateString; + @ApiModelProperty(value = "计划报批日期是否可以编辑") + private String planApprovalDateEditFlag; + /** * 项目状态 */ @@ -359,4 +370,23 @@ public class ProcessEsAnnualInit implements Serializable { @TableField(exist = false) private String sort; + + public void setDateEditFlag() { + if (this.getDraftPlannedCompleteDate() != null) { + this.setDraftPlannedCompleteDateEditFlag(YesOrNoEnum.NO.getValue()); + } else { + this.setDraftPlannedCompleteDateEditFlag(YesOrNoEnum.YES.getValue()); + } + if (this.getSolicitationDraftPlanCompleteDate() != null) { + this.setSolicitationDraftPlanCompleteDateEditFlag(YesOrNoEnum.NO.getValue()); + } else { + this.setSolicitationDraftPlanCompleteDateEditFlag(YesOrNoEnum.YES.getValue()); + } + if (this.getPlanApprovalDate() != null) { + this.setPlanApprovalDateEditFlag(YesOrNoEnum.NO.getValue()); + } else { + this.setPlanApprovalDateEditFlag(YesOrNoEnum.YES.getValue()); + } + } + } \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java index 10653464..27cb9168 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java @@ -126,6 +126,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl data.setProcessInstanceId(processInstanceId)); + dataList.forEach(ProcessEsAnnualInit::setDateEditFlag); saveBatch(dataList); // 根据流程实例id更新流程总表 String prcName = commonVO.getPrcName(); @@ -307,6 +308,8 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl d.setRejectSecondFlag(YesOrNoEnum.NO.getValue())); dataList.forEach(d -> d.setRejectFlag(YesOrNoEnum.YES.getValue())); dataList.forEach(d -> d.setExecutionId(executionId)); + dataList.forEach(ProcessEsAnnualInit::setDateEditFlag); + dataList.forEach(data -> data.setProcessInstanceId(processInstanceId)); // 先删后增 if (batchDelFlag) { saveOrUpdateBatch(dataList); @@ -315,13 +318,15 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl data.setProcessInstanceId(processInstanceId)); saveBatch(dataList); } break; case STANDARD_ENGINEER_EDIT: dataList = annualInitData.getDataList(); dataList.forEach(d -> d.setRejectFlag(YesOrNoEnum.NO.getValue())); + dataList.forEach(ProcessEsAnnualInit::setDateEditFlag); + dataList.forEach(data -> data.setProcessInstanceId(processInstanceId)); + dataList.forEach(data -> data.setExecutionId(executionId)); // 先删后增 if (batchDelFlag) { saveOrUpdateBatch(dataList); @@ -330,8 +335,6 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl data.setProcessInstanceId(processInstanceId)); - dataList.forEach(data -> data.setExecutionId(executionId)); saveBatch(dataList); } break;