ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 制修订流程-会签驳回问题

Browse Source
This commit is contained in:
mzaxd
2023-12-27 16:43:55 +08:00
parent 9d0f999244
commit 251f76a4e6
4 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/CounterSignNodeNameConstants.java
+4
View File
@@ -12,5 +12,9 @@ public class CounterSignNodeNameConstants {
public static final String ES_INIT_CHANGE_EXPERT_NODE_NAME = "专家审批";
public static final String ES_REVISION_OTHER_DRAFT_USER_CHECK_NODE_NAME = "其它起草人校对";
public static final String ES_REVISION_LEADER_APPROVAL_NODE_NAME = "主管级领导审批";
public static final String ES_REVISION_RELATED_LEADER_APPROVAL_NODE_NAME = "相关部门领导会签";
}
laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java
+1 -1
View File
@@ -443,7 +443,7 @@ public class ActFlowCommonService {
updateWrapper.eq(ProcessApprovalRecord::getProcessInstanceId, prcId);
updateWrapper.eq(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.INCOMPLETE.getValue());
updateWrapper.eq(ProcessApprovalRecord::getTaskName, nodeName);
updateWrapper.set(ProcessApprovalRecord::getFinishFlag, CommitFlagEnum.UNDISPOSED.getValue());
updateWrapper.set(ProcessApprovalRecord::getCommitFlag, CommitFlagEnum.UNDISPOSED.getValue());
processApprovalRecordService.update(updateWrapper);
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java
+5 -6
View File
@@ -190,35 +190,34 @@ public class ProcessEsRevision implements Serializable {
/**
* 校对人
*/
@TableField(exist = false)
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "CONCAT(realname, '(', username, ')')")
@ApiModelProperty(value = "校对人")
private String proofreader;
/**
* 审批人（主管级领导）
*/
@TableField(exist = false)
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "CONCAT(realname, '(', username, ')')")
@ApiModelProperty(value = "审批人（主管级领导）")
private String approvalUser;
/**
* 审批人（标准化）
*/
@TableField(exist = false)
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "CONCAT(realname, '(', username, ')')")
@ApiModelProperty(value = "审批人（标准化）")
private String approvalUserStandard;
/**
* 相关部门领导
*/
@TableField(exist = false)
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "CONCAT(realname, '(', username, ')')")
@ApiModelProperty(value = "相关部门领导")
private String relatedLeader;
/**
* 授权部门
*/
@TableField(exist = false)
@ApiModelProperty(value = "授权部门")
private String authDept;
@@ -254,7 +253,7 @@ public class ProcessEsRevision implements Serializable {
/**
* 总工程师
*/
@TableField(exist = false)
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "CONCAT(realname, '(', username, ')')")
@ApiModelProperty(value = "总工程师")
private String chiefEngineer;
laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
+19
View File
@@ -10,6 +10,7 @@ import com.jero.modules.activiti.entity.ProcessAll;
import com.jero.modules.activiti.entity.ProcessApprovalRecord;
import com.jero.modules.activiti.enums.ProcessTypeEnum;
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.enums.ProcessType;
import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPRevisionType;
@@ -462,6 +463,24 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
saveOrUpdate(data);
processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, userMap);
break;
case OTHER_DRAFT_USER_CHECK:
// 如果是会签节点，驳回后要将其余节点recode设置为 未处理 状态
if (!pass) {
actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.ES_REVISION_OTHER_DRAFT_USER_CHECK_NODE_NAME);
}
break;
case LEADER_APPROVAL:
// 如果是会签节点，驳回后要将其余节点recode设置为 未处理 状态
if (!pass) {
actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.ES_REVISION_LEADER_APPROVAL_NODE_NAME);
}
break;
case RELATED_LEADER_APPROVAL:
// 如果是会签节点，驳回后要将其余节点recode设置为 未处理 状态
if (!pass) {
actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.ES_REVISION_RELATED_LEADER_APPROVAL_NODE_NAME);
}
break;
case MAIN_DRAFT_USER_RELEASE:
data = revisionData.getData();
saveOrUpdate(data);