From c180e669ab4e1792c5ca33d3af1c2c4e04ffbbe6 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Mon, 27 Apr 2020 17:37:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=97=E9=81=93=E4=BA=BA=E5=91=98=E5=BA=95?=
 =?UTF-8?q?=E6=95=B0=E7=AE=A1=E7=90=86=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/StreetPersonBaseController.java |  3 +--
 .../esua/epdc/dao/StreetPersonBaseDao.java     |  9 +++++++++
 .../epdc/service/StreetPersonBaseService.java  | 18 +++++++++---------
 .../impl/StreetPersonBaseServiceImpl.java      | 14 +++++++++++---
 .../resources/mapper/StreetPersonBaseDao.xml   |  7 +++++++
 5 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/StreetPersonBaseController.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/StreetPersonBaseController.java
index bf13f4636..b04f0db6b 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/StreetPersonBaseController.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/StreetPersonBaseController.java
@@ -65,8 +65,7 @@ public class StreetPersonBaseController {
     public Result save(@RequestBody StreetPersonBaseDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        streetPersonBaseService.save(dto);
-        return new Result();
+        return streetPersonBaseService.save(dto);
     }
 
     @PutMapping
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/StreetPersonBaseDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/StreetPersonBaseDao.java
index f055ef201..f70ced31c 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/StreetPersonBaseDao.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/StreetPersonBaseDao.java
@@ -42,4 +42,13 @@ public interface StreetPersonBaseDao extends BaseDao<StreetPersonBaseEntity> {
      * @Date: 2020-04-26
      */
     StreetPersonBaseDTO selectOneStreetPersonBase(String streetId);
+
+    /**
+     * @Description: 检查街道人员底数是否已存在
+     * @Param: [streetId]
+     * @return: int
+     * @Author: zy
+     * @Date: 2020-04-27
+     */
+    int checkStreetIsExist(long streetId);
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/StreetPersonBaseService.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/StreetPersonBaseService.java
index e38829417..5f9a3779e 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/StreetPersonBaseService.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/StreetPersonBaseService.java
@@ -19,6 +19,7 @@ package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.StreetPersonBaseDTO;
 import com.elink.esua.epdc.entity.StreetPersonBaseEntity;
 
@@ -63,15 +64,14 @@ public interface StreetPersonBaseService extends BaseService<StreetPersonBaseEnt
      */
     StreetPersonBaseDTO get(String id);
 
-    /**
-     * 默认保存
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-04-13
-     */
-    void save(StreetPersonBaseDTO dto);
+    /** 
+     * @Description: 默认保存 
+     * @Param: [dto] 
+     * @return: com.elink.esua.epdc.commons.tools.utils.Result 
+     * @Author: zy 
+     * @Date: 2020-04-27 
+     */ 
+    Result save(StreetPersonBaseDTO dto);
 
     /**
      * 默认更新
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/StreetPersonBaseServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/StreetPersonBaseServiceImpl.java
index 05e250de8..34e887f09 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/StreetPersonBaseServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/StreetPersonBaseServiceImpl.java
@@ -20,9 +20,11 @@ package com.elink.esua.epdc.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.constant.KpiFieldConstant;
 import com.elink.esua.epdc.dao.StreetPersonBaseDao;
 import com.elink.esua.epdc.dto.StreetPersonBaseDTO;
@@ -68,9 +70,9 @@ public class StreetPersonBaseServiceImpl extends BaseServiceImpl<StreetPersonBas
     }
 
     private QueryWrapper<StreetPersonBaseEntity> getWrapper(Map<String, Object> params){
-        String streetName = (String)params.get("street");
+        String streetId = (String)params.get("streetId");
         QueryWrapper<StreetPersonBaseEntity> wrapper = new QueryWrapper<>();
-        wrapper.like(StringUtils.isNotBlank(streetName), "StREET", streetName);
+        wrapper.eq(StringUtils.isNotBlank(streetId), FieldConstant.STREET_ID, streetId);
 
         return wrapper;
     }
@@ -83,9 +85,15 @@ public class StreetPersonBaseServiceImpl extends BaseServiceImpl<StreetPersonBas
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void save(StreetPersonBaseDTO dto) {
+    public Result save(StreetPersonBaseDTO dto) {
+        // 判断街道人员底数是否重复插入
+        int isExist = baseDao.checkStreetIsExist(dto.getStreetId());
+        if (isExist > NumConstant.ZERO) {
+            return new Result().error("该街道已设置人员底数，请选择其他街道");
+        }
         StreetPersonBaseEntity entity = ConvertUtils.sourceToTarget(dto, StreetPersonBaseEntity.class);
         insert(entity);
+        return new Result();
     }
 
     @Override
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/StreetPersonBaseDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/StreetPersonBaseDao.xml
index 5729ece9f..152eb9209 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/StreetPersonBaseDao.xml
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/StreetPersonBaseDao.xml
@@ -27,4 +27,11 @@
 		FROM epdc_street_person_base
 		WHERE STREET_ID = #{streetId} AND DEL_FLAG = 0
     </select>
+
+    <select id="checkStreetIsExist" resultType="int">
+        SELECT
+          COUNT(1)
+		FROM epdc_street_person_base
+		WHERE STREET_ID = #{streetId} AND DEL_FLAG = 0
+    </select>
 </mapper>
\ No newline at end of file