From f71f02e6c575bc506242b4f005daf796032d1ad0 Mon Sep 17 00:00:00 2001
From: sunzheng <sunzheng.cn>
Date: Tue, 9 Jan 2024 16:22:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../drafting/common/DraftingConstant.java     | 14 ++++++++++++
 .../PayDraftingGroupController.java           | 22 +++++++++----------
 .../PayDraftingGroupSubItemController.java    | 19 ++++++++--------
 .../entity/PayDraftingGroupSubItem.java       |  4 ++++
 .../xml/PayDraftingGroupSubItemMapper.xml     |  3 ++-
 .../impl/PayDraftingGroupServiceImpl.java     |  4 ++--
 6 files changed, 41 insertions(+), 25 deletions(-)
 create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/common/DraftingConstant.java

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/common/DraftingConstant.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/common/DraftingConstant.java
new file mode 100644
index 00000000..73095fc2
--- /dev/null
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/common/DraftingConstant.java
@@ -0,0 +1,14 @@
+package com.jero.drafting.common;
+
+public interface DraftingConstant {
+
+    /**审核状态 1:待审核 2:已通过 3:未通过*/
+    Integer CHECK_PENDING = 1;
+
+    /**审核状态 1:待审核 2:已通过 3:未通过*/
+    Integer CHECK_PASS = 2;
+
+    /**审核状态 1:待审核 2:已通过 3:未通过*/
+    Integer CHECK_REJECTION = 3;
+
+}
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupController.java
index ff1c9866..5e8cca90 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupController.java
@@ -59,7 +59,7 @@ public class PayDraftingGroupController extends JeroController<PayDraftingGroup,
      * @param pageNo 页数
      * @param pageSize 条数
      */
