[新增] 权限申请流程

2023-05-09 16:35:16 +08:00
parent f42eaf211a
commit 7c793af87c
38 changed files with 175 additions and 109 deletions
@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
 Test set: com.adc.da.rsa.RSATest
 -------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.212 s - in com.adc.da.rsa.RSATest
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.661 s - in com.adc.da.rsa.RSATest
@@ -45,9 +45,9 @@ public interface PowerApplyActDao extends BaseMapper<PowerApplyAct> {

    int batchInsert(@Param("list")List<PowerApplyAct> powerApplyActs);

-    List<PowerApplyActPageVO> selectListBydataId(@Param("dataId")String dataId);
+    PowerApplyActPageVO selectListBydataId(@Param("dataId")String dataId);

-    List<PowerApplyActPageVO> selectListByPrcId(@Param("prcId")String prcId);
+    PowerApplyActPageVO selectListByPrcId(@Param("prcId")String prcId);

    List<PowerApplyActPageVO> selectListBydataIdNodel(@Param("dataId")String dataId);

@@ -44,4 +44,7 @@ public interface PowerApplyDao extends BaseMapper<PowerApply> {
    List<PowerApply> queryList(@Param("pageVO") PowerApplyPageVO powerApplyPageVO);

    int saveBatch(@Param("list") List<PowerApplyAct> powerApplies);
+
+    void savePowerAct(@Param("item") PowerApplyAct powerApplyAct);
+
 }
@@ -51,6 +51,11 @@
            (#{item.id}, #{item.dataId}, #{item.reportId}, #{item.power}, #{item.applyReason}, #{item.userId}, #{item.createUserId}, #{item.createDate}, #{item.updateDate}, #{item.updateUserId}, #{item.delFlag})
        </foreach>
    </insert>
+    <insert id="savePowerAct">
+        insert into power_apply (id,data_id, report_id, power, apply_reason, user_id, create_user_id, create_date, update_date, update_user_id, del_flag)
+        values
+        (#{item.id}, #{item.dataId}, #{item.reportId}, #{item.power}, #{item.applyReason}, #{item.userId}, #{item.createUserId}, #{item.createDate}, #{item.updateDate}, #{item.updateUserId}, #{item.delFlag})
+    </insert>


    <!-- 根据查询VO进行分页查询 -->
@@ -51,6 +51,11 @@
            (#{item.id}, #{item.dataId}, #{item.reportId}, #{item.power}, #{item.applyReason}, #{item.userId}, #{item.createUserId}, #{item.createDate}, #{item.updateDate}, #{item.updateUserId}, #{item.delFlag})
        </foreach>
    </insert>
+    <insert id="savePowerAct">
+        insert into power_apply (id,data_id, report_id, power, apply_reason, user_id, create_user_id, create_date, update_date, update_user_id, del_flag)
+        values
+        (#{item.id}, #{item.dataId}, #{item.reportId}, #{item.power}, #{item.applyReason}, #{item.userId}, #{item.createUserId}, #{item.createDate}, #{item.updateDate}, #{item.updateUserId}, #{item.delFlag})
+    </insert>


    <!-- 根据查询VO进行分页查询 -->
@@ -1,81 +1,97 @@
-com\adc\da\report\service\impl\ReportLabelServiceImpl.class
-com\adc\da\report\dao\mysql\FileDao.class
-com\adc\da\report\eo\PowerApply.class
-com\adc\da\report\util\FileContentUtil.class
+com\adc\da\report\controller\ReportRatingController.class
+com\adc\da\report\dao\mysql\ReportUserCommentDao.class
 com\adc\da\report\config\ObsConfig.class
-com\adc\da\report\service\impl\IReportContentServiceImpl.class
 com\adc\da\report\vo\LabelAllDetailVo.class
 com\adc\da\report\controller\TtReportManageActController.class
 com\adc\da\report\service\IReportContentService.class
-com\adc\da\report\eo\ReportLabelEntity.class
-com\adc\da\report\controller\LabelManageController.class
-com\adc\da\report\service\impl\IpowerApplyActServiceImpl.class
-com\adc\da\report\service\ITreeLabelService.class
-com\adc\da\report\service\IReportLogBookService.class
 com\adc\da\report\util\OSSClientUtil.class
 com\adc\da\report\util\PageUtils.class
 com\adc\da\report\dao\mysql\ReportDao.class
 com\adc\da\report\util\WaterMarkUtil.class
-com\adc\da\report\dao\mysql\PowerApplyDao.class
 com\adc\da\report\eo\PowerApplyAct.class
-com\adc\da\report\service\impl\ITreeLabelServiceImpl.class
-com\adc\da\report\service\IReportLabelService.class
-com\adc\da\report\vo\PowerApplyActPageVO.class
-com\adc\da\report\vo\BasePageVO.class
 com\adc\da\report\dao\mysql\ReportLabelDao.class
 com\adc\da\report\service\impl\ITtReportManageActServiceImpl.class
 com\adc\da\report\vo\PowerApplyPageVO.class
-com\adc\da\report\controller\PowerApplyController.class
 com\adc\da\report\controller\ReportManageConroller.class
 com\adc\da\report\service\impl\IpowerApplyServiceImpl.class
-com\adc\da\report\eo\ReportLogBook.class
 com\adc\da\report\constant\ReportConstants.class
 com\adc\da\report\vo\ReportLogPageVO.class
 com\adc\da\report\eo\LogEntity.class
-com\adc\da\report\dao\mysql\ReportLogBookDao.class
 com\adc\da\report\util\PdfUtil.class
-com\adc\da\report\controller\ReportLogBookController.class
-com\adc\da\report\service\IReportService.class
+com\adc\da\report\eo\ReportUserCommentEntity.class
 com\adc\da\report\util\WordUtil.class
-com\adc\da\report\eo\LabelEntity.class
-com\adc\da\report\eo\TtReportManageAct.class
-com\adc\da\report\vo\LogVo.class
 com\adc\da\report\service\impl\IFileServiceImpl.class
 com\adc\da\report\vo\ReportQueryVo.class
-com\adc\da\report\vo\LabelAllVo.class
-com\adc\da\report\service\ILogService.class
-com\adc\da\report\vo\ReportVo.class
-com\adc\da\report\service\impl\ILogServiceImpl.class
 com\adc\da\report\service\impl\IReportLogBookServiceImpl.class
 com\adc\da\report\util\PptUtil.class
 com\adc\da\report\vo\TtReportManageActPageVO.class
-com\adc\da\report\util\ExcelUtil.class
+com\adc\da\report\controller\ReportCommentController.class
 com\adc\da\report\dao\mysql\LogDao.class
 com\adc\da\report\dao\mysql\ReportContentDao.class
 com\adc\da\report\dao\mysql\TreeLabelDao.class
 com\adc\da\report\aspect\ReportLogAspect.class
 com\adc\da\report\util\LocalFileUtil.class
 com\adc\da\report\dao\mysql\LabelDao.class
-com\adc\da\report\service\impl\ILabelServiceImpl.class
 com\adc\da\report\controller\ReportLogController.class
-com\adc\da\report\service\ITtReportManageActService.class
-com\adc\da\report\service\IPowerApplyActService.class
 com\adc\da\report\controller\TreeLabelManagerController.class
 com\adc\da\report\eo\TreeLabelEntity.class
-com\adc\da\report\dao\mysql\ReportUserDao.class
-com\adc\da\report\util\ObsBootUtil.class
 com\adc\da\report\vo\DeleteParamRequestVO.class
-com\adc\da\report\eo\FileEntity.class
 com\adc\da\report\service\IPowerApplyService.class
 com\adc\da\report\dao\mysql\PowerApplyActDao.class
-com\adc\da\report\eo\ReportEntity.class
 com\adc\da\report\service\IFileService.class
-com\adc\da\report\dao\mysql\TtReportManageActDao.class
-com\adc\da\report\annotation\ReportLog.class
 com\adc\da\report\service\impl\IReportServiceImpl.class
 com\adc\da\report\vo\LabelVo.class
-com\adc\da\report\eo\ReportContentEntity.class
+com\adc\da\report\service\impl\IReportUserRatingServiceImpl.class
 com\adc\da\report\constant\TreeLabelConstants.class
-com\adc\da\report\service\ILabelService.class
 com\adc\da\report\vo\TreeLabelVo.class
+com\adc\da\report\constant\PowerApplyConstants.class
+com\adc\da\report\vo\ReportDetailVo.class
+com\adc\da\report\service\impl\ReportLabelServiceImpl.class
+com\adc\da\report\dao\mysql\FileDao.class
+com\adc\da\report\eo\PowerApply.class
+com\adc\da\report\util\FileContentUtil.class
+com\adc\da\report\service\impl\IReportContentServiceImpl.class
+com\adc\da\report\eo\ReportUserRatingEntity.class
+com\adc\da\report\vo\ReportDetailThumbUpVo.class
+com\adc\da\report\eo\ReportLabelEntity.class
+com\adc\da\report\controller\LabelManageController.class
+com\adc\da\report\service\impl\IpowerApplyActServiceImpl.class
+com\adc\da\report\service\ITreeLabelService.class
+com\adc\da\report\service\IReportLogBookService.class
+com\adc\da\report\dao\mysql\ReportUserRatingDao.class
+com\adc\da\report\dao\mysql\PowerApplyDao.class
+com\adc\da\report\service\impl\ITreeLabelServiceImpl.class
+com\adc\da\report\service\IReportLabelService.class
+com\adc\da\report\vo\PowerApplyActPageVO.class
+com\adc\da\report\vo\BasePageVO.class
+com\adc\da\report\controller\PowerApplyController.class
+com\adc\da\report\dto\ReportRatingDTO.class
+com\adc\da\report\vo\ReportCommentVo.class
+com\adc\da\report\eo\ReportLogBook.class
+com\adc\da\report\dto\ReportCommentDTO.class
+com\adc\da\report\service\impl\IReportUserCommentServiceImpl.class
+com\adc\da\report\dao\mysql\ReportLogBookDao.class
+com\adc\da\report\controller\ReportLogBookController.class
+com\adc\da\report\service\IReportService.class
+com\adc\da\report\eo\LabelEntity.class
+com\adc\da\report\eo\TtReportManageAct.class
+com\adc\da\report\vo\LogVo.class
+com\adc\da\report\vo\LabelAllVo.class
+com\adc\da\report\service\ILogService.class
+com\adc\da\report\vo\ReportVo.class
+com\adc\da\report\service\impl\ILogServiceImpl.class
+com\adc\da\report\util\ExcelUtil.class
+com\adc\da\report\service\IReportUserRatingService.class
+com\adc\da\report\service\impl\ILabelServiceImpl.class
+com\adc\da\report\service\ITtReportManageActService.class
+com\adc\da\report\service\IPowerApplyActService.class
+com\adc\da\report\dao\mysql\ReportUserDao.class
+com\adc\da\report\util\ObsBootUtil.class
+com\adc\da\report\eo\FileEntity.class
+com\adc\da\report\eo\ReportEntity.class
+com\adc\da\report\service\IReportUserCommentService.class
+com\adc\da\report\dao\mysql\TtReportManageActDao.class
+com\adc\da\report\annotation\ReportLog.class
+com\adc\da\report\eo\ReportContentEntity.class
+com\adc\da\report\service\ILabelService.class
 com\adc\da\report\eo\ReportUserEntity.class
@@ -1,29 +1,13 @@
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\vo\PowerApplyActPageVO.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\vo\PowerApplyPageVO.java
-D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\service\impl\IReportLogBookServiceImpl.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\util\ExcelUtil.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\constant\TreeLabelConstants.java
-D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\util\ObsBootUtil.java
-D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\util\FileContentUtil.java
-D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\eo\PowerApply.java
-D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\util\PageUtils.java
-D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\util\PptUtil.java
-D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\util\PdfUtil.java
-D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\vo\TtReportManageActPageVO.java
-D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\eo\FileEntity.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\dao\mysql\ReportUserRatingDao.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\vo\LabelAllDetailVo.java
-D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\vo\ReportQueryVo.java
-D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\controller\TtReportManageActController.java
-D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\eo\TtReportManageAct.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\service\IReportUserCommentService.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\vo\ReportVo.java
-D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\dao\mysql\ReportLogBookDao.java
-D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\service\ILogService.java
-D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\service\ITtReportManageActService.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\service\impl\ReportLabelServiceImpl.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\vo\DeleteParamRequestVO.java
-D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\dao\mysql\FileDao.java
-D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\service\IReportLogBookService.java
-D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\service\IReportService.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\vo\LabelAllVo.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\eo\ReportContentEntity.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\service\IPowerApplyActService.java
@@ -35,22 +19,17 @@ D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\vo\TreeLabelVo.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\controller\PowerApplyController.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\dao\mysql\ReportLabelDao.java
-D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\util\LocalFileUtil.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\service\impl\IFileServiceImpl.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\controller\ReportLogBookController.java
-D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\service\impl\ILogServiceImpl.java
-D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\constant\ReportConstants.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\dao\mysql\ReportUserCommentDao.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\vo\ReportDetailThumbUpVo.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\service\impl\IReportContentServiceImpl.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\dao\mysql\TtReportManageActDao.java
-D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\eo\LabelEntity.java
-D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\eo\ReportUserEntity.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\vo\ReportCommentVo.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\dao\mysql\ReportDao.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\eo\TreeLabelEntity.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\vo\LogVo.java
-D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\eo\LogEntity.java
-D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\config\ObsConfig.java
-D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\service\ITreeLabelService.java
-D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\aspect\ReportLogAspect.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\dto\ReportRatingDTO.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\dao\mysql\TreeLabelDao.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\service\IFileService.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\controller\ReportLogController.java
@@ -58,24 +37,61 @@ D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\util\WaterMarkUtil.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\dao\mysql\ReportUserDao.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\eo\ReportEntity.java
-D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\service\impl\IpowerApplyServiceImpl.java
-D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\service\impl\ITtReportManageActServiceImpl.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\dao\mysql\PowerApplyActDao.java
-D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\service\IPowerApplyService.java
-D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\annotation\ReportLog.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\controller\ReportManageConroller.java
-D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\vo\ReportLogPageVO.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\service\IReportLabelService.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\controller\TreeLabelManagerController.java
-D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\dao\mysql\ReportContentDao.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\vo\BasePageVO.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\eo\ReportUserRatingEntity.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\service\impl\IReportServiceImpl.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\service\impl\IpowerApplyActServiceImpl.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\constant\PowerApplyConstants.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\util\OSSClientUtil.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\controller\ReportRatingController.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\service\impl\IReportLogBookServiceImpl.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\controller\ReportCommentController.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\util\ObsBootUtil.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\util\FileContentUtil.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\eo\PowerApply.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\util\PageUtils.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\util\PptUtil.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\util\PdfUtil.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\vo\TtReportManageActPageVO.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\eo\FileEntity.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\vo\ReportQueryVo.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\controller\TtReportManageActController.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\service\impl\IReportUserRatingServiceImpl.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\eo\TtReportManageAct.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\eo\ReportUserCommentEntity.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\dao\mysql\ReportLogBookDao.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\service\ILogService.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\service\ITtReportManageActService.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\vo\ReportDetailVo.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\dao\mysql\FileDao.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\service\IReportLogBookService.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\service\IReportService.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\util\LocalFileUtil.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\service\impl\ILogServiceImpl.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\constant\ReportConstants.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\eo\LabelEntity.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\eo\ReportUserEntity.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\eo\LogEntity.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\config\ObsConfig.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\service\ITreeLabelService.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\aspect\ReportLogAspect.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\service\impl\IpowerApplyServiceImpl.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\service\impl\ITtReportManageActServiceImpl.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\service\IPowerApplyService.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\dto\ReportCommentDTO.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\annotation\ReportLog.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\service\impl\IReportUserCommentServiceImpl.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\vo\ReportLogPageVO.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\dao\mysql\ReportContentDao.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\service\IReportUserRatingService.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\controller\LabelManageController.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\eo\ReportLogBook.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\dao\mysql\PowerApplyDao.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\vo\LabelVo.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\service\impl\ILabelServiceImpl.java
-D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\util\OSSClientUtil.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\service\impl\ITreeLabelServiceImpl.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-report\src\main\java\com\adc\da\report\service\ILabelService.java
@@ -18,7 +18,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

 import java.util.Date;
-import java.util.List;
 import java.util.UUID;

@Service
@@ -49,16 +48,14 @@ public class ActivitDefineService {
            reportId = UUID.randomUUID().toString().replace("-","");
        }
        if ("1".equals(prcType)){
-            List<PowerApplyAct> powerApplyActs = JSONObject.parseArray(dataJson, PowerApplyAct.class);
-            for (PowerApplyAct powerApplyAct : powerApplyActs) {
-                powerApplyAct.setId(UUID.randomUUID().toString().replaceAll("-",""));
-                powerApplyAct.setDataId(reportId);
-                powerApplyAct.setTaskId(taskId);
-                powerApplyAct.setPrcId(prcId);
-                powerApplyAct.setDelFlag(0);
-                powerApplyAct.setCreateDate(new Date());
-            }
-            powerApplyActDao.batchInsert(powerApplyActs);
+            PowerApplyAct powerApplyAct = JSONObject.parseObject(dataJson, PowerApplyAct.class);
+            powerApplyAct.setId(UUID.randomUUID().toString().replaceAll("-",""));
+            powerApplyAct.setDataId(reportId);
+            powerApplyAct.setTaskId(taskId);
+            powerApplyAct.setPrcId(prcId);
+            powerApplyAct.setDelFlag(0);
+            powerApplyAct.setCreateDate(new Date());
+            iPowerApplyActService.saveOrUpdateSingle(powerApplyAct);
        }else if ("4".equals(prcType)){
            TtReportManageAct ttReportManageAct = JSONObject.parseObject(dataJson, TtReportManageAct.class);
            ttReportManageAct.setDataId(reportId);
@@ -438,15 +438,17 @@ public class TodoTaskController {
     */
    @ApiOperation(value = "详情")
    @GetMapping("/queryDetail")
-    public ResponseMessage queryDetail(@RequestParam("prcId") String prcId, @RequestParam("prcType")String prcType,
-                                       @RequestParam("tag") Integer tag) {
+    public ResponseMessage queryDetail(@RequestParam(value = "prcId",required = false) String prcId, @RequestParam("prcType")String prcType,
+                                       @RequestParam(value = "dataId",required = false) String dataId) {
        List<BusProcessNew> busProcessNews = iBusProcessNewService.selectEOByTaskId(prcId);
+        BusProcessNew busProcessNew = null;
        if (busProcessNews.size() == 0) {
-            return null;
+            busProcessNew = iBusProcessNewService.selectEOByDataId(dataId);
+        }else {
+            busProcessNew = busProcessNews.get(0);
        }
-        BusProcessNew busProcessNew = busProcessNews.get(0);
        // 查找详细业务数据
-        BusProcessNewVO busProcessNewVO = this.queryDetailDate(busProcessNew, prcType,tag);
+        BusProcessNewVO busProcessNewVO = this.queryDetailDate(busProcessNew, prcType);
        //审批数据
        List<BusProcessApprove> busProcessApproves =
                busProcessApproveMapper.selectEoByPrcIdAndTask(busProcessNewVO.getPId());
@@ -482,8 +484,8 @@ public class TodoTaskController {
    private BusProcessNewVO queryDetailDateByDataId(String dataId, String prcType) {
        BusProcessNewVO busProcessNewVO = new BusProcessNewVO();
        if ("1".equals(prcType)){
-            List<PowerApplyActPageVO> powerApplyActs = powerApplyActDao.selectListBydataId(dataId);
-            String string = JSONArray.toJSONString(powerApplyActs);
+            PowerApplyActPageVO powerApplyActPageVO = powerApplyActDao.selectListBydataId(dataId);
+            String string = JSONArray.toJSONString(powerApplyActPageVO);
            //去对应的 数据表查数据
            busProcessNewVO.setDataJson(string);
        }else if ("4".equals(prcType)){
@@ -495,20 +497,19 @@ public class TodoTaskController {
        return busProcessNewVO;
    }

-    private BusProcessNewVO queryDetailDate(BusProcessNew busProcessNew, String prcType, Integer tag) {
+    private BusProcessNewVO queryDetailDate(BusProcessNew busProcessNew, String prcType) {
        BusProcessNewVO busProcessNewVO = new BusProcessNewVO();
        BeanUtils.copyProperties(busProcessNew,busProcessNewVO);
        String pId = busProcessNew.getPId();
        String dataId = busProcessNew.getDataId();
        if ("1".equals(prcType)){
-            List<PowerApplyActPageVO> powerApplyActs = new ArrayList<>();
+            PowerApplyActPageVO powerApplyAct = new PowerApplyActPageVO();
            if (StringUtils.isBlank(pId)){
-                //代办查看详情
-                powerApplyActs = powerApplyActDao.selectListBydataId(dataId);
+                powerApplyAct = powerApplyActDao.selectListBydataId(dataId);
            }else {
-                powerApplyActs = powerApplyActDao.selectListByPrcId(pId);
+                powerApplyAct = powerApplyActDao.selectListByPrcId(pId);
            }
-            String string = JSONArray.toJSONString(powerApplyActs);
+            String string = JSONArray.toJSONString(powerApplyAct);
            //去对应的 数据表查数据
            busProcessNewVO.setDataJson(string);
        }else if("4".equals(prcType)){
@@ -26,6 +26,8 @@ public interface BusProcessNewMapper extends BaseMapper<BusProcessNew> {
    List<BusProcessNew> findNoExecuteBusProcessNewForEnd(@Param("taskIds")List<String> taskIds);

    List<BusProcessNew> selectEOByTaskId(@Param("prcId") String prcId);
+
+    BusProcessNew selectEOByDataId(@Param("dataId")String dataId);
 //    String queryTaskName(@Param("id")String id);

 }
@@ -30,4 +30,5 @@ public interface IBusProcessNewService extends IService<BusProcessNew> {
    List<BusProcessNew> findNoExecuteBusProcessNewForEnd(List<String> taskIdList);

    List<BusProcessNew> selectEOByTaskId(String prcId);
+    BusProcessNew selectEOByDataId(String prcId);
 }
@@ -73,4 +73,9 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
    public List<BusProcessNew> selectEOByTaskId(String prcId) {
        return baseMapper.selectEOByTaskId(prcId);
    }
+
+    @Override
+    public BusProcessNew selectEOByDataId(String dataId) {
+        return baseMapper.selectEOByDataId(dataId);
+    }
 }
@@ -2,11 +2,13 @@ package com.adc.da.wkflow.listener.powerApply;

 import com.adc.da.login.util.UserUtils;
 import com.adc.da.report.dao.mysql.PowerApplyActDao;
+import com.adc.da.report.dao.mysql.PowerApplyDao;
 import com.adc.da.report.eo.PowerApplyAct;
 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;
 import com.adc.da.wkflow.business_main.service.IBusProcessNewService;
+import com.adc.da.wkflow.listener.FlagEnum;
 import com.adc.da.wkflow.util.SpringContextUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -23,6 +25,7 @@ public class twoApplyAfter implements TaskListener {
    @Override
    public void notify(DelegateTask delegateTask) {
        PowerApplyActDao powerApplyActDao = SpringContextUtil.getBean(PowerApplyActDao.class);
+        PowerApplyDao powerApplyDao = SpringContextUtil.getBean(PowerApplyDao.class);
        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
        IBusProcessApproveService approveService = SpringContextUtil.getBean(IBusProcessApproveService.class);
        //查询task任务
@@ -35,12 +38,10 @@ public class twoApplyAfter implements TaskListener {
        }
        //构建工作流代办
        BusProcessNew busProcessNew = new BusProcessNew();
-//        busProcessNew.setUserId(powerApplyAct.getUpdateUserId());
        busProcessNew.setUserId(UserUtils.getUserId());
        busProcessNew.setPId(delegateTask.getProcessInstanceId());
        busProcessNew.setTaskInfo(delegateTask.getEventName());
        busProcessNew.setTaskId(delegateTask.getId());
-//        busProcessNew.set(FlowTypeEnum.BGQXSQLC.getValue());
        busProcessNew.setDataId(powerApplyAct.getDataId());
        busBean.save(busProcessNew);

@@ -50,8 +51,14 @@ public class twoApplyAfter implements TaskListener {
        List<BusProcessApprove> list = approveService.list(approveWrapper);
        String fromValsJson = list.get(0).getFromValsJson();
        JSONObject object = JSONObject.parseObject(fromValsJson);
-
+        String s = object.getString("flag") == "" || object.getString("flag") == null ? FlagEnum.AGREE.getValue() : object.getString("flag");
        delegateTask.setVariable("oneApprove",object.getString("oneApprove"));
        delegateTask.setVariable("twoApprove",object.getString("twoApprove"));
+
+        // 1: 同意 2：退回
+        delegateTask.setVariable("flag",s);
+        if ("1".equals(s)){
+            powerApplyDao.savePowerAct(powerApplyAct);
+        }
    }
 }
@@ -33,4 +33,8 @@
        where BUS_PROCESS_NEW.P_ID = #{prcId}
        order by CREATE_DATE desc
    </select>
+    <select id="selectEOByDataId" resultType="com.adc.da.wkflow.business_main.entity.BusProcessNew">
+        select BUS_PROCESS_NEW.* from  BUS_PROCESS_NEW
+        where BUS_PROCESS_NEW.DATA_ID = #{dataId}
+    </select>
 </mapper>
@@ -33,4 +33,8 @@
        where BUS_PROCESS_NEW.P_ID = #{prcId}
        order by CREATE_DATE desc
    </select>
+    <select id="selectEOByDataId" resultType="com.adc.da.wkflow.business_main.entity.BusProcessNew">
+        select BUS_PROCESS_NEW.* from  BUS_PROCESS_NEW
+        where BUS_PROCESS_NEW.DATA_ID = #{dataId}
+    </select>
 </mapper>
@@ -11,7 +11,6 @@ com\adc\da\wkflow\business_main\service\IBusProcessApproveService.class
 com\adc\da\wkflow\business_activiti\task\TaskController.class
 com\adc\da\wkflow\business_activiti\task\TempTestController.class
 com\adc\da\wkflow\business_main\service\IBusProcessEntrustService.class
-com\adc\da\wkflow\listener\SCBG\twoApplyAfter.class
 com\adc\da\wkflow\listener\FlagEnum.class
 com\adc\da\wkflow\business_main\mapper\BusProcessApproveMapper.class
 com\adc\da\wkflow\enums\SubmitStatusEnum.class
@@ -25,6 +24,7 @@ com\adc\da\wkflow\business_activiti\service\ActivitDefineService.class
 com\adc\da\wkflow\listener\SetupPersonnelFront.class
 com\adc\da\wkflow\business_main\vo\ApproveDataVO.class
 com\adc\da\wkflow\util\wrapper\Wrapper.class
+com\adc\da\wkflow\dto\StartProcessEO.class
 com\adc\da\wkflow\business_activiti\dto\StandardDTONew.class
 com\adc\da\wkflow\util\file\FileTools.class
 com\adc\da\wkflow\business_main\service\impl\BusProcessNewServiceImpl.class
@@ -62,11 +62,11 @@ D:\desktop\hzwl\dazhong\faw-report-library-boot\report-activity\src\main\java\co
 D:\desktop\hzwl\dazhong\faw-report-library-boot\report-activity\src\main\java\com\adc\da\wkflow\business_activiti\dto\Form.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\report-activity\src\main\java\com\adc\da\wkflow\business_activiti\model\ActivitiModelImageController.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\report-activity\src\main\java\com\adc\da\wkflow\business_main\vo\ApproveDataVO.java
-D:\desktop\hzwl\dazhong\faw-report-library-boot\report-activity\src\main\java\com\adc\da\wkflow\listener\SCBG\twoApplyAfter.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\report-activity\src\main\java\com\adc\da\wkflow\business_activiti\dto\Page.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\report-activity\src\main\java\com\adc\da\wkflow\business_activiti\dto\ProjectAssessDTO.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\report-activity\src\main\java\com\adc\da\wkflow\business_activiti\instance\ActivitiInstanceController.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\report-activity\src\main\java\com\adc\da\wkflow\business_main\service\impl\BusProcessApproveServiceImpl.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\report-activity\src\main\java\com\adc\da\wkflow\util\SpringContextUtil.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\report-activity\src\main\java\com\adc\da\wkflow\business_main\vo\BusProcessNewVO.java
+D:\desktop\hzwl\dazhong\faw-report-library-boot\report-activity\src\main\java\com\adc\da\wkflow\dto\StartProcessEO.java
 D:\desktop\hzwl\dazhong\faw-report-library-boot\report-activity\src\main\java\com\adc\da\wkflow\business_main\entity\BusProcessApprove.java