screen_customer_agency表新增parent_area_code列;对应修改组织信息采集接口(screen_screencoll/customeragency)

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerAgencyFormDTO.java

@@ -73,4 +73,9 @@ public class CustomerAgencyFormDTO implements Serializable {
      * 是否显示
      */
     private String isDisplay;
+
+    /**
+     * 当前组织的上级行政地区编码add0204;举例平阴县对应的是济南市3701
+     */
+    private String parentAreaCode;
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerAgencyEntity.java

@@ -109,4 +109,9 @@ public class ScreenCustomerAgencyEntity extends BaseEpmetEntity {
 	 * desc: 是否参与上级计算yes:参与;no:不参与 add 01.14
 	 */
 	private String upToCal;
+
+	/**
+	 * 当前组织的上级行政地区编码add0204;举例平阴县370124对应的是济南市3701
+	 */
+	private String parentAreaCode;
 }

epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.5__screen_org_add_source_col.sql

@@ -37,4 +37,5 @@
 
 -- 2、epmet_evaluation_index、epmet_data_statistical_display 都要执行，网格和部门增加area_code
 # alter table screen_customer_grid add column AREA_CODE varchar(30) DEFAULT NULL COMMENT 'V2升级必传参数：当前网格所属行政地区编码，去除末尾0';
-# alter table screen_customer_dept add column AREA_CODE varchar(30) DEFAULT NULL COMMENT 'V2升级必传参数：当前网格所属行政地区编码，去除末尾0';
+# alter table screen_customer_dept add column AREA_CODE varchar(30) DEFAULT NULL COMMENT 'V2升级必传参数：当前部门所属行政地区编码，去除末尾0';
+# alter table screen_customer_agency add column `PARENT_AREA_CODE` varchar(30) DEFAULT NULL COMMENT '当前组织的上级行政地区编码add0204;举例平阴县370124对应的是济南市3701';

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml

@@ -31,7 +31,8 @@
         CREATED_TIME,
         UPDATED_BY,
         UPDATED_TIME,
-        DATA_END_TIME
+        DATA_END_TIME,
+        PARENT_AREA_CODE
         ) values
         <foreach collection="list" item="item" index="index" separator=",">
             (
@@ -54,7 +55,8 @@
             now(),
             'APP_USER',
             now(),
-            #{item.dataEndTime}
+            #{item.dataEndTime},
+            #{item.parentAreaCode}
             )
         </foreach>
     </insert>