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 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 @@ AND pwgs.pack = #{payWorkingGroupSubItem.pack} + + AND pwg.year = #{year} + AND pwgs.need_invoice in