-//    @RequiresPermissions("draftingGroupProject:search")
+    @RequiresPermissions("draftingGroup:search")
     @ApiOperation(value="起草组项目-分页列表查询", notes="起草组项目-分页列表查询")
     @GetMapping(value = "/list")
     public Result<?> queryPageList(PayDraftingGroup payDraftingGroup,
@@ -71,7 +71,7 @@ public class PayDraftingGroupController extends JeroController<PayDraftingGroup,
         }
 
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        if(!rolePermissionService.getRolePermission("draftingGroupProject:search")){
+        if(!rolePermissionService.getRolePermission("draftingGroup:search")){
             payDraftingGroup.setPrincipalA(sysUser.getId());
             payDraftingGroup.setPrincipalB(sysUser.getId());
         }
@@ -110,7 +110,7 @@ public class PayDraftingGroupController extends JeroController<PayDraftingGroup,
      * @return
      */
     @AutoLog(value = "起草组项目-添加",operateType = 1)
-//    @RequiresPermissions("draftingGroupProject:add")
+    @RequiresPermissions("draftingGroup:add")
     @ApiOperation(value="起草组项目-添加", notes="起草组项目-添加")
     @PostMapping(value = "/add")
     public Result<?> add(@RequestBody PayDraftingGroup payDraftingGroup) {
@@ -142,7 +142,7 @@ public class PayDraftingGroupController extends JeroController<PayDraftingGroup,
      * @return
      */
     @AutoLog(value = "起草组项目-通过id删除",operateType = 2)
-//    @RequiresPermissions("draftingGroupProject:delete")
+    @RequiresPermissions("draftingGroup:delete")
     @ApiOperation(value="起草组项目-通过id删除", notes="起草组项目-通过id删除")
     @GetMapping(value = "/delete")
     public Result<?> delete(@RequestParam(name="id") String id) {
@@ -159,7 +159,7 @@ public class PayDraftingGroupController extends JeroController<PayDraftingGroup,
      * @param ids 起草组项目ids 逗号分隔
      * @return
      */
-//    @RequiresPermissions("draftingGroupProject:batchDel")
+    @RequiresPermissions("draftingGroup:batchDel")
     @ApiOperation(value="起草组项目-批量删除", notes="起草组项目-批量删除")
     @GetMapping(value = "/deleteBatch")
     public Result<?> deleteBatch(@RequestParam(name="ids") String ids) {
@@ -183,8 +183,8 @@ public class PayDraftingGroupController extends JeroController<PayDraftingGroup,
      * @return
      */
     @AutoLog(value = "起草组项目-复制",operateType = 3)
-//    @RequiresPermissions("draftingGroupProject:copy")
-//    @ApiOperation(value="起草组项目-复制", notes="起草组项目-复制")
+    @RequiresPermissions("draftingGroup:copy")
+    @ApiOperation(value="起草组项目-复制", notes="起草组项目-复制")
     @PostMapping(value = "/copy")
     public Result<?> copy(@RequestBody PayDraftingGroup payDraftingGroup) {
         if(StringUtils.isBlank(payDraftingGroup.getId())){
@@ -195,7 +195,7 @@ public class PayDraftingGroupController extends JeroController<PayDraftingGroup,
             return Result.error("起草组不存在！");
         }
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        if(!rolePermissionService.getRolePermission("draftingGroupProject:copy") && !Objects.equals(payDraftingGroupOld.getPrincipalIdA(),sysUser.getId())){
+        if(!rolePermissionService.getRolePermission("draftingGroup:copy") && !Objects.equals(payDraftingGroupOld.getPrincipalIdA(),sysUser.getId())){
             return Result.error(payDraftingGroupOld.getDraftingGroupProject() + "数据权限不足！");
         }
         payDraftingGroupService.copy(payDraftingGroup);
@@ -255,7 +255,7 @@ public class PayDraftingGroupController extends JeroController<PayDraftingGroup,
      * @return
      */
     @AutoLog(value = "起草组项目-修改",operateType = 3)
-//    @RequiresPermissions("draftingGroupProject:edit")
+    @RequiresPermissions("draftingGroup:edit")
     @ApiOperation(value="起草组项目-编辑", notes="起草组项目-编辑")
     @PostMapping(value = "/edit")
     public Result<?> edit(@RequestBody PayDraftingGroup payDraftingGroup) {
@@ -271,7 +271,7 @@ public class PayDraftingGroupController extends JeroController<PayDraftingGroup,
             return Result.error("起草组不存在！");
         }
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        if(!rolePermissionService.getRolePermission("draftingGroupProject:edit") && !Objects.equals(payDraftingGroupOld.getPrincipalIdA(),sysUser.getId())){
+        if(!rolePermissionService.getRolePermission("draftingGroup:edit") && !Objects.equals(payDraftingGroupOld.getPrincipalIdA(),sysUser.getId())){
             return Result.error(payDraftingGroupOld.getDraftingGroupProject() + "数据权限不足！");
         }
         try {
@@ -288,8 +288,6 @@ public class PayDraftingGroupController extends JeroController<PayDraftingGroup,
             return Result.error("起草组项目已存在！");
         }
         payDraftingGroupService.setPayDraftingGroup(payDraftingGroup);
-//        LambdaUpdateWrapper<PayDraftingGroup> updatePayDraftingGroup = new LambdaUpdateWrapper<>();
-//        updatePayDraftingGroup.eq(PayDraftingGroup::getId,payDraftingGroup.getId());
         payDraftingGroupService.updateById(payDraftingGroup);
         return Result.OK("编辑成功!");
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java
index 5bf2b149..c87664ca 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java
@@ -79,7 +79,7 @@ public class PayDraftingGroupSubItemController extends JeroController<PayDraftin
      * @param paymentDate            日期
      * @return
      */
-//    @RequiresPermissions("draftingGroupMember:search")
+    @RequiresPermissions("draftingGroupMember:search")
     @ApiOperation(value = "起草组成员-分页列表查询", notes = "起草组成员-分页列表查询")
     @GetMapping(value = "/list")
     public Result<?> queryPageList(PayDraftingGroupSubItem payDraftingGroupSubItem,
@@ -100,7 +100,7 @@ public class PayDraftingGroupSubItemController extends JeroController<PayDraftin
             return Result.error("起草组不存在！");
         }
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        if(!rolePermissionService.getRolePermission("draftingGroupMember:search") && !Objects.equals(payDraftingGroup.getPrincipalIdA(),sysUser.getId())){
+        if(!rolePermissionService.getRolePermission("draftingGroup:underStudy:search") && !Objects.equals(payDraftingGroup.getPrincipalIdA(),sysUser.getId())){
             return Result.error("数据权限不足！");
         }
         Page<PayDraftingGroupSubItem> page = new Page<>(pageNo, pageSize);
@@ -115,7 +115,7 @@ public class PayDraftingGroupSubItemController extends JeroController<PayDraftin
      * @return
      */
     @AutoLog(value = "起草组成员-添加",operateType = 2)
-//    @RequiresPermissions("draftingGroupMember:add")
+    @RequiresPermissions("draftingGroupMember:add")
     @ApiOperation(value = "起草组成员-添加", notes = "起草组成员-添加")
     @PostMapping(value = "/add")
     public Result<?> add(@RequestBody PayDraftingGroupSubItem payDraftingGroupSubItem) {
@@ -134,7 +134,7 @@ public class PayDraftingGroupSubItemController extends JeroController<PayDraftin
      * @return
      */
     @AutoLog(value = "起草组成员-删除",operateType = 4)
-//    @RequiresPermissions("draftingGroupMember:delete")
+    @RequiresPermissions("draftingGroupMember:delete")
     @ApiOperation(value = "起草组成员-通过id删除", notes = "起草组成员-通过id删除")
     @GetMapping(value = "/delete")
     public Result<?> delete(@RequestParam(name = "id") String id) {
@@ -148,7 +148,7 @@ public class PayDraftingGroupSubItemController extends JeroController<PayDraftin
      * @param ids 起草组成员ids 逗号分隔
      * @return
      */
-//    @RequiresPermissions("draftingGroupMember:batchDel")
+    @RequiresPermissions("draftingGroupMember:batchDel")
     @ApiOperation(value = "起草组成员-批量删除", notes = "起草组成员-批量删除")
     @GetMapping(value = "/deleteBatch")
     public Result<?> deleteBatch(@RequestParam(name = "ids") String ids) {
@@ -163,7 +163,7 @@ public class PayDraftingGroupSubItemController extends JeroController<PayDraftin
      * @return
      */
     @AutoLog(value = "工作组成员-修改",operateType = 3)
-//    @RequiresPermissions("draftingGroupMember:edit")
+    @RequiresPermissions("draftingGroupMember:edit")
     @ApiOperation(value = "工作组成员-编辑", notes = "工作组成员-编辑")
     @PostMapping(value = "/edit")
     public Result<?> edit(@RequestBody PayDraftingGroupSubItem payDraftingGroupSubItem) {
@@ -197,7 +197,7 @@ public class PayDraftingGroupSubItemController extends JeroController<PayDraftin
      *
      * @return
      */
-//    @RequiresPermissions("draftingGroupMember:downTemplate")
+    @RequiresPermissions("draftingGroupMember:downTemplate")
     @ApiOperation(value = "起草组成员-模板下载", notes = "起草组成员-模板下载")
     @GetMapping(value = "/downloadExcelModel")
     public ModelAndView downloadExcelModel() {
@@ -211,7 +211,7 @@ public class PayDraftingGroupSubItemController extends JeroController<PayDraftin
      * @return
      */
     @AutoLog(value = "起草组成员-excel导入数据",operateType = 5)
-//    @RequiresPermissions("draftingGroupMember:import")
+    @RequiresPermissions("draftingGroupMember:import")
     @PostMapping(value = "/importExcel")
     @ApiOperation(value = "起草组成员-通过excel导入数据", notes = "起草组成员-通过excel导入数据")
     public Result<?> importExcel(HttpServletRequest request) {
@@ -230,7 +230,7 @@ public class PayDraftingGroupSubItemController extends JeroController<PayDraftin
      * @param payDraftingGroupSubItem 起草组成员
      */
     @AutoLog(value = "起草组成员-导出excel",operateType = 6)
-//    @RequiresPermissions("draftingGroupMember:export")
+    @RequiresPermissions("draftingGroupMember:export")
     @GetMapping(value = "/exportXls")
     @ApiOperation(value = "起草组成员-导出excel", notes = "起草组成员-导出excel")
     public ModelAndView exportXls(HttpServletRequest request,
@@ -364,7 +364,6 @@ public class PayDraftingGroupSubItemController extends JeroController<PayDraftin
                     }
                 }
                 excelList.add(excel);
-                System.err.println(excelList);
             }
         }
         return super.exportListXls(excelList, PayDraftingGroupSubItemExcel.class, "起草组成员");
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroupSubItem.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroupSubItem.java
index c8829e25..d562317d 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroupSubItem.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroupSubItem.java
@@ -417,4 +417,8 @@ public class PayDraftingGroupSubItem implements Serializable {
     @TableField(exist = false)
     @Dict(dicCode = "yn")
     private Integer mailRemind;
+
+    /**审核状态 1:待审核 2:已通过 3:已驳回**/
+    @ApiModelProperty(value = "审核状态")
+    private Integer checkResult;
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupSubItemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupSubItemMapper.xml
index 499826f5..4a55975e 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupSubItemMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupSubItemMapper.xml
@@ -21,6 +21,7 @@
         pdgs.contacts_temporary_id_three AS contactsTemporaryIdThree,
         pdgs.contacts_temporary_name_three AS contactsTemporaryNameThree,
         pdgs.remarks,
+        pdgs.check_result AS checkResult,
         pdgs.create_by AS createBy,
         pdgs.create_time AS createTime,
         pdgs.update_by AS updateBy
@@ -28,7 +29,7 @@
         left join pay_company_management_temporary pcmt on pdgs.charge_company_temporary_id = pcmt.id
         left join pay_company_management pcm on pcmt.company_id = pcm.id
         <where>
-            pdgs.drafting_group_id = #{payDraftingGroupSubItem.draftingGroupId}
+            pdgs.drafting_group_id = #{payDraftingGroupSubItem.draftingGroupId} AND (pdgs.check_result = 1 OR pdgs.check_result = 2)
             <if test="payDraftingGroupSubItem.chargeCompanyTemporaryName != null and payDraftingGroupSubItem.chargeCompanyTemporaryName != ''">
                 AND pcm.company_name LIKE
                 concat('%',concat(#{payDraftingGroupSubItem.chargeCompanyTemporaryName},'%'))
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java
index 493ae75d..efe83b30 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java
@@ -159,7 +159,7 @@ public class PayDraftingGroupServiceImpl extends ServiceImpl<PayDraftingGroupMap
             throw new JeroBootException("该起草组不存在！");
         }
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        if (!rolePermissionService.getRolePermission("draftingGroupProject:delete") && !Objects.equals(payDraftingGroupOld.getPrincipalIdA(), sysUser.getId())) {
+        if (!rolePermissionService.getRolePermission("draftingGroup:delete") && !Objects.equals(payDraftingGroupOld.getPrincipalIdA(), sysUser.getId())) {
             throw new JeroBootException(payDraftingGroupOld.getDraftingGroupProject() + "起草组项目不可操作！");
         }
 
@@ -199,7 +199,7 @@ public class PayDraftingGroupServiceImpl extends ServiceImpl<PayDraftingGroupMap
                 throw new JeroBootException("起草组不存在！");
             }
             LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-            if (!rolePermissionService.getRolePermission("draftingGroupProject:batchDel") && !Objects.equals(payDraftingGroupOld.getPrincipalIdA(), sysUser.getId())) {
+            if (!rolePermissionService.getRolePermission("draftingGroup:batchDel") && !Objects.equals(payDraftingGroupOld.getPrincipalIdA(), sysUser.getId())) {
                 sb.append(payDraftingGroupOld.getDraftingGroupProject() + "起草组项目不可操作！<br/>");
             }
             LambdaQueryWrapper<PayDraftingGroupSubItem> query = new LambdaQueryWrapper<>();