diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java index ec589851..ede3e42b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java @@ -184,11 +184,12 @@ public class PayWorkingGroupController extends JeroController queryListByNotCompany(@RequestParam(name = "companyId") String companyId) { + public Result queryListByNotCompany(@RequestParam(name = "companyId") String companyId, + @RequestParam(name = "workingGroupProject", required = false) String workingGroupProject) { if(StringUtils.isBlank(companyId)){ return Result.error("企业id不能为空!"); } - List list = payWorkingGroupService.queryListByNotCompany(companyId); + List list = payWorkingGroupService.queryListByNotCompany(companyId,workingGroupProject); return Result.OK(list); } /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java index f4761483..24322ad4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java @@ -52,7 +52,7 @@ public interface PayWorkingGroupMapper extends BaseMapper { * @Return * @Exception */ - List queryListByNotCompany(@Param("companyId") String companyId); + List queryListByNotCompany(@Param("companyId") String companyId, @Param("workingGroupProject") String workingGroupProject); /** * @Description 工作组统计 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml index 2aeea262..3ec03dc8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml @@ -132,6 +132,9 @@ update_time AS updateTime FROM pay_working_group WHERE id NOT IN (SELECT working_group_id FROM pay_working_group_subitem WHERE charge_company_id=#{companyId}) + + and working_group_project like concat('%',#{workingGroupProject},'%') + projectId, diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java index 86ef19b0..a5fda272 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java @@ -9,7 +9,6 @@ import com.jero.project.entity.PayWorkingGroup; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.statistics.entity.*; -import java.util.ArrayList; import java.util.List; /** @@ -45,7 +44,7 @@ public interface IPayWorkingGroupService extends IService { * @Return * @Exception */ - List queryListByNotCompany(String companyId); + List queryListByNotCompany(String companyId, String workingGroupProject); /** * @Description 根据id删除 * @Author lqt diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java index 525f4684..da2ad612 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java @@ -94,8 +94,8 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl queryListByNotCompany(String companyId) { - return payWorkingGroupMapper.queryListByNotCompany(companyId); + public List queryListByNotCompany(String companyId, String workingGroupProject) { + return payWorkingGroupMapper.queryListByNotCompany(companyId,workingGroupProject); } @Override