feat: 年度制修订 标准化发起流程 三个日期字段是否可以修改标识符
This commit is contained in:
+30
@@ -1,5 +1,6 @@
|
|||||||
package com.jero.modules.activiti.process.esAnnualInit.entity;
|
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.IdType;
|
||||||
import com.baomidou.mybatisplus.annotation.TableField;
|
import com.baomidou.mybatisplus.annotation.TableField;
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
@@ -9,6 +10,7 @@ import java.util.Date;
|
|||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import com.jero.common.aspect.annotation.Dict;
|
import com.jero.common.aspect.annotation.Dict;
|
||||||
|
import com.jero.common.constant.enums.YesOrNoEnum;
|
||||||
import io.swagger.annotations.ApiModel;
|
import io.swagger.annotations.ApiModel;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@@ -196,6 +198,9 @@ public class ProcessEsAnnualInit implements Serializable {
|
|||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String draftPlannedCompleteDateString;
|
private String draftPlannedCompleteDateString;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "草稿计划完成日期是否可以编辑")
|
||||||
|
private String draftPlannedCompleteDateEditFlag;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 征求意见稿计划完成日期
|
* 征求意见稿计划完成日期
|
||||||
*/
|
*/
|
||||||
@@ -208,6 +213,9 @@ public class ProcessEsAnnualInit implements Serializable {
|
|||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String solicitationDraftPlanCompleteDateString;
|
private String solicitationDraftPlanCompleteDateString;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "征求意见稿计划完成日期是否可以编辑")
|
||||||
|
private String solicitationDraftPlanCompleteDateEditFlag;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 计划报批日期
|
* 计划报批日期
|
||||||
*/
|
*/
|
||||||
@@ -220,6 +228,9 @@ public class ProcessEsAnnualInit implements Serializable {
|
|||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String planApprovalDateString;
|
private String planApprovalDateString;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "计划报批日期是否可以编辑")
|
||||||
|
private String planApprovalDateEditFlag;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 项目状态
|
* 项目状态
|
||||||
*/
|
*/
|
||||||
@@ -359,4 +370,23 @@ public class ProcessEsAnnualInit implements Serializable {
|
|||||||
|
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String sort;
|
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());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
+6
-3
@@ -126,6 +126,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
|
|||||||
processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, this.getUserMap(actVariables));
|
processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, this.getUserMap(actVariables));
|
||||||
// 保存数据
|
// 保存数据
|
||||||
dataList.forEach(data -> data.setProcessInstanceId(processInstanceId));
|
dataList.forEach(data -> data.setProcessInstanceId(processInstanceId));
|
||||||
|
dataList.forEach(ProcessEsAnnualInit::setDateEditFlag);
|
||||||
saveBatch(dataList);
|
saveBatch(dataList);
|
||||||
// 根据流程实例id更新流程总表
|
// 根据流程实例id更新流程总表
|
||||||
String prcName = commonVO.getPrcName();
|
String prcName = commonVO.getPrcName();
|
||||||
@@ -307,6 +308,8 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
|
|||||||
dataList.forEach(d -> d.setRejectSecondFlag(YesOrNoEnum.NO.getValue()));
|
dataList.forEach(d -> d.setRejectSecondFlag(YesOrNoEnum.NO.getValue()));
|
||||||
dataList.forEach(d -> d.setRejectFlag(YesOrNoEnum.YES.getValue()));
|
dataList.forEach(d -> d.setRejectFlag(YesOrNoEnum.YES.getValue()));
|
||||||
dataList.forEach(d -> d.setExecutionId(executionId));
|
dataList.forEach(d -> d.setExecutionId(executionId));
|
||||||
|
dataList.forEach(ProcessEsAnnualInit::setDateEditFlag);
|
||||||
|
dataList.forEach(data -> data.setProcessInstanceId(processInstanceId));
|
||||||
// 先删后增
|
// 先删后增
|
||||||
if (batchDelFlag) {
|
if (batchDelFlag) {
|
||||||
saveOrUpdateBatch(dataList);
|
saveOrUpdateBatch(dataList);
|
||||||
@@ -315,13 +318,15 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
|
|||||||
wrapper.eq(ProcessEsAnnualInit::getExecutionId, executionId);
|
wrapper.eq(ProcessEsAnnualInit::getExecutionId, executionId);
|
||||||
wrapper.eq(ProcessEsAnnualInit::getRejectSecondFlag, YesOrNoEnum.YES.getValue());
|
wrapper.eq(ProcessEsAnnualInit::getRejectSecondFlag, YesOrNoEnum.YES.getValue());
|
||||||
remove(wrapper);
|
remove(wrapper);
|
||||||
dataList.forEach(data -> data.setProcessInstanceId(processInstanceId));
|
|
||||||
saveBatch(dataList);
|
saveBatch(dataList);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case STANDARD_ENGINEER_EDIT:
|
case STANDARD_ENGINEER_EDIT:
|
||||||
dataList = annualInitData.getDataList();
|
dataList = annualInitData.getDataList();
|
||||||
dataList.forEach(d -> d.setRejectFlag(YesOrNoEnum.NO.getValue()));
|
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) {
|
if (batchDelFlag) {
|
||||||
saveOrUpdateBatch(dataList);
|
saveOrUpdateBatch(dataList);
|
||||||
@@ -330,8 +335,6 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
|
|||||||
wrapper.eq(ProcessEsAnnualInit::getExecutionId, executionId);
|
wrapper.eq(ProcessEsAnnualInit::getExecutionId, executionId);
|
||||||
wrapper.eq(ProcessEsAnnualInit::getRejectFlag, YesOrNoEnum.YES.getValue());
|
wrapper.eq(ProcessEsAnnualInit::getRejectFlag, YesOrNoEnum.YES.getValue());
|
||||||
remove(wrapper);
|
remove(wrapper);
|
||||||
dataList.forEach(data -> data.setProcessInstanceId(processInstanceId));
|
|
||||||
dataList.forEach(data -> data.setExecutionId(executionId));
|
|
||||||
saveBatch(dataList);
|
saveBatch(dataList);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|||||||
Reference in New Issue
Block a user