[修改] 流程监听器的名称

report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java

@@ -444,6 +444,13 @@ public class TodoTaskController {
             String string = JSONArray.toJSONString(powerApplyActs);
             //去对应的 数据表查数据
             busProcessNewVO.setDataJson(string);
+        }else if ("2".equals(prcType)){
+            TtReportManageActPageVO ttReportManageActPageVO = ttReportManageActDao.selectByDataId(dataId);
+            List<PowerApplyActPageVO> powerApplyActs = powerApplyActDao.selectListBydataId(dataId);
+            ttReportManageActPageVO.setPowerList(powerApplyActs);
+            String string = JSONArray.toJSONString(ttReportManageActPageVO);
+            //去对应的 数据表查数据
+            busProcessNewVO.setDataJson(string);
         }
         return busProcessNewVO;
     }

report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/oneApplyAfter.java

@@ -19,7 +19,7 @@ import java.util.List;
 /**
  * 上传报告  发起流程
  */
-public class aid2 implements TaskListener {
+public class oneApplyAfter implements TaskListener {
 
     @Override
     public void notify(DelegateTask delegateTask) {

report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/reEditAfter.java

@@ -18,7 +18,7 @@ import java.util.List;
 /**
  * 上传报告  发起流程
  */
-public class aid4 implements TaskListener {
+public class reEditAfter implements TaskListener {
 
     @Override
     public void notify(DelegateTask delegateTask) {

report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/startAfter.java

@@ -18,7 +18,7 @@ import java.util.List;
 /**
  * 上传报告  发起流程
  */
-public class aid1 implements TaskListener {
+public class startAfter implements TaskListener {
 
     @Override
     public void notify(DelegateTask delegateTask) {

report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/twoApplyAfter.java

@@ -1,8 +1,11 @@
 package com.adc.da.wkflow.listener.SCBG;
 
 import com.adc.da.login.util.UserUtils;
+import com.adc.da.report.dao.mysql.PowerApplyActDao;
 import com.adc.da.report.dao.mysql.TtReportManageActDao;
+import com.adc.da.report.eo.PowerApplyAct;
 import com.adc.da.report.eo.TtReportManageAct;
+import com.adc.da.report.service.ITtReportManageActService;
 import com.adc.da.wkflow.business_main.entity.BusProcessApprove;
 import com.adc.da.wkflow.business_main.entity.BusProcessNew;
 import com.adc.da.wkflow.business_main.service.IBusProcessApproveService;
@@ -19,11 +22,13 @@ import java.util.List;
 /**
  * 上传报告  发起流程
  */
-public class aid3 implements TaskListener {
+public class twoApplyAfter implements TaskListener {
 
     @Override
     public void notify(DelegateTask delegateTask) {
+        PowerApplyActDao powerApplyActDao = SpringContextUtil.getBean(PowerApplyActDao.class);
         TtReportManageActDao ttReportManageActDao = SpringContextUtil.getBean(TtReportManageActDao.class);
+        ITtReportManageActService ttReportManageActService = SpringContextUtil.getBean(ITtReportManageActService.class);
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         IBusProcessApproveService approveService = SpringContextUtil.getBean(IBusProcessApproveService.class);
         //查询task任务
@@ -33,6 +38,11 @@ public class aid3 implements TaskListener {
         TtReportManageAct ttReportManageAct = new TtReportManageAct();
         if (ttReportManageActs.size()>0){
             ttReportManageAct = ttReportManageActs.get(0);
+            List<PowerApplyAct> powerApplyActs = powerApplyActDao.selectActListBydataId(ttReportManageAct.getCreateUserId());
+            for (PowerApplyAct powerApplyAct : powerApplyActs) {
+                powerApplyAct.setReportId(ttReportManageAct.getId());
+            }
+            ttReportManageAct.setPowerList(powerApplyActs);
         }
         //构建工作流代办
         BusProcessNew busProcessNew = new BusProcessNew();
@@ -53,8 +63,7 @@ public class aid3 implements TaskListener {
         // 1: 同意 2：退回
         delegateTask.setVariable("flag",s);
         if ("1".equals(s)){
-            //todo
-//            ttReportManageActDao.saveBatch(powerApplyActs);
+            ttReportManageActService.saveReport(ttReportManageAct);
         }
 
     }

report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/oneApplyAfter.java

@@ -19,7 +19,7 @@ import java.util.List;
 /**
  * 权限申请流程  发起流程
  */
-public class aid2 implements TaskListener {
+public class oneApplyAfter implements TaskListener {
 
     @Override
     public void notify(DelegateTask delegateTask) {

report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/reEditAfter.java

@@ -20,7 +20,7 @@ import java.util.List;
 /**
  * 权限申请流程  发起流程
  */
-public class aid3 implements TaskListener {
+public class reEditAfter implements TaskListener {
 
     @Override
     public void notify(DelegateTask delegateTask) {

report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/startAfter.java

@@ -18,7 +18,7 @@ import java.util.List;
 /**
  * 权限申请流程  发起流程
  */
-public class aid1 implements TaskListener {
+public class startAfter implements TaskListener {
 
     @Override
     public void notify(DelegateTask delegateTask) {

report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/twoApplyAfter.java

@@ -18,7 +18,7 @@ import java.util.List;
 /**
  * 权限申请流程  发起流程
  */
-public class aid4 implements TaskListener {
+public class twoApplyAfter implements TaskListener {
 
     @Override
     public void notify(DelegateTask delegateTask) {