add 工作组项目-查询不存在成员单位的列表 增加查询参数

jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java

@@ -184,11 +184,12 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 	  */
 	 @ApiOperation(value="工作组项目-查询不存在成员单位的列表", notes="工作组项目-查询不存在成员单位的列表")
 	 @GetMapping(value = "/queryListByNotCompany")
-	 public Result<?> 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<PayWorkingGroup> list = payWorkingGroupService.queryListByNotCompany(companyId);
+		 List<PayWorkingGroup> list = payWorkingGroupService.queryListByNotCompany(companyId,workingGroupProject);
 		 return Result.OK(list);
 	 }
 	/**

jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java

@@ -52,7 +52,7 @@ public interface PayWorkingGroupMapper extends BaseMapper<PayWorkingGroup> {
      * @Return
      * @Exception
      */
-    List<PayWorkingGroup> queryListByNotCompany(@Param("companyId") String companyId);
+    List<PayWorkingGroup> queryListByNotCompany(@Param("companyId") String companyId, @Param("workingGroupProject") String workingGroupProject);
 
     /**
      * @Description 工作组统计

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})
+        <if test="workingGroupProject != null and workingGroupProject != ''">
+            and working_group_project like concat('%',#{workingGroupProject},'%')
+        </if>
     </select>
     <sql id="v_statistical_confirm_sql">
         projectId,

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<PayWorkingGroup> {
     * @Return
     * @Exception
     */
-    List<PayWorkingGroup> queryListByNotCompany(String companyId);
+    List<PayWorkingGroup> queryListByNotCompany(String companyId, String workingGroupProject);
     /**
     * @Description 根据id删除
     * @Author  lqt

jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java

@@ -94,8 +94,8 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
     }
 
     @Override
-    public List<PayWorkingGroup> queryListByNotCompany(String companyId) {
-        return payWorkingGroupMapper.queryListByNotCompany(companyId);
+    public List<PayWorkingGroup> queryListByNotCompany(String companyId, String workingGroupProject) {
+        return payWorkingGroupMapper.queryListByNotCompany(companyId,workingGroupProject);
     }
 
     @Override