From 91e2faba699cbf7e1591df237e1f0d0dc8ed3587 Mon Sep 17 00:00:00 2001
From: zhangqinlin <1500920753@qq.com>
Date: Wed, 1 Sep 2021 11:56:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/jero/data/entity/ChildrenFindByName.java | 3 +++
 .../com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml | 3 ++-
 .../java/com/jero/mail/controller/PayMailBillController.java   | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/ChildrenFindByName.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/ChildrenFindByName.java
index f034ed49..5e738644 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/ChildrenFindByName.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/ChildrenFindByName.java
@@ -7,6 +7,9 @@ import java.io.Serializable;
 @Data
 public class ChildrenFindByName implements Serializable {
 
+    @ApiModelProperty(value = "分标委成员id")
+    private java.lang.String childrenId;
+
     @ApiModelProperty(value = "企业名称")
     private java.lang.String companyName;
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml
index b539a421..9ff5fb3a 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml
@@ -5,6 +5,7 @@
         <id property="id" column="id"></id>
         <result property="name" column="name"></result>
         <collection property="list" ofType="com.jero.data.entity.ChildrenFindByName" javaType="java.util.List">
+            <id property="childrenId" column="childrenId"></id>
             <result property="companyName" column="companyName"></result>
             <result property="post" column="post"></result>
             <result property="phone" column="phone"></result>
@@ -12,7 +13,7 @@
         </collection>
     </resultMap>
     <select id="list"  resultMap="people">
-       SELECT pe.id as id,pt.name as peopleName,pm.company_name as companyName,pt.post as post,pt.phone as phone ,pe.name as name
+       SELECT pe.id as id,pt.name as peopleName,pm.company_name as companyName,pt.post as post,pt.phone as phone ,pe.name as name,pm.id as childrenId
        from
         pay_case_committee pe
         left JOIN pay_case_committee_subitem pm on (pe.id = pm.committee_id)
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
index 942ecced..69675e92 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.aspect.annotation.DictPoint;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.mail.entity.PayMailBill;
@@ -45,6 +46,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 	 */
 	@AutoLog(value = "票据邮寄-分页列表查询")
 	@ApiOperation(value="票据邮寄-分页列表查询", notes="票据邮寄-分页列表查询")
+	@DictPoint
 	@GetMapping(value = "/list")
 	public Result<?> queryPageList(PayMailBill payMailBill,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,