jiezhoufg/yc_fdjyfluru
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

填写完成后消除待办

Browse Source
This commit is contained in:
ys.git 2025-12-10 14:20:20 +08:00
parent 77653999e2
commit 34b80c0fae
4 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/xdap/self_development/listener/EngineModelListener.java
View File

@ -33,7 +33,7 @@ public class EngineModelListener implements ReadListener<DataEntryEngineModelExc
private final EngineParamDetailService engineParamDetailService;
private static final int BATCH_COUNT = 1000;
private final String ycOrOt;
private Integer versionNumber = 0;
private Integer versionNumber = 1;
private Date date = new Date();
private XdapUsers usersPojo;

23
src/main/java/com/xdap/self_development/service/impl/ActivitiProcessServiceImpl.java
View File

@ -196,16 +196,27 @@ public class ActivitiProcessServiceImpl implements ActivitiProcessService {
.doUpdate(EngineParamDetailPojo.class);
}
boolean b = false;
// 保存审批环节配置
for (ApprovalNodeDTO nodeDTO : approvalNodeRequest.getNodeList()) {
if (ObjectUtils.isEmpty(nodeDTO.getAssignees())) {
b = true;
continue;
}
Integer nodeOrder = nodeDTO.getNodeOrder();
if (b) {
nodeOrder = nodeOrder - 1;
}
ApprovalConfigPojo config = new ApprovalConfigPojo();
config.setApprovalId(approvalId);
config.setNodeName(nodeDTO.getNodeName());
config.setAssignees(String.join(",", nodeDTO.getAssignees()));
config.setNodeOrder(nodeDTO.getNodeOrder());
config.setNodeOrder(nodeOrder);
config.setCreatedBy(userId);
config.setCreationDate(new Date());
sw.buildFromDatasource("xdap_app_223770822127386625").doInsert(config);
b = false;
}
//记录审批提交操作
ParamApprovalRecordPojo record = new ParamApprovalRecordPojo();
@ -416,11 +427,11 @@ public class ActivitiProcessServiceImpl implements ActivitiProcessService {
.collect(Collectors.toList());
//已完成人的待办is_delete=1
sw.buildFromDatasource("xdap_app_223770822127386625")
.update("is_delete", 1)
.update("last_update_date", new Date())
.eq("document_no", approvalId)
.doUpdate(TodoTaskPojo.class);
sw.buildFromDatasource("xdap_app_223770822127386625")
.update("is_delete", 1)
.update("last_update_date", new Date())
.eq("document_no", approvalId)
.doUpdate(TodoTaskPojo.class);
for (String remainingAssignee : remainingAssignees) {
TodoTaskPojo todoTaskPojo = new TodoTaskPojo();

2
src/main/java/com/xdap/self_development/service/impl/DataEntryEngineModelServiceImpl.java
View File

@ -60,7 +60,7 @@ public class DataEntryEngineModelServiceImpl implements DataEntryEngineModelServ
private int page = 1;
private int size = 10;
private Integer versionNumber = 0;
private Integer versionNumber = 1;
@Override

18
src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java
View File

@ -297,7 +297,20 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
.doUpdate(EngineParamDetailPojo.class);
} else if (engineParamDetailPojo.getOperation().equals(String.valueOf(ParamOperation.INSERT))) {
//应该不会有新增参数 要不然还要给参数绑定部门，责任人，填写人
}
//填写后消除待办
String id = engineParamDetailPojo.getId();
EngineParamDetailPojo engineParamDetailPojo1 = selectById(id);
String filledBy = engineParamDetailPojo1.getFilledBy();
sw.buildFromDatasource("xdap_app_223770822127386625")
.update("is_delete", 1)
.update("last_update_date", new Date())
.eq("owner_id", filledBy)
.eq("current_node","数据维护")
.doUpdate(TodoTaskPojo.class);
//应该不会有新增参数 要不然还要给参数绑定部门，责任人，填写人
// EngineParamDetailPojo ei = new EngineParamDetailPojo();
//
// BeanUtils.copyProperties(engineParamDetailPojo, ei,"id","majorVersion");
@ -345,7 +358,7 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
// } else {
// throw new RuntimeException("有数据并非草稿或最新版本或超出最新版本,请检查后更新");
// }
}
}
//分解任务
@ -400,6 +413,7 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
sw.buildFromDatasource("xdap_app_223770822127386625")
.eq("owner_id", userID)
.eq("model_id", engineModelId)
.eq("current_node", "任务分解")
.update("is_delete", 1)
.doUpdate(TodoTaskPojo.class);
// //机型的分发状态改为已分发