fix(89221): 标准解读流程--分发节点--分发--分发部分数据后,剩余部分数据的分发待办应该去掉驳回

This commit is contained in:
yjz
2024-08-21 19:32:25 +08:00
parent 0eb88bdc14
commit fde27b9e71
3 changed files with 17 additions and 2 deletions
@@ -92,5 +92,10 @@ public class ProcessStandardInterpret extends BaseEntity {
@ApiModelProperty(value = "批准人员")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "CONCAT(realname, '(', username, ')')")
private String approvePersonId;
/**标准主解读人分发节点是否显示驳回(字典:1:是,2:否)*/
@ApiModelProperty(value = "标准主解读人分发节点是否显示驳回(字典:1:是,0:否)")
@Dict(dicCode = "yn")
@TableField(exist = false)
private String showReject = "1";
}
@@ -102,6 +102,8 @@ public class StandardInterpretFlow implements WorkCenterService {
public void handleTransfer(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord,
String toUserId, String userId) {
ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class);
ProcessApprovalRecordService processApprovalRecordService =
SpringContextUtil.getBean(ProcessApprovalRecordService.class);
// 更新流程人员变量
processAllService.specialTransfer(processAll, processApprovalRecord, toUserId, userId);
// 解读人填写信息(分发)
@@ -158,8 +160,6 @@ public class StandardInterpretFlow implements WorkCenterService {
}
// 查询其他子流程
ProcessApprovalRecordService processApprovalRecordService =
SpringContextUtil.getBean(ProcessApprovalRecordService.class);
List<ProcessApprovalRecord> processApprovalRecordList = processApprovalRecordService.list(
new LambdaQueryWrapper<ProcessApprovalRecord>()
.eq(ProcessApprovalRecord::getProcessInstanceId, processApprovalRecord.getProcessInstanceId())
@@ -730,6 +730,16 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
&& YesOrNoEnum.NO.getValue().equals(processStandardInterpret.getChooseClause())){
processStandardInterpretClauseList = new ArrayList<>();
}
// 是否显示驳回
// 查询是否存在子流程
int count = processApprovalRecordService.count(
new LambdaQueryWrapper<ProcessApprovalRecord>()
.eq(ProcessApprovalRecord::getProcessInstanceId,
processApprovalRecord.getProcessInstanceId())
.isNotNull(ProcessApprovalRecord::getParentTaskId));
if (count > 0 || StandardInterpretCommon.MASTER_INTERPRET_AGAIN_DISTRIBUTE.equals(node)){
processStandardInterpret.setShowReject(YesOrNoEnum.NO.getValue());
}
}
// 通过 标准解读流程id 查询 标准解读流程_条款中间表_子表