From 42fb81ed45edd0a2106f12e8aa6ce1c77babe18b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期日, 18 九月 2022 20:08:57 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/crm/manager/controller/CstmrController.java |   25 ++++++++++++++++++++++---
 src/main/java/com/zy/crm/system/service/DicService.java          |    2 ++
 src/main/java/com/zy/crm/system/service/impl/DicServiceImpl.java |    4 ++++
 src/main/resources/mapper/DicMapper.xml                          |    7 +++++++
 src/main/java/com/zy/crm/system/mapper/DicMapper.java            |    2 ++
 5 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/crm/manager/controller/CstmrController.java b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
index 9a60544..b56f090 100644
--- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
@@ -15,6 +15,8 @@
 import com.zy.crm.manager.entity.CstmrType;
 import com.zy.crm.manager.service.CstmrService;
 import com.zy.crm.manager.service.CstmrTypeService;
+import com.zy.crm.system.entity.Dic;
+import com.zy.crm.system.service.DicService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Row;
@@ -39,6 +41,8 @@
     private CstmrService cstmrService;
     @Autowired
     private CstmrTypeService cstmrTypeService;
+    @Autowired
+    private DicService dicService;
 
     @RequestMapping(value = "/cstmr/{id}/auth")
     @ManagerAuth
@@ -236,11 +240,26 @@
                 // 澶囨敞
                 cstmr.setRemarks(row.getCell(6).getStringCellValue());
                 // 鐪�
-                cstmr.setProvince(row.getCell(7).getStringCellValue());
+                String province = row.getCell(7).getStringCellValue();
+                Dic dicProvince = dicService.selectByName(province);
+                if (Cools.isEmpty(dicProvince)) {
+                    throw new CoolException("绗�" + i + "琛岀渷鍚嶄笉鍚堟硶锛岃閲嶆柊瀵煎叆");
+                }
+                cstmr.setProvince(dicProvince.getCode());
                 // 甯�
-                cstmr.setCity(row.getCell(8).getStringCellValue());
+                String city = row.getCell(8).getStringCellValue();
+                Dic dicCity = dicService.selectByName(city);
+                if (Cools.isEmpty(dicCity)) {
+                    throw new CoolException("绗�" + i + "琛屽競鍚嶄笉鍚堟硶锛岃閲嶆柊瀵煎叆");
+                }
+                cstmr.setCity(dicCity.getCode());
                 // 鍖�
-                cstmr.setDistrict(row.getCell(9).getStringCellValue());
+                String district = row.getCell(9).getStringCellValue();
+                Dic dicDistrict = dicService.selectByName(district);
+                if (Cools.isEmpty(dicDistrict)) {
+                    throw new CoolException("绗�" + i + "琛屽幙鍚嶄笉鍚堟硶锛岃閲嶆柊瀵煎叆");
+                }
+                cstmr.setDistrict(dicDistrict.getCode());
                 // 璇︾粏鍦板潃
                 cstmr.setAddr(row.getCell(10).getStringCellValue());
                 // 鍖哄垎
diff --git a/src/main/java/com/zy/crm/system/mapper/DicMapper.java b/src/main/java/com/zy/crm/system/mapper/DicMapper.java
index 1b3678f..90836c7 100644
--- a/src/main/java/com/zy/crm/system/mapper/DicMapper.java
+++ b/src/main/java/com/zy/crm/system/mapper/DicMapper.java
@@ -9,4 +9,6 @@
 @Repository
 public interface DicMapper extends BaseMapper<Dic> {
 
+    Dic selectByName(String name);
+
 }
diff --git a/src/main/java/com/zy/crm/system/service/DicService.java b/src/main/java/com/zy/crm/system/service/DicService.java
index a686a12..11019fd 100644
--- a/src/main/java/com/zy/crm/system/service/DicService.java
+++ b/src/main/java/com/zy/crm/system/service/DicService.java
@@ -5,4 +5,6 @@
 
 public interface DicService extends IService<Dic> {
 
+    Dic selectByName(String name);
+
 }
diff --git a/src/main/java/com/zy/crm/system/service/impl/DicServiceImpl.java b/src/main/java/com/zy/crm/system/service/impl/DicServiceImpl.java
index 91fded3..5e4de34 100644
--- a/src/main/java/com/zy/crm/system/service/impl/DicServiceImpl.java
+++ b/src/main/java/com/zy/crm/system/service/impl/DicServiceImpl.java
@@ -9,4 +9,8 @@
 @Service("dicService")
 public class DicServiceImpl extends ServiceImpl<DicMapper, Dic> implements DicService {
 
+    @Override
+    public Dic selectByName(String name) {
+        return this.baseMapper.selectByName(name);
+    }
 }
diff --git a/src/main/resources/mapper/DicMapper.xml b/src/main/resources/mapper/DicMapper.xml
index 4ecf8ec..771b43b 100644
--- a/src/main/resources/mapper/DicMapper.xml
+++ b/src/main/resources/mapper/DicMapper.xml
@@ -10,4 +10,11 @@
 
     </resultMap>
 
+    <select id="selectByName" resultMap="BaseResultMap">
+        select top 1 *
+        from sys_dic
+        where 1=1
+        and name = #{name}
+    </select>
+
 </mapper>

--
Gitblit v1.9.1