工作组添加年份

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";
     /**
      * 财务人员
      */

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());
 		 }

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);
 		 }

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;
 }

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=",">