楚江erp：客户简称导入逻辑调整（读取字典值）

@@ -8,7 +8,9 @@ import com.lframework.starter.common.exceptions.impl.DefaultClientException;
 import com.lframework.starter.web.core.components.excel.ExcelImportListener;
 import com.lframework.starter.web.core.utils.ApplicationUtil;
 import com.lframework.starter.web.core.utils.JsonUtil;
+import com.lframework.starter.web.inner.entity.SysDataDicItem;
 import com.lframework.starter.web.inner.entity.SysDept;
+import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
 import com.lframework.starter.web.inner.service.system.SysDeptService;
 import com.lframework.xingyun.basedata.entity.Customer;
 import com.lframework.xingyun.basedata.entity.CustomerShort;
@@ -16,6 +18,7 @@ import com.lframework.xingyun.basedata.service.customer.CustomerService;
 import com.lframework.xingyun.basedata.service.customer.CustomerShortService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -31,7 +34,7 @@ public class CustomerShortImportListener extends ExcelImportListener<CustomerSho
                 .eq(Customer::getName, data.getCustomerName());
         Customer customer = customerService.getOne(customerWrapper);
         if (customer == null) {
-            throw new DefaultClientException("第" + context.readRowHolder().getRowIndex() + "行，客户[" + data.getCustomerName()
+            throw new DefaultClientException("第" + (context.readRowHolder().getRowIndex() + 1) + "行，客户[" + data.getCustomerName()
                     + "]不存在，请检查后再次导入！");
         }
         data.setCustomerId(customer.getId());
@@ -39,26 +42,39 @@ public class CustomerShortImportListener extends ExcelImportListener<CustomerSho
         CustomerShortService customerShortService = ApplicationUtil.getBean(CustomerShortService.class);
         CustomerShort customerShort = customerShortService.getByCustomerId(customer.getId());
         if (customerShort != null) {
-            throw new DefaultClientException("第" + context.readRowHolder().getRowIndex() + "行，客户[" + data.getCustomerName()
+            throw new DefaultClientException("第" + (context.readRowHolder().getRowIndex() + 1) + "行，客户[" + data.getCustomerName()
                     + "]简称已存在，请检查后再次导入！");
         }
         // 客户类型
-        String type = data.getType();
-        if ("终端".equals(type)) {
-            type = "TERMINAL";
-        } else if ("经销".equals(type)) {
-            type = "DEALER";
-        } else {
-            throw new DefaultClientException("第" + context.readRowHolder().getRowIndex() + "行，客户类型只能填写“终端”或“经销”，请检查后再次导入！");
+        String customerType = "";
+        SysDataDicItemService sysDataDicItemService = ApplicationUtil.getBean(SysDataDicItemService.class);
+        List<SysDataDicItem> enterpriseTypes = sysDataDicItemService.findByDicCode("ENTERPRISE_TYPE");
+        StringBuilder enterpriseTypesBuilder = new StringBuilder();
+        for (SysDataDicItem dicItem : enterpriseTypes) {
+            String name = dicItem.getName();
+            enterpriseTypesBuilder.append("“").append(name).append("”");
+            enterpriseTypesBuilder.append("或");
+
+            String type = data.getType();
+            if (name.equals(type)) {
+                customerType = dicItem.getCode();
+            }
+        }
+        if (enterpriseTypesBuilder.length() > 0) {
+            enterpriseTypesBuilder.deleteCharAt(enterpriseTypesBuilder.length() - 1);
+        }
+        if (StringUtils.isBlank(customerType)) {
+            throw new DefaultClientException("第" + ((context.readRowHolder().getRowIndex() + 1)) + "行，客户类型只能填写" + enterpriseTypesBuilder
+                    + "，请检查后再次导入！");
         }
-        data.setType(type);
+        data.setType(customerType);
         // 办事处
         SysDeptService sysDeptService = ApplicationUtil.getBean(SysDeptService.class);
         LambdaQueryWrapper<SysDept> deptWrapper = Wrappers.lambdaQuery(SysDept.class);
         deptWrapper.eq(SysDept::getName, data.getDeptName());
         SysDept office = sysDeptService.getOne(deptWrapper);
         if (office == null) {
-            throw new DefaultClientException("第" + context.readRowHolder().getRowIndex() + "行，[" + data.getDeptName()
+            throw new DefaultClientException("第" + (context.readRowHolder().getRowIndex() + 1) + "行，[" + data.getDeptName()
                     + "]不存在，请检查后再次导入！");
         }
         data.setDeptId(office.getId());
@@ -67,17 +83,17 @@ public class CustomerShortImportListener extends ExcelImportListener<CustomerSho
         deptWrapper.eq(SysDept::getName, data.getRegionName());
         SysDept region = sysDeptService.getOne(deptWrapper);
         if (region == null) {
-            throw new DefaultClientException("第" + context.readRowHolder().getRowIndex() + "行，[" + data.getRegionName()
+            throw new DefaultClientException("第" + (context.readRowHolder().getRowIndex() + 1) + "行，[" + data.getRegionName()
                     + "]不存在，请检查后再次导入！");
         }
         List<SysDept> regionList = sysDeptService.queryArea(null, office.getId());
         if (CollectionUtils.isEmpty(regionList)) {
-            throw new DefaultClientException("第" + context.readRowHolder().getRowIndex() + "行，[" + data.getRegionName()
+            throw new DefaultClientException("第" + (context.readRowHolder().getRowIndex() + 1) + "行，[" + data.getRegionName()
                     + "]不属于[" + data.getDeptName() + "]，请检查后再次导入！");
         }
         List<String> regionNameList = regionList.stream().map(SysDept::getName).collect(Collectors.toList());
         if (!regionNameList.contains(region.getName())) {
-            throw new DefaultClientException("第" + context.readRowHolder().getRowIndex() + "行，[" + data.getRegionName()
+            throw new DefaultClientException("第" + (context.readRowHolder().getRowIndex() + 1) + "行，[" + data.getRegionName()
                     + "]不属于[" + data.getDeptName() + "]，请检查后再次导入！");
         }
         data.setRegion(region.getId());