Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud

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));
                     }
                 }
             });

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml

@@ -472,9 +472,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}
     </select>