Merge remote-tracking branch 'origin/dev_0906_new_demand'

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyOrgDTO.java

@@ -89,6 +89,11 @@ public class IcPartyOrgDTO implements Serializable {
      */
 	private String principal;
 
+    /**
+     * 负责人staffId
+     */
+	private String principalStaffId;
+
     /**
      * 联系电话
      */

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/EditPrincipalFormDTO.java

@@ -30,4 +30,7 @@ public class EditPrincipalFormDTO implements Serializable {
      */
     @NotBlank(message = "principalMobile不能为空",groups = AddGroup.class)
     private String principalMobile;
+
+    @NotBlank(message = "principalStaffId不能为空",groups = AddGroup.class)
+    private String principalStaffId;
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyOrgEntity.java

@@ -78,6 +78,11 @@ public class IcPartyOrgEntity extends BaseEpmetEntity {
 	 */
 	private String principal;
 
+	/**
+	 * 负责人staffId
+	 */
+	private String principalStaffId;
+
 	/**
 	 * 联系电话
 	 */

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.10__add_principal_staff_id.sql

@@ -0,0 +1,3 @@
+ALTER TABLE ic_party_org ADD COLUMN PRINCIPAL_STAFF_ID VARCHAR(32) DEFAULT '' COMMENT '负责人staffId' AFTER PRINCIPAL_MOBILE;
+alter  table ic_party_org modify PRINCIPAL_MOBILE  VARCHAR(30) DEFAULT '' COMMENT '联系方式';
+alter  table ic_party_org modify PRINCIPAL  VARCHAR(30) DEFAULT '' COMMENT '负责人';

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml

@@ -30,6 +30,7 @@
         update ic_party_org
         set PRINCIPAL_MOBILE = #{principalMobile},
             PRINCIPAL = #{principal},
+            PRINCIPAL_STAFF_ID = #{principalStaffId},
             UPDATED_TIME = NOW()
         where id = #{partyOrgId}
     </update>