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

Merge branch 'fix_foton_20230613' into 'master'

Browse Source 
Fix foton 20230613

See merge request laws-foton-slrs/foton-wkflow-rest!59
This commit is contained in:
高嵩
2023-07-26 03:51:52 +00:00
parent 185d3c6d0b e246384ed3
commit 4215ceed6e
3 changed files with 25 additions and 20 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
+17 -17
View File
@@ -247,13 +247,13 @@ public class WebServiceOAServiceImpl implements WebServiceOAService {
head.setPASSWORD("TEST_oa201611241710"); head.setPASSWORD("TEST_oa201611241710");
head.setSRVLEVEL("1"); head.setSRVLEVEL("1");
List<Object> list = new ArrayList<>(); List<Object> list = new ArrayList<>();
notifyTodoSendContexts.forEach(each -> { // notifyTodoSendContexts.forEach(each -> {
if (each.getLink()!= null){ // if (each.getLink()!= null){
if (each.getLink().contains("#/")){ // if (each.getLink().contains("#/")){
each.setLink(each.getLink().replaceAll("#/","")); // each.setLink(each.getLink().replaceAll("#/",""));
} // }
} // }
}); // });
list.addAll(notifyTodoSendContexts); list.addAll(notifyTodoSendContexts);
jsonSend.setHEAD(head); jsonSend.setHEAD(head);
jsonSend.setLIST(list); jsonSend.setLIST(list);
@@ -318,11 +318,11 @@ public class WebServiceOAServiceImpl implements WebServiceOAService {
@Override @Override
@Async @Async
public NotifyTodoAppResult setTodoDone(NotifyTodoSendContext notifyTodoSendContext) throws Exception{ public NotifyTodoAppResult setTodoDone(NotifyTodoSendContext notifyTodoSendContext) throws Exception{
if (notifyTodoSendContext.getLink()!= null){ // if (notifyTodoSendContext.getLink()!= null){
if (notifyTodoSendContext.getLink().contains("#/")){ // if (notifyTodoSendContext.getLink().contains("#/")){
notifyTodoSendContext.setLink(notifyTodoSendContext.getLink().replaceAll("#/","")); // notifyTodoSendContext.setLink(notifyTodoSendContext.getLink().replaceAll("#/",""));
} // }
} // }
NotifyTodoAppResult notifyTodoAppResult = new NotifyTodoAppResult(); NotifyTodoAppResult notifyTodoAppResult = new NotifyTodoAppResult();
String result = ""; String result = "";
SimpleDateFormat sdf=new SimpleDateFormat("yyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf=new SimpleDateFormat("yyy-MM-dd HH:mm:ss");
@@ -371,11 +371,11 @@ public class WebServiceOAServiceImpl implements WebServiceOAService {
@Override @Override
@Async @Async
public NotifyTodoAppResult sendTodo(BusProcessNew busProcessNew) throws Exception{ public NotifyTodoAppResult sendTodo(BusProcessNew busProcessNew) throws Exception{
if (busProcessNew.getLink()!= null){ // if (busProcessNew.getLink()!= null){
if (busProcessNew.getLink().contains("#/")){ // if (busProcessNew.getLink().contains("#/")){
busProcessNew.setLink(busProcessNew.getLink().replaceAll("#/","")); // busProcessNew.setLink(busProcessNew.getLink().replaceAll("#/",""));
} // }
} // }
NotifyTodoAppResult notifyTodoAppResult = new NotifyTodoAppResult(); NotifyTodoAppResult notifyTodoAppResult = new NotifyTodoAppResult();
String result = ""; String result = "";
SimpleDateFormat sdf=new SimpleDateFormat("yyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf=new SimpleDateFormat("yyy-MM-dd HH:mm:ss");
src/main/java/com/ydw/bat/wkflow/business_wkflow/form/service/FormValsService.java
+6 -2
View File
@@ -233,8 +233,12 @@ public class FormValsService {
public Datas getFormValByTaskId(String task_id) { public Datas getFormValByTaskId(String task_id) {
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>(); QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("acti_task_id", task_id); queryWrapper.eq("acti_task_id", task_id);
Datas datas = datasService.getOne(queryWrapper); queryWrapper.orderByDesc("CREATE_TIME");
return datas; List<Datas> list = datasService.list(queryWrapper);
if (list.isEmpty()){
return null;
}
return list.get(0);
} }
public String taskSubmit(FormSubmitDto formSubmitDto) { public String taskSubmit(FormSubmitDto formSubmitDto) {
src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1After.java
+2 -1
View File
@@ -47,7 +47,6 @@ public class ProcessStep1After implements TaskListener {
} else { } else {
nextUserList.add(delegateTask.getVariable("Step1",String.class)); nextUserList.add(delegateTask.getVariable("Step1",String.class));
} }
delegateTask.setVariable("deptCenterId", nextUserList);
delegateTask.setVariable("deptLeaderFlag",0); delegateTask.setVariable("deptLeaderFlag",0);
}else { }else {
nextUserList.add(delegateTask.getVariable("prcCreateUser",String.class)); nextUserList.add(delegateTask.getVariable("prcCreateUser",String.class));
@@ -55,6 +54,8 @@ public class ProcessStep1After implements TaskListener {
delegateTask.setVariable("deptLeaderFlag",1); delegateTask.setVariable("deptLeaderFlag",1);
} }
delegateTask.setVariable("deptCenterId", nextUserList);
//截止时间 流程描述 创建人 //截止时间 流程描述 创建人
String user = delegateTask.getVariable("prcCreateUser",String.class); String user = delegateTask.getVariable("prcCreateUser",String.class);
String username = delegateTask.getVariable("prcCreateUserName", String.class); String username = delegateTask.getVariable("prcCreateUserName", String.class);