DZ/faw-report-library-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[修改] 流程重复发起问题

Browse Source
This commit is contained in:
bupengxiang
2023-05-11 17:42:21 +08:00
parent 8d5456d53c
commit 0062d75e59
33 changed files with 65 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
report-activity/src/main/java/com/adc/da/wkflow/business_activiti/dto/TaskCommonQuery.java
+3
View File
@@ -56,4 +56,7 @@ public class TaskCommonQuery {
@ApiModelProperty(value = "高级搜索字符串")
private String advanceSearchVOStr;
@ApiModelProperty(value = "发起人")
private String creatUserName;
}
report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java
+1
View File
@@ -122,6 +122,7 @@ public class TaskController {
map.put("prcNum",one.getPrcNum());
Date createTime = busProcessEntrust.getCreateTime();
map.put("createTime",createTime);
map.put("approvalOpinion",busProcessEntrust.getApprovalOpinion());
if (i+1 != EOS.size()){
BusProcessEntrust busProcessEntrust1 = EOS.get(i + 1);
Date endTime = busProcessEntrust1.getCreateTime();
report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java
+6 -1
View File
@@ -186,6 +186,9 @@ public class TodoTaskController {
if (taskCommonQuery.getCreatuserId() != null && !taskCommonQuery.getCreatuserId().equals("")) {
queryWrapper.eq("CREAT_USER", taskCommonQuery.getCreatuserId());
}
if (taskCommonQuery.getCreatUserName() != null && !taskCommonQuery.getCreatUserName().equals("")) {
queryWrapper.like("CREATE_USER_NAME", taskCommonQuery.getCreatUserName());
}
queryWrapper.lambda().eq(BusProcessName::getSubmitStatus,SubmitStatusEnum.SUBMIT.getValue());
BusProcessName busProcessName = iBusProcessNameService.getOne(queryWrapper);
@@ -262,7 +265,8 @@ public class TodoTaskController {
@ApiImplicitParam(name = "pId", value = "流程实例ID")})
@GetMapping("/changeAssigneeNew")
public Wrapper<String> changeAssigneeNew(String taskId, String assignee, String userId, String pId,
@RequestParam(required = false,value = "replaceMap")String replaceMap) {
@RequestParam(required = false,value = "replaceMap")String replaceMap,
String approvalOpinion) {
List<String> list = Arrays.asList(taskId.split(","));
for (String str : list) {
@@ -291,6 +295,7 @@ public class TodoTaskController {
busProcessEntrust.setPrcId(pId);
busProcessEntrust.setPrcName(one.getPrcName());
busProcessEntrust.setTaskId(str);
busProcessEntrust.setApprovalOpinion(approvalOpinion);
iBusProcessEntrustService.save(busProcessEntrust);
}
}
report-activity/src/main/java/com/adc/da/wkflow/business_main/entity/BusProcessEntrust.java
+5
View File
@@ -59,5 +59,10 @@ public class BusProcessEntrust implements Serializable {
@TableField("VALID_FLAG")
private String validFlag;
/**
* 审批意见
*/
@TableField("APPROVAL_OPINION")
private String approvalOpinion;
}
report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessNameServiceImpl.java
+3
View File
@@ -55,6 +55,9 @@ public class BusProcessNameServiceImpl extends ServiceImpl<BusProcessNameMapper,
}else if (StringUtils.equals(FlowTypeEnum.SCBGLC.getValue(), prcType)){
prcName = FlowTypeEnum.SCBGLC.getPrcName();
prcNum = FlowTypeEnum.SCBGLC.getPrcNum();
}else if (StringUtils.equals(FlowTypeEnum.BJBGLC.getValue(), prcType)){
prcName = FlowTypeEnum.BJBGLC.getPrcName();
prcNum = FlowTypeEnum.BJBGLC.getPrcNum();
}
else {
throw new ActivitiException("非法的流程类型： " + prcType);
report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/oneApplyAfter.java
+1 -1
View File
@@ -57,7 +57,7 @@ public class oneApplyAfter implements TaskListener {
// 1: 同意 2：退回
delegateTask.setVariable("flag",s);
if ("1".equals(s)){
ttReportManageActService.saveReport(ttReportManageAct);
ttReportManageActService.saveOrUpdataReport(ttReportManageAct);
}
}
report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/oneApplyAfter.java
+1 -1
View File
@@ -28,7 +28,7 @@ public class oneApplyAfter implements TaskListener {
IBusProcessApproveService approveService = SpringContextUtil.getBean(IBusProcessApproveService.class);
//查询task任务
LambdaQueryWrapper<PowerApplyAct> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(PowerApplyAct::getPrcId, delegateTask.getProcessInstanceId());
queryWrapper.eq(PowerApplyAct::getTaskId, delegateTask.getId());
queryWrapper.eq(PowerApplyAct::getDelFlag, 0);
List<PowerApplyAct> powerApplyActs = powerApplyActDao.selectList(queryWrapper);
PowerApplyAct powerApplyAct = new PowerApplyAct();
report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/reEditAfter.java
+1 -1
View File
@@ -30,7 +30,7 @@ public class reEditAfter implements TaskListener {
IBusProcessApproveService approveService = SpringContextUtil.getBean(IBusProcessApproveService.class);
//查询task任务
LambdaQueryWrapper<PowerApplyAct> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(PowerApplyAct::getPrcId, delegateTask.getProcessInstanceId());
queryWrapper.eq(PowerApplyAct::getTaskId, delegateTask.getId());
queryWrapper.eq(PowerApplyAct::getDelFlag, 0);
List<PowerApplyAct> powerApplyActs = powerApplyActDao.selectList(queryWrapper);
PowerApplyAct powerApplyAct = new PowerApplyAct();
report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/startAfter.java
+1 -1
View File
@@ -27,7 +27,7 @@ public class startAfter implements TaskListener {
IBusProcessApproveService approveService = SpringContextUtil.getBean(IBusProcessApproveService.class);
//查询task任务
LambdaQueryWrapper<PowerApplyAct> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(PowerApplyAct::getPrcId, delegateTask.getProcessInstanceId());
queryWrapper.eq(PowerApplyAct::getTaskId, delegateTask.getId());
queryWrapper.eq(PowerApplyAct::getDelFlag, 0);
List<PowerApplyAct> powerApplyActs = powerApplyActDao.selectList(queryWrapper);
PowerApplyAct powerApplyAct = new PowerApplyAct();
report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/twoApplyAfter.java
+3 -4
View File
@@ -16,7 +16,6 @@ import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
import java.util.List;
import java.util.stream.Collectors;
/**
* 权限申请流程 发起流程
@@ -31,7 +30,7 @@ public class twoApplyAfter implements TaskListener {
IBusProcessApproveService approveService = SpringContextUtil.getBean(IBusProcessApproveService.class);
//查询task任务
LambdaQueryWrapper<PowerApplyAct> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(PowerApplyAct::getPrcId, delegateTask.getProcessInstanceId());
queryWrapper.eq(PowerApplyAct::getTaskId, delegateTask.getId());
queryWrapper.eq(PowerApplyAct::getDelFlag, 0);
List<PowerApplyAct> powerApplyActs = powerApplyActDao.selectList(queryWrapper);
PowerApplyAct powerApplyAct = new PowerApplyAct();
@@ -61,8 +60,8 @@ public class twoApplyAfter implements TaskListener {
delegateTask.setVariable("flag",s);
if ("1".equals(s)){
powerApplyDao.savePowerAct(powerApplyAct);
List<String> collect = powerApplyActs.stream().map(e -> e.getId()).collect(Collectors.toList());
powerApplyActDao.batchDel(collect);
// List<String> collect = powerApplyActs.stream().map(e -> e.getId()).collect(Collectors.toList());
// powerApplyActDao.batchDel(collect);
}
}
}
report-activity/src/main/java/com/adc/da/wkflow/util/ImpulseSenderUtils.java
+4
View File
@@ -110,6 +110,10 @@ public class ImpulseSenderUtils {
number = bgqxsqNumber.incrementAndGet();
checkNumberLegitimate(number,"上传审批流程");
break;
case BJBGLC:
number = bgqxsqNumber.incrementAndGet();
checkNumberLegitimate(number,"编辑审批流程");
break;
default:
throw new ActivitiException("流程类型 " + flowType + " 非法！");
}