Merge remote-tracking branch 'origin/dev_optimize' into develop

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java

@@ -44,6 +44,16 @@ public class IcResiCollectMemFormDTO implements Serializable {
     // @NotNull(message = "疫苗接种情况不能为空", groups = {IcResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class})
     private Integer ymjz;
 
+    /**
+     * 户籍所在地
+     */
+    private String domicilePlace;
+
+    /**
+     * 学校或公司
+     */
+    private String workPlace;
+
     /**
      * 社区居民信息登记-查询返参用
      */

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java

@@ -45,4 +45,15 @@ public class CollectListMemberExcelResultDTO implements Serializable {
     @Excel(name = "疫苗接种情况",replace = { "全程接种_1", "未全程接种_2", "未接种_0" }, width = 30)
     private String ymjz;
 
+    /**
+     * 户籍所在地
+     */
+    @Excel(name = "户籍所在地", width = 60)
+    private String domicilePlace;
+
+    /**
+     * 学校或公司
+     */
+    @Excel(name = "单位或学校", width = 60)
+    private String workPlace;
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java

@@ -69,6 +69,15 @@ public class CollectListResultDTO implements Serializable {
          */
         private Integer ymjz;
 
+        /**
+         * 户籍所在地
+         */
+        private String domicilePlace;
+
+        /**
+         * 学校或公司
+         */
+        private String workPlace;
 
     }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java

@@ -53,4 +53,13 @@ public class IcResiMemberEntity extends BaseEpmetEntity {
      */
 	private Integer ymjz;
 
+	/**
+	 * 户籍所在地
+	 */
+	private String domicilePlace;
+
+	/**
+	 * 学校或公司
+	 */
+	private String workPlace;
 }

epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.40__member_huji.sql

@@ -0,0 +1,2 @@
+alter table ic_resi_member add COLUMN DOMICILE_PLACE VARCHAR(128) comment '户籍所在地' AFTER YMJZ;
+alter table ic_resi_member add COLUMN WORK_PLACE VARCHAR(128) comment '单位或学校' AFTER DOMICILE_PLACE;

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml

@@ -47,7 +47,9 @@
             m.ID_NUM AS memberIdNum,
             m.MOBILE AS memberMobile,
             m.HE_SUAN_COUNT AS heSuanCount,
-            m.YMJZ AS ymjz
+            m.YMJZ AS ymjz,
+            m.DOMICILE_PLACE as domicilePlace,
+            m.WORK_PLACE as workPlace
         from ic_resi_member m
         where m.DEL_FLAG = 0
         and m.IC_RESI_COLLECT_ID = #{id}

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiMemberDao.xml

@@ -12,7 +12,9 @@
             m.ID_NUM,
             m.MOBILE,
             m.HE_SUAN_COUNT,
-            m.YMJZ
+            m.YMJZ,
+            m.DOMICILE_PLACE,
+            m.WORK_PLACE
         FROM
             ic_resi_member m
         WHERE