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:
yuezhihang
2022-02-14 10:37:58 +08:00
parent a1ebbb7ef9
commit bde97a99ba
3 changed files with 17 additions and 15 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
+6 -6
View File
@@ -173,12 +173,12 @@ public class TodoTaskController extends BaseAction {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String data = sdf.format(entry.getValue().get(0).get("createTime"));
res.setAcceptTime(data);
//获取新的流程名称
QueryWrapper<BusProcessNew> queryWrapper1=new QueryWrapper<>();
queryWrapper1.eq("P_ID",res.getPrcId());
queryWrapper1.eq("TASK_ID",res.getTaskIds());
BusProcessNew busProcessNew=iBusProcessNewService.getOne(queryWrapper1);
res.setPrcName(busProcessNew != null ? (StringUtils.isNotBlank(busProcessNew.getPrcName()) ? busProcessNew.getPrcName() : "") : "" );
// //获取新的流程名称
// QueryWrapper<BusProcessNew> queryWrapper1=new QueryWrapper<>();
// queryWrapper1.eq("P_ID",res.getPrcId());
// queryWrapper1.eq("TASK_ID",res.getTaskIds());
// BusProcessNew busProcessNew=iBusProcessNewService.getOne(queryWrapper1);
// res.setPrcName(busProcessNew != null ? (StringUtils.isNotBlank(busProcessNew.getPrcName()) ? busProcessNew.getPrcName() : "") : "" );
todoList.add(res);
}
}
src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/SLApplicantAfter.java
+7 -7
View File
@@ -77,19 +77,19 @@ public class SLApplicantAfter implements TaskListener{
String user = object.getString("prcCreateUser");
String username = object.getString("prcCreateUserName");
// object.getString("standName")
String standName = "";
if(object.getString("standInData").equals("0")){
standName = "国内";
}else {
standName = "海外";
}
String standName = object.getString("standName");
// if(object.getString("standInData").equals("0")){
// standName = "国内";
// }else {
// standName = "海外";
// }
String standAllName = "";
if(object.getString("standYear") != null && !object.getString("standYear").equals("")){
standAllName = verifyObj(object.getString("standSort")) + " " + verifyObj(object.getString("standNumber")) + "-" + verifyObj(object.getString("standYear"));
}else {
standAllName = verifyObj(object.getString("standSort")) + " " + verifyObj(object.getString("standNumber"));
}
String prcName = standAllName+"-"+standName+"标准入库";
String prcName = standAllName+"-"+standName+"-入库";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java
+4 -2
View File
@@ -66,13 +66,15 @@ public class ResolveAfter implements TaskListener{
delegateTask.setVariable("createDate",new Date());
String title=object.getString("itemsNum1")+"-"+object.getString("itemsName1");
delegateTask.setVariable("titles",title);
String prcName = title+"-标准解读流程-选择执行人";
// String prcName = title+"-标准解读流程-选择执行人";
String prcName = title+"-标准解读流程-解读";
String prcName1 = object.getString("itemsNum")+"-"+object.getString("itemsName")+"-"+"解读";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
one1.setPrcType("9");
one1.setPrcName(prcName);
one1.setPrcName(prcName1);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);