From 0de7012353a66d14ddf6fafc9677875adb9e00cc Mon Sep 17 00:00:00 2001
From: bupengxiang <bupengxiang@syxysoft.com>
Date: Thu, 4 May 2023 18:00:32 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E7=9B=91=E5=90=AC=E5=99=A8=E7=9A=84=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/ShiroFilterConfiguration.java      |  5 +++--
 .../da/report/dao/mysql/PowerApplyActDao.java |  2 ++
 .../adc/da/report/dao/mysql/ReportDao.java    |  3 +++
 .../service/ITtReportManageActService.java    |  2 ++
 .../impl/ITtReportManageActServiceImpl.java   | 19 +++++++++++++++++++
 .../mapper/mysql/PowerApplyActMapper.xml      |  5 +++++
 .../mapper/mysql/ReportManageMapper.xml       | 19 +++++++++++++++++++
 .../task/TodoTaskController.java              |  7 +++++++
 .../SCBG/{aid2.java => oneApplyAfter.java}    |  2 +-
 .../SCBG/{aid4.java => reEditAfter.java}      |  2 +-
 .../SCBG/{aid1.java => startAfter.java}       |  2 +-
 .../SCBG/{aid3.java => twoApplyAfter.java}    | 15 ++++++++++++---
 .../{aid2.java => oneApplyAfter.java}         |  2 +-
 .../{aid3.java => reEditAfter.java}           |  2 +-
 .../powerApply/{aid1.java => startAfter.java} |  2 +-
 .../{aid4.java => twoApplyAfter.java}         |  2 +-
 16 files changed, 79 insertions(+), 12 deletions(-)
 rename report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/{aid2.java => oneApplyAfter.java} (98%)
 rename report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/{aid4.java => reEditAfter.java} (98%)
 rename report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/{aid1.java => startAfter.java} (98%)
 rename report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/{aid3.java => twoApplyAfter.java} (77%)
 rename report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/{aid2.java => oneApplyAfter.java} (98%)
 rename report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/{aid3.java => reEditAfter.java} (98%)
 rename report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/{aid1.java => startAfter.java} (98%)
 rename report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/{aid4.java => twoApplyAfter.java} (98%)

