From 4bd3971f29e7dbe810f02778f2823158b5c459b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Fri, 15 Oct 2021 15:49:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=B9=B4=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/jero/common/common/RoleCommon.java    | 4 ----
 .../jero/project/controller/PayCommonProjectController.java | 3 +++
 .../controller/PayWorkingGroupSubItemController.java        | 2 ++
 .../com/jero/project/entity/PayWorkingGroupSubItem.java     | 6 ++++++
 .../project/mapper/xml/PayWorkingGroupSubItemMapper.xml     | 3 +++
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/common/RoleCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/common/RoleCommon.java
index 5d055584..8120f629 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/common/common/RoleCommon.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/common/RoleCommon.java
@@ -2,10 +2,6 @@ package com.jero.common.common;
 
 public class RoleCommon {
 
-    /**
-     * 项目负责人
-     */
-    public final static String XMFZR = "xmfzr";
     /**
      * 财务人员
      */
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
index 28b8ad5c..21f2aa32 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
@@ -226,6 +226,9 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 		 }else{
 			 queryWrapper.in("id", Arrays.asList(""));
 		 }
+		 if(!StringUtils.isEmpty(payCommonProject.getYear())){
+			 queryWrapper.eq("year",payCommonProject.getYear());
+		 }
 		 if(!StringUtils.isEmpty(payCommonProject.getChargeProject())){
 			 queryWrapper.like("charge_project",payCommonProject.getChargeProject());
 		 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
index 4f795639..385eb9ae 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
@@ -241,7 +241,9 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 				 List<PayWorkingGroup> listPrincipalIdA = listPayWorkingGroup.stream().filter(item->Objects.equals(item.getId(),p.getWorkingGroupId())).collect(Collectors.toList());
 				 if(!CollectionUtils.isEmpty(listPrincipalIdA)){
 				 	p.setPrincipalName(listPrincipalIdA.get(0).getPrincipalNameA());
+				 	p.setYear(listPrincipalIdA.get(0).getYear());
 				 }
+
 			 });
 			 pageList.setRecords(list);
 		 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java
index 535c2ebe..d10e8a49 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java
@@ -223,4 +223,10 @@ public class PayWorkingGroupSubItem implements Serializable {
     @TableField(exist = false)
     @ApiModelProperty(value = "负责人")
     private String principalName;
+    /**
+     * 运行年份
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "运行年份")
+    private String year;
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml
index 1bbdeb7a..214cbed9 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml
@@ -189,6 +189,9 @@
             <if test="payWorkingGroupSubItem.pack != null">
                 AND pwgs.pack = #{payWorkingGroupSubItem.pack}
             </if>
+            <if test="year != null and year != ''">
+                AND pwg.year = #{year}
+            </if>
             <if test="listNeedInvoice != null and listNeedInvoice.size() > 0">
                 AND pwgs.need_invoice in
                  <foreach collection="listNeedInvoice" index="index" item="item" open="(" close=")" separator=",">