改为各类自己的方法，避免公共类方法

module_kzks/src/main/java/org/jeecg/modules/projectCost/service/IProjectCostService.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.projectCost.service;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.projectCost.entity.ProjectCost;
 import org.jeecg.modules.projectCost.vo.ProjectCostListVO;
@@ -15,6 +16,9 @@ import java.util.List;
  */
 public interface IProjectCostService extends IService<ProjectCost> {
 
+    /**查询列表*/
+    List<ProjectCost> projectCostlist(Wrapper<ProjectCost> queryWrapper);
+
     /**根据批产任务号查询项目成本（批产主任务和批产子任务）*/
     public ProjectCostListVO getPCRWList(String pccode);
 

module_kzks/src/main/java/org/jeecg/modules/projectCost/service/impl/ProjectCostServiceImpl.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.projectCost.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.modules.dataSourceSwitch.annotation.TargetDataSource;
@@ -29,6 +30,11 @@ public class ProjectCostServiceImpl extends ServiceImpl<ProjectCostMapper, Proje
     @SuppressWarnings("all")
     private ProjectCostMapper projectCostMapper;
 
+    /**查询列表*/
+    public List<ProjectCost> projectCostlist(Wrapper<ProjectCost> queryWrapper) {
+        return this.getBaseMapper().selectList(queryWrapper);
+    }
+
     /**根据批产任务号查询项目成本（批产主任务和批产子任务）*/
     public ProjectCostListVO getPCRWList(String pccode){
         QueryWrapper<ProjectCost> queryWrapper = new QueryWrapper<>();

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/controller/ProjectCostHuijiController.java

@@ -89,7 +89,7 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
 	 * @return
 	 */
 	//@AutoLog(value = "项目成本汇集表-分页列表查询")
-	@ApiOperation(value="项目成本汇集——分页查询——两级（一级汇集、二级主任务及主批产任务及子任务及子批产任务）", notes="项目成本汇集——分页查询——两级（一级汇集、二级主任务及子任务）")
+	@ApiOperation(value="项目成本汇集——分页查询——汇总+两级（一级汇集、二级主任务及主批产任务及子任务及子批产任务）", notes="项目成本汇集——分页查询——两级（一级汇集、二级主任务及子任务）")
 	@GetMapping(value = "/list")
 	public Result<ProjectCostHuijiSumVO> queryPageList(ProjectCostHuiji projectCostHuiji,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -100,7 +100,7 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
 
 		QueryWrapper<ProjectCostHuiji> queryWrapper = QueryGenerator.initQueryWrapper(projectCostHuiji, req.getParameterMap());
 		Page<ProjectCostHuiji> page = new Page<ProjectCostHuiji>(pageNo, pageSize);
-		Page<ProjectCostHuiji> pageList = projectCostHuijiService.page(page, queryWrapper);
+		Page<ProjectCostHuiji> pageList = projectCostHuijiService.costHuijPage(page, queryWrapper);
 		if(pageList != null ){//costYsService
 			List<ProjectCostHuijiListVO> list=pageList.getRecords().stream().map(i -> {
 

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/service/IProjectCostHuijiService.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.projectCostHuiji.service;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.projectCostHuiji.entity.ProjectCostHuiji;
 
@@ -13,6 +15,12 @@ import java.util.List;
  */
 public interface IProjectCostHuijiService extends IService<ProjectCostHuiji> {
 
+
+    /**
+     * 分页查询
+     */
+    public Page<ProjectCostHuiji> costHuijPage(Page<ProjectCostHuiji> page, Wrapper<ProjectCostHuiji> queryWrapper);
+
     /**
      * 对比
      */

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/service/impl/ProjectCostHuijiServiceImpl.java

@@ -1,5 +1,8 @@
 package org.jeecg.modules.projectCostHuiji.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.dataSourceSwitch.annotation.TargetDataSource;
 import org.jeecg.modules.dataSourceSwitch.enums.DataSourceType;
 import org.jeecg.modules.projectCostHuiji.entity.ProjectCostHuiji;
@@ -27,6 +30,13 @@ public class ProjectCostHuijiServiceImpl extends ServiceImpl<ProjectCostHuijiMap
     private ProjectCostHuijiMapper huijiMapper;
 
     /**
+     * 分页查询
+     */
+    public Page<ProjectCostHuiji> costHuijPage(Page<ProjectCostHuiji> page, Wrapper<ProjectCostHuiji> queryWrapper) {
+        return this.getBaseMapper().selectPage(page, queryWrapper);
+    }
+
+    /**
      * 对比
      */
     public List<ProjectCostHuiji> compareListByIds(List<String> ids){

module_kzks/src/main/java/org/jeecg/modules/projectPushList/service/impl/ProjectPushListServiceImpl.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.projectPushList.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.kyTaskInfo.entity.KyTaskInfo;
 import org.jeecg.modules.kyTaskInfo.service.IKyTaskInfoService;
@@ -17,13 +18,10 @@ import org.jeecg.modules.projectPushSet.service.IProjectPushSetService;
 import org.jeecg.modules.system.entity.SysDepart;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.service.ISysDepartService;
-import org.jeecg.modules.system.service.ISysUserDepartService;
 import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -51,8 +49,6 @@ public class ProjectPushListServiceImpl extends ServiceImpl<ProjectPushListMappe
     @Autowired
     private IProjectCostService costService;
     @Autowired
-    private ISysUserDepartService userDepartService;
-    @Autowired
     private IKyTaskInfoService kyTaskInfoService;
     @Autowired
     private ISysUserService sysUserService;
@@ -84,7 +80,7 @@ public class ProjectPushListServiceImpl extends ServiceImpl<ProjectPushListMappe
                 projectCostQueryWrapper = new QueryWrapper<>();
                 projectCostQueryWrapper.eq("clf",new BigDecimal(0));
                 projectCostQueryWrapper.eq("cost_percent",stage);
-                List<ProjectCost> projectCostList1 = costService.list(projectCostQueryWrapper);
+                List<ProjectCost> projectCostList1 = costService.projectCostlist(projectCostQueryWrapper);
 
                 List<String> roleIds = Arrays.asList(set.getPushTo().split(","));
                 List<UserNameIDVO> userNameIdList = this.userNamesByRoleIds(roleIds);
@@ -117,7 +113,7 @@ public class ProjectPushListServiceImpl extends ServiceImpl<ProjectPushListMappe
                 projectCostQueryWrapper = new QueryWrapper<>();
                 projectCostQueryWrapper.eq("wxf",new BigDecimal(0));
                 projectCostQueryWrapper.eq("cost_percent",stage);
-                List<ProjectCost> projectCostList1 = costService.list(projectCostQueryWrapper);
+                List<ProjectCost> projectCostList1 = costService.projectCostlist(projectCostQueryWrapper);
 
                 List<String> roleIds = Arrays.asList(set.getPushTo().split(","));
                 List<UserNameIDVO> userNameIdList = this.userNamesByRoleIds(roleIds);
@@ -149,7 +145,7 @@ public class ProjectPushListServiceImpl extends ServiceImpl<ProjectPushListMappe
                 projectCostQueryWrapper = new QueryWrapper<>();
                 projectCostQueryWrapper.eq("gzjlwf",new BigDecimal(0));
                 projectCostQueryWrapper.eq("cost_percent",stage);
-                List<ProjectCost> projectCostList1 = costService.list(projectCostQueryWrapper);
+                List<ProjectCost> projectCostList1 = costService.projectCostlist(projectCostQueryWrapper);
                 List<String> roleIds = Arrays.asList(set.getPushTo().split(","));
                 List<UserNameIDVO> userNameIdList = this.userNamesByRoleIds(roleIds);
 
@@ -177,7 +173,7 @@ public class ProjectPushListServiceImpl extends ServiceImpl<ProjectPushListMappe
         QueryWrapper<ProjectCost> projectCostQueryWrapper= new QueryWrapper<>();
         projectCostQueryWrapper.eq("contractfpe",new BigDecimal(0));
         projectCostQueryWrapper.eq("cost_percent",stage);
-        List<ProjectCost> projectCostList1 = costService.list(projectCostQueryWrapper);
+        List<ProjectCost> projectCostList1 = costService.projectCostlist(projectCostQueryWrapper);
 
         for (ProjectCost cost:projectCostList1){
             String taskno = cost.getTaskno();
@@ -213,7 +209,7 @@ public class ProjectPushListServiceImpl extends ServiceImpl<ProjectPushListMappe
         projectCostQueryWrapper = new QueryWrapper<>();
         projectCostQueryWrapper.eq("taskmoney",new BigDecimal(0));
         projectCostQueryWrapper.eq("TaskMoney",stage);
-        List<ProjectCost> projectCostList2 = costService.list(projectCostQueryWrapper);
+        List<ProjectCost> projectCostList2 = costService.projectCostlist(projectCostQueryWrapper);
 
         for (ProjectCost cost:projectCostList2){
             String taskno = cost.getTaskno();

module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrder/controller/WzOutboundOrderHController.java

@@ -10,7 +10,6 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.projectCost.service.IProjectCostService;
 import org.jeecg.modules.wzOutboundOrder.convert.WzOutboundOrderBConvert;
 import org.jeecg.modules.wzOutboundOrder.entity.WzOutboundOrderH;
 import org.jeecg.modules.wzOutboundOrder.service.IWzOutboundOrderBService;
@@ -48,9 +47,6 @@ public class WzOutboundOrderHController extends JeecgController<WzOutboundOrderH
 	@Autowired
 	@SuppressWarnings("all")
 	private IWzOutboundOrderBService bService;
-	@Autowired
-	@SuppressWarnings("all")
-	private IProjectCostService projectCostService;
 
 
 	/**
@@ -147,7 +143,7 @@ public class WzOutboundOrderHController extends JeecgController<WzOutboundOrderH
 
 	 	QueryWrapper<WzOutboundOrderH> wrapper = new QueryWrapper<>();
 	 	wrapper.eq("rwh",taskno);
-	 	List<WzOutboundOrderH> list =wzOutboundOrderHService.list(wrapper);
+	 	List<WzOutboundOrderH> list =wzOutboundOrderHService.wzHlist(wrapper);
 	 	List<WzOutboundOrderH> list1 = new ArrayList<>();
 	 	if (list!=null && !list.isEmpty()) {
 			for (WzOutboundOrderH h:list){

module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrder/service/IWzOutboundOrderHService.java

@@ -1,9 +1,9 @@
 package org.jeecg.modules.wzOutboundOrder.service;
 
-import org.jeecg.modules.wzOutboundOrder.entity.WzOutboundOrderH;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.wzOutboundOrder.entity.WzOutboundOrderH;
 import org.jeecg.modules.wzOutboundOrder.vo.WzOutboundOrderBDetailListVO;
-import org.jeecg.modules.xmcbDetail.vo.ComContractInfoExchangeHTEVO;
 import org.springframework.web.servlet.ModelAndView;
 
 import java.util.List;
@@ -16,6 +16,9 @@ import java.util.List;
  */
 public interface IWzOutboundOrderHService extends IService<WzOutboundOrderH> {
 
+    /**查询列表*/
+    List<WzOutboundOrderH> wzHlist(Wrapper<WzOutboundOrderH> queryWrapper);
+
     /**
      * 导出材料费详情excel
      */

module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrder/service/impl/WzOutboundOrderHServiceImpl.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.wzOutboundOrder.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.dataSourceSwitch.annotation.TargetDataSource;
@@ -37,6 +38,11 @@ public class WzOutboundOrderHServiceImpl extends ServiceImpl<WzOutboundOrderHMap
     @Value("${jeecg.path.upload}")
     private String upLoadPath;
 
+    /**查询列表*/
+    public List<WzOutboundOrderH> wzHlist(Wrapper<WzOutboundOrderH> queryWrapper) {
+        return this.getBaseMapper().selectList(queryWrapper);
+    }
+
     /**
      * 导出材料费详情excel
      */