diff --git a/adc-da-login/src/main/java/com/adc/da/login/config/ShiroFilterConfiguration.java b/adc-da-login/src/main/java/com/adc/da/login/config/ShiroFilterConfiguration.java
index 03f89b2..36140c7 100644
--- a/adc-da-login/src/main/java/com/adc/da/login/config/ShiroFilterConfiguration.java
+++ b/adc-da-login/src/main/java/com/adc/da/login/config/ShiroFilterConfiguration.java
@@ -120,6 +120,9 @@ public class ShiroFilterConfiguration {
         filterChainDefinitionMap.put(restPath + "/updateUserInfo", ANON);
         filterChainDefinitionMap.put(restPath + "/updatePassword", ANON);
         filterChainDefinitionMap.put(restPath + "/user/supplierRegistry/*", ANON);
+        /* 流程需要 */
+        filterChainDefinitionMap.put(restPath + "/service/model/**", ANON);
+        filterChainDefinitionMap.put(restPath + "/service/editor/stencilset", ANON);
 
         filterChainDefinitionMap.put(restPath  + "/**", AUTHC);
 
@@ -132,8 +135,6 @@ public class ShiroFilterConfiguration {
         filterChainDefinitionMap.put(adminPath + "/logout", "logout");
 //        filterChainDefinitionMap.put(restPath + "/**", "logout");
         filterChainDefinitionMap.put("/swagger-ui.html", ANON);
-        /* 流程需要 */
-        filterChainDefinitionMap.put(restPath + "/service/model/**", ANON);
 //        filterChainDefinitionMap.put("/swagger-ui.html", "jwtFilter");
         /* 全api一般需要登录才能使用 */
 
diff --git a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/PowerApplyActDao.java b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/PowerApplyActDao.java
index eda274f..e46c364 100644
--- a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/PowerApplyActDao.java
+++ b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/PowerApplyActDao.java
@@ -49,5 +49,7 @@ public interface PowerApplyActDao extends BaseMapper<PowerApplyAct> {
 
     List<PowerApplyActPageVO> selectListBydataIdNodel(@Param("dataId")String dataId);
 
+    List<PowerApplyAct> selectActListBydataId(@Param("dataId")String dataId);
+
     int batchDel(@Param("ids") List<String> ids);
 }
diff --git a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportDao.java b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportDao.java
index 65b48c8..257a475 100644
--- a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportDao.java
+++ b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportDao.java
@@ -1,6 +1,7 @@
 package com.adc.da.report.dao.mysql;
 
 import com.adc.da.report.eo.ReportEntity;
+import com.adc.da.report.eo.TtReportManageAct;
 import com.adc.da.report.vo.ReportQueryVo;
 import com.adc.da.report.vo.ReportVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -59,4 +60,6 @@ public interface ReportDao extends BaseMapper<ReportEntity> {
     List<String> isAct(@Param("Vo") ReportQueryVo vo);
 
     long selectByidAndName(@Param("Vo")ReportEntity entity);
+
+    void saveReportAct(@Param("Vo") TtReportManageAct ttReportManageAct);
 }
diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/ITtReportManageActService.java b/adc-da-report/src/main/java/com/adc/da/report/service/ITtReportManageActService.java
index 8464e9a..91b4e82 100644
--- a/adc-da-report/src/main/java/com/adc/da/report/service/ITtReportManageActService.java
+++ b/adc-da-report/src/main/java/com/adc/da/report/service/ITtReportManageActService.java
@@ -18,4 +18,6 @@ public interface ITtReportManageActService {
     void saveOrUpdateSingle(TtReportManageAct ttReportManageAct);
 
     void deleteById(DeleteParamRequestVO deleteParamVO);
+
+    void saveReport(TtReportManageAct ttReportManageAct);
 }
diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.java
index 5eeb7d7..4e30d21 100644
--- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.java
+++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.java
@@ -1,7 +1,10 @@
 package com.adc.da.report.service.impl;
 
 
+import com.adc.da.report.dao.mysql.PowerApplyDao;
+import com.adc.da.report.dao.mysql.ReportDao;
 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.report.vo.DeleteParamRequestVO;
@@ -11,6 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
@@ -27,6 +31,12 @@ import java.util.List;
 @Service
 public class ITtReportManageActServiceImpl extends ServiceImpl<TtReportManageActDao, TtReportManageAct> implements ITtReportManageActService {
 
+    @Autowired
+    ReportDao reportDao;
+
+    @Autowired
+    PowerApplyDao powerApplyDao;
+
     /**
      * @param ttReportManageActPageVO
      * @return <com.adc.da.report.entity.TtReportManageAct>
@@ -108,4 +118,13 @@ public class ITtReportManageActServiceImpl extends ServiceImpl<TtReportManageAct
         ttReportManageAct.setDelFlag(1);
 		baseMapper.update(ttReportManageAct,wrapper);
     }
+
+    @Override
+    public void saveReport(TtReportManageAct ttReportManageAct) {
+        //保存报告
+        reportDao.saveReportAct(ttReportManageAct);
+        //保存报告权限数据
+        List<PowerApplyAct> powerList = ttReportManageAct.getPowerList();
+        powerApplyDao.saveBatch(powerList);
+    }
 }
diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/PowerApplyActMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/PowerApplyActMapper.xml
index 7a9a0ff..08d55e7 100644
--- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/PowerApplyActMapper.xml
+++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/PowerApplyActMapper.xml
@@ -113,4 +113,9 @@
         left join TT_REPORT_MANAGE rep on a.report_id = rep.id
         where a.data_id = #{dataId}
     </select>
+    <select id="selectActListBydataId" resultType="com.adc.da.report.eo.PowerApplyAct">
+        select 	a.*
+        from <include refid="TableName"/> a
+        where a.data_id = #{dataId} and a.del_flag = 0
+    </select>
 </mapper>
diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml
index 3d3a78e..210c100 100644
--- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml
+++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml
@@ -2,6 +2,25 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.adc.da.report.dao.mysql.ReportDao">
 
+    <!-- 通用查询结果列 -->
+    <sql id="BaseColumnList">
+        id,
+        data_id, name, keycontent, maincontent, department, year, fileId, confidentialLevel, privacyLevel, createUserId, createDate, updateDate, del_flag
+    </sql>
+
+    <sql id="BaseColumnValue">
+        #{Vo.id},
+        #{Vo.dataId},#{Vo.name},#{Vo.keycontent},#{Vo.maincontent},#{Vo.department},#{Vo.year},#{Vo.fileId},
+        #{Vo.confidentialLevel},#{Vo.privacyLevel},
+        #{Vo.createUserId},
+        #{Vo.createDate},#{Vo.updateDate},#{Vo.del_flag}
+    </sql>
+
+    <insert id="saveReportAct">
+        insert into TT_REPORT_MANAGE (<include refid="BaseColumnList"/>)
+        value (<include refid="BaseColumnValue"/>)
+    </insert>
+
     <select id="getReportDateList" parameterType="string" resultType="string">
        select distinct year from TT_REPORT_MANAGE t1
         left join TR_REPORT_USER t2 on t1.id=t2.reportId
diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java
index 222c485..30e8992 100644
--- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java
+++ b/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;
     }
diff --git a/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/aid2.java b/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/oneApplyAfter.java
similarity index 98%
rename from report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/aid2.java
rename to report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/oneApplyAfter.java
index 27d0752..f25ebee 100644
--- a/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/aid2.java
+++ b/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) {
diff --git a/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/aid4.java b/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/reEditAfter.java
similarity index 98%
rename from report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/aid4.java
rename to report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/reEditAfter.java
index f1f027d..18ca0ab 100644
--- a/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/aid4.java
+++ b/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) {
diff --git a/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/aid1.java b/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/startAfter.java
similarity index 98%
rename from report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/aid1.java
rename to report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/startAfter.java
index 432427a..d20bcc6 100644
--- a/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/aid1.java
+++ b/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) {
diff --git a/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/aid3.java b/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/twoApplyAfter.java
similarity index 77%
rename from report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/aid3.java
rename to report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/twoApplyAfter.java
index fe5a6d0..f49caac 100644
--- a/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/aid3.java
+++ b/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);
         }
 
     }
diff --git a/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/aid2.java b/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/oneApplyAfter.java
similarity index 98%
rename from report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/aid2.java
rename to report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/oneApplyAfter.java
index 6baef86..25f3860 100644
--- a/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/aid2.java
+++ b/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) {
diff --git a/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/aid3.java b/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/reEditAfter.java
similarity index 98%
rename from report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/aid3.java
rename to report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/reEditAfter.java
index f777612..ab1b0b7 100644
--- a/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/aid3.java
+++ b/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) {
diff --git a/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/aid1.java b/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/startAfter.java
similarity index 98%
rename from report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/aid1.java
rename to report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/startAfter.java
index c8f3a18..607d91e 100644
--- a/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/aid1.java
+++ b/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) {
diff --git a/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/aid4.java b/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/twoApplyAfter.java
similarity index 98%
rename from report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/aid4.java
rename to report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/twoApplyAfter.java
index f3c18ed..8900202 100644
--- a/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/aid4.java
+++ b/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) {