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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
super_liu
2022-01-06 17:57:46 +08:00
parent f4bf45b24d d604243e85
commit b4667922fc
5 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_oa/webService/controller/WebServiceOAController.java
+1 -1
View File
@@ -61,7 +61,7 @@ public class WebServiceOAController extends BaseAction {
@Autowired @Autowired
private WebServiceOAService webServiceOAService; private WebServiceOAService webServiceOAService;
@ApiOperation(value = "强制撤回", notes = "强制撤回") @ApiOperation(value = "强制删除OA待办", notes = "强制删除OA待办")
@GetMapping("/deleteOAByMandatory") @GetMapping("/deleteOAByMandatory")
public void deleteOAByMandatory(String todoId,String assignee) { public void deleteOAByMandatory(String todoId,String assignee) {
webServiceOAService.deleteOAByMandatory(todoId,assignee); webServiceOAService.deleteOAByMandatory(todoId,assignee);
src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java
+3
View File
@@ -123,6 +123,9 @@ public class DeptApplayAfter implements TaskListener{
} else { } else {
delegateTask.setVariable("bzFlag", 2); delegateTask.setVariable("bzFlag", 2);
prcName=prcName+"-填写解读分析"; prcName=prcName+"-填写解读分析";
JSONObject object1=object.getJSONObject("RollBack");
nextUserList.add(String.valueOf(object1.getString("id")));
delegateTask.setVariable("zxUserId",object.getJSONObject("RollBack"));
} }
src/main/java/com/ydw/bat/wkflow/listener/standardRead/EngineerApplayAfter.java
+3 -2
View File
@@ -51,8 +51,9 @@ public class EngineerApplayAfter implements TaskListener{
} else { } else {
prcName=prcName+"-填写解读分析"; prcName=prcName+"-填写解读分析";
delegateTask.setVariable("gcFlag", 2); delegateTask.setVariable("gcFlag", 2);
JSONObject object1=delegateTask.getVariable("zxUserId",JSONObject.class); JSONObject object1=object.getJSONObject("RollBack");
nextUserList.add(object1.getString("id")); nextUserList.add(String.valueOf(object1.getString("id")));
delegateTask.setVariable("zxUserId",object.getJSONObject("RollBack"));
} }
//截止时间 流程描述 创建人 //截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java
+1
View File
@@ -73,6 +73,7 @@ public class ExpainAfter implements TaskListener{
for (Object obj:responUserList) { for (Object obj:responUserList) {
JSONObject object1 = (JSONObject)obj; JSONObject object1 = (JSONObject)obj;
if (object.getString("AOLIGEI").equals(object1.getString("KEYS"))) { if (object.getString("AOLIGEI").equals(object1.getString("KEYS"))) {
object.put("RollBack",object1);
BusProcessNew busProcessNewNext = new BusProcessNew(); BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause"); busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java
+3 -2
View File
@@ -51,9 +51,10 @@ public class ZrApplayAfter implements TaskListener{
}else { }else {
prcName=prcName+"-填写解读分析"; prcName=prcName+"-填写解读分析";
delegateTask.setVariable("zrFlag",2); delegateTask.setVariable("zrFlag",2);
log.error("戒毒流程当前工作节点驳回人为："+String.valueOf(delegateTask.getVariable("zxUserId"))); log.error("解读流程当前工作节点驳回人为："+String.valueOf(delegateTask.getVariable("zxUserId")));
JSONObject object1=JSONObject.parseObject(String.valueOf(delegateTask.getVariable("zxUserId"))); JSONObject object1=object.getJSONObject("RollBack");
nextUserList.add(String.valueOf(object1.getString("id"))); nextUserList.add(String.valueOf(object1.getString("id")));
delegateTask.setVariable("zxUserId",object.getJSONObject("RollBack"));
} }
//截止时间 流程描述 创建人 //截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());