FT/foton-wkflow-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

企标制修订-技术标准流程-流程图、流程历史改造。

Browse Source
This commit is contained in:
wangzhijiang
2024-03-26 10:55:41 +08:00
parent 271628bbdd
commit 2902b27e56
4 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java
+5 -4
View File
@@ -656,9 +656,9 @@ public class TodoTaskController extends BaseAction {
}catch (Exception e){ }catch (Exception e){
logger.error(e.toString()); logger.error(e.toString());
} }
taskService.complete(busMes.getTaskId());
this.busProcessHistoryService.complete(busMes); this.busProcessHistoryService.complete(busMes);
taskService.complete(busMes.getTaskId());
} else { } else {
return WrapMapper.error("当前任务不存在"); return WrapMapper.error("当前任务不存在");
} }
@@ -690,12 +690,13 @@ public class TodoTaskController extends BaseAction {
}catch (Exception e){ }catch (Exception e){
logger.error(e.toString()); logger.error(e.toString());
} }
busMes.setTaskId(taskId);
this.busProcessHistoryService.complete(busMes);
taskService.complete(taskId); taskService.complete(taskId);
} else { } else {
return WrapMapper.error("当前任务不存在"); return WrapMapper.error("当前任务不存在");
} }
busMes.setTaskId(taskId);
this.busProcessHistoryService.complete(busMes);
} }
return WrapMapper.ok(prcid); return WrapMapper.ok(prcid);
} }
src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/IBusProcessHistoryServiceImpl.java
+5 -5
View File
@@ -435,11 +435,11 @@ public class IBusProcessHistoryServiceImpl extends ServiceImpl<BusProcessHistory
for (BusProcessHistory history : childList) { for (BusProcessHistory history : childList) {
busProcessHistory.setTaskId(busProcessHistory.getId()); busProcessHistory.setTaskId(busProcessHistory.getId());
busProcessHistory.setTaskStatus(TaskStatusEnum.DONE.getValue()); busProcessHistory.setTaskStatus(TaskStatusEnum.DONE.getValue());
if (StringUtils.equals(history.getTaskStatus(),TaskStatusEnum.TODO.getValue()) || StringUtils.equals(history.getTaskStatus(),TaskStatusEnum.RECEIVED.getValue())) { // if (StringUtils.equals(history.getTaskStatus(),TaskStatusEnum.TODO.getValue()) || StringUtils.equals(history.getTaskStatus(),TaskStatusEnum.RECEIVED.getValue())) {
busProcessHistory.setTaskStatus(TaskStatusEnum.TODO.getValue()); // busProcessHistory.setTaskStatus(TaskStatusEnum.TODO.getValue());
busProcessHistory.setTaskId(null); // busProcessHistory.setTaskId(null);
break; // break;
} // }
if (StringUtils.equals(history.getImgShowColor(), "0")) { if (StringUtils.equals(history.getImgShowColor(), "0")) {
busProcessHistory.setImgShowColor(history.getImgShowColor()); busProcessHistory.setImgShowColor(history.getImgShowColor());
src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantC1After.java
+31 -26
View File
@@ -19,10 +19,7 @@ import org.apache.commons.lang.StringUtils;
import org.apache.tomcat.util.digester.ArrayStack; import org.apache.tomcat.util.digester.ArrayStack;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.*;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
/** /**
* 重新发起企标制修订流程后 * 重新发起企标制修订流程后
@@ -148,31 +145,39 @@ public class BLApplicantC1After implements TaskListener{
public void addBusProcessHistory(JSONObject json,DelegateTask delegateTask) { public void addBusProcessHistory(JSONObject json,DelegateTask delegateTask) {
IBusProcessHistoryService bphService = SpringContextUtil.getBean(IBusProcessHistoryService.class); IBusProcessHistoryService bphService = SpringContextUtil.getBean(IBusProcessHistoryService.class);
String qcUserId = (String) delegateTask.getVariable("qcUserId"); List<BusProcessHistory> bphList = new ArrayList<>();
QueryWrapper<BusProcessHistory> bphQueryWrap = new QueryWrapper<>(); List<String> qcUserIdList = Arrays.asList(json.getString("qcUserId").split(","));
bphQueryWrap.lambda().eq(BusProcessHistory::getActiProcInstId, delegateTask.getProcessInstanceId()); if (CollectionUtils.isNotEmpty(qcUserIdList)) {
bphQueryWrap.lambda().eq(BusProcessHistory::getUserId, qcUserId); // 企标编写节点父节点信息
bphQueryWrap.lambda().eq(BusProcessHistory::getTaskKey, BussLibraryNodeKeyEnum.BUSS_LIBRARY2.getValue()); BusProcessHistory qbbxPBph = new BusProcessHistory();
bphQueryWrap.lambda().isNull(BusProcessHistory::getTaskId); String qbbxPBphId = UUID.randomUUID().toString();
qbbxPBph.setId(qbbxPBphId);
List<BusProcessHistory> busProcessHistoryList = bphService.list(bphQueryWrap); qbbxPBph.setActiProcInstId(delegateTask.getProcessInstanceId());
if (CollectionUtils.isEmpty(busProcessHistoryList)) { qbbxPBph.setTaskKey(BussLibraryNodeKeyEnum.BUSS_LIBRARY2.getValue());
List<BusProcessHistory> bphList = new ArrayList<>(); qbbxPBph.setFlowType(FlowTypeEnum.QBZXD_JSBZ.getValue());
// 重新起草
BusProcessHistory cxqcBph = new BusProcessHistory();
cxqcBph.setActiProcInstId(delegateTask.getProcessInstanceId());
cxqcBph.setUserId(qcUserId);
cxqcBph.setTaskKey(BussLibraryNodeKeyEnum.BUSS_LIBRARY2.getValue());
cxqcBph.setFlowType(FlowTypeEnum.QBZXD_JSBZ.getValue());
cxqcBph.setIsSub("2");
cxqcBph.setIsMany("2");
int orderNum = bphService.getMaxOrderNum(delegateTask.getProcessInstanceId(), BussLibraryNodeKeyEnum.BUSS_LIBRARY_C1.getValue()); int orderNum = bphService.getMaxOrderNum(delegateTask.getProcessInstanceId(), BussLibraryNodeKeyEnum.BUSS_LIBRARY_C1.getValue());
cxqcBph.setOrderNum(orderNum + 1); qbbxPBph.setOrderNum(orderNum + 1);
bphList.add(cxqcBph); qbbxPBph.setIsSub("2");
qbbxPBph.setIsMany("1");
bphList.add(qbbxPBph);
bphService.insertBatch(bphList); for (String qcUserId : qcUserIdList) {
bphService.updateOrderNum(delegateTask.getProcessInstanceId(), orderNum + 1, bphList.size()); // 企标编写子节点信息
BusProcessHistory qbbxBph = new BusProcessHistory();
qbbxBph.setActiProcInstId(delegateTask.getProcessInstanceId());
qbbxBph.setUserId(qcUserId);
qbbxBph.setTaskKey(BussLibraryNodeKeyEnum.BUSS_LIBRARY2.getValue());
qbbxBph.setFlowType(FlowTypeEnum.QBZXD_JSBZ.getValue());
qbbxBph.setOrderNum(orderNum + 1);
qbbxBph.setIsSub("2");
qbbxBph.setIsMany("1");
qbbxBph.setManyPId(qbbxPBphId);
bphList.add(qbbxBph);
}
delegateTask.setVariable("qcUserList",qcUserIdList);
} }
bphService.insertBatch(bphList);
} }
private String verifyObj(String str){ private String verifyObj(String str){
src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary4After.java
+1 -1
View File
@@ -207,7 +207,7 @@ public class BussLibrary4After implements TaskListener{
zqyjPBph.setId(zqyjPBphId); zqyjPBph.setId(zqyjPBphId);
zqyjPBph.setActiProcInstId(delegateTask.getProcessInstanceId()); zqyjPBph.setActiProcInstId(delegateTask.getProcessInstanceId());
zqyjPBph.setTaskKey(BussLibraryNodeKeyEnum.BUSS_LIBRARY5.getValue()); zqyjPBph.setTaskKey(BussLibraryNodeKeyEnum.BUSS_LIBRARY5.getValue());
zqyjPBph.setFlowType(FlowTypeEnum.BZZQYJLC.getValue()); zqyjPBph.setFlowType(FlowTypeEnum.QBZXD_JSBZ.getValue());
zqyjPBph.setOrderNum(BussLibraryNodeKeyEnum.BUSS_LIBRARY5.getOrderNum()); zqyjPBph.setOrderNum(BussLibraryNodeKeyEnum.BUSS_LIBRARY5.getOrderNum());
zqyjPBph.setIsSub("2"); zqyjPBph.setIsSub("2");
zqyjPBph.setIsMany("1"); zqyjPBph.setIsMany("1");