Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java

src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseWFRWFXXMapper.java

@@ -12,10 +12,10 @@ import java.util.List;
  * @since 1.8
  */
 public interface GBaseWFRWFXXMapper extends BaseMapper<GBaseWFRWFXX> {
-    @Select("select a.ajbh, b.zjhm, b.ajmc, b.jysm, b.djrq, " +
-            "(SELECT COUNT(DISTINCT a2.ajbh) FROM dwd_asj_zfba_ajjbxx a2 " +
-            "JOIN dwd_asj_zfba_wfrwfxx b2 ON a2.ajbh = b2.ajbh " +
-            "WHERE a2.zjhm = a.zjhm AND a2.ajbzdm = 1) count_num " +
+    @Select("select b.ajbh, b.zjhm, b.ajmc, b.jysm, b.djrq, " +
+            "(SELECT COUNT(DISTINCT a2.ajbh) " +
+            "FROM dwd_asj_zfba_wfrwfxx a2 " +
+            "WHERE a2.zjhm = b.zjhm AND a.ajbzdm = 1) count_num " +
             "from dwd_asj_zfba_ajjbxx a " +
             "join dwd_asj_zfba_wfrwfxx b on a.ajbh = b.ajbh " +
             "where a.ajbzdm = 1;")

src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java

@@ -1178,7 +1178,7 @@ public class PointServiceImpl implements PointService {
                  "中技毕业", "中等专科学校", "高中", "高中毕业", "农业高中毕业" -> 3;// 高中中专
             case "农业初中毕业", "技工学校", "技工学校肄业", "技工学校毕业", "初中", "职业初中毕业", "初中毕业",
                  "初中肆业", "相当初中毕业" -> 4;// 初中
-            case "小学", "小学肄业", "小学毕业", "相当小学毕业", "文盲", "文盲或半文盲", "学龄前儿童" -> 5;// 小学
+            case "小学", "小学肄业", "小学肆业", "小学毕业", "相当小学毕业", "文盲", "文盲或半文盲", "学龄前儿童" -> 5;// 小学
             default -> 0;
         };
     }
@@ -1885,8 +1885,8 @@ public class PointServiceImpl implements PointService {
                 try {
                     LocalDateTime localDateTime = LocalDateTime.parse(dateString, DateTimeFormatter.ofPattern("yyyyMMdd"));
                     return localDateTime.format(DateTimeFormatter.ofPattern("yyyy年MM月dd日"));
-                } catch (Exception ex) {
-                    log.error("日期转换异常{}", dateString, ex);
+                } catch (Exception ignored) {
+
                 }
             }
         }
@@ -1915,8 +1915,8 @@ public class PointServiceImpl implements PointService {
                             time = String.valueOf(param);
                             LocalDateTime localDateTime = LocalDateTime.parse(time, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
                             return localDateTime.format(DateTimeFormatter.ofPattern("yyyy年MM月dd日HH时mm分"));
-                        } catch (Exception exxx) {
-                            log.info("日期转换异常{}", time, ex);
+                        } catch (Exception ignored) {
+
                         }
                     }
                 }