新增remark

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcCommunitySelfOrganizationDTO.java

@@ -133,4 +133,9 @@ public class IcCommunitySelfOrganizationDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 备注
+     */
+	private String remark;
+
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddCommunitySelfOrganizationFormDTO.java

@@ -56,6 +56,11 @@ public class AddCommunitySelfOrganizationFormDTO implements Serializable {
      */
     private String organizationCreatedTime;
 
+    /**
+     * 备注
+     */
+    private String remark;
+
     /**
      * 经度
      */

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditCommunitySelfOrganizationFormDTO.java

@@ -68,6 +68,11 @@ public class EditCommunitySelfOrganizationFormDTO implements Serializable {
      */
     private String latitude;
 
+    /**
+     * 备注
+     */
+    private String remark;
+
     /**
      * 社区自组织ID
      */

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java

@@ -53,6 +53,11 @@ public class CommunitySelfOrganizationListDTO implements Serializable {
      */
     private String organizationCreatedTime;
 
+    /**
+     * 备注
+     */
+    private String remark;
+
     /**
      * 经度
      */

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcCommunitySelfOrganizationEntity.java

@@ -106,4 +106,9 @@ public class IcCommunitySelfOrganizationEntity extends BaseEpmetEntity {
      */
 	private String latitude;
 
+    /**
+     * 备注
+     */
+    private String remark;
+
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/ExportCommunitySelfOrganizationExcel.java

@@ -31,6 +31,9 @@ public class ExportCommunitySelfOrganizationExcel {
     @Excel(name = "创建时间", width = 20, needMerge = true)
     private String organizationCreatedTime;
 
+    @Excel(name = "备注", width = 60, needMerge = true)
+    private String remark;
+
     @ExcelCollection(name = "组织成员")
     private List<ImportCommunitySelfOrganizationSon> organizationPersonnel;
 

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/ImportCommunitySelfOrganization.java

@@ -40,6 +40,9 @@ public class ImportCommunitySelfOrganization extends ExcelVerifyInfo {
     @Excel(name = "创建时间", needMerge = true)
     private String organizationCreatedTime;
 
+    @Excel(name = "备注", needMerge = true)
+    private String remark;
+
     @ExcelCollection(name = "组织成员")
     private List<ImportCommunitySelfOrganizationSon> persons;
 

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.13__add_column_remark.sql

@@ -0,0 +1 @@
+alter table ic_community_self_organization add COLUMN REMARK VARCHAR(500) comment '备注' AFTER ORGANIZATION_CREATED_TIME;

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml

@@ -14,6 +14,7 @@
             LONGITUDE = #{longitude},
             LATITUDE = #{latitude},
             ORGANIZATION_CREATED_TIME = #{organizationCreatedTime},
+            REMARK = #{remark},
             UPDATED_TIME = NOW(),
             UPDATED_BY = #{updatedBy}
         WHERE DEL_FLAG = 0