Merge branch 'develop_master' into develop_3

adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java

@@ -402,4 +402,7 @@ public interface workFlowFeignClient {
 
     @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/everyDayTenOlock",method = RequestMethod.GET)
     List<BusProcessNew> everyDayTenOlock();
+
+    @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/everyDayTenOlockSAM",method = RequestMethod.GET)
+    List<BusProcessNew> everyDayTenOlockSAM();
 }

adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java

@@ -11,7 +11,9 @@ import com.adc.da.sys.entity.UserEO;
 import com.adc.da.sys.service.IUserEOService;
 import com.adc.da.workFlow.controller.WorkFlowController;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -31,6 +33,7 @@ import java.util.List;
  */
 @Component
 @EnableScheduling
+@Slf4j
 public class ProcessTimer {
 
     @Autowired
@@ -178,7 +181,35 @@ public class ProcessTimer {
                 busMes.setJson(jsonObject.toJSONString());
                 busMes.setUserId(jsonObject.getString("revisionId"));
                 Wrapper<String> wrapper=workFlowFeignClient.completeTaskByUserId(busMes);
-                System.out.println("dasda");
+                log.info("政策课题组会后流程已发起");
+            }
+        }
+    }
+
+    @Scheduled(cron = "0 0 10 * * ? ")//每天十点执行
+//    @Scheduled(cron = "*/40 * * * * ? ")//20s
+    public void everyDayTenOlockScanSAM() {
+        List<BusProcessNew> busProcessNews=new ArrayList<>();
+        busProcessNews=workFlowFeignClient.everyDayTenOlockSAM();
+        if (!busProcessNews.isEmpty()){
+            for (BusProcessNew bus:busProcessNews) {
+                JSONObject jsonObject= JSON.parseObject(bus.getMesg());
+                String taskInfo = bus.getTaskInfo();
+                String result = jsonObject.getJSONObject("roleList").getString("dockUser");
+                result = result.split(",")[0];
+                jsonObject.put("member",result);
+                if(taskInfo.equals("标准化活动参会流程-流程结束")){
+                    jsonObject.put("auto","1");
+                    ResponseMessage responseMessage = workFlowController.startProcessNew("22",result,null);
+                    BusMes busMes=new BusMes();
+                    busMes.setTaskIds(String.valueOf(responseMessage.getData()));
+                    busMes.setJson(jsonObject.toJSONString());
+                    busMes.setUserId(result);
+
+                    Wrapper<String> wrapper=workFlowFeignClient.completeTaskByUserId(busMes);
+                    System.out.println("标准化活动会后流程自动发起");
+                }
+
             }
         }
     }
@@ -187,6 +218,7 @@ public class ProcessTimer {
     public static void main(String[]args){
         ProcessTimer processTimer = new ProcessTimer();
         processTimer.everyDayTenOlockScan();
+        processTimer.everyDayTenOlockScanSAM();
     }
 
 }

adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java

@@ -46,6 +46,11 @@ public class ActDefineStartMap {
         map.put("18","policyResearchGroupAttendMeeting");
         map.put("19","policyResearchGroupAfterMeeting");
 
+        //企标复审流程
+        map.put("23","enterpriseBidReviewProcess");
+        map.put("24","Aboliish");
+        map.put("25","enterpriseStandardSystemRevisionPlan");
+
         return map.get(type);
     }
 }