Merge remote-tracking branch 'origin/master'

module_kzks/src/main/java/org/jeecg/modules/dataSourceSwitch/aspect/TargetDataSourceAspect.java

@@ -5,23 +5,17 @@ import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
-import org.aspectj.lang.reflect.MethodSignature;
-import org.jeecg.modules.dataSourceSwitch.annotation.TargetDataSource;
-import org.jeecg.modules.dataSourceSwitch.manage.DataSourceManagement;
-import org.jeecg.modules.dataSourceSwitch.service.ISwitchDataSourceService;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.jeecg.modules.dataSourceSwitch.datasource.DynamicDataSourceContextHolder;
+import org.jeecg.modules.dataSourceSwitch.enums.DataSourceType;
+import org.jeecg.modules.dataSourceSwitch.mark.DataSourceMark;
 import org.springframework.stereotype.Component;
 
-import java.lang.reflect.Method;
 
+@Slf4j
 @Component
 @Aspect
-@Slf4j
 public class TargetDataSourceAspect {
 
-    @Autowired
-    private ISwitchDataSourceService switchDataSourceService;
-
     @Pointcut("@annotation(org.jeecg.modules.dataSourceSwitch.annotation.TargetDataSource) || @within(org.jeecg.modules.dataSourceSwitch.annotation.TargetDataSource)")
     public void dsPointCut() {
     }
@@ -29,35 +23,14 @@ public class TargetDataSourceAspect {
     @Around("dsPointCut()")
     public Object around(ProceedingJoinPoint point) throws Throwable {
 
-        String dataSourceType = DataSourceManagement.getDataSourceType();
-        log.info("原数据源为："+dataSourceType);
-//        DataSourceManagement.setDataSourceType("MASTER");
-        Integer type = switchDataSourceService.getType();
-
-        TargetDataSource annotation = null;
-        Class<? extends Object> target = point.getTarget().getClass();//获得当前访问的class
-
-        if(target.isAnnotationPresent(TargetDataSource.class)){ // 判断是否存在@注解
-            annotation = target.getAnnotation(TargetDataSource.class);// 判断类上是否标注着注解
-            log.info("类上标注了注解,type="+type);
-
-            if ("SLAVE".equals(annotation.value().name()) && type != null && type == 1){
-                DataSourceManagement.setDataSourceType(annotation.value().name());
-            }
-        }else{
-            Method method = ((MethodSignature) point.getSignature()).getMethod();// 得到访问的方法对象
-            if(method.isAnnotationPresent(TargetDataSource.class)){// 判断方法上是否标注着注解，如果类和方法上都没有标注，则报错
-                annotation = method.getAnnotation(TargetDataSource.class);
-                log.info("方法上标注了注解,type="+type);
+        System.out.println("------------------------MARK值为："+DataSourceMark.MARK);
 
-                if ("SLAVE".equals(annotation.value().name()) && type != null && type == 1){
-                    DataSourceManagement.setDataSourceType(annotation.value().name());// 取出注解中的数据源名
-                }
-                log.info(annotation.value().name()+type);
-            }else{
-                throw new RuntimeException("@TargetDataSource注解只能用于类或者方法上, 错误出现在:[" +
-                        target.toString() +" " + method.toString() + "];");
-            }
+        if (DataSourceMark.MARK == null) {
+            DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
+        } else if (DataSourceMark.MARK.equals(1)) {
+            DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.SLAVE.name());
+        } else {
+            DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
         }
 
         try
@@ -67,7 +40,7 @@ public class TargetDataSourceAspect {
         finally
         {
             // 销毁数据源 在执行方法之后
-            DataSourceManagement.clearDataSourceType();
+            DynamicDataSourceContextHolder.clearDataSourceType();
         }
 
     }

module_kzks/src/main/java/org/jeecg/modules/dataSourceSwitch/controller/SwitchDataSourceController.java

@@ -1,42 +1,26 @@
 package org.jeecg.modules.dataSourceSwitch.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.dataSourceSwitch.entity.SwitchDataSource;
-import org.jeecg.modules.dataSourceSwitch.service.ISwitchDataSourceService;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+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.dataSourceSwitch.entity.SwitchDataSource;
+import org.jeecg.modules.dataSourceSwitch.service.ISwitchDataSourceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
 
- /**
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+/**
  * @Description: switch_data_source
  * @Author: jeecg-boot
  * @Date:   2023-08-27
@@ -57,10 +41,7 @@ public class SwitchDataSourceController extends JeecgController<SwitchDataSource
 	 @ApiOperation(value="数据源切换")
 	 @GetMapping(value = "/edit1")
 	 public Integer edit1(Integer type) {
-		 SwitchDataSource switchDataSource = new SwitchDataSource();
-		 switchDataSource.setId(1);
-		 switchDataSource.setType(type);
-		 switchDataSourceService.updateById(switchDataSource);
+		 switchDataSourceService.updateSwitchDataSource(type);
 		 return type;
 	 }
 

module_kzks/src/main/java/org/jeecg/modules/dataSourceSwitch/manage/DataSourceManagement.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.dataSourceSwitch.manage;
+package org.jeecg.modules.dataSourceSwitch.datasource;
 
 import org.jeecg.modules.dataSourceSwitch.enums.DataSourceType;
 import org.slf4j.Logger;
@@ -12,23 +12,27 @@ import javax.sql.DataSource;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+
+/**
+ * 数据源切换处理
+ */
 @Primary
 @Component
-public class DataSourceManagement extends AbstractRoutingDataSource {
-
+public class DynamicDataSourceContextHolder extends AbstractRoutingDataSource
+{
     @Resource
     private DataSource master;
 
     @Resource
     private DataSource slave;
 
-    public static final Logger log = LoggerFactory.getLogger(DataSourceManagement.class);
+    public static final Logger log = LoggerFactory.getLogger(DynamicDataSourceContextHolder.class);
 
     /**
      * 使用ThreadLocal维护变量，ThreadLocal为每个使用该变量的线程提供独立的变量副本，
      * 所以每一个线程都可以独立地改变自己的副本，而不会影响其它线程所对应的副本。
      */
-    public static final ThreadLocal<String> flag = new ThreadLocal<>();
+    private static final ThreadLocal<String> flag = new ThreadLocal<>();
 
     /**
      * 设置数据源的变量
@@ -57,13 +61,18 @@ public class DataSourceManagement extends AbstractRoutingDataSource {
 
 
 
-    public DataSourceManagement(){
+    public DynamicDataSourceContextHolder(){
         flag.set(DataSourceType.MASTER.name());
     }
 
+    /**
+     * AbstractRoutingDataSource的源码里
+     * 通过determineCurrentLookupKey 方法返回的key
+     * 去resolvedDataSources里面找对应的DataSource
+     * */
     @Override
     protected Object determineCurrentLookupKey() {
-        return flag.get();
+        return getDataSourceType();
     }
 
     @Override
@@ -75,6 +84,4 @@ public class DataSourceManagement extends AbstractRoutingDataSource {
         super.setDefaultTargetDataSource(master);
         super.afterPropertiesSet();
     }
-
-
 }

module_kzks/src/main/java/org/jeecg/modules/dataSourceSwitch/mapper/SwitchDataSourceMapper.java

@@ -12,6 +12,15 @@ import org.jeecg.modules.dataSourceSwitch.entity.SwitchDataSource;
  */
 public interface SwitchDataSourceMapper extends BaseMapper<SwitchDataSource> {
 
+    /**
+     * 修改switch
+     */
+    @Select("update switch_data_source set type =#{type} where id = 1")
+    public void updateSwitchDataSource(Integer type);
+
+    /**
+     * 查type
+     */
     @Select("select type from switch_data_source where id =1")
     public Integer getType();
 

module_kzks/src/main/java/org/jeecg/modules/dataSourceSwitch/mark/DataSourceMark.java

@@ -0,0 +1,7 @@
+package org.jeecg.modules.dataSourceSwitch.mark;
+
+public class DataSourceMark {
+
+    public static Integer MARK;
+
+}

module_kzks/src/main/java/org/jeecg/modules/dataSourceSwitch/runner/InitDataSourceTypeRunner.java

@@ -0,0 +1,26 @@
+package org.jeecg.modules.dataSourceSwitch.runner;
+
+
+import org.jeecg.modules.dataSourceSwitch.mark.DataSourceMark;
+import org.jeecg.modules.dataSourceSwitch.service.ISwitchDataSourceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.stereotype.Component;
+
+@Component
+public class InitDataSourceTypeRunner implements ApplicationRunner {
+
+    @Autowired
+    private ISwitchDataSourceService switchDataSourceService;
+
+    @Override
+    public void run(ApplicationArguments args) throws Exception {
+        Integer type = switchDataSourceService.getType();
+        if (type != null && type == 0) {
+            DataSourceMark.MARK = 0;
+        } else if (type != null && type == 1) {
+            DataSourceMark.MARK = 1;
+        }
+    }
+}

module_kzks/src/main/java/org/jeecg/modules/dataSourceSwitch/service/ISwitchDataSourceService.java

@@ -11,6 +11,14 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ISwitchDataSourceService extends IService<SwitchDataSource> {
 
+    /**
+     * 修改switch
+     */
+    public void updateSwitchDataSource(Integer type);
+
+    /**
+     * 查type
+     */
     public Integer getType();
 
 }

module_kzks/src/main/java/org/jeecg/modules/dataSourceSwitch/service/impl/SwitchDataSourceServiceImpl.java

@@ -1,12 +1,16 @@
 package org.jeecg.modules.dataSourceSwitch.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.ObjectUtils;
 import org.jeecg.modules.dataSourceSwitch.entity.SwitchDataSource;
 import org.jeecg.modules.dataSourceSwitch.mapper.SwitchDataSourceMapper;
+import org.jeecg.modules.dataSourceSwitch.mark.DataSourceMark;
 import org.jeecg.modules.dataSourceSwitch.service.ISwitchDataSourceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Objects;
+
 /**
  * @Description: switch_data_source
  * @Author: jeecg-boot
@@ -21,6 +25,21 @@ public class SwitchDataSourceServiceImpl extends ServiceImpl<SwitchDataSourceMap
     @SuppressWarnings("all")
     private SwitchDataSourceMapper switchDataSourceMapper;
 
+    /**
+     * 修改switch
+     */
+    public void updateSwitchDataSource(Integer type) {
+        if (ObjectUtils.isNotEmpty(type) && Objects.equals(type,1)){
+            DataSourceMark.MARK = 1;
+        }else {
+            DataSourceMark.MARK = 0;
+        }
+        switchDataSourceMapper.updateSwitchDataSource(type);
+    }
+
+    /**
+     * 查type
+     */
     public Integer getType(){
         return switchDataSourceMapper.getType();
     }

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
      */