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

Merge branch 'develop' into 'FOTON'

Browse Source 
Develop

See merge request foton-wkflow-group/foton-wkflow-rest!69
This commit is contained in:
王夏晖
2021-12-17 11:27:31 +08:00
parent 8bcb65318b c5e5bafd12
commit 4bac6b0da6
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarPublicIdeaAll.java
+3
View File
@@ -69,4 +69,7 @@ public class SarPublicIdeaAll {
@TableField("wk_flag") @TableField("wk_flag")
private String wkFlag; private String wkFlag;
@TableField("state")
private String state;
} }
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step10After.java
+2 -1
View File
@@ -49,7 +49,7 @@ public class Step10After implements TaskListener {
if (!jsonArray.isEmpty()){ if (!jsonArray.isEmpty()){
jsonArray.forEach(o -> { jsonArray.forEach(o -> {
JSONObject object1=JSONObject.parseObject(o.toString()); JSONObject object1=JSONObject.parseObject(o.toString());
if ("1".equals(object1.getString("state"))) { if ("1".equals(object1.getString("state")) || "2".equals(object1.getString("state"))) {
SarPublicIdeaAll sarPublicIdeaAll = new SarPublicIdeaAll(); SarPublicIdeaAll sarPublicIdeaAll = new SarPublicIdeaAll();
sarPublicIdeaAll.setId(String.valueOf(UUID.randomUUID())); sarPublicIdeaAll.setId(String.valueOf(UUID.randomUUID()));
sarPublicIdeaAll.setChapterName(object1.getString("chapterName")); sarPublicIdeaAll.setChapterName(object1.getString("chapterName"));
@@ -63,6 +63,7 @@ public class Step10After implements TaskListener {
sarPublicIdeaAll.setUserId(object1.getString("responUser")); sarPublicIdeaAll.setUserId(object1.getString("responUser"));
sarPublicIdeaAll.setWkFlag("1"); sarPublicIdeaAll.setWkFlag("1");
sarPublicIdeaAll.setIdeaId(delegateTask.getVariable("YJID", String.class)); sarPublicIdeaAll.setIdeaId(delegateTask.getVariable("YJID", String.class));
sarPublicIdeaAll.setState(object1.getString("state"));
sarPublicIdeaAlls.add(sarPublicIdeaAll); sarPublicIdeaAlls.add(sarPublicIdeaAll);
} }
}); });