Explorar o código

销售询价单(inquiry form)

yuansh hai 5 meses
pai
achega
61308e0744
Modificáronse 100 ficheiros con 249 adicións e 499 borrados
  1. 3 20
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/controller/BaseCompanyInformationController.java
  2. 3 20
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/controller/BaseExchangeRateController.java
  3. 4 20
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/controller/BaseProductArchiveController.java
  4. 5 21
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/controller/BaseProductClassController.java
  5. 4 21
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/controller/BaseProjectArchiveController.java
  6. 4 22
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/controller/BaseShipArchiveAccessoriesController.java
  7. 4 19
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/controller/BaseShipArchiveController.java
  8. 6 24
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/controller/BaseShipArchiveRelateCustomerController.java
  9. 3 20
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/controller/BaseTemplatesController.java
  10. 3 20
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/controller/SerialPatternController.java
  11. 2 1
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseCompanyInformation.java
  12. 1 1
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseExchangeRate.java
  13. 2 2
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseProductArchive.java
  14. 1 1
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseProductClass.java
  15. 1 1
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseProjectArchive.java
  16. 1 1
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseShipArchive.java
  17. 1 1
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseShipArchiveAccessories.java
  18. 1 1
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseShipArchiveRelateCustomer.java
  19. 1 1
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseTemplates.java
  20. 1 1
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/SerialPattern.java
  21. 2 5
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/BaseCompanyInformationMapper.java
  22. 2 5
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/BaseExchangeRateMapper.java
  23. 2 5
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/BaseProductArchiveMapper.java
  24. 2 5
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/BaseProductClassMapper.java
  25. 2 5
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/BaseProjectArchiveMapper.java
  26. 2 5
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/BaseShipArchiveAccessoriesMapper.java
  27. 2 5
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/BaseShipArchiveMapper.java
  28. 2 5
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/BaseShipArchiveRelateCustomerMapper.java
  29. 2 5
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/BaseTemplatesMapper.java
  30. 2 3
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/SerialPatternMapper.java
  31. 1 1
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/xml/BaseCompanyInformationMapper.xml
  32. 1 1
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/xml/BaseExchangeRateMapper.xml
  33. 1 1
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/xml/BaseProductArchiveMapper.xml
  34. 1 1
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/xml/BaseProductClassMapper.xml
  35. 1 1
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/xml/BaseProjectArchiveMapper.xml
  36. 1 1
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/xml/BaseShipArchiveAccessoriesMapper.xml
  37. 1 1
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/xml/BaseShipArchiveMapper.xml
  38. 1 1
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/xml/BaseShipArchiveRelateCustomerMapper.xml
  39. 1 1
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/xml/BaseTemplatesMapper.xml
  40. 2 2
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/xml/SerialPatternMapper.xml
  41. 2 2
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/IBaseCompanyInformationService.java
  42. 2 2
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/IBaseExchangeRateService.java
  43. 2 2
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/IBaseProductArchiveService.java
  44. 2 2
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/IBaseProductClassService.java
  45. 2 2
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/IBaseProjectArchiveService.java
  46. 2 2
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/IBaseShipArchiveAccessoriesService.java
  47. 2 2
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/IBaseShipArchiveRelateCustomerService.java
  48. 2 2
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/IBaseShipArchiveService.java
  49. 2 2
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/IBaseTemplatesService.java
  50. 2 2
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/ISerialPatternService.java
  51. 4 4
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/impl/BaseCompanyInformationServiceImpl.java
  52. 4 4
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/impl/BaseExchangeRateServiceImpl.java
  53. 4 4
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/impl/BaseProductArchiveServiceImpl.java
  54. 4 4
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/impl/BaseProductClassServiceImpl.java
  55. 4 4
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/impl/BaseProjectArchiveServiceImpl.java
  56. 4 4
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/impl/BaseShipArchiveAccessoriesServiceImpl.java
  57. 4 4
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/impl/BaseShipArchiveRelateCustomerServiceImpl.java
  58. 4 4
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/impl/BaseShipArchiveServiceImpl.java
  59. 4 4
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/impl/BaseTemplatesServiceImpl.java
  60. 4 4
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/impl/SerialPatternServiceImpl.java
  61. 10 15
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/controller/CuspCustomerProfileController.java
  62. 4 21
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/controller/CuspIntermediatorController.java
  63. 10 15
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/controller/CuspSupplierEvaluationController.java
  64. 4 21
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/controller/CuspSupplierProfileCatalogController.java
  65. 10 16
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/controller/CuspSupplierProfileController.java
  66. 1 1
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspCustomerProfile.java
  67. 1 1
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspCustomerProfileMan.java
  68. 1 1
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspIntermediator.java
  69. 1 1
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspSupplierEvaluation.java
  70. 1 1
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspSupplierEvaluationScore.java
  71. 1 1
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspSupplierProfile.java
  72. 1 1
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspSupplierProfileCatalog.java
  73. 1 1
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspSupplierProfileMan.java
  74. 1 1
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspSupplierProfileQualification.java
  75. 2 2
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/mapper/CuspCustomerProfileManMapper.java
  76. 2 5
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/mapper/CuspCustomerProfileMapper.java
  77. 2 5
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/mapper/CuspIntermediatorMapper.java
  78. 2 5
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/mapper/CuspSupplierEvaluationMapper.java
  79. 2 2
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/mapper/CuspSupplierEvaluationScoreMapper.java
  80. 2 2
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/mapper/CuspSupplierProfileCatalogMapper.java
  81. 2 2
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/mapper/CuspSupplierProfileManMapper.java
  82. 4 6
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/mapper/CuspSupplierProfileMapper.java
  83. 2 2
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/mapper/CuspSupplierProfileQualificationMapper.java
  84. 2 2
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/mapper/xml/CuspCustomerProfileManMapper.xml
  85. 1 1
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/mapper/xml/CuspCustomerProfileMapper.xml
  86. 1 1
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/mapper/xml/CuspIntermediatorMapper.xml
  87. 1 1
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/mapper/xml/CuspSupplierEvaluationMapper.xml
  88. 2 2
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/mapper/xml/CuspSupplierEvaluationScoreMapper.xml
  89. 3 3
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/mapper/xml/CuspSupplierProfileCatalogMapper.xml
  90. 2 2
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/mapper/xml/CuspSupplierProfileManMapper.xml
  91. 2 2
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/mapper/xml/CuspSupplierProfileMapper.xml
  92. 2 2
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/mapper/xml/CuspSupplierProfileQualificationMapper.xml
  93. 3 2
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/service/ICuspCustomerProfileManService.java
  94. 4 3
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/service/ICuspCustomerProfileService.java
  95. 2 2
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/service/ICuspIntermediatorService.java
  96. 3 2
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/service/ICuspSupplierEvaluationScoreService.java
  97. 4 3
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/service/ICuspSupplierEvaluationService.java
  98. 2 2
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/service/ICuspSupplierProfileCatalogService.java
  99. 3 2
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/service/ICuspSupplierProfileManService.java
  100. 3 2
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/service/ICuspSupplierProfileQualificationService.java

+ 3 - 20
srm-module-code/src/main/java/com/cuidian/srm/baseCode/controller/BaseCompanyInformationController.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/controller/BaseCompanyInformationController.java

@@ -1,39 +1,22 @@
-package com.cuidian.srm.baseCode.controller;
+package org.jeecg.modules.baseCode.controller;
 
 import java.util.Arrays;
-import java.util.HashMap;
-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.system.query.QueryRuleEnum;
-import org.jeecg.common.util.oConvertUtils;
-import com.cuidian.srm.baseCode.entity.BaseCompanyInformation;
-import com.cuidian.srm.baseCode.service.IBaseCompanyInformationService;
+import org.jeecg.modules.baseCode.entity.BaseCompanyInformation;
+import org.jeecg.modules.baseCode.service.IBaseCompanyInformationService;
 
 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.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.system.base.controller.JeecgController;
 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;

+ 3 - 20
srm-module-code/src/main/java/com/cuidian/srm/baseCode/controller/BaseExchangeRateController.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/controller/BaseExchangeRateController.java

@@ -1,39 +1,22 @@
-package com.cuidian.srm.baseCode.controller;
+package org.jeecg.modules.baseCode.controller;
 
 import java.util.Arrays;
-import java.util.HashMap;
-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.system.query.QueryRuleEnum;
-import org.jeecg.common.util.oConvertUtils;
-import com.cuidian.srm.baseCode.entity.BaseExchangeRate;
-import com.cuidian.srm.baseCode.service.IBaseExchangeRateService;
+import org.jeecg.modules.baseCode.entity.BaseExchangeRate;
+import org.jeecg.modules.baseCode.service.IBaseExchangeRateService;
 
 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.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.system.base.controller.JeecgController;
 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;

+ 4 - 20
srm-module-code/src/main/java/com/cuidian/srm/baseCode/controller/BaseProductArchiveController.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/controller/BaseProductArchiveController.java

