feat: sap导入数据组织名称修改

abi-cloud-qr-platform-api/src/main/java/com/abi/platform/api/BaseSapImportApi.java

@@ -3,7 +3,7 @@ package com.abi.platform.api;
 
 import com.abi.platform.Base.BaseResponse;
 import com.abi.platform.dto.req.BatchImportBrandReq;
-import com.abi.platform.dto.req.BatchImportOrginzationReq;
+import com.abi.platform.dto.req.BatchImportOrganizationReq;
 import com.abi.platform.dto.req.BatchImportSkuReq;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -20,11 +20,11 @@ public interface BaseSapImportApi {
     /**
      * 批量导入组织架构数据
      *
-     * @param batchImportOrginzationReq 批量导入组织架构数据入参
+     * @param batchImportOrganizationReq 批量导入组织架构数据入参
      * @return
      */
-    @PostMapping("batchImportOrginzation")
-    BaseResponse batchImportOrginzation(@RequestBody BatchImportOrginzationReq batchImportOrginzationReq);
+    @PostMapping("batchImportOrganization")
+    BaseResponse batchImportOrganization(@RequestBody BatchImportOrganizationReq batchImportOrganizationReq);
 
     /**
      * 批量导入SKU数据

abi-cloud-qr-platform-api/src/main/java/com/abi/platform/dto/req/BatchImportOrginzationReq.java

@@ -17,18 +17,18 @@ import java.util.List;
  */
 @Data
 @ApiModel
-public class BatchImportOrginzationReq implements Serializable {
+public class BatchImportOrganizationReq implements Serializable {
 
     @ApiModelProperty("组织架构List")
-    private List<SapOrginzation> orginzationList;
+    private List<SapOrganization> organizationList;
 
 
     @Data
     @NoArgsConstructor
     @AllArgsConstructor
     @ToString
-    @ApiModel(value = "BatchImportOrginzationReq_SapOrginzation")
-    public static class SapOrginzation implements Serializable {
+    @ApiModel(value = "BatchImportOrganizationReq_SapOrganization")
+    public static class SapOrganization implements Serializable {
 
         @ApiModelProperty(value = "id")
         private Long id;
@@ -43,7 +43,7 @@ public class BatchImportOrginzationReq implements Serializable {
         private String parentCode;
 
         @ApiModelProperty(value = "层级 0-国家 1-bu 2-region 3-area 4-terrion")
-        private Integer orginzationLevel;
+        private Integer organizationLevel;
 
         @ApiModelProperty(value = "省")
         private String province;

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/BaseSapImportController.java

@@ -2,10 +2,10 @@ package com.abi.qms.platform.controller.console;
 
 import com.abi.qms.platform.annotation.PassToken;
 import com.abi.qms.platform.dto.req.BatchImportBrandReq;
-import com.abi.qms.platform.dto.req.BatchImportOrginzationReq;
+import com.abi.qms.platform.dto.req.BatchImportOrganizationReq;
 import com.abi.qms.platform.dto.req.BatchImportSkuReq;
 import com.abi.qms.platform.service.BaseSapBrandService;
-import com.abi.qms.platform.service.BaseSapOrginzationService;
+import com.abi.qms.platform.service.BaseSapOrganizationService;
 import com.abi.qms.platform.service.BaseSapSkuService;
 import com.abi.task.common.api.base.BaseResponse;
 import io.swagger.annotations.Api;
@@ -29,7 +29,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class BaseSapImportController {
 
     @Autowired
-    private BaseSapOrginzationService baseSapOrginzationService;
+    private BaseSapOrganizationService baseSapOrganizationService;
 
     @Autowired
     private BaseSapSkuService baseSapSkuService;
@@ -39,11 +39,11 @@ public class BaseSapImportController {
 
 
     @ApiOperation("批量导入组织架构数据")
-    @PostMapping("batchImportOrginzation")
+    @PostMapping("batchImportOrganization")
     @PassToken
-    public BaseResponse batchImportOrginzation(@RequestBody BatchImportOrginzationReq batchImportOrginzationReq) {
+    public BaseResponse batchImportOrganization(@RequestBody BatchImportOrganizationReq batchImportOrganizationReq) {
 
-        baseSapOrginzationService.batchImportOrginzation(batchImportOrginzationReq);
+        baseSapOrganizationService.batchImportOrganization(batchImportOrganizationReq);
         //包装出参
         return BaseResponse.create();
     }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/FactoryController.java

@@ -134,10 +134,10 @@ public class FactoryController {
 
 
     @ApiOperation("包材厂下拉框")
-    @GetMapping("listPageMaterials")
-    public BaseResponse<ListPageMaterialsRes> listPageMaterials() {
+    @GetMapping("listCoverFactorySelect")
+    public BaseResponse<ListCoverFactorySelectRes> listCoverFactorySelect() {
         //包材厂下拉框
-        ListPageMaterialsRes result = factoryService.listPageMaterials();
+        ListCoverFactorySelectRes result = factoryService.listCoverFactorySelect();
         //包装出参
         return BaseResponse.create(result);
     }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/entity/BaseSapOrginzation.java

@@ -19,7 +19,7 @@ import java.time.LocalDateTime;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value = "组织架构表对象", description = "组织架构表")
-public class BaseSapOrginzation {
+public class BaseSapOrganization {
 
     @ApiModelProperty(value = "id")
     @TableId(value = "id", type = IdType.AUTO)
@@ -35,7 +35,7 @@ public class BaseSapOrginzation {
     private String parentCode;
 
     @ApiModelProperty(value = "层级 0-国家 1-bu 2-region 3-area 4-terrion")
-    private Integer orginzationLevel;
+    private Integer organizationLevel;
 
     @ApiModelProperty(value = "省")
     private String province;

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/mapper/BaseSapOrginzationMapper.java

@@ -1,6 +1,6 @@
 package com.abi.qms.platform.dao.mapper;
 
-import com.abi.qms.platform.dao.entity.BaseSapOrginzation;
+import com.abi.qms.platform.dao.entity.BaseSapOrganization;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @date: 2021/06/01 17:01
  * @description: 组织架构表mapper接口
  */
-public interface BaseSapOrginzationMapper extends BaseMapper<BaseSapOrginzation> {
+public interface BaseSapOrganizationMapper extends BaseMapper<BaseSapOrganization> {
 
 
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/BatchImportOrginzationReq.java

@@ -17,18 +17,18 @@ import java.util.List;
  */
 @Data
 @ApiModel
-public class BatchImportOrginzationReq implements Serializable {
+public class BatchImportOrganizationReq implements Serializable {
 
     @ApiModelProperty("组织架构List")
-    private List<SapOrginzation> orginzationList;
+    private List<SapOrganization> organizationList;
 
 
     @Data
     @NoArgsConstructor
     @AllArgsConstructor
     @ToString
-    @ApiModel(value = "BatchImportOrginzationReq_SapOrginzation")
-    public static class SapOrginzation implements Serializable {
+    @ApiModel(value = "BatchImportOrganizationReq_SapOrganization")
+    public static class SapOrganization implements Serializable {
 
         @ApiModelProperty(value = "id")
         private Long id;
@@ -43,7 +43,7 @@ public class BatchImportOrginzationReq implements Serializable {
         private String parentCode;
 
         @ApiModelProperty(value = "层级 0-国家 1-bu 2-region 3-area 4-terrion")
-        private Integer orginzationLevel;
+        private Integer organizationLevel;
 
         @ApiModelProperty(value = "省")
         private String province;

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/ListPageMaterialsRes.java

@@ -17,10 +17,10 @@ import java.util.List;
  */
 @Data
 @ApiModel
-public class ListPageMaterialsRes implements Serializable {
+public class ListCoverFactorySelectRes implements Serializable {
 
     @ApiModelProperty("包材厂列表")
-    private List<FactoryBean> factoryBeanList;
+    private List<CoverFactoryBean> factoryBeanList;
 
     /**
      * 包材厂bean
@@ -29,8 +29,8 @@ public class ListPageMaterialsRes implements Serializable {
     @NoArgsConstructor
     @AllArgsConstructor
     @ToString
-    @ApiModel(value = "ListPageMaterialsRes_FactoryBean")
-    public static class FactoryBean implements Serializable {
+    @ApiModel(value = "ListCoverFactorySelectRes_CoverFactoryBean")
+    public static class CoverFactoryBean implements Serializable {
 
         @ApiModelProperty(value = "id")
         private Long id;

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/BaseSapOrganizationService.java

@@ -0,0 +1,18 @@
+package com.abi.qms.platform.service;
+
+import com.abi.qms.platform.dto.req.BatchImportOrganizationReq;
+
+/**
+ * @author: fangxinjian
+ * @date: 2021/06/01 17:20
+ * @description:
+ */
+public interface BaseSapOrganizationService {
+
+    /**
+     * 批量导入sap组织架构数据
+     *
+     * @param batchImportOrganizationReq
+     */
+    void batchImportOrganization(BatchImportOrganizationReq batchImportOrganizationReq);
+}

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/BaseSapOrginzationService.java

@@ -1,18 +0,0 @@
-package com.abi.qms.platform.service;
-
-import com.abi.qms.platform.dto.req.BatchImportOrginzationReq;
-
-/**
- * @author: fangxinjian
- * @date: 2021/06/01 17:20
- * @description:
- */
-public interface BaseSapOrginzationService {
-
-    /**
-     * 批量导入sap组织架构数据
-     *
-     * @param batchImportOrginzationReq
-     */
-    void batchImportOrginzation(BatchImportOrginzationReq batchImportOrginzationReq);
-}

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/FactoryService.java

@@ -12,7 +12,7 @@ import com.abi.qms.platform.dto.res.ListBeerFactorySelectRes;
 import com.abi.qms.platform.dto.res.ListFactoryEnableRes;
 import com.abi.qms.platform.dto.res.ListFactoryRes;
 import com.abi.qms.platform.dto.res.ListPackageFactorySelectRes;
-import com.abi.qms.platform.dto.res.ListPageMaterialsRes;
+import com.abi.qms.platform.dto.res.ListCoverFactorySelectRes;
 import com.abi.task.common.excel.preperties.FactoryProperty;
 
 import java.util.List;
@@ -70,5 +70,5 @@ public interface FactoryService {
      *
      * @return
      */
-    ListPageMaterialsRes listPageMaterials();
+    ListCoverFactorySelectRes listCoverFactorySelect();
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/BaseSapOrganizationServiceImpl.java

@@ -0,0 +1,76 @@
+package com.abi.qms.platform.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.abi.qms.platform.dao.entity.BaseSapOrganization;
+import com.abi.qms.platform.dao.mapper.BaseSapOrganizationMapper;
+import com.abi.qms.platform.dto.req.BatchImportOrganizationReq;
+import com.abi.qms.platform.infrastructure.util.AssertUtil;
+import com.abi.qms.platform.service.BaseSapOrganizationService;
+import com.abi.task.common.api.exception.BusinessException;
+import com.abi.task.common.api.exception.ErrorCodeEnum;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * @author: fangxinjian
+ * @date: 2021/06/01 17:20
+ * @description:
+ */
+@Service
+public class BaseSapOrganizationServiceImpl implements BaseSapOrganizationService {
+
+    @Autowired
+    private BaseSapOrganizationMapper baseSapOrganizationMapper;
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void batchImportOrganization(BatchImportOrganizationReq req) {
+        List<BatchImportOrganizationReq.SapOrganization> organizationList = req.getOrganizationList();
+
+        for (BatchImportOrganizationReq.SapOrganization sap : organizationList) {
+
+            BaseSapOrganization organization = new BaseSapOrganization();
+            organization.setCustomerCode(sap.getCustomerCode());
+            organization.setCustomerName(sap.getCustomerName());
+            organization.setOrganizationLevel(sap.getOrganizationLevel());
+            organization.setParentCode(sap.getParentCode());
+            organization.setProvince(sap.getProvince());
+            organization.setId(sap.getId());
+
+            saveBaseSapOrganization(organization);
+        }
+
+    }
+
+    public void saveBaseSapOrganization(BaseSapOrganization bso) {
+
+        //校验入参 code不能重复
+        QueryWrapper<BaseSapOrganization> qw = new QueryWrapper<>();
+        qw.eq("customer_code", bso.getCustomerCode());
+        if (bso.getId() != null) {
+            qw.ne("id", bso.getId());
+        }
+        List<BaseSapOrganization> organizationList = baseSapOrganizationMapper.selectList(qw);
+        if (CollectionUtil.isNotEmpty(organizationList)) {
+            throw new BusinessException(ErrorCodeEnum.ERROR_PARAM.getCode(), "组织架构ID已存在");
+        }
+
+        if (bso.getId() != null) {
+            BaseSapOrganization baseSapOrganization = baseSapOrganizationMapper.selectById(bso.getId());
+            AssertUtil.isNull(baseSapOrganization, "组织架构不存在");
+        }
+
+        //新增or修改
+        if (bso.getId() != null) {
+            baseSapOrganizationMapper.updateById(bso);
+        } else {
+            baseSapOrganizationMapper.insert(bso);
+        }
+
+    }
+}

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/BaseSapOrginzationServiceImpl.java

@@ -1,76 +0,0 @@
-package com.abi.qms.platform.service.impl;
-
-import cn.hutool.core.collection.CollectionUtil;
-import com.abi.qms.platform.dao.entity.BaseSapOrginzation;
-import com.abi.qms.platform.dao.mapper.BaseSapOrginzationMapper;
-import com.abi.qms.platform.dto.req.BatchImportOrginzationReq;
-import com.abi.qms.platform.infrastructure.util.AssertUtil;
-import com.abi.qms.platform.service.BaseSapOrginzationService;
-import com.abi.task.common.api.exception.BusinessException;
-import com.abi.task.common.api.exception.ErrorCodeEnum;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-/**
- * @author: fangxinjian
- * @date: 2021/06/01 17:20
- * @description:
- */
-@Service
-public class BaseSapOrginzationServiceImpl implements BaseSapOrginzationService {
-
-    @Autowired
-    private BaseSapOrginzationMapper baseSapOrginzationMapper;
-
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void batchImportOrginzation(BatchImportOrginzationReq req) {
-        List<BatchImportOrginzationReq.SapOrginzation> orginzationList = req.getOrginzationList();
-
-        for (BatchImportOrginzationReq.SapOrginzation sap : orginzationList) {
-
-            BaseSapOrginzation orginzation = new BaseSapOrginzation();
-            orginzation.setCustomerCode(sap.getCustomerCode());
-            orginzation.setCustomerName(sap.getCustomerName());
-            orginzation.setOrginzationLevel(sap.getOrginzationLevel());
-            orginzation.setParentCode(sap.getParentCode());
-            orginzation.setProvince(sap.getProvince());
-            orginzation.setId(sap.getId());
-
-            saveBaseSapOrginzation(orginzation);
-        }
-
-    }
-
-    public void saveBaseSapOrginzation(BaseSapOrginzation bso) {
-
-        //校验入参 code不能重复
-        QueryWrapper<BaseSapOrginzation> qw = new QueryWrapper<>();
-        qw.eq("customer_code", bso.getCustomerCode());
-        if (bso.getId() != null) {
-            qw.ne("id", bso.getId());
-        }
-        List<BaseSapOrginzation> orginzationList = baseSapOrginzationMapper.selectList(qw);
-        if (CollectionUtil.isNotEmpty(orginzationList)) {
-            throw new BusinessException(ErrorCodeEnum.ERROR_PARAM.getCode(), "组织架构ID已存在");
-        }
-
-        if (bso.getId() != null) {
-            BaseSapOrginzation baseSapOrginzation = baseSapOrginzationMapper.selectById(bso.getId());
-            AssertUtil.isNull(baseSapOrginzation, "组织架构不存在");
-        }
-
-        //新增or修改
-        if (bso.getId() != null) {
-            baseSapOrginzationMapper.updateById(bso);
-        } else {
-            baseSapOrginzationMapper.insert(bso);
-        }
-
-    }
-}

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/FactoryServiceImpl.java

@@ -23,7 +23,7 @@ import com.abi.qms.platform.dto.res.ListBeerFactorySelectRes;
 import com.abi.qms.platform.dto.res.ListFactoryEnableRes;
 import com.abi.qms.platform.dto.res.ListFactoryRes;
 import com.abi.qms.platform.dto.res.ListPackageFactorySelectRes;
-import com.abi.qms.platform.dto.res.ListPageMaterialsRes;
+import com.abi.qms.platform.dto.res.ListCoverFactorySelectRes;
 import com.abi.qms.platform.infrastructure.util.AssertUtil;
 import com.abi.qms.platform.infrastructure.util.PageUtil;
 import com.abi.qms.platform.infrastructure.util.UserUtil;
@@ -330,16 +330,16 @@ public class FactoryServiceImpl implements FactoryService {
     }
 
     @Override
-    public ListPageMaterialsRes listPageMaterials() {
+    public ListCoverFactorySelectRes listCoverFactorySelect() {
 
-        ListPageMaterialsRes res = new ListPageMaterialsRes();
+        ListCoverFactorySelectRes res = new ListCoverFactorySelectRes();
         QueryWrapper<BaseFactory> qw = new QueryWrapper<>();
         qw.eq("factory_type", FactoryTypeEnum.COVER.getCode());
         qw.eq("is_delete", 0);
         qw.eq("valid", 1);
 
         List<BaseFactory> baseFactoryList = baseFactoryMapper.selectList(qw);
-        List<ListPageMaterialsRes.FactoryBean> beanList = PojoConverterUtils.copyList(baseFactoryList, ListPageMaterialsRes.FactoryBean.class);
+        List<ListCoverFactorySelectRes.CoverFactoryBean> beanList = PojoConverterUtils.copyList(baseFactoryList, ListCoverFactorySelectRes.CoverFactoryBean.class);
         res.setFactoryBeanList(beanList);
         return res;
     }

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/BaseSapOrginzationMapper.xml

@@ -1,14 +1,14 @@
 <?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.abi.qms.platform.dao.mapper.BaseSapOrginzationMapper">
+<mapper namespace="com.abi.qms.platform.dao.mapper.BaseSapOrganizationMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.abi.qms.platform.dao.entity.BaseSapOrginzation">
+    <resultMap id="BaseResultMap" type="com.abi.qms.platform.dao.entity.BaseSapOrganization">
         <id column="id" property="id" />
         <result column="customer_code" property="customerCode" />
         <result column="customer_name" property="customerName" />
         <result column="parent_code" property="parentCode" />
-        <result column="orginzation_level" property="orginzationLevel" />
+        <result column="organization_level" property="organizationLevel" />
         <result column="province" property="province" />
         <result column="create_time" property="createTime" />
         <result column="create_by" property="createBy" />
@@ -19,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, customer_code, customer_name, parent_code, orginzation_level, province, create_time, create_by, update_time, update_by, is_delete
+        id, customer_code, customer_name, parent_code, organization_level, province, create_time, create_by, update_time, update_by, is_delete
     </sql>
 
 </mapper>