From 91ea2f225609699913ae341bcc2af574c399e70f Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Mon, 27 Apr 2020 15:21:09 +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=E9=A1=B5=E9=9D=A2=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/StreetPersionGoalMonthServiceImpl.java    | 5 +++--
 .../epdc/service/impl/StreetPersonBaseServiceImpl.java     | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/StreetPersionGoalMonthServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/StreetPersionGoalMonthServiceImpl.java
index 0d97dab35..9a4c0d278 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/StreetPersionGoalMonthServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/StreetPersionGoalMonthServiceImpl.java
@@ -20,6 +20,7 @@ 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.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
@@ -86,7 +87,7 @@ public class StreetPersionGoalMonthServiceImpl extends BaseServiceImpl<StreetPer
     public Result save(StreetPersionGoalMonthDTO dto) {
         // 判断所选月份 是否存在目标分数
         int isTargetScore = baseDao.checkTheGoalOfStreetThisMonth(dto);
-        if (isTargetScore > 0) {
+        if (isTargetScore > NumConstant.ZERO) {
             return new Result().error("所选月份已设定目标分数，请重新选择月份");
         }
         // 查询每个街道的人员底数
@@ -158,7 +159,7 @@ public class StreetPersionGoalMonthServiceImpl extends BaseServiceImpl<StreetPer
             if(month.equals(dto.getMonthYear())){
                 map = this.splicingStreetGoalScore(map, dto); //拼接街道每月目标数
             }else{
-                if(map.size() > 0){
+                if(map.size() > NumConstant.ZERO){
                     list.add(map);
                     map = new HashMap<>();
                 }
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 9f007b0cf..05e250de8 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
@@ -23,8 +23,10 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 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.constant.KpiFieldConstant;
 import com.elink.esua.epdc.dao.StreetPersonBaseDao;
 import com.elink.esua.epdc.dto.StreetPersonBaseDTO;
+import com.elink.esua.epdc.entity.KpiRuleEntity;
 import com.elink.esua.epdc.entity.StreetPersonBaseEntity;
 import com.elink.esua.epdc.redis.StreetPersonBaseRedis;
 import com.elink.esua.epdc.service.StreetPersonBaseService;
@@ -66,10 +68,9 @@ public class StreetPersonBaseServiceImpl extends BaseServiceImpl<StreetPersonBas
     }
 
     private QueryWrapper<StreetPersonBaseEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
-
+        String streetName = (String)params.get("street");
         QueryWrapper<StreetPersonBaseEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+        wrapper.like(StringUtils.isNotBlank(streetName), "StREET", streetName);
 
         return wrapper;
     }