From a7f045f94a9597815fe99a019b6589ca600c9457 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Sat, 8 May 2021 14:23:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=94=9F=E4=BA=A7bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/group/ResiGroupDao.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml index 50006ae2dd..1930d48814 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml @@ -471,9 +471,8 @@ ta.ATTACHMENT_URL AS imgUrl, rt.GROUP_ID AS groupId FROM resi_topic rt - LEFT JOIN resi_topic_attachment ta ON ta.TOPIC_ID = rt.ID + LEFT JOIN resi_topic_attachment ta ON ta.TOPIC_ID = rt.ID AND ta.attachment_type = 'image' WHERE rt.DEL_FLAG = '0' - AND ta.attachment_type = 'image' AND rt.ID = #{topicId} From 7e19b2d45e7e64b9db1624ec8dae176ecad010d7 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Sat, 8 May 2021 14:26:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?bigDecimal=E9=99=A4=E6=B3=95=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=9B=9B=E8=88=8D=E4=BA=94=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../indexcoll/impl/FactIndexCollectServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexCollectServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexCollectServiceImpl.java index 4e53c3db97..127479f37e 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexCollectServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexCollectServiceImpl.java @@ -879,10 +879,10 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService { m.setServiceAblity(monthCountBd.multiply(m.getServiceAblity())); m.setGovernAblity(monthCountBd.multiply(m.getGovernAblity())); }else { - m.setIndexTotal(monthCountBd.multiply(m.getIndexTotal()).divide(selfCount)); - m.setPartyDevAblity(monthCountBd.multiply(m.getPartyDevAblity()).divide(selfCount)); - m.setServiceAblity(monthCountBd.multiply(m.getServiceAblity()).divide(selfCount)); - m.setGovernAblity(monthCountBd.multiply(m.getGovernAblity()).divide(selfCount)); + m.setIndexTotal(monthCountBd.multiply(m.getIndexTotal()).divide(selfCount,NumConstant.SIX,BigDecimal.ROUND_HALF_UP)); + m.setPartyDevAblity(monthCountBd.multiply(m.getPartyDevAblity()).divide(selfCount,NumConstant.SIX,BigDecimal.ROUND_HALF_UP)); + m.setServiceAblity(monthCountBd.multiply(m.getServiceAblity()).divide(selfCount,NumConstant.SIX,BigDecimal.ROUND_HALF_UP)); + m.setGovernAblity(monthCountBd.multiply(m.getGovernAblity()).divide(selfCount,NumConstant.SIX,BigDecimal.ROUND_HALF_UP)); } } });