@@ -1,42 +1,26 @@
-package com.cuidian.srm.baseCode.controller;
+package org.jeecg.modules.baseCode.controller;
 
 import java.util.Arrays;
-import java.util.HashMap;
 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 com.cuidian.srm.baseCode.service.ISerialPatternService;
+import org.jeecg.modules.baseCode.service.ISerialPatternService;
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.query.QueryRuleEnum;
-import org.jeecg.common.util.oConvertUtils;
-import com.cuidian.srm.baseCode.entity.BaseProductArchive;
-import com.cuidian.srm.baseCode.service.IBaseProductArchiveService;
+import org.jeecg.modules.baseCode.entity.BaseProductArchive;
+import org.jeecg.modules.baseCode.service.IBaseProductArchiveService;
 
 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.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.system.base.controller.JeecgController;
 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;

+ 5 - 21
srm-module-code/src/main/java/com/cuidian/srm/baseCode/controller/BaseProductClassController.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/controller/BaseProductClassController.java

@@ -1,42 +1,26 @@
-package com.cuidian.srm.baseCode.controller;
+package org.jeecg.modules.baseCode.controller;
 
 import java.util.Arrays;
-import java.util.HashMap;
 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 com.cuidian.srm.baseCode.entity.BaseProductClass;
-import com.cuidian.srm.baseCode.service.IBaseProductClassService;
-import com.cuidian.srm.baseCode.service.ISerialPatternService;
+import org.jeecg.modules.baseCode.entity.BaseProductClass;
+import org.jeecg.modules.baseCode.service.IBaseProductClassService;
+import org.jeecg.modules.baseCode.service.ISerialPatternService;
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.query.QueryRuleEnum;
-import org.jeecg.common.util.oConvertUtils;
 
 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.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.system.base.controller.JeecgController;
 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;
