From e546ee328c811623ce1eb8891ebd2cc1fef4532b Mon Sep 17 00:00:00 2001
From: sunzheng <sunzheng.cn>
Date: Thu, 11 Jan 2024 15:24:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BC=81=E4=B8=9A=E7=AB=AF?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=B5=B7=E8=8D=89=E7=BB=84=E6=88=90=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayDraftingGroupSubItemController.java    | 45 +++++++++++++------
 .../xml/PayDraftingGroupSubItemMapper.xml     |  3 ++
 2 files changed, 35 insertions(+), 13 deletions(-)

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 fa03d042..c7f61c6f 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
@@ -78,19 +78,7 @@ public class PayDraftingGroupSubItemController extends JeroController<PayDraftin
     @Resource
     private IPayContactsManagementTemporaryService payContactsManagementTemporaryService;
     @Resource
-    private IPayMailBillService payMailBillService;
-    @Resource
-    private IPayPackCompanyService payPackCompanyService;
-    @Resource
-    private IPayMailBillProjectService payMailBillProjectService;
-    @Resource
-    private IPayIncomeContractAssociatedService payIncomeContractAssociatedService;
-    @Resource
     private ISysUserService sysUserService;
-    @Resource
-    private IPayPackCompanyProjectService payPackCompanyProjectService;
-    @Resource
-    private IPayIncomeContractService payIncomeContractService;
 
     /**
      * 分页列表查询
@@ -122,7 +110,7 @@ public class PayDraftingGroupSubItemController extends JeroController<PayDraftin
             return Result.error("起草组不存在！");
         }
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        if(!rolePermissionService.getRolePermission("draftingGroup:underStudy:search") && !Objects.equals(payDraftingGroup.getPrincipalIdA(),sysUser.getId())){
+        if(!rolePermissionService.getRolePermission("draftingGroupMember:search") && !Objects.equals(payDraftingGroup.getPrincipalIdA(),sysUser.getId())){
             return Result.error("数据权限不足！");
         }
         Page<PayDraftingGroupSubItem> page = new Page<>(pageNo, pageSize);
@@ -502,4 +490,35 @@ public class PayDraftingGroupSubItemController extends JeroController<PayDraftin
         payDraftingGroupSubItemService.checkRegister(checkVO);
         return Result.OK("审核成功!");
     }
+
+    /**
+     * 分页列表查询
+     *
+     * @param payDraftingGroupSubItem 起草组成员
+     * @return
+     */
+    @ApiOperation(value = "企业端-查询起草组成员", notes = "起草组成员-分页列表查询")
+    @GetMapping(value = "/getItemById")
+    public Result<?> query(PayDraftingGroupSubItem payDraftingGroupSubItem,
+                           @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                           @RequestParam(name = "paymentDate", required = false) String paymentDate) {
+        if (!StringUtils.isBlank(payDraftingGroupSubItem.getChargeCompanyTemporaryName()) && payDraftingGroupSubItem.getChargeCompanyTemporaryName().length() > 50) {
+            return Result.error("成员单位长度不能大于50个字符");
+        }
+        if (StringUtils.isBlank(payDraftingGroupSubItem.getDraftingGroupId())) {
+            return Result.error("起草组id不能为空！");
+        }
+        if (StringUtils.isBlank(payDraftingGroupSubItem.getId())) {
+            return Result.error("起草组成员id不能为空！");
+        }
+        PayDraftingGroup payDraftingGroup = payDraftingGroupService.getById(payDraftingGroupSubItem.getDraftingGroupId());
+        if(Objects.isNull(payDraftingGroup)){
+            return Result.error("起草组不存在！");
+        }
+        Page<PayDraftingGroupSubItem> page = new Page<>(pageNo, pageSize);
+        IPage<PayDraftingGroupSubItem> pageList = payDraftingGroupSubItemService.queryPageList(page, payDraftingGroupSubItem, paymentDate);
+        PayDraftingGroupSubItem item = pageList.getRecords().get(0);
+        return Result.OK(item);
+    }
 }
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 e96a25a5..bf073555 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
@@ -34,6 +34,9 @@
                 AND pcm.company_name LIKE
                 concat('%',concat(#{payDraftingGroupSubItem.chargeCompanyTemporaryName},'%'))
             </if>
+            <if test="payDraftingGroupSubItem.id != null and payDraftingGroupSubItem.id != ''">
+                AND pdgs.id = #{payDraftingGroupSubItem.id}
+            </if>
         </where>
         GROUP BY pdgs.id
         ORDER BY pdgs.create_time desc