From 4ac3cfa8576d55dd3c20d483e2bf41cdcb44b194 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 21 Oct 2022 10:07:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/modules/item/service/impl/ItemServiceImpl.java | 1 + .../src/main/resources/mapper/item/ItemDao.xml | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 12bcc43aa..745070a43 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -3968,6 +3968,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem Integer elseValue = 0; for(CategoryAnalysisPieResultDTO dto : list){ if(cityCompre.contains(dto.getName())){ + dto.setName(dto.getName().replace("城市综合-","")); resultList.add(dto); }else{ elseValue += Integer.parseInt(dto.getValue()); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index ad69cad50..812fb5ef1 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -2432,9 +2432,9 @@ parameterType="com.elink.esua.epdc.dto.item.form.ScreenTotalFormDTO"> select DATE_FORMAT(item.CREATED_TIME,'%Y-%m') as time, - count(item.EVALUATION_SCORE = 0 or null) as bmy, - count(item.EVALUATION_SCORE = 1 or null) as jbmy, - count(item.EVALUATION_SCORE = 2 or null) as fcmy + ROUND(count(item.EVALUATION_SCORE = 0 or null) / count(item.ID) * 100,1) as bmy, + ROUND(count(item.EVALUATION_SCORE = 1 or null) / count(item.ID) * 100,1) as jbmy, + ROUND(count(item.EVALUATION_SCORE = 2 or null) / count(item.ID) * 100,1) as fcmy from epdc_item item where item.DEL_FLAG = '0' and item.IS_PEOPLE = '1'