Merge remote-tracking branch 'origin/develop_master' into develop_3

# Conflicts: # adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java
2021-11-03 13:51:29 +08:00
parent f87438832f 7e1cc917dd
commit 60bd72ce14
77 changed files with 6089 additions and 509 deletions
@@ -26,10 +26,26 @@ public class ActDefineStartMap {
        map.put("9","standardReadWkflow");
        map.put("10","itemlistvalidationprocessKey");

+        // 政策入库
+        map.put("laws1","lawsLibraryWkflow");
        //政策征求意见, 认证重点法规/政策  流程
        map.put("laws2","PolicyCommentProcessWorkFlow");
        map.put("laws3","KCSTPReviewProcessWorkFlow");

+        //张超然
+        map.put("20","StandardApplyMeetProcess");
+        map.put("21","StandardMeetProcess");
+        map.put("22","StandardAfterMeetProcess");
+
+        //李奥
+        map.put("14","ParticipateRevisionFiling");
+        map.put("15","JoinStandardFiling");
+        map.put("16","RecommendedApprovalleo");
+        //孔维一
+        map.put("17","policyResearchGroupEnrollment");
+        map.put("18","policyResearchGroupAttendMeeting");
+        map.put("19","policyResearchGroupAfterMeeting");
+
        return map.get(type);
    }
 }