feat: 企标更改流程发起的时候判断企标状态不能是废止和封存
This commit is contained in:
@@ -137,6 +137,11 @@ public class ResultCommon {
|
|||||||
*/
|
*/
|
||||||
public static final String INVALID_ESP = "invalid.esp";
|
public static final String INVALID_ESP = "invalid.esp";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 不可以编辑废止或封存状态的企标
|
||||||
|
*/
|
||||||
|
public static final String CAN_NOT_EDIT_ABOLISH_OR_ARCHIVE_ES = "can.not.edit.abolish.or.archive.es";
|
||||||
|
|
||||||
// ---------项目合规评估流程---------
|
// ---------项目合规评估流程---------
|
||||||
/**
|
/**
|
||||||
* 模块负责人不能为空
|
* 模块负责人不能为空
|
||||||
|
|||||||
+19
-1
@@ -11,6 +11,7 @@ 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.CounterSignNodeNameConstants;
|
||||||
import com.jero.modules.activiti.process.common.entity.ProcessDraft;
|
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.enums.ProcessType;
|
||||||
|
import com.jero.modules.activiti.process.common.enums.StandardStateEnum;
|
||||||
import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
|
import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
|
||||||
import com.jero.modules.activiti.process.esArchive.entity.ProcessEsArchive;
|
import com.jero.modules.activiti.process.esArchive.entity.ProcessEsArchive;
|
||||||
import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO;
|
import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO;
|
||||||
@@ -24,6 +25,8 @@ 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.service.IProcessHandleService;
|
||||||
import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
|
import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
|
||||||
import com.jero.modules.activiti.service.ProcessNodeLinkService;
|
import com.jero.modules.activiti.service.ProcessNodeLinkService;
|
||||||
|
import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
|
||||||
|
import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
|
||||||
import com.jero.modules.sys.utils.UserUtils;
|
import com.jero.modules.sys.utils.UserUtils;
|
||||||
import com.jero.modules.system.service.ISysUserDepartService;
|
import com.jero.modules.system.service.ISysUserDepartService;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
@@ -69,6 +72,9 @@ public class ProcessEsChangeServiceImpl extends ServiceImpl<ProcessEsChangeMappe
|
|||||||
@Resource
|
@Resource
|
||||||
private TaskService taskService;
|
private TaskService taskService;
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private ILawsEnterpriseStandardService esService;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void startProcess(ESChangeDataVO changeData) {
|
public void startProcess(ESChangeDataVO changeData) {
|
||||||
// 执行流程发起前的操作
|
// 执行流程发起前的操作
|
||||||
@@ -163,7 +169,19 @@ public class ProcessEsChangeServiceImpl extends ServiceImpl<ProcessEsChangeMappe
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void startRunTask(ESChangeDataVO changeData) {
|
public void startRunTask(ESChangeDataVO changeData) {
|
||||||
// do nothing now
|
// 如果标准当前状态是废止或封存,不能发起变更流程
|
||||||
|
ProcessEsChange data = changeData.getData();
|
||||||
|
if (data != null) {
|
||||||
|
String standardId = data.getStandardId();
|
||||||
|
LawsEnterpriseStandard es = esService.getById(standardId);
|
||||||
|
if (es != null) {
|
||||||
|
String standardState = es.getStandardState();
|
||||||
|
if (StandardStateEnum.ABOLISH.getStateValue().equals(standardState) ||
|
||||||
|
StandardStateEnum.ARCHIVE.getStateValue().equals(standardState)) {
|
||||||
|
throw new JeroBootException(ResultCommon.CAN_NOT_EDIT_ABOLISH_OR_ARCHIVE_ES);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -67,4 +67,5 @@ draft.not.exists=\u8349\u7A3F\u4E0D\u5B58\u5728
|
|||||||
en.standard.number.conflict=\u4F01\u6807\u7F16\u53F7\u5DF2\u5B58\u5728\uFF0C\u9700\u7B49\u5F85\u91CD\u65B0\u751F\u6210\u987A\u5E8F\u53F7
|
en.standard.number.conflict=\u4F01\u6807\u7F16\u53F7\u5DF2\u5B58\u5728\uFF0C\u9700\u7B49\u5F85\u91CD\u65B0\u751F\u6210\u987A\u5E8F\u53F7
|
||||||
tag.add.error.2=\u6BCF\u5F20\u8868\u6700\u591A\u670950\u4E2A\u5B57\u6BB5\u3002
|
tag.add.error.2=\u6BCF\u5F20\u8868\u6700\u591A\u670950\u4E2A\u5B57\u6BB5\u3002
|
||||||
task.urging.error=\u53EA\u80FD\u50AC\u529E\u5F85\u529E\u4EFB\u52A1
|
task.urging.error=\u53EA\u80FD\u50AC\u529E\u5F85\u529E\u4EFB\u52A1
|
||||||
invalid.esp=\u65E0\u6548\u7684\u4F01\u6807\u8BA1\u5212\uFF0C\u8BF7\u91CD\u65B0\u9009\u62E9
|
invalid.esp=\u65E0\u6548\u7684\u4F01\u6807\u8BA1\u5212\uFF0C\u8BF7\u91CD\u65B0\u9009\u62E9
|
||||||
|
can.not.edit.abolish.or.archive.es=\u5DF2\u5E9F\u6B62\u6216\u5DF2\u5F52\u6863\u7684\u4F01\u6807\u8BA1\u5212\u4E0D\u80FD\u7F16\u8F91,\u8BF7\u91CD\u65B0\u9009\u62E9
|
||||||
@@ -72,4 +72,5 @@ draft.not.exists=Draft not exists
|
|||||||
en.standard.number.conflict=standard number exists
|
en.standard.number.conflict=standard number exists
|
||||||
tag.add.error.2=each table can have a maximum of 50 fields.
|
tag.add.error.2=each table can have a maximum of 50 fields.
|
||||||
task.urging.error=Can only remind to do tasks
|
task.urging.error=Can only remind to do tasks
|
||||||
invalid.esp=Invalid enterprise standard, please check
|
invalid.esp=Invalid enterprise standard, please check
|
||||||
|
can.not.edit.abolish.or.archive.es=Can not edit abolished or archived enterprise standards, please check
|
||||||
@@ -72,4 +72,5 @@ draft.not.exists=\u8349\u7A3F\u4E0D\u5B58\u5728
|
|||||||
en.standard.number.conflict=\u4F01\u6807\u7F16\u53F7\u5DF2\u5B58\u5728\uFF0C\u9700\u7B49\u5F85\u91CD\u65B0\u751F\u6210\u987A\u5E8F\u53F7
|
en.standard.number.conflict=\u4F01\u6807\u7F16\u53F7\u5DF2\u5B58\u5728\uFF0C\u9700\u7B49\u5F85\u91CD\u65B0\u751F\u6210\u987A\u5E8F\u53F7
|
||||||
tag.add.error.2=\u6BCF\u5F20\u8868\u6700\u591A\u670950\u4E2A\u5B57\u6BB5\u3002
|
tag.add.error.2=\u6BCF\u5F20\u8868\u6700\u591A\u670950\u4E2A\u5B57\u6BB5\u3002
|
||||||
task.urging.error=\u53EA\u80FD\u50AC\u529E\u5F85\u529E\u4EFB\u52A1
|
task.urging.error=\u53EA\u80FD\u50AC\u529E\u5F85\u529E\u4EFB\u52A1
|
||||||
invalid.esp=\u65E0\u6548\u7684\u4F01\u6807\u8BA1\u5212\uFF0C\u8BF7\u91CD\u65B0\u9009\u62E9
|
invalid.esp=\u65E0\u6548\u7684\u4F01\u6807\u8BA1\u5212\uFF0C\u8BF7\u91CD\u65B0\u9009\u62E9
|
||||||
|
can.not.edit.abolish.or.archive.es=\u5DF2\u5E9F\u6B62\u6216\u5DF2\u5F52\u6863\u7684\u4F01\u6807\u8BA1\u5212\u4E0D\u80FD\u7F16\u8F91,\u8BF7\u91CD\u65B0\u9009\u62E9
|
||||||
Reference in New Issue
Block a user