Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/processor/MaskProcessor.java

@@ -141,15 +141,16 @@ public class MaskProcessor {
      * @return
      */
     private String maskIdCard(String originString) {
+        int clearTextLength = 12;
         // 仅将6位之后的全都打码
         int length = originString.length();
-        if (length <= 6) {
+        if (length <= clearTextLength) {
             return originString;
         }
 
-        String maskStr = StrUtil.repeatByLength("*", length - 6);
+        String maskStr = StrUtil.repeatByLength("*", length - clearTextLength);
 
-        return originString.replaceAll("^(\\d{6})[a-zA-Z0-9]*$", new StringBuilder("$1").append(maskStr).toString());
+        return originString.replaceAll("^(\\d{10})\\d+([a-zA-Z0-9]{2})$", new StringBuilder("$1").append(maskStr).append("$2").toString());
     }
 
     /**

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProcessStatusRatioResultDTO.java

@@ -4,8 +4,8 @@ import lombok.Data;
 
 @Data
 public class ProcessStatusRatioResultDTO {
-    private Long processingCount;
-    private Long closedCount;
-    private Double processingRatio;
-    private Double closedRatio;
+    private Long processingCount = 0l;
+    private Long closedCount = 0l;
+    private Double processingRatio = 0d;
+    private Double closedRatio = 0d;
 }

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

@@ -418,6 +418,10 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
 
         ProcessStatusRatioResultDTO r = new ProcessStatusRatioResultDTO();
 
+        if (CollectionUtils.isEmpty(m)) {
+            return r;
+        }
+
         BigDecimal processingCount = new BigDecimal(0);
         BigDecimal closedCount = new BigDecimal(0);
         ;
@@ -607,6 +611,9 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
                 "【事件研判分析】查找家属失败");
 
         ArrayList<IcEventYpAnalysisResultDTO.Dependent> dependents = new ArrayList<>();
+        if (CollectionUtils.isEmpty(dependents)) {
+            return dependents;
+        }
         for (HouseUserDTO u : familyInfo.getHouseUserList()) {
             dependents.add(new IcEventYpAnalysisResultDTO.Dependent(u.getIcResiUserId(), u.getIcUserName()));
         }

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml

@@ -63,7 +63,7 @@
               and c.CATEGORY_CODE = #{categoryCode}
           </if>
         </where>
-        order by CREATE_TIME desc
+        order by e.CREATED_TIME desc
     </select>
     <select id="listMonthlyEventCount" resultType="com.epmet.dto.result.IcEventMonthlyCountResultDTO">
         select t.monthName, count(1) eventCount