zcr:标准化活动会后流程自动发起

src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java

@@ -54,6 +54,13 @@ public class BusProcessNewController extends BaseAction {
         return findtodotask;
     }
 
+    @ApiOperation(value = "每天十点需要启动 标准化活动参会流程")
+    @GetMapping("/everyDayTenOlockSAM")
+    public List<BusProcessNew> everyDayTenOlockSAM() {
+        List<BusProcessNew> findtodotask = iBusProcessNewService.everyDayTenOlockSAM();
+        return findtodotask;
+    }
+
 
 }
 

src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java

@@ -30,4 +30,6 @@ public interface BusProcessNewMapper extends BaseMapper<BusProcessNew> {
 
     List<BusProcessNew> everyDayTenOlock();
 
+    List<BusProcessNew> everyDayTenOlockSAM();
+
 }

src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java

@@ -34,4 +34,6 @@ public interface IBusProcessNewService extends IService<BusProcessNew> {
 
     List<BusProcessNew> everyDayTenOlock();
 
+    List<BusProcessNew> everyDayTenOlockSAM();
+
 }

src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java

@@ -78,4 +78,9 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
     public List<BusProcessNew> everyDayTenOlock() {
         return baseMapper.everyDayTenOlock();
     }
+
+    @Override
+    public List<BusProcessNew> everyDayTenOlockSAM() {
+        return baseMapper.everyDayTenOlockSAM();
+    }
 }

src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java

@@ -12,6 +12,7 @@ import com.ydw.bat.wkflow.util.SpringContextUtil;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 //外部署名推荐批准
 public class RAstartAfter implements TaskListener {

src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java

@@ -39,12 +39,17 @@ public class AutoStartAfter implements TaskListener {
         List<String> nextUserList = new ArrayList();
 
         String prcName ="标准化活动会后流程-";
-        if(StringUtils.isNotBlank(object.getString("member"))) {
-            prcName = prcName + "参会人上传会议资料，填写标准及议题";
-            nextUserList.add(object.getString("member"));
+        prcName = prcName + "参会人上传会议资料，填写标准及议题";
+        if ("1".equals(object.getString("auto"))){
             delegateTask.setVariable("member", object.getString("member"));
+            nextUserList.add(object.getString("member"));
+        }
+        else {
+            if (StringUtils.isNotBlank(object.getString("memberId"))) {
+                delegateTask.setVariable("member", object.getString("memberId"));
+                nextUserList.add(object.getString("memberId"));
+            }
         }
-
 
         //截止时间 流程描述 创建人
         String user = object.getString("prcCreateUser");

src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java

@@ -51,6 +51,8 @@ public class DirectorVerifyAfter implements TaskListener {
             if(StringUtils.isNotBlank(object.getString("member"))) {
                 nextUserList.add(object.getString("member"));
                 delegateTask.setVariable("member", object.getString("member"));
+            }else{
+                nextUserList.add(delegateTask.getVariable("member",String.class));
             }
         }
 

src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java

@@ -29,7 +29,6 @@ public class EngineerReviseDoneAfter implements TaskListener {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         //流程信息
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
-        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
         //根据流程id找到流程信息
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
@@ -42,7 +41,10 @@ public class EngineerReviseDoneAfter implements TaskListener {
 //            prcName = "标准化活动参会流程-" + "会议结束";
         prcName = prcName + "流程结束";
 
-
+        //把ch_pageData(前端的) 中的 meetingStartTime取出，放入最外层大JSON里(object)
+//        JSONObject o1 = object.getJSONObject("ch_pageData");
+//        String meetingStartTime = o1.getString("meetingStartTime");
+//        object.put("meetingStartTime",meetingStartTime);
 
         //截止时间 流程描述 创建人
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
@@ -86,7 +88,7 @@ public class EngineerReviseDoneAfter implements TaskListener {
             busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
             busProcessNewNext.setMesg(object.toJSONString());
             busProcessNewNext.setFinishFlag("0");
-            busProcessNewNext.setTaskInfo(delegateTask.getName());
+            busProcessNewNext.setTaskInfo("标准化活动参会流程-流程结束");
             busProcessNewNext.setPrcName(prcName);
             busBean.save(busProcessNewNext);
         }

src/main/resources/mapper/datas/BusProcessNewMapper.xml

@@ -45,4 +45,16 @@
 	CONCAT( date_sub( DATE_FORMAT( NOW(), '%Y-%m-%d' ), INTERVAL 1 DAY), '%')) and TASK_INFO = '政策课题组参会流程-流程结束'
     </select>
 
+    <select id="everyDayTenOlockSAM" resultType="com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew">
+      SELECT
+            *
+        FROM
+            bus_process_new
+        WHERE
+            MESG -> '$**.meetingStartTime' LIKE CONCAT(
+            '%',
+	CONCAT( date_sub( DATE_FORMAT( NOW(), '%Y-%m-%d' ), INTERVAL 1 DAY), '%')) and
+	TASK_INFO = '标准化活动参会流程-流程结束'
+    </select>
+
 </mapper>