Merge remote-tracking branch 'origin/master'

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java

@@ -1959,16 +1959,20 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
     @Override
     public EventAnalysisResultDTO getEventAnalysis(String orgId, String orgType, String eventType) {
         String orgPath = getOrgPath(orgId, orgType);
-        log.info(orgPath);
-        EventAnalysisResultDTO dto = baseDao.getEventBySourceTypeCount(orgPath);//根据事件来源获取事件数量
-        Integer total;
-        if (StringUtils.isEmpty(eventType)) {
-            total = dto.getJiSuJiBan() + dto.getZhiTongLianBan() + dto.getWangGeHua();
-        } else {
-            total = eventType.equals("0") ? dto.getJiSuJiBan() : eventType.equals("1") ?
-                    dto.getZhiTongLianBan() : dto.getWangGeHua();
+        try {
+            EventAnalysisResultDTO dto = baseDao.getEventBySourceTypeCount(orgPath);//根据事件来源获取事件数量
+            Integer total;
+            if (StringUtils.isEmpty(eventType)) {
+                total = dto.getJiSuJiBan() + dto.getZhiTongLianBan() + dto.getWangGeHua();
+            } else {
+                total = eventType.equals("0") ? dto.getJiSuJiBan() : eventType.equals("1") ?
+                        dto.getZhiTongLianBan() : dto.getWangGeHua();
+            }
+            return biuldData(dto, orgPath, eventType, total);
+        } catch (Exception e) {
+            e.getMessage();
+            return null;
         }
-        return biuldData(dto, orgPath, eventType, total);
     }
 
     private EventAnalysisResultDTO biuldData(EventAnalysisResultDTO dto, String orgPath, String eventType, Integer total) {
@@ -1980,29 +1984,33 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
          * 已归档 只要包含一条归档数据即为已归档(应该只有一条)
          * manageType: 0、上报 1、阅收 2、完结 3、审核 4、事件评价 5、结案归档
          */
-        for (int i = 0; i < 4; i++) {
-            Integer temp;
-            if (i == 0) {
-                temp = baseDao.getEventByReplyTypeCount(orgPath, eventType, String.valueOf(i));
-                dto.setDaiChuLi(temp);
-                dto.setDaiChuLiRate(new BigDecimal((double) temp / total).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
-            }
-            if (i == 1) {
-                temp = baseDao.getEventByReplyTypeCount(orgPath, eventType, String.valueOf(i));
-                dto.setChuLiZhong(temp);
-                dto.setChuLiZhongRate(new BigDecimal((double) temp / total).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
-            }
-            if (i == 2) {
-                temp = baseDao.getEventByReplyTypeCount(orgPath, eventType, String.valueOf(i));
-                dto.setYiJieAn(temp);
-                dto.setYiJieAnRate(new BigDecimal((double) temp / total).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
-            }
-            if (i == 3) {
-                i = i + 2;
-                temp = baseDao.getEventByReplyTypeCount(orgPath, eventType, String.valueOf(i));
-                dto.setGuiDang(temp);
-                dto.setGuiDangRate(new BigDecimal((double) temp / total).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+        try {
+            for (int i = 0; i < 4; i++) {
+                Integer temp;
+                if (i == 0) {
+                    temp = baseDao.getEventByReplyTypeCount(orgPath, eventType, String.valueOf(i));
+                    dto.setDaiChuLi(temp);
+                    dto.setDaiChuLiRate(new BigDecimal((double) temp / total).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+                }
+                if (i == 1) {
+                    temp = baseDao.getEventByReplyTypeCount(orgPath, eventType, String.valueOf(i));
+                    dto.setChuLiZhong(temp);
+                    dto.setChuLiZhongRate(new BigDecimal((double) temp / total).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+                }
+                if (i == 2) {
+                    temp = baseDao.getEventByReplyTypeCount(orgPath, eventType, String.valueOf(i));
+                    dto.setYiJieAn(temp);
+                    dto.setYiJieAnRate(new BigDecimal((double) temp / total).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+                }
+                if (i == 3) {
+                    i = i + 2;
+                    temp = baseDao.getEventByReplyTypeCount(orgPath, eventType, String.valueOf(i));
+                    dto.setGuiDang(temp);
+                    dto.setGuiDangRate(new BigDecimal((double) temp / total).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+                }
             }
+        }catch (Exception e){
+            e.getMessage();
         }
         return dto;
     }