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 queryPageListCompany(PayMemberProjectSubitem payMemberProjectSubitem, + public Result> 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 queryWrapper = QueryGenerator.initQueryWrapper(payMemberProjectSubitem, req.getParameterMap()); + if (StringUtils.isNotBlank(payMemberProjectSubitem.getParticularYear())){ + queryWrapper.eq("pmp.particular_year",payMemberProjectSubitem.getParticularYear()); + } Page page = new Page<>(pageNo, pageSize); IPage 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 @@ +