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

合并分支 'dev_20230216' 到 'master'

Browse Source 
Dev 20230216

查看合并请求 laws-foton-slrs/foton-wkflow-rest!26
This commit is contained in:
高嵩
2023-04-09 18:12:10 +08:00
parent f644a4096a 99c3dacb04
commit 486572301b
2 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java
+8 -8
View File
@@ -106,7 +106,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService {
List<NotifyTodoSendContext> notifyTodoSendContexts = new ArrayList<>(); List<NotifyTodoSendContext> notifyTodoSendContexts = new ArrayList<>();
NotifyTodoSendContext notifyTodoSendContext = new NotifyTodoSendContext(); NotifyTodoSendContext notifyTodoSendContext = new NotifyTodoSendContext();
notifyTodoSendContext.setAppName("SRMS"); notifyTodoSendContext.setAppName("SPRS");
notifyTodoSendContext.setModelId(todoId); notifyTodoSendContext.setModelId(todoId);
notifyTodoSendContext.setModelName(object.getTaskInfo()); notifyTodoSendContext.setModelName(object.getTaskInfo());
notifyTodoSendContext.setType("1"); notifyTodoSendContext.setType("1");
@@ -154,7 +154,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService {
List<NotifyTodoSendContext> notifyTodoSendContexts = new ArrayList<>(); List<NotifyTodoSendContext> notifyTodoSendContexts = new ArrayList<>();
NotifyTodoSendContext notifyTodoSendContext = new NotifyTodoSendContext(); NotifyTodoSendContext notifyTodoSendContext = new NotifyTodoSendContext();
notifyTodoSendContext.setAppName("SRMS"); notifyTodoSendContext.setAppName("SPRS");
notifyTodoSendContext.setModelId(busProcessNew.getId()); notifyTodoSendContext.setModelId(busProcessNew.getId());
notifyTodoSendContext.setModelName(object.getTaskInfo()); notifyTodoSendContext.setModelName(object.getTaskInfo());
notifyTodoSendContext.setType("1"); notifyTodoSendContext.setType("1");
@@ -197,7 +197,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService {
List<NotifyTodoSendContext> notifyTodoSendContexts = new ArrayList<>(); List<NotifyTodoSendContext> notifyTodoSendContexts = new ArrayList<>();
list.forEach(busProcessNew -> { list.forEach(busProcessNew -> {
NotifyTodoSendContext notifyTodoSendContext = new NotifyTodoSendContext(); NotifyTodoSendContext notifyTodoSendContext = new NotifyTodoSendContext();
notifyTodoSendContext.setAppName("SRMS"); notifyTodoSendContext.setAppName("SPRS");
notifyTodoSendContext.setModelId(busProcessNew.getId()); notifyTodoSendContext.setModelId(busProcessNew.getId());
notifyTodoSendContext.setModelName(busProcessNew.getTaskInfo()); notifyTodoSendContext.setModelName(busProcessNew.getTaskInfo());
notifyTodoSendContext.setType("1"); notifyTodoSendContext.setType("1");
@@ -242,7 +242,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService {
HEAD head = new HEAD(); HEAD head = new HEAD();
head.setACCOUNT("OA"); head.setACCOUNT("OA");
head.setBIZTRANSACTIONID("SYC_161320210206133219"); head.setBIZTRANSACTIONID("SYC_161320210206133219");
head.setCONSUMER("SRMS"); head.setCONSUMER("SPRS");
head.setCOUNT("1"); head.setCOUNT("1");
head.setPASSWORD("TEST_oa201611241710"); head.setPASSWORD("TEST_oa201611241710");
head.setSRVLEVEL("1"); head.setSRVLEVEL("1");
@@ -287,7 +287,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService {
log.info("--------------------------ESP 发送已办任务----------------------------"); log.info("--------------------------ESP 发送已办任务----------------------------");
SimpleDateFormat sdf = new SimpleDateFormat("yyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf = new SimpleDateFormat("yyy-MM-dd HH:mm:ss");
NotifyTodoSendContext notifyTodoSendContext = new NotifyTodoSendContext(); NotifyTodoSendContext notifyTodoSendContext = new NotifyTodoSendContext();
notifyTodoSendContext.setAppName("SRMS"); notifyTodoSendContext.setAppName("SPRS");
notifyTodoSendContext.setCreateTime(sdf.format(new Date())); notifyTodoSendContext.setCreateTime(sdf.format(new Date()));
QueryWrapper queryWrapper1 = new QueryWrapper(); QueryWrapper queryWrapper1 = new QueryWrapper();
@@ -319,7 +319,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService {
HEAD head = new HEAD(); HEAD head = new HEAD();
head.setACCOUNT("OA"); head.setACCOUNT("OA");
head.setBIZTRANSACTIONID("SYC_161320210206133219"); head.setBIZTRANSACTIONID("SYC_161320210206133219");
head.setCONSUMER("SRMS"); head.setCONSUMER("SPRS");
head.setCOUNT("1"); head.setCOUNT("1");
head.setPASSWORD("oa201611241710"); head.setPASSWORD("oa201611241710");
head.setSRVLEVEL("1"); head.setSRVLEVEL("1");
@@ -366,14 +366,14 @@ public class WebServiceOAServiceImpl implements WebServiceOAService {
HEAD head = new HEAD(); HEAD head = new HEAD();
head.setACCOUNT("OA"); head.setACCOUNT("OA");
head.setBIZTRANSACTIONID("SYC_161320210206133219"); head.setBIZTRANSACTIONID("SYC_161320210206133219");
head.setCONSUMER("SRMS"); head.setCONSUMER("SPRS");
head.setCOUNT("1"); head.setCOUNT("1");
head.setPASSWORD("oa201611241710"); head.setPASSWORD("oa201611241710");
head.setSRVLEVEL("1"); head.setSRVLEVEL("1");
List<Object> list = new ArrayList<>(); List<Object> list = new ArrayList<>();
NotifyTodoSendContext notifyTodoSendContext = new NotifyTodoSendContext(); NotifyTodoSendContext notifyTodoSendContext = new NotifyTodoSendContext();
// 待办来源的系统 // 待办来源的系统
notifyTodoSendContext.setAppName("SRMS"); notifyTodoSendContext.setAppName("SPRS");
//创建时间 //创建时间
notifyTodoSendContext.setCreateTime(sdf.format(new Date())); notifyTodoSendContext.setCreateTime(sdf.format(new Date()));
// 待办在原系统唯一标识 // 待办在原系统唯一标识
src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java
+14 -1
View File
@@ -251,9 +251,22 @@ public class ProcessStep4After implements TaskListener {
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
QueryWrapper queryWrapperInfo = new QueryWrapper();
queryWrapperInfo.eq("TASK_ID", delegateTask.getId());
BusProcessNew oneInfo = busBean.getOne(queryWrapperInfo);
String mesg = oneInfo.getMesg();
//{"examineName":"张兰英(zhanglanying)","wgLeader":"zhanglanying,","releaseTime":"2023-04-07","LXDName":"11-立项单","examine":"zhanglanying","planStatus":"计划已确认","esName":"11","type":"5","commentText":"","dockUserName":"张兰英(zhanglanying)","engineerName":"","approverName":"张兰英(zhanglanying)","wgLeaderName":"张兰英","resPerson":"zhanglanying","bussSort":"FT","isRelate":"否","taskBreak":[],"tsJsonName":"技术基础","draftTime":"2023-04-07","bzfgbzFlag":"0","nowEsId":"866w8vtamwairixa80vi2r18rp8f8h0l","dockUser":"zhanglanying","area":["EKEV"],"approver":"zhanglanying","unitName":"福田汽车集团","prcCreateUser":"zhanglanying","prcCreateUserName":"张兰英","tsJson":"cc9e2a93a1ce4344ca8e7f875a28080e","engineer":"","addFlag":"0","passFlag":"0","technologic":"1","resPersonName":"张兰英(zhanglanying)","drafter":"zhanglanying","unit":"30000000","bzFlag":"0","countersignerName":"张兰英(zhanglanying)","reviseStatus":"制定","countersigner":"zhanglanying","deptCenterFlag":"0","drafterName":"张兰英(zhanglanying)"}
JSONObject jsonObject = JSONObject.parseObject(mesg);
String prcNameInfo = "";
if(jsonObject!=null) {
Object esName = jsonObject.get("esName");
Object bussSortInfo = jsonObject.get("bussSort");
prcNameInfo = bussSortInfo + "-" + esName + "-企标制修订";
}
if (one1 != null) { if (one1 != null) {
one1.setPrcType("25"); one1.setPrcType("25");
// one1.setPrcName(prcName); one1.setPrcName(prcNameInfo);
one1.setCreatUser(user); one1.setCreatUser(user);
one1.setCreatUserName(username); one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1); busProcessNameService.saveOrUpdate(one1);