From 98efbe093c1c3e9b80ff1a25b3b6d141f8b1aa51 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 12 Oct 2021 17:22:27 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E8=B5=84=E6=96=99=E7=BD=91=E5=85=83=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C=E5=B9=B4=E4=BB=BD=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayMemberProjectSubitemController.java       | 6 +++++-
 .../com/jero/member/entity/PayMemberProjectSubitem.java     | 6 ++++++
 .../member/mapper/xml/PayMemberProjectSubitemMapper.xml     | 3 ++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java
index 5845f2e3..4aa20796 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java
@@ -26,6 +26,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.member.vo.PayMemberProjectSubitemExcel;
 import lombok.extern.slf4j.Slf4j;
 import com.jero.common.system.base.controller.JeroController;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.BeanUtils;
@@ -75,7 +76,7 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
      */
     @ApiOperation(value = "企业端 会员项目成员表-分页列表查询", notes = "企业联系人相关的资料网员项目")
     @GetMapping(value = "/pageCompany")
-    public Result<?> queryPageListCompany(PayMemberProjectSubitem payMemberProjectSubitem,
+    public Result<IPage<PayMemberProjectSubitem>> queryPageListCompany(PayMemberProjectSubitem payMemberProjectSubitem,
                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                    HttpServletRequest req) {
@@ -84,6 +85,9 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
         PayContactsManagement contactsManagement = contactsManagementService.getById(userId);
         payMemberProjectSubitem.setCompanyId(contactsManagement.getCompanyId());
         QueryWrapper<PayMemberProjectSubitem> queryWrapper = QueryGenerator.initQueryWrapper(payMemberProjectSubitem, req.getParameterMap());
+        if (StringUtils.isNotBlank(payMemberProjectSubitem.getParticularYear())){
+            queryWrapper.eq("pmp.particular_year",payMemberProjectSubitem.getParticularYear());
+        }
         Page<PayMemberProjectSubitem> page = new Page<>(pageNo, pageSize);
         IPage<PayMemberProjectSubitem> pageList = memberProjectSubitemService.queryPageListCompany(page, queryWrapper);
         return Result.OK(pageList);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java
index ad830b78..24ae6073 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java
@@ -259,4 +259,10 @@ public class PayMemberProjectSubitem implements Serializable {
     @TableField(exist = false)
     private String projectName;
 
+    /**
+     * 运行年份
+     */
+    @TableField(exist = false)
+    private String particularYear;
+
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml
index 4b7781a8..edc3febd 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml
@@ -30,10 +30,11 @@
         <result column="make_invoice" property="makeInvoice" />
         <result column="mail" property="mail" />
         <result column="project_name" property="projectName" />
+        <result column="particular_year" property="particularYear"/>
     </resultMap>
 
     <select id="queryPageListCompany" resultMap="MemberProjectSubitemResultMap">
-        select pmps.*,pmp.project_name from pay_member_project_subitem pmps
+        select pmps.*,pmp.project_name,pmp.particular_year from pay_member_project_subitem pmps
         left join pay_member_project pmp on pmps.project_id = pmp.id
         ${ew.customSqlSegment}
     </select>