历史遗留问题

module_kzks/src/main/java/org/jeecg/dataSync/task/MaterialProcurementDataSync.java

@@ -3,8 +3,8 @@ package org.jeecg.dataSync.task;
 import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.TypeReference;
 import org.apache.commons.lang3.ObjectUtils;
-import org.jeecg.modules.KzksCostModelClPrice.entity.KzksCostModelClPrice;
-import org.jeecg.modules.KzksCostModelClPrice.service.IKzksCostModelClPriceService;
+import org.jeecg.modules.kzksCostModelClPrice.entity.KzksCostModelClPrice;
+import org.jeecg.modules.kzksCostModelClPrice.service.IKzksCostModelClPriceService;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;

module_kzks/src/main/java/org/jeecg/modules/costModelClPrice/service/impl/CostModelClPriceServiceImpl.java

@@ -19,7 +19,7 @@ import java.util.List;
  * @Version: V1.0
  */
 @Service
-@TargetDataSource(value = DataSourceType.SLAVE)
+@TargetDataSource
 public class CostModelClPriceServiceImpl extends ServiceImpl<CostModelClPriceMapper, CostModelClPrice> implements ICostModelClPriceService {
 
     @Autowired

module_kzks/src/main/java/org/jeecg/modules/kyBgInfo/service/impl/KyBgInfoServiceImpl.java

@@ -27,7 +27,7 @@ import java.util.List;
  * @Version: V1.0
  */
 @Service
-@TargetDataSource(value = DataSourceType.SLAVE)
+@TargetDataSource
 public class KyBgInfoServiceImpl extends ServiceImpl<KyBgInfoMapper, KyBgInfo> implements IKyBgInfoService {
 
     @Autowired

module_kzks/src/main/java/org/jeecg/modules/kyTaskInfo/service/impl/KyTaskInfoServiceImpl.java

@@ -19,7 +19,7 @@ import java.util.List;
  * @Version: V1.0
  */
 @Service
-@TargetDataSource(value = DataSourceType.SLAVE)
+@TargetDataSource
 public class KyTaskInfoServiceImpl extends ServiceImpl<KyTaskInfoMapper, KyTaskInfo> implements IKyTaskInfoService {
 
     @Autowired

module_kzks/src/main/java/org/jeecg/modules/kzksCostModelClPrice/controller/KzksCostModelClPriceController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.KzksCostModelClPrice.controller;
+package org.jeecg.modules.kzksCostModelClPrice.controller;
 
 import java.util.Arrays;
 import java.util.List;
@@ -12,14 +12,14 @@ 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.KzksCostModelClPrice.entity.KzksCostModelClPrice;
-import org.jeecg.modules.KzksCostModelClPrice.service.IKzksCostModelClPriceService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.kzksCostModelClPrice.entity.KzksCostModelClPrice;
+import org.jeecg.modules.kzksCostModelClPrice.service.IKzksCostModelClPriceService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;

module_kzks/src/main/java/org/jeecg/modules/kzksCostModelClPrice/entity/KzksCostModelClPrice.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.KzksCostModelClPrice.entity;
+package org.jeecg.modules.kzksCostModelClPrice.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;

module_kzks/src/main/java/org/jeecg/modules/kzksCostModelClPrice/mapper/KzksCostModelClPriceMapper.java

@@ -1,12 +1,11 @@
-package org.jeecg.modules.KzksCostModelClPrice.mapper;
+package org.jeecg.modules.kzksCostModelClPrice.mapper;
 
-import java.util.List;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
-import org.jeecg.modules.KzksCostModelClPrice.entity.KzksCostModelClPrice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.kzksCostModelClPrice.entity.KzksCostModelClPrice;
+
 
 /**
  * @Description: kzks_cost_model_cl_price

module_kzks/src/main/java/org/jeecg/modules/kzksCostModelClPrice/mapper/xml/KzksCostModelClPriceMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.KzksCostModelClPrice.mapper.KzksCostModelClPriceMapper">
+<mapper namespace="org.jeecg.modules.kzksCostModelClPrice.mapper.KzksCostModelClPriceMapper">
 
 </mapper>

module_kzks/src/main/java/org/jeecg/modules/kzksCostModelClPrice/service/IKzksCostModelClPriceService.java

@@ -1,7 +1,8 @@
-package org.jeecg.modules.KzksCostModelClPrice.service;
+package org.jeecg.modules.kzksCostModelClPrice.service;
+
 
-import org.jeecg.modules.KzksCostModelClPrice.entity.KzksCostModelClPrice;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.kzksCostModelClPrice.entity.KzksCostModelClPrice;
 
 /**
  * @Description: kzks_cost_model_cl_price

module_kzks/src/main/java/org/jeecg/modules/kzksCostModelClPrice/service/impl/KzksCostModelClPriceServiceImpl.java

@@ -1,12 +1,12 @@
-package org.jeecg.modules.KzksCostModelClPrice.service.impl;
+package org.jeecg.modules.kzksCostModelClPrice.service.impl;
 
-import org.jeecg.modules.KzksCostModelClPrice.entity.KzksCostModelClPrice;
-import org.jeecg.modules.KzksCostModelClPrice.mapper.KzksCostModelClPriceMapper;
-import org.jeecg.modules.KzksCostModelClPrice.service.IKzksCostModelClPriceService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.kzksCostModelClPrice.entity.KzksCostModelClPrice;
+import org.jeecg.modules.kzksCostModelClPrice.mapper.KzksCostModelClPriceMapper;
+import org.jeecg.modules.kzksCostModelClPrice.service.IKzksCostModelClPriceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
  * @Description: kzks_cost_model_cl_price

module_kzks/src/main/java/org/jeecg/modules/mesInfo/service/impl/MesInfoServiceImpl.java

@@ -27,7 +27,7 @@ import java.util.List;
  * @Version: V1.0
  */
 @Service
-@TargetDataSource(value = DataSourceType.SLAVE)
+@TargetDataSource
 public class MesInfoServiceImpl extends ServiceImpl<MesInfoMapper, MesInfo> implements IMesInfoService {
 
     @Autowired

module_kzks/src/main/java/org/jeecg/modules/mesInfoInstallationcost/service/impl/MesInfoInstallationcostServiceImpl.java

@@ -15,7 +15,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  * @Date:   2023-08-22
  * @Version: V1.0
  */
-@TargetDataSource(value = DataSourceType.SLAVE)
+@TargetDataSource
 @Service
 public class MesInfoInstallationcostServiceImpl extends ServiceImpl<MesInfoInstallationcostMapper, MesInfoInstallationcost> implements IMesInfoInstallationcostService {
 

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

@@ -24,7 +24,7 @@ import java.util.List;
  * @Version: V1.0
  */
 @Service
-@TargetDataSource(value = DataSourceType.SLAVE)
+@TargetDataSource
 public class ProjectCostServiceImpl extends ServiceImpl<ProjectCostMapper, ProjectCost> implements IProjectCostService {
 
     @Autowired

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

@@ -18,7 +18,6 @@ import org.jeecg.modules.projectCost.entity.ProjectCost;
 import org.jeecg.modules.projectCost.entity.ProjectCostSumVo;
 import org.jeecg.modules.projectCost.service.IProjectCostService;
 import org.jeecg.modules.projectCost.vo.ProjectCostVO;
-import org.jeecg.modules.projectCostHuiji.convert.ProjectCostHuijiCustomConvert;
 import org.jeecg.modules.projectCostHuiji.convert.impl.ProjectCostHuijiConverCustomImpl;
 import org.jeecg.modules.projectCostHuiji.convert.ProjectCostHuijiConvert;
 import org.jeecg.modules.projectCostHuiji.entity.ProjectCostHuiji;
@@ -125,7 +124,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> page = new Page<>(pageNo, pageSize);
 
         CompletableFuture<Page<ProjectCostHuiji>> pageFuture = CompletableFuture.supplyAsync(() -> {
             return projectCostHuijiService.costHuijPage(page, queryWrapper);

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

@@ -23,7 +23,7 @@ import java.util.List;
  * @Version: V1.0
  */
 @Service
-@TargetDataSource(value = DataSourceType.SLAVE)
+@TargetDataSource
 public class ProjectCostHuijiServiceImpl extends ServiceImpl<ProjectCostHuijiMapper, ProjectCostHuiji> implements IProjectCostHuijiService {
 
     @Autowired

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

@@ -22,7 +22,7 @@ import java.util.List;
  * @Version: V1.0
  */
 @Service
-@TargetDataSource(value = DataSourceType.SLAVE)
+@TargetDataSource
 public class WzOutboundOrderBServiceImpl extends ServiceImpl<WzOutboundOrderBMapper, WzOutboundOrderB> implements IWzOutboundOrderBService {
 
     @Autowired

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

@@ -28,7 +28,7 @@ import java.util.List;
  * @Version: V1.0
  */
 @Service
-@TargetDataSource(value = DataSourceType.SLAVE)
+@TargetDataSource
 public class WzOutboundOrderHServiceImpl extends ServiceImpl<WzOutboundOrderHMapper, WzOutboundOrderH> implements IWzOutboundOrderHService {
 
     @Autowired