@@ -105,7 +89,7 @@ public class BaseProductClassController extends JeecgController<BaseProductClass
             }
         } else {
 
-            Result<String> result = serialPatternService.getNextSerial("cusp_intermediator", "code");
+            Result<String> result = serialPatternService.getNextSerial("base_product_class", "code");
             if (!result.isSuccess()) {
                 return result;
             }

+ 4 - 21
srm-module-code/src/main/java/com/cuidian/srm/baseCode/controller/BaseProjectArchiveController.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/controller/BaseProjectArchiveController.java

@@ -1,43 +1,26 @@
-package com.cuidian.srm.baseCode.controller;
+package org.jeecg.modules.baseCode.controller;
 
 import java.util.Arrays;
-import java.util.HashMap;
 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 com.cuidian.srm.baseCode.entity.BaseProductArchive;
-import com.cuidian.srm.baseCode.service.ISerialPatternService;
+import org.jeecg.modules.baseCode.service.ISerialPatternService;
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.query.QueryRuleEnum;
-import org.jeecg.common.util.oConvertUtils;
-import com.cuidian.srm.baseCode.entity.BaseProjectArchive;
-import com.cuidian.srm.baseCode.service.IBaseProjectArchiveService;
+import org.jeecg.modules.baseCode.entity.BaseProjectArchive;
+import org.jeecg.modules.baseCode.service.IBaseProjectArchiveService;
 
 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.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.system.base.controller.JeecgController;
 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;

+ 4 - 22
srm-module-code/src/main/java/com/cuidian/srm/baseCode/controller/BaseShipArchiveAccessoriesController.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/controller/BaseShipArchiveAccessoriesController.java

@@ -1,45 +1,27 @@
-package com.cuidian.srm.baseCode.controller;
+package org.jeecg.modules.baseCode.controller;
 
 import java.util.Arrays;
-import java.util.HashMap;
-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.system.query.QueryRuleEnum;
-import org.jeecg.common.util.oConvertUtils;
-import com.cuidian.srm.baseCode.entity.BaseShipArchiveAccessories;
-import com.cuidian.srm.baseCode.service.IBaseShipArchiveAccessoriesService;
+import org.jeecg.modules.baseCode.entity.BaseShipArchiveAccessories;
+import org.jeecg.modules.baseCode.service.IBaseShipArchiveAccessoriesService;
 
 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.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.system.base.controller.JeecgController;
 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 org.apache.shiro.authz.annotation.RequiresPermissions;
 
- /**
+/**
  * @Description: 船舶档案 - 配件明细
  * @Author: jeecg-boot
  * @Date:   2024-11-05

+ 4 - 19
srm-module-code/src/main/java/com/cuidian/srm/baseCode/controller/BaseShipArchiveController.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/controller/BaseShipArchiveController.java

@@ -1,43 +1,28 @@
-package com.cuidian.srm.baseCode.controller;
+package org.jeecg.modules.baseCode.controller;
 
 import java.util.Arrays;
 import java.util.HashMap;
 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 com.cuidian.srm.baseCode.entity.BaseProductArchive;
-import com.cuidian.srm.baseCode.service.ISerialPatternService;
-import org.apache.commons.lang.StringUtils;
+import org.jeecg.modules.baseCode.service.ISerialPatternService;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryRuleEnum;
-import org.jeecg.common.util.oConvertUtils;
-import com.cuidian.srm.baseCode.entity.BaseShipArchive;
-import com.cuidian.srm.baseCode.service.IBaseShipArchiveService;
+import org.jeecg.modules.baseCode.entity.BaseShipArchive;
+import org.jeecg.modules.baseCode.service.IBaseShipArchiveService;
 
 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.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.system.base.controller.JeecgController;
 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;

+ 6 - 24
srm-module-code/src/main/java/com/cuidian/srm/baseCode/controller/BaseShipArchiveRelateCustomerController.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/controller/BaseShipArchiveRelateCustomerController.java

@@ -1,48 +1,30 @@
-package com.cuidian.srm.baseCode.controller;
+package org.jeecg.modules.baseCode.controller;
 
 import java.util.Arrays;
-import java.util.HashMap;
-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 com.cuidian.srm.baseCode.entity.BaseShipArchive;
-import com.cuidian.srm.baseCode.service.IBaseShipArchiveService;
+import org.jeecg.modules.baseCode.entity.BaseShipArchive;
+import org.jeecg.modules.baseCode.service.IBaseShipArchiveService;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.query.QueryRuleEnum;
-import org.jeecg.common.util.oConvertUtils;
-import com.cuidian.srm.baseCode.entity.BaseShipArchiveRelateCustomer;
-import com.cuidian.srm.baseCode.service.IBaseShipArchiveRelateCustomerService;
+import org.jeecg.modules.baseCode.entity.BaseShipArchiveRelateCustomer;
+import org.jeecg.modules.baseCode.service.IBaseShipArchiveRelateCustomerService;
 
 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.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.system.base.controller.JeecgController;
 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 org.apache.shiro.authz.annotation.RequiresPermissions;
 
- /**
+/**
  * @Description: 船舶档案子表 - 关联客户
  * @Author: jeecg-boot
  * @Date:   2024-11-05

+ 3 - 20
srm-module-code/src/main/java/com/cuidian/srm/baseCode/controller/BaseTemplatesController.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/controller/BaseTemplatesController.java

@@ -1,39 +1,22 @@
-package com.cuidian.srm.baseCode.controller;
+package org.jeecg.modules.baseCode.controller;
 
 import java.util.Arrays;
-import java.util.HashMap;
-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.system.query.QueryRuleEnum;
-import org.jeecg.common.util.oConvertUtils;
-import com.cuidian.srm.baseCode.entity.BaseTemplates;
-import com.cuidian.srm.baseCode.service.IBaseTemplatesService;
+import org.jeecg.modules.baseCode.entity.BaseTemplates;
+import org.jeecg.modules.baseCode.service.IBaseTemplatesService;
 
 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.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.system.base.controller.JeecgController;
 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;

+ 3 - 20
srm-module-code/src/main/java/com/cuidian/srm/baseCode/controller/SerialPatternController.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/controller/SerialPatternController.java

@@ -1,40 +1,23 @@
-package com.cuidian.srm.baseCode.controller;
+package org.jeecg.modules.baseCode.controller;
 
 import java.util.Arrays;
-import java.util.HashMap;
-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 com.cuidian.srm.baseCode.entity.SerialPattern;
-import com.cuidian.srm.baseCode.service.ISerialPatternService;
+import org.jeecg.modules.baseCode.entity.SerialPattern;
+import org.jeecg.modules.baseCode.service.ISerialPatternService;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.query.QueryRuleEnum;
-import org.jeecg.common.util.oConvertUtils;
 
 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.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.system.base.controller.JeecgController;
 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;

+ 2 - 1
srm-module-code/src/main/java/com/cuidian/srm/baseCode/entity/BaseCompanyInformation.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseCompanyInformation.java

@@ -1,4 +1,4 @@
-package com.cuidian.srm.baseCode.entity;
+package org.jeecg.modules.baseCode.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
@@ -57,6 +57,7 @@ public class BaseCompanyInformation implements Serializable {
 	/**状态(1-启用,0-停用)*/
 //	@Excel(name = "状态(status)", width = 15)
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
+    @Dict(dicCode = "valid_status")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
 //	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)

+ 1 - 1
srm-module-code/src/main/java/com/cuidian/srm/baseCode/entity/BaseExchangeRate.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseExchangeRate.java

@@ -1,4 +1,4 @@
-package com.cuidian.srm.baseCode.entity;
+package org.jeecg.modules.baseCode.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;

+ 2 - 2
srm-module-code/src/main/java/com/cuidian/srm/baseCode/entity/BaseProductArchive.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseProductArchive.java

@@ -1,4 +1,4 @@
-package com.cuidian.srm.baseCode.entity;
+package org.jeecg.modules.baseCode.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
@@ -67,7 +67,7 @@ public class BaseProductArchive implements Serializable {
 	/**产品分类*/
 	@Excel(name = "分类(class)", width = 15)
     @ApiModelProperty(value = "产品分类")
-    @Dict(dictTable = "base_product_class", dicText = "name", dicCode = "id")
+    @Dict(dictTable = "base_product_class", dicCode = "id", dicText = "name")
     private String classId;
 	/**编码*/
 	@Excel(name = "编码(code)", width = 15)

+ 1 - 1
srm-module-code/src/main/java/com/cuidian/srm/baseCode/entity/BaseProductClass.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseProductClass.java

@@ -1,4 +1,4 @@
-package com.cuidian.srm.baseCode.entity;
+package org.jeecg.modules.baseCode.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;

+ 1 - 1
srm-module-code/src/main/java/com/cuidian/srm/baseCode/entity/BaseProjectArchive.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseProjectArchive.java

@@ -1,4 +1,4 @@
-package com.cuidian.srm.baseCode.entity;
+package org.jeecg.modules.baseCode.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;

+ 1 - 1
srm-module-code/src/main/java/com/cuidian/srm/baseCode/entity/BaseShipArchive.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseShipArchive.java

@@ -1,4 +1,4 @@
-package com.cuidian.srm.baseCode.entity;
+package org.jeecg.modules.baseCode.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;

+ 1 - 1
srm-module-code/src/main/java/com/cuidian/srm/baseCode/entity/BaseShipArchiveAccessories.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseShipArchiveAccessories.java

@@ -1,4 +1,4 @@
-package com.cuidian.srm.baseCode.entity;
+package org.jeecg.modules.baseCode.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;

+ 1 - 1
srm-module-code/src/main/java/com/cuidian/srm/baseCode/entity/BaseShipArchiveRelateCustomer.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseShipArchiveRelateCustomer.java

@@ -1,4 +1,4 @@
-package com.cuidian.srm.baseCode.entity;
+package org.jeecg.modules.baseCode.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;

+ 1 - 1
srm-module-code/src/main/java/com/cuidian/srm/baseCode/entity/BaseTemplates.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseTemplates.java

@@ -1,4 +1,4 @@
-package com.cuidian.srm.baseCode.entity;
+package org.jeecg.modules.baseCode.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;

+ 1 - 1
srm-module-code/src/main/java/com/cuidian/srm/baseCode/entity/SerialPattern.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/SerialPattern.java

@@ -1,4 +1,4 @@
-package com.cuidian.srm.baseCode.entity;
+package org.jeecg.modules.baseCode.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;

+ 2 - 5
srm-module-code/src/main/java/com/cuidian/srm/baseCode/mapper/BaseCompanyInformationMapper.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/BaseCompanyInformationMapper.java

@@ -1,9 +1,6 @@
-package com.cuidian.srm.baseCode.mapper;
+package org.jeecg.modules.baseCode.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import com.cuidian.srm.baseCode.entity.BaseCompanyInformation;
+import org.jeecg.modules.baseCode.entity.BaseCompanyInformation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

+ 2 - 5
srm-module-code/src/main/java/com/cuidian/srm/baseCode/mapper/BaseExchangeRateMapper.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/BaseExchangeRateMapper.java

@@ -1,9 +1,6 @@
-package com.cuidian.srm.baseCode.mapper;
+package org.jeecg.modules.baseCode.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import com.cuidian.srm.baseCode.entity.BaseExchangeRate;
+import org.jeecg.modules.baseCode.entity.BaseExchangeRate;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

+ 2 - 5
srm-module-code/src/main/java/com/cuidian/srm/baseCode/mapper/BaseProductArchiveMapper.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/BaseProductArchiveMapper.java

@@ -1,9 +1,6 @@
-package com.cuidian.srm.baseCode.mapper;
+package org.jeecg.modules.baseCode.mapper;
 
-import java.util.List;
-
-import com.cuidian.srm.baseCode.entity.BaseProductArchive;
-import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.baseCode.entity.BaseProductArchive;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

+ 2 - 5
srm-module-code/src/main/java/com/cuidian/srm/baseCode/mapper/BaseProductClassMapper.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/BaseProductClassMapper.java

@@ -1,9 +1,6 @@
-package com.cuidian.srm.baseCode.mapper;
+package org.jeecg.modules.baseCode.mapper;
 
-import java.util.List;
-
-import com.cuidian.srm.baseCode.entity.BaseProductClass;
-import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.baseCode.entity.BaseProductClass;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

+ 2 - 5
srm-module-code/src/main/java/com/cuidian/srm/baseCode/mapper/BaseProjectArchiveMapper.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/BaseProjectArchiveMapper.java

@@ -1,9 +1,6 @@
-package com.cuidian.srm.baseCode.mapper;
+package org.jeecg.modules.baseCode.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import com.cuidian.srm.baseCode.entity.BaseProjectArchive;
+import org.jeecg.modules.baseCode.entity.BaseProjectArchive;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

+ 2 - 5
srm-module-code/src/main/java/com/cuidian/srm/baseCode/mapper/BaseShipArchiveAccessoriesMapper.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/BaseShipArchiveAccessoriesMapper.java

@@ -1,9 +1,6 @@
-package com.cuidian.srm.baseCode.mapper;
+package org.jeecg.modules.baseCode.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import com.cuidian.srm.baseCode.entity.BaseShipArchiveAccessories;
+import org.jeecg.modules.baseCode.entity.BaseShipArchiveAccessories;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

+ 2 - 5
srm-module-code/src/main/java/com/cuidian/srm/baseCode/mapper/BaseShipArchiveMapper.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/BaseShipArchiveMapper.java

@@ -1,9 +1,6 @@
-package com.cuidian.srm.baseCode.mapper;
+package org.jeecg.modules.baseCode.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import com.cuidian.srm.baseCode.entity.BaseShipArchive;
+import org.jeecg.modules.baseCode.entity.BaseShipArchive;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

+ 2 - 5
srm-module-code/src/main/java/com/cuidian/srm/baseCode/mapper/BaseShipArchiveRelateCustomerMapper.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/BaseShipArchiveRelateCustomerMapper.java

@@ -1,9 +1,6 @@
-package com.cuidian.srm.baseCode.mapper;
+package org.jeecg.modules.baseCode.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import com.cuidian.srm.baseCode.entity.BaseShipArchiveRelateCustomer;
+import org.jeecg.modules.baseCode.entity.BaseShipArchiveRelateCustomer;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

+ 2 - 5
srm-module-code/src/main/java/com/cuidian/srm/baseCode/mapper/BaseTemplatesMapper.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/BaseTemplatesMapper.java

@@ -1,9 +1,6 @@
-package com.cuidian.srm.baseCode.mapper;
+package org.jeecg.modules.baseCode.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import com.cuidian.srm.baseCode.entity.BaseTemplates;
+import org.jeecg.modules.baseCode.entity.BaseTemplates;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

+ 2 - 3
srm-module-code/src/main/java/com/cuidian/srm/baseCode/mapper/SerialPatternMapper.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/SerialPatternMapper.java

@@ -1,11 +1,10 @@
-package com.cuidian.srm.baseCode.mapper;
+package org.jeecg.modules.baseCode.mapper;
 
-import java.util.List;
 import java.util.Map;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.ibatis.annotations.Param;
-import com.cuidian.srm.baseCode.entity.SerialPattern;
+import org.jeecg.modules.baseCode.entity.SerialPattern;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

+ 1 - 1
srm-module-code/src/main/java/com/cuidian/srm/baseCode/mapper/xml/BaseCompanyInformationMapper.xml → srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/xml/BaseCompanyInformationMapper.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="com.cuidian.srm.baseCode.mapper.BaseCompanyInformationMapper">
+<mapper namespace="org.jeecg.modules.baseCode.mapper.BaseCompanyInformationMapper">
 
 </mapper>

+ 1 - 1
srm-module-code/src/main/java/com/cuidian/srm/baseCode/mapper/xml/BaseExchangeRateMapper.xml → srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/xml/BaseExchangeRateMapper.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="com.cuidian.srm.baseCode.mapper.BaseExchangeRateMapper">
+<mapper namespace="org.jeecg.modules.baseCode.mapper.BaseExchangeRateMapper">
 
 </mapper>

+ 1 - 1
srm-module-code/src/main/java/com/cuidian/srm/baseCode/mapper/xml/BaseProductArchiveMapper.xml → srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/xml/BaseProductArchiveMapper.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="com.cuidian.srm.baseCode.mapper.BaseProductArchiveMapper">
+<mapper namespace="org.jeecg.modules.baseCode.mapper.BaseProductArchiveMapper">
 
 </mapper>

+ 1 - 1
srm-module-code/src/main/java/com/cuidian/srm/baseCode/mapper/xml/BaseProductClassMapper.xml → srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/xml/BaseProductClassMapper.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="com.cuidian.srm.baseCode.mapper.BaseProductClassMapper">
+<mapper namespace="org.jeecg.modules.baseCode.mapper.BaseProductClassMapper">
 
 </mapper>

+ 1 - 1
srm-module-code/src/main/java/com/cuidian/srm/baseCode/mapper/xml/BaseProjectArchiveMapper.xml → srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/xml/BaseProjectArchiveMapper.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="com.cuidian.srm.baseCode.mapper.BaseProjectArchiveMapper">
+<mapper namespace="org.jeecg.modules.baseCode.mapper.BaseProjectArchiveMapper">
 
 </mapper>

+ 1 - 1
srm-module-code/src/main/java/com/cuidian/srm/baseCode/mapper/xml/BaseShipArchiveAccessoriesMapper.xml → srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/xml/BaseShipArchiveAccessoriesMapper.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="com.cuidian.srm.baseCode.mapper.BaseShipArchiveAccessoriesMapper">
+<mapper namespace="org.jeecg.modules.baseCode.mapper.BaseShipArchiveAccessoriesMapper">
 
 </mapper>

+ 1 - 1
srm-module-code/src/main/java/com/cuidian/srm/baseCode/mapper/xml/BaseShipArchiveMapper.xml → srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/xml/BaseShipArchiveMapper.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="com.cuidian.srm.baseCode.mapper.BaseShipArchiveMapper">
+<mapper namespace="org.jeecg.modules.baseCode.mapper.BaseShipArchiveMapper">
 
 </mapper>

+ 1 - 1
srm-module-code/src/main/java/com/cuidian/srm/baseCode/mapper/xml/BaseShipArchiveRelateCustomerMapper.xml → srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/xml/BaseShipArchiveRelateCustomerMapper.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="com.cuidian.srm.baseCode.mapper.BaseShipArchiveRelateCustomerMapper">
+<mapper namespace="org.jeecg.modules.baseCode.mapper.BaseShipArchiveRelateCustomerMapper">
 
 </mapper>

+ 1 - 1
srm-module-code/src/main/java/com/cuidian/srm/baseCode/mapper/xml/BaseTemplatesMapper.xml → srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/xml/BaseTemplatesMapper.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="com.cuidian.srm.baseCode.mapper.BaseTemplatesMapper">
+<mapper namespace="org.jeecg.modules.baseCode.mapper.BaseTemplatesMapper">
 
 </mapper>

+ 2 - 2
srm-module-code/src/main/java/com/cuidian/srm/baseCode/mapper/xml/SerialPatternMapper.xml → srm-module-code/src/main/java/org/jeecg/modules/baseCode/mapper/xml/SerialPatternMapper.xml

@@ -1,8 +1,8 @@
 <?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="com.cuidian.srm.baseCode.mapper.SerialPatternMapper">
+<mapper namespace="org.jeecg.modules.baseCode.mapper.SerialPatternMapper">
 
-    <select id="findByTableField" resultType="com.cuidian.srm.baseCode.entity.SerialPattern">
+    <select id="findByTableField" resultType="org.jeecg.modules.baseCode.entity.SerialPattern">
         select
             *
         from serial_pattern

+ 2 - 2
srm-module-code/src/main/java/com/cuidian/srm/baseCode/service/IBaseCompanyInformationService.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/IBaseCompanyInformationService.java

@@ -1,6 +1,6 @@
-package com.cuidian.srm.baseCode.service;
+package org.jeecg.modules.baseCode.service;
 
-import com.cuidian.srm.baseCode.entity.BaseCompanyInformation;
+import org.jeecg.modules.baseCode.entity.BaseCompanyInformation;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

+ 2 - 2
srm-module-code/src/main/java/com/cuidian/srm/baseCode/service/IBaseExchangeRateService.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/IBaseExchangeRateService.java

@@ -1,6 +1,6 @@
-package com.cuidian.srm.baseCode.service;
+package org.jeecg.modules.baseCode.service;
 
-import com.cuidian.srm.baseCode.entity.BaseExchangeRate;
+import org.jeecg.modules.baseCode.entity.BaseExchangeRate;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

+ 2 - 2
srm-module-code/src/main/java/com/cuidian/srm/baseCode/service/IBaseProductArchiveService.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/IBaseProductArchiveService.java

@@ -1,7 +1,7 @@
-package com.cuidian.srm.baseCode.service;
+package org.jeecg.modules.baseCode.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.cuidian.srm.baseCode.entity.BaseProductArchive;
+import org.jeecg.modules.baseCode.entity.BaseProductArchive;
 
 /**
  * @Description: base_product_archive

+ 2 - 2
srm-module-code/src/main/java/com/cuidian/srm/baseCode/service/IBaseProductClassService.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/IBaseProductClassService.java

@@ -1,7 +1,7 @@
-package com.cuidian.srm.baseCode.service;
+package org.jeecg.modules.baseCode.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.cuidian.srm.baseCode.entity.BaseProductClass;
+import org.jeecg.modules.baseCode.entity.BaseProductClass;
 
 /**
  * @Description: 产品分类

+ 2 - 2
srm-module-code/src/main/java/com/cuidian/srm/baseCode/service/IBaseProjectArchiveService.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/IBaseProjectArchiveService.java

@@ -1,6 +1,6 @@
-package com.cuidian.srm.baseCode.service;
+package org.jeecg.modules.baseCode.service;
 
-import com.cuidian.srm.baseCode.entity.BaseProjectArchive;
+import org.jeecg.modules.baseCode.entity.BaseProjectArchive;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

+ 2 - 2
srm-module-code/src/main/java/com/cuidian/srm/baseCode/service/IBaseShipArchiveAccessoriesService.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/IBaseShipArchiveAccessoriesService.java

@@ -1,6 +1,6 @@
-package com.cuidian.srm.baseCode.service;
+package org.jeecg.modules.baseCode.service;
 
-import com.cuidian.srm.baseCode.entity.BaseShipArchiveAccessories;
+import org.jeecg.modules.baseCode.entity.BaseShipArchiveAccessories;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

+ 2 - 2
srm-module-code/src/main/java/com/cuidian/srm/baseCode/service/IBaseShipArchiveRelateCustomerService.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/IBaseShipArchiveRelateCustomerService.java

@@ -1,6 +1,6 @@
-package com.cuidian.srm.baseCode.service;
+package org.jeecg.modules.baseCode.service;
 
-import com.cuidian.srm.baseCode.entity.BaseShipArchiveRelateCustomer;
+import org.jeecg.modules.baseCode.entity.BaseShipArchiveRelateCustomer;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

+ 2 - 2
srm-module-code/src/main/java/com/cuidian/srm/baseCode/service/IBaseShipArchiveService.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/IBaseShipArchiveService.java

@@ -1,6 +1,6 @@
-package com.cuidian.srm.baseCode.service;
+package org.jeecg.modules.baseCode.service;
 
-import com.cuidian.srm.baseCode.entity.BaseShipArchive;
+import org.jeecg.modules.baseCode.entity.BaseShipArchive;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

+ 2 - 2
srm-module-code/src/main/java/com/cuidian/srm/baseCode/service/IBaseTemplatesService.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/IBaseTemplatesService.java

@@ -1,6 +1,6 @@
-package com.cuidian.srm.baseCode.service;
+package org.jeecg.modules.baseCode.service;
 
-import com.cuidian.srm.baseCode.entity.BaseTemplates;
+import org.jeecg.modules.baseCode.entity.BaseTemplates;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

+ 2 - 2
srm-module-code/src/main/java/com/cuidian/srm/baseCode/service/ISerialPatternService.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/ISerialPatternService.java

@@ -1,6 +1,6 @@
-package com.cuidian.srm.baseCode.service;
+package org.jeecg.modules.baseCode.service;
 
-import com.cuidian.srm.baseCode.entity.SerialPattern;
+import org.jeecg.modules.baseCode.entity.SerialPattern;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.common.api.vo.Result;
 

+ 4 - 4
srm-module-code/src/main/java/com/cuidian/srm/baseCode/service/impl/BaseCompanyInformationServiceImpl.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/impl/BaseCompanyInformationServiceImpl.java

@@ -1,8 +1,8 @@
-package com.cuidian.srm.baseCode.service.impl;
+package org.jeecg.modules.baseCode.service.impl;
 
-import com.cuidian.srm.baseCode.entity.BaseCompanyInformation;
-import com.cuidian.srm.baseCode.mapper.BaseCompanyInformationMapper;
-import com.cuidian.srm.baseCode.service.IBaseCompanyInformationService;
+import org.jeecg.modules.baseCode.entity.BaseCompanyInformation;
+import org.jeecg.modules.baseCode.mapper.BaseCompanyInformationMapper;
+import org.jeecg.modules.baseCode.service.IBaseCompanyInformationService;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

+ 4 - 4
srm-module-code/src/main/java/com/cuidian/srm/baseCode/service/impl/BaseExchangeRateServiceImpl.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/impl/BaseExchangeRateServiceImpl.java

@@ -1,8 +1,8 @@
-package com.cuidian.srm.baseCode.service.impl;
+package org.jeecg.modules.baseCode.service.impl;
 
-import com.cuidian.srm.baseCode.entity.BaseExchangeRate;
-import com.cuidian.srm.baseCode.mapper.BaseExchangeRateMapper;
-import com.cuidian.srm.baseCode.service.IBaseExchangeRateService;
+import org.jeecg.modules.baseCode.entity.BaseExchangeRate;
+import org.jeecg.modules.baseCode.mapper.BaseExchangeRateMapper;
+import org.jeecg.modules.baseCode.service.IBaseExchangeRateService;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

+ 4 - 4
srm-module-code/src/main/java/com/cuidian/srm/baseCode/service/impl/BaseProductArchiveServiceImpl.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/impl/BaseProductArchiveServiceImpl.java

@@ -1,8 +1,8 @@
-package com.cuidian.srm.baseCode.service.impl;
+package org.jeecg.modules.baseCode.service.impl;
 
-import com.cuidian.srm.baseCode.entity.BaseProductArchive;
-import com.cuidian.srm.baseCode.mapper.BaseProductArchiveMapper;
-import com.cuidian.srm.baseCode.service.IBaseProductArchiveService;
+import org.jeecg.modules.baseCode.entity.BaseProductArchive;
+import org.jeecg.modules.baseCode.mapper.BaseProductArchiveMapper;
+import org.jeecg.modules.baseCode.service.IBaseProductArchiveService;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

+ 4 - 4
srm-module-code/src/main/java/com/cuidian/srm/baseCode/service/impl/BaseProductClassServiceImpl.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/impl/BaseProductClassServiceImpl.java

@@ -1,8 +1,8 @@
-package com.cuidian.srm.baseCode.service.impl;
+package org.jeecg.modules.baseCode.service.impl;
 
-import com.cuidian.srm.baseCode.entity.BaseProductClass;
-import com.cuidian.srm.baseCode.mapper.BaseProductClassMapper;
-import com.cuidian.srm.baseCode.service.IBaseProductClassService;
+import org.jeecg.modules.baseCode.entity.BaseProductClass;
+import org.jeecg.modules.baseCode.mapper.BaseProductClassMapper;
+import org.jeecg.modules.baseCode.service.IBaseProductClassService;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

+ 4 - 4
srm-module-code/src/main/java/com/cuidian/srm/baseCode/service/impl/BaseProjectArchiveServiceImpl.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/impl/BaseProjectArchiveServiceImpl.java

@@ -1,8 +1,8 @@
-package com.cuidian.srm.baseCode.service.impl;
+package org.jeecg.modules.baseCode.service.impl;
 
-import com.cuidian.srm.baseCode.entity.BaseProjectArchive;
-import com.cuidian.srm.baseCode.mapper.BaseProjectArchiveMapper;
-import com.cuidian.srm.baseCode.service.IBaseProjectArchiveService;
+import org.jeecg.modules.baseCode.entity.BaseProjectArchive;
+import org.jeecg.modules.baseCode.mapper.BaseProjectArchiveMapper;
+import org.jeecg.modules.baseCode.service.IBaseProjectArchiveService;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

+ 4 - 4
srm-module-code/src/main/java/com/cuidian/srm/baseCode/service/impl/BaseShipArchiveAccessoriesServiceImpl.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/impl/BaseShipArchiveAccessoriesServiceImpl.java

@@ -1,8 +1,8 @@
-package com.cuidian.srm.baseCode.service.impl;
+package org.jeecg.modules.baseCode.service.impl;
 
-import com.cuidian.srm.baseCode.entity.BaseShipArchiveAccessories;
-import com.cuidian.srm.baseCode.mapper.BaseShipArchiveAccessoriesMapper;
-import com.cuidian.srm.baseCode.service.IBaseShipArchiveAccessoriesService;
+import org.jeecg.modules.baseCode.entity.BaseShipArchiveAccessories;
+import org.jeecg.modules.baseCode.mapper.BaseShipArchiveAccessoriesMapper;
+import org.jeecg.modules.baseCode.service.IBaseShipArchiveAccessoriesService;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

+ 4 - 4
srm-module-code/src/main/java/com/cuidian/srm/baseCode/service/impl/BaseShipArchiveRelateCustomerServiceImpl.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/impl/BaseShipArchiveRelateCustomerServiceImpl.java

@@ -1,8 +1,8 @@
-package com.cuidian.srm.baseCode.service.impl;
+package org.jeecg.modules.baseCode.service.impl;
 
-import com.cuidian.srm.baseCode.entity.BaseShipArchiveRelateCustomer;
-import com.cuidian.srm.baseCode.mapper.BaseShipArchiveRelateCustomerMapper;
-import com.cuidian.srm.baseCode.service.IBaseShipArchiveRelateCustomerService;
+import org.jeecg.modules.baseCode.entity.BaseShipArchiveRelateCustomer;
+import org.jeecg.modules.baseCode.mapper.BaseShipArchiveRelateCustomerMapper;
+import org.jeecg.modules.baseCode.service.IBaseShipArchiveRelateCustomerService;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

+ 4 - 4
srm-module-code/src/main/java/com/cuidian/srm/baseCode/service/impl/BaseShipArchiveServiceImpl.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/impl/BaseShipArchiveServiceImpl.java

@@ -1,8 +1,8 @@
-package com.cuidian.srm.baseCode.service.impl;
+package org.jeecg.modules.baseCode.service.impl;
 
-import com.cuidian.srm.baseCode.entity.BaseShipArchive;
-import com.cuidian.srm.baseCode.mapper.BaseShipArchiveMapper;
-import com.cuidian.srm.baseCode.service.IBaseShipArchiveService;
+import org.jeecg.modules.baseCode.entity.BaseShipArchive;
+import org.jeecg.modules.baseCode.mapper.BaseShipArchiveMapper;
+import org.jeecg.modules.baseCode.service.IBaseShipArchiveService;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

+ 4 - 4
srm-module-code/src/main/java/com/cuidian/srm/baseCode/service/impl/BaseTemplatesServiceImpl.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/impl/BaseTemplatesServiceImpl.java

@@ -1,8 +1,8 @@
-package com.cuidian.srm.baseCode.service.impl;
+package org.jeecg.modules.baseCode.service.impl;
 
-import com.cuidian.srm.baseCode.entity.BaseTemplates;
-import com.cuidian.srm.baseCode.mapper.BaseTemplatesMapper;
-import com.cuidian.srm.baseCode.service.IBaseTemplatesService;
+import org.jeecg.modules.baseCode.entity.BaseTemplates;
+import org.jeecg.modules.baseCode.mapper.BaseTemplatesMapper;
+import org.jeecg.modules.baseCode.service.IBaseTemplatesService;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

+ 4 - 4
srm-module-code/src/main/java/com/cuidian/srm/baseCode/service/impl/SerialPatternServiceImpl.java → srm-module-code/src/main/java/org/jeecg/modules/baseCode/service/impl/SerialPatternServiceImpl.java

@@ -1,9 +1,9 @@
-package com.cuidian.srm.baseCode.service.impl;
+package org.jeecg.modules.baseCode.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.cuidian.srm.baseCode.entity.SerialPattern;
-import com.cuidian.srm.baseCode.mapper.SerialPatternMapper;
-import com.cuidian.srm.baseCode.service.ISerialPatternService;
+import org.jeecg.modules.baseCode.entity.SerialPattern;
+import org.jeecg.modules.baseCode.mapper.SerialPatternMapper;
+import org.jeecg.modules.baseCode.service.ISerialPatternService;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.oConvertUtils;

+ 10 - 15
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/controller/CuspCustomerProfileController.java → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/controller/CuspCustomerProfileController.java

@@ -1,21 +1,19 @@
-package com.cuidian.srm.cuspCode.controller;
+package org.jeecg.modules.cuspCode.controller;
 
-import java.io.UnsupportedEncodingException;
 import java.io.IOException;
-import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 import java.util.HashMap;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.cuidian.srm.baseCode.entity.BaseProductArchive;
-import com.cuidian.srm.baseCode.service.ISerialPatternService;
+import org.jeecg.modules.baseCode.service.ISerialPatternService;
 import org.apache.commons.lang.StringUtils;
+import org.jeecg.modules.cuspCode.entity.CuspCustomerProfile;
+import org.jeecg.modules.cuspCode.entity.CuspCustomerProfileMan;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -27,11 +25,9 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryRuleEnum;
 import org.jeecg.common.util.oConvertUtils;
-import com.cuidian.srm.cuspCode.entity.CuspCustomerProfileMan;
-import com.cuidian.srm.cuspCode.entity.CuspCustomerProfile;
-import com.cuidian.srm.cuspCode.vo.CuspCustomerProfilePage;
-import com.cuidian.srm.cuspCode.service.ICuspCustomerProfileService;
-import com.cuidian.srm.cuspCode.service.ICuspCustomerProfileManService;
+import org.jeecg.modules.cuspCode.vo.CuspCustomerProfilePage;
+import org.jeecg.modules.cuspCode.service.ICuspCustomerProfileService;
+import org.jeecg.modules.cuspCode.service.ICuspCustomerProfileManService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -42,7 +38,6 @@ 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 com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -80,9 +75,9 @@ public class CuspCustomerProfileController {
 	@ApiOperation(value="客户档案-分页列表查询", notes="客户档案-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<CuspCustomerProfile>> queryPageList(CuspCustomerProfile cuspCustomerProfile,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
+                                                            @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                                            @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                                            HttpServletRequest req) {
         // 自定义查询规则
         Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
         // 自定义多选的查询规则为:LIKE_WITH_OR

+ 4 - 21
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/controller/CuspIntermediatorController.java → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/controller/CuspIntermediatorController.java

@@ -1,43 +1,26 @@
-package com.cuidian.srm.cuspCode.controller;
+package org.jeecg.modules.cuspCode.controller;
 
 import java.util.Arrays;
-import java.util.HashMap;
 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 com.cuidian.srm.baseCode.entity.BaseProductArchive;
-import com.cuidian.srm.baseCode.service.ISerialPatternService;
+import org.jeecg.modules.baseCode.service.ISerialPatternService;
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.query.QueryRuleEnum;
-import org.jeecg.common.util.oConvertUtils;
-import com.cuidian.srm.cuspCode.entity.CuspIntermediator;
-import com.cuidian.srm.cuspCode.service.ICuspIntermediatorService;
+import org.jeecg.modules.cuspCode.entity.CuspIntermediator;
+import org.jeecg.modules.cuspCode.service.ICuspIntermediatorService;
 
 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.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.system.base.controller.JeecgController;
 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;

+ 10 - 15
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/controller/CuspSupplierEvaluationController.java → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/controller/CuspSupplierEvaluationController.java

@@ -1,21 +1,19 @@
-package com.cuidian.srm.cuspCode.controller;
+package org.jeecg.modules.cuspCode.controller;
 
-import java.io.UnsupportedEncodingException;
 import java.io.IOException;
-import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 import java.util.HashMap;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.cuidian.srm.baseCode.entity.BaseProductArchive;
-import com.cuidian.srm.baseCode.service.ISerialPatternService;
+import org.jeecg.modules.baseCode.service.ISerialPatternService;
 import org.apache.commons.lang.StringUtils;
+import org.jeecg.modules.cuspCode.entity.CuspSupplierEvaluation;
+import org.jeecg.modules.cuspCode.entity.CuspSupplierEvaluationScore;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -27,11 +25,9 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryRuleEnum;
 import org.jeecg.common.util.oConvertUtils;
-import com.cuidian.srm.cuspCode.entity.CuspSupplierEvaluationScore;
-import com.cuidian.srm.cuspCode.entity.CuspSupplierEvaluation;
-import com.cuidian.srm.cuspCode.vo.CuspSupplierEvaluationPage;
-import com.cuidian.srm.cuspCode.service.ICuspSupplierEvaluationService;
-import com.cuidian.srm.cuspCode.service.ICuspSupplierEvaluationScoreService;
+import org.jeecg.modules.cuspCode.vo.CuspSupplierEvaluationPage;
+import org.jeecg.modules.cuspCode.service.ICuspSupplierEvaluationService;
+import org.jeecg.modules.cuspCode.service.ICuspSupplierEvaluationScoreService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -42,7 +38,6 @@ 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 com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -80,9 +75,9 @@ public class CuspSupplierEvaluationController {
 	@ApiOperation(value="供应商考评-分页列表查询", notes="供应商考评-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<CuspSupplierEvaluation>> queryPageList(CuspSupplierEvaluation cuspSupplierEvaluation,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
+															   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+															   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+															   HttpServletRequest req) {
         // 自定义查询规则
         Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
         // 自定义多选的查询规则为:LIKE_WITH_OR

+ 4 - 21
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/controller/CuspSupplierProfileCatalogController.java → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/controller/CuspSupplierProfileCatalogController.java

@@ -1,42 +1,25 @@
-package com.cuidian.srm.cuspCode.controller;
+package org.jeecg.modules.cuspCode.controller;
 
 import java.util.Arrays;
-import java.util.HashMap;
 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 com.cuidian.srm.cuspCode.entity.CuspSupplierProfileMan;
-import com.cuidian.srm.cuspCode.vo.CuspSupplierProfilePage;
+import org.jeecg.modules.cuspCode.vo.CuspSupplierProfilePage;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.query.QueryRuleEnum;
-import org.jeecg.common.util.oConvertUtils;
-import com.cuidian.srm.cuspCode.entity.CuspSupplierProfileCatalog;
-import com.cuidian.srm.cuspCode.service.ICuspSupplierProfileCatalogService;
+import org.jeecg.modules.cuspCode.entity.CuspSupplierProfileCatalog;
+import org.jeecg.modules.cuspCode.service.ICuspSupplierProfileCatalogService;
 
 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.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.system.base.controller.JeecgController;
 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;

+ 10 - 16
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/controller/CuspSupplierProfileController.java → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/controller/CuspSupplierProfileController.java

@@ -1,23 +1,21 @@
-package com.cuidian.srm.cuspCode.controller;
+package org.jeecg.modules.cuspCode.controller;
 
-import java.io.UnsupportedEncodingException;
 import java.io.IOException;
-import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 import java.util.HashMap;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.cuidian.srm.baseCode.service.ISerialPatternService;
-import com.cuidian.srm.cuspCode.entity.CuspCustomerProfile;
-import com.cuidian.srm.cuspCode.vo.CuspSupplierDeadlineReminderVo;
+import org.jeecg.modules.baseCode.service.ISerialPatternService;
+import org.jeecg.modules.cuspCode.vo.CuspSupplierDeadlineReminderVo;
 import org.apache.commons.lang.StringUtils;
-import org.jeecg.modules.system.service.ISysUserService;
+import org.jeecg.modules.cuspCode.entity.CuspSupplierProfile;
+import org.jeecg.modules.cuspCode.entity.CuspSupplierProfileMan;
+import org.jeecg.modules.cuspCode.entity.CuspSupplierProfileQualification;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -29,13 +27,10 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryRuleEnum;
 import org.jeecg.common.util.oConvertUtils;
-import com.cuidian.srm.cuspCode.entity.CuspSupplierProfileMan;
-import com.cuidian.srm.cuspCode.entity.CuspSupplierProfileQualification;
-import com.cuidian.srm.cuspCode.entity.CuspSupplierProfile;
-import com.cuidian.srm.cuspCode.vo.CuspSupplierProfilePage;
-import com.cuidian.srm.cuspCode.service.ICuspSupplierProfileService;
-import com.cuidian.srm.cuspCode.service.ICuspSupplierProfileManService;
-import com.cuidian.srm.cuspCode.service.ICuspSupplierProfileQualificationService;
+import org.jeecg.modules.cuspCode.vo.CuspSupplierProfilePage;
+import org.jeecg.modules.cuspCode.service.ICuspSupplierProfileService;
+import org.jeecg.modules.cuspCode.service.ICuspSupplierProfileManService;
+import org.jeecg.modules.cuspCode.service.ICuspSupplierProfileQualificationService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -46,7 +41,6 @@ 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 com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;

+ 1 - 1
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/entity/CuspCustomerProfile.java → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspCustomerProfile.java

@@ -1,4 +1,4 @@
-package com.cuidian.srm.cuspCode.entity;
+package org.jeecg.modules.cuspCode.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;

+ 1 - 1
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/entity/CuspCustomerProfileMan.java → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspCustomerProfileMan.java

@@ -1,4 +1,4 @@
-package com.cuidian.srm.cuspCode.entity;
+package org.jeecg.modules.cuspCode.entity;
 
 import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.IdType;

+ 1 - 1
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/entity/CuspIntermediator.java → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspIntermediator.java

@@ -1,4 +1,4 @@
-package com.cuidian.srm.cuspCode.entity;
+package org.jeecg.modules.cuspCode.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;

+ 1 - 1
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/entity/CuspSupplierEvaluation.java → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspSupplierEvaluation.java

@@ -1,4 +1,4 @@
-package com.cuidian.srm.cuspCode.entity;
+package org.jeecg.modules.cuspCode.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;

+ 1 - 1
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/entity/CuspSupplierEvaluationScore.java → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspSupplierEvaluationScore.java

@@ -1,4 +1,4 @@
-package com.cuidian.srm.cuspCode.entity;
+package org.jeecg.modules.cuspCode.entity;
 
 import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.IdType;

+ 1 - 1
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/entity/CuspSupplierProfile.java → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspSupplierProfile.java

@@ -1,4 +1,4 @@
-package com.cuidian.srm.cuspCode.entity;
+package org.jeecg.modules.cuspCode.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;

+ 1 - 1
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/entity/CuspSupplierProfileCatalog.java → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspSupplierProfileCatalog.java

@@ -1,4 +1,4 @@
-package com.cuidian.srm.cuspCode.entity;
+package org.jeecg.modules.cuspCode.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;

+ 1 - 1
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/entity/CuspSupplierProfileMan.java → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspSupplierProfileMan.java

@@ -1,4 +1,4 @@
-package com.cuidian.srm.cuspCode.entity;
+package org.jeecg.modules.cuspCode.entity;
 
 import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.IdType;

+ 1 - 1
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/entity/CuspSupplierProfileQualification.java → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspSupplierProfileQualification.java

@@ -1,4 +1,4 @@
-package com.cuidian.srm.cuspCode.entity;
+package org.jeecg.modules.cuspCode.entity;
 
 import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.IdType;

+ 2 - 2
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/mapper/CuspCustomerProfileManMapper.java → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/mapper/CuspCustomerProfileManMapper.java

@@ -1,7 +1,7 @@
-package com.cuidian.srm.cuspCode.mapper;
+package org.jeecg.modules.cuspCode.mapper;
 
 import java.util.List;
-import com.cuidian.srm.cuspCode.entity.CuspCustomerProfileMan;
+import org.jeecg.modules.cuspCode.entity.CuspCustomerProfileMan;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 

+ 2 - 5
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/mapper/CuspCustomerProfileMapper.java → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/mapper/CuspCustomerProfileMapper.java

@@ -1,9 +1,6 @@
-package com.cuidian.srm.cuspCode.mapper;
+package org.jeecg.modules.cuspCode.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import com.cuidian.srm.cuspCode.entity.CuspCustomerProfile;
+import org.jeecg.modules.cuspCode.entity.CuspCustomerProfile;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

+ 2 - 5
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/mapper/CuspIntermediatorMapper.java → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/mapper/CuspIntermediatorMapper.java

@@ -1,9 +1,6 @@
-package com.cuidian.srm.cuspCode.mapper;
+package org.jeecg.modules.cuspCode.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import com.cuidian.srm.cuspCode.entity.CuspIntermediator;
+import org.jeecg.modules.cuspCode.entity.CuspIntermediator;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

+ 2 - 5
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/mapper/CuspSupplierEvaluationMapper.java → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/mapper/CuspSupplierEvaluationMapper.java

@@ -1,9 +1,6 @@
-package com.cuidian.srm.cuspCode.mapper;
+package org.jeecg.modules.cuspCode.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import com.cuidian.srm.cuspCode.entity.CuspSupplierEvaluation;
+import org.jeecg.modules.cuspCode.entity.CuspSupplierEvaluation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

+ 2 - 2
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/mapper/CuspSupplierEvaluationScoreMapper.java → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/mapper/CuspSupplierEvaluationScoreMapper.java

@@ -1,7 +1,7 @@
-package com.cuidian.srm.cuspCode.mapper;
+package org.jeecg.modules.cuspCode.mapper;
 
 import java.util.List;
-import com.cuidian.srm.cuspCode.entity.CuspSupplierEvaluationScore;
+import org.jeecg.modules.cuspCode.entity.CuspSupplierEvaluationScore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 

+ 2 - 2
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/mapper/CuspSupplierProfileCatalogMapper.java → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/mapper/CuspSupplierProfileCatalogMapper.java

@@ -1,9 +1,9 @@
-package com.cuidian.srm.cuspCode.mapper;
+package org.jeecg.modules.cuspCode.mapper;
 
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
-import com.cuidian.srm.cuspCode.entity.CuspSupplierProfileCatalog;
+import org.jeecg.modules.cuspCode.entity.CuspSupplierProfileCatalog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

+ 2 - 2
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/mapper/CuspSupplierProfileManMapper.java → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/mapper/CuspSupplierProfileManMapper.java

@@ -1,7 +1,7 @@
-package com.cuidian.srm.cuspCode.mapper;
+package org.jeecg.modules.cuspCode.mapper;
 
 import java.util.List;
-import com.cuidian.srm.cuspCode.entity.CuspSupplierProfileMan;
+import org.jeecg.modules.cuspCode.entity.CuspSupplierProfileMan;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 

+ 4 - 6
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/mapper/CuspSupplierProfileMapper.java → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/mapper/CuspSupplierProfileMapper.java

@@ -1,13 +1,11 @@
-package com.cuidian.srm.cuspCode.mapper;
-
-import java.util.List;
+package org.jeecg.modules.cuspCode.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.cuidian.srm.cuspCode.vo.CuspSupplierDeadlineReminderVo;
+import org.jeecg.modules.cuspCode.vo.CuspSupplierDeadlineReminderVo;
 import org.apache.ibatis.annotations.Param;
-import com.cuidian.srm.cuspCode.entity.CuspSupplierProfile;
+import org.jeecg.modules.cuspCode.entity.CuspSupplierProfile;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -18,5 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface CuspSupplierProfileMapper extends BaseMapper<CuspSupplierProfile> {
 
-    IPage<CuspSupplierDeadlineReminderVo> page2(Page<CuspSupplierDeadlineReminderVo> page,@Param("ew")  QueryWrapper<CuspSupplierDeadlineReminderVo> queryWrapper);
+    IPage<CuspSupplierDeadlineReminderVo> page2(Page<CuspSupplierDeadlineReminderVo> page, @Param("ew")  QueryWrapper<CuspSupplierDeadlineReminderVo> queryWrapper);
 }

+ 2 - 2
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/mapper/CuspSupplierProfileQualificationMapper.java → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/mapper/CuspSupplierProfileQualificationMapper.java

@@ -1,7 +1,7 @@
-package com.cuidian.srm.cuspCode.mapper;
+package org.jeecg.modules.cuspCode.mapper;
 
 import java.util.List;
-import com.cuidian.srm.cuspCode.entity.CuspSupplierProfileQualification;
+import org.jeecg.modules.cuspCode.entity.CuspSupplierProfileQualification;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 

+ 2 - 2
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/mapper/xml/CuspCustomerProfileManMapper.xml → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/mapper/xml/CuspCustomerProfileManMapper.xml

@@ -1,6 +1,6 @@
 <?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="com.cuidian.srm.cuspCode.mapper.CuspCustomerProfileManMapper">
+<mapper namespace="org.jeecg.modules.cuspCode.mapper.CuspCustomerProfileManMapper">
 
 	<delete id="deleteByMainId" parameterType="java.lang.String">
 		DELETE 
@@ -8,7 +8,7 @@
 		WHERE
 			 head_id = #{mainId} 	</delete>
 	
-	<select id="selectByMainId" parameterType="java.lang.String" resultType="com.cuidian.srm.cuspCode.entity.CuspCustomerProfileMan">
+	<select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.cuspCode.entity.CuspCustomerProfileMan">
 		SELECT * 
 		FROM  cusp_customer_profile_man
 		WHERE

+ 1 - 1
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/mapper/xml/CuspCustomerProfileMapper.xml → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/mapper/xml/CuspCustomerProfileMapper.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="com.cuidian.srm.cuspCode.mapper.CuspCustomerProfileMapper">
+<mapper namespace="org.jeecg.modules.cuspCode.mapper.CuspCustomerProfileMapper">
 
 </mapper>

+ 1 - 1
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/mapper/xml/CuspIntermediatorMapper.xml → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/mapper/xml/CuspIntermediatorMapper.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="com.cuidian.srm.cuspCode.mapper.CuspIntermediatorMapper">
+<mapper namespace="org.jeecg.modules.cuspCode.mapper.CuspIntermediatorMapper">
 
 </mapper>

+ 1 - 1
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/mapper/xml/CuspSupplierEvaluationMapper.xml → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/mapper/xml/CuspSupplierEvaluationMapper.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="com.cuidian.srm.cuspCode.mapper.CuspSupplierEvaluationMapper">
+<mapper namespace="org.jeecg.modules.cuspCode.mapper.CuspSupplierEvaluationMapper">
 
 </mapper>

+ 2 - 2
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/mapper/xml/CuspSupplierEvaluationScoreMapper.xml → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/mapper/xml/CuspSupplierEvaluationScoreMapper.xml

@@ -1,6 +1,6 @@
 <?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="com.cuidian.srm.cuspCode.mapper.CuspSupplierEvaluationScoreMapper">
+<mapper namespace="org.jeecg.modules.cuspCode.mapper.CuspSupplierEvaluationScoreMapper">
 
 	<delete id="deleteByMainId" parameterType="java.lang.String">
 		DELETE 
@@ -8,7 +8,7 @@
 		WHERE
 			 head_id = #{mainId} 	</delete>
 	
-	<select id="selectByMainId" parameterType="java.lang.String" resultType="com.cuidian.srm.cuspCode.entity.CuspSupplierEvaluationScore">
+	<select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.cuspCode.entity.CuspSupplierEvaluationScore">
 		SELECT * 
 		FROM  cusp_supplier_evaluation_score
 		WHERE

+ 3 - 3
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/mapper/xml/CuspSupplierProfileCatalogMapper.xml → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/mapper/xml/CuspSupplierProfileCatalogMapper.xml

@@ -1,6 +1,6 @@
 <?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="com.cuidian.srm.cuspCode.mapper.CuspSupplierProfileCatalogMapper">
+<mapper namespace="org.jeecg.modules.cuspCode.mapper.CuspSupplierProfileCatalogMapper">
 
     <delete id="deleteByMainId" parameterType="java.lang.String">
         DELETE
@@ -8,8 +8,8 @@
         WHERE
             head_id = #{mainId} 	</delete>
 
-    <select id="selectByMainId" parameterType="java.lang.String" resultType="com.cuidian.srm.cuspCode.entity.CuspSupplierProfileCatalog">
-        SELECT a.valid,c.name class_id,b.code,b.chinese_name,b.english_name,b.specifications,b.model,b.measurement_unit,b.harmful_substances
+    <select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.cuspCode.entity.CuspSupplierProfileCatalog">
+        SELECT a.head_id,a.product_id,a.valid,c.name class_id,b.code,b.chinese_name,b.english_name,b.specifications,b.model,b.measurement_unit,b.harmful_substances
         FROM  cusp_supplier_profile_catalog a
                   left join base_product_archive b on a.product_id = b.id
                   left join base_product_class c on b.class_id = c.id

+ 2 - 2
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/mapper/xml/CuspSupplierProfileManMapper.xml → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/mapper/xml/CuspSupplierProfileManMapper.xml

@@ -1,6 +1,6 @@
 <?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="com.cuidian.srm.cuspCode.mapper.CuspSupplierProfileManMapper">
+<mapper namespace="org.jeecg.modules.cuspCode.mapper.CuspSupplierProfileManMapper">
 
 	<delete id="deleteByMainId" parameterType="java.lang.String">
 		DELETE 
@@ -8,7 +8,7 @@
 		WHERE
 			 head_id = #{mainId} 	</delete>
 	
-	<select id="selectByMainId" parameterType="java.lang.String" resultType="com.cuidian.srm.cuspCode.entity.CuspSupplierProfileMan">
+	<select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.cuspCode.entity.CuspSupplierProfileMan">
 		SELECT * 
 		FROM  cusp_supplier_profile_man
 		WHERE

+ 2 - 2
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/mapper/xml/CuspSupplierProfileMapper.xml → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/mapper/xml/CuspSupplierProfileMapper.xml

@@ -1,8 +1,8 @@
 <?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="com.cuidian.srm.cuspCode.mapper.CuspSupplierProfileMapper">
+<mapper namespace="org.jeecg.modules.cuspCode.mapper.CuspSupplierProfileMapper">
 
-    <select id="page2"  resultType="com.cuidian.srm.cuspCode.vo.CuspSupplierDeadlineReminderVo">
+    <select id="page2"  resultType="org.jeecg.modules.cuspCode.vo.CuspSupplierDeadlineReminderVo">
        select * from (
         select
         code,name,abbreviation,duty_paragraph,contacts,

+ 2 - 2
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/mapper/xml/CuspSupplierProfileQualificationMapper.xml → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/mapper/xml/CuspSupplierProfileQualificationMapper.xml

@@ -1,6 +1,6 @@
 <?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="com.cuidian.srm.cuspCode.mapper.CuspSupplierProfileQualificationMapper">
+<mapper namespace="org.jeecg.modules.cuspCode.mapper.CuspSupplierProfileQualificationMapper">
 
 	<delete id="deleteByMainId" parameterType="java.lang.String">
 		DELETE 
@@ -8,7 +8,7 @@
 		WHERE
 			 head_id = #{mainId} 	</delete>
 	
-	<select id="selectByMainId" parameterType="java.lang.String" resultType="com.cuidian.srm.cuspCode.entity.CuspSupplierProfileQualification">
+	<select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.cuspCode.entity.CuspSupplierProfileQualification">
 		SELECT * 
 		FROM  cusp_supplier_profile_qualification
 		WHERE

+ 3 - 2
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/service/ICuspCustomerProfileManService.java → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/service/ICuspCustomerProfileManService.java

@@ -1,7 +1,8 @@
-package com.cuidian.srm.cuspCode.service;
+package org.jeecg.modules.cuspCode.service;
 
-import com.cuidian.srm.cuspCode.entity.CuspCustomerProfileMan;
+import org.jeecg.modules.cuspCode.entity.CuspCustomerProfileMan;
 import com.baomidou.mybatisplus.extension.service.IService;
+
 import java.util.List;
 
 /**

+ 4 - 3
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/service/ICuspCustomerProfileService.java → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/service/ICuspCustomerProfileService.java

@@ -1,8 +1,9 @@
-package com.cuidian.srm.cuspCode.service;
+package org.jeecg.modules.cuspCode.service;
 
-import com.cuidian.srm.cuspCode.entity.CuspCustomerProfileMan;
-import com.cuidian.srm.cuspCode.entity.CuspCustomerProfile;
+import org.jeecg.modules.cuspCode.entity.CuspCustomerProfileMan;
+import org.jeecg.modules.cuspCode.entity.CuspCustomerProfile;
 import com.baomidou.mybatisplus.extension.service.IService;
+
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.List;

+ 2 - 2
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/service/ICuspIntermediatorService.java → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/service/ICuspIntermediatorService.java

@@ -1,6 +1,6 @@
-package com.cuidian.srm.cuspCode.service;
+package org.jeecg.modules.cuspCode.service;
 
-import com.cuidian.srm.cuspCode.entity.CuspIntermediator;
+import org.jeecg.modules.cuspCode.entity.CuspIntermediator;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

+ 3 - 2
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/service/ICuspSupplierEvaluationScoreService.java → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/service/ICuspSupplierEvaluationScoreService.java

@@ -1,7 +1,8 @@
-package com.cuidian.srm.cuspCode.service;
+package org.jeecg.modules.cuspCode.service;
 
-import com.cuidian.srm.cuspCode.entity.CuspSupplierEvaluationScore;
+import org.jeecg.modules.cuspCode.entity.CuspSupplierEvaluationScore;
 import com.baomidou.mybatisplus.extension.service.IService;
+
 import java.util.List;
 
 /**

+ 4 - 3
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/service/ICuspSupplierEvaluationService.java → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/service/ICuspSupplierEvaluationService.java

@@ -1,8 +1,9 @@
-package com.cuidian.srm.cuspCode.service;
+package org.jeecg.modules.cuspCode.service;
 
-import com.cuidian.srm.cuspCode.entity.CuspSupplierEvaluationScore;
-import com.cuidian.srm.cuspCode.entity.CuspSupplierEvaluation;
+import org.jeecg.modules.cuspCode.entity.CuspSupplierEvaluationScore;
+import org.jeecg.modules.cuspCode.entity.CuspSupplierEvaluation;
 import com.baomidou.mybatisplus.extension.service.IService;
+
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.List;

+ 2 - 2
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/service/ICuspSupplierProfileCatalogService.java → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/service/ICuspSupplierProfileCatalogService.java

@@ -1,6 +1,6 @@
-package com.cuidian.srm.cuspCode.service;
+package org.jeecg.modules.cuspCode.service;
 
-import com.cuidian.srm.cuspCode.entity.CuspSupplierProfileCatalog;
+import org.jeecg.modules.cuspCode.entity.CuspSupplierProfileCatalog;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;

+ 3 - 2
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/service/ICuspSupplierProfileManService.java → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/service/ICuspSupplierProfileManService.java

@@ -1,7 +1,8 @@
-package com.cuidian.srm.cuspCode.service;
+package org.jeecg.modules.cuspCode.service;
 
-import com.cuidian.srm.cuspCode.entity.CuspSupplierProfileMan;
+import org.jeecg.modules.cuspCode.entity.CuspSupplierProfileMan;
 import com.baomidou.mybatisplus.extension.service.IService;
+
 import java.util.List;
 
 /**

+ 3 - 2
srm-module-code/src/main/java/com/cuidian/srm/cuspCode/service/ICuspSupplierProfileQualificationService.java → srm-module-code/src/main/java/org/jeecg/modules/cuspCode/service/ICuspSupplierProfileQualificationService.java

@@ -1,7 +1,8 @@
-package com.cuidian.srm.cuspCode.service;
+package org.jeecg.modules.cuspCode.service;
 
-import com.cuidian.srm.cuspCode.entity.CuspSupplierProfileQualification;
+import org.jeecg.modules.cuspCode.entity.CuspSupplierProfileQualification;
 import com.baomidou.mybatisplus.extension.service.IService;
+
 import java.util.List;
 
 /**

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio