From 6045a406d78612b1149be18bfcee10a7f83c2859 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 5 Feb 2021 10:22:34 +0800
Subject: [PATCH] =?UTF-8?q?screen=5Fcustomer=5Fagency=E6=96=B0=E5=A2=9Epar?=
 =?UTF-8?q?ent=5Farea=5Fcode;screen=5Fcustomer=5Fgrid|dept=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9Earea=5Fcode;=20=E8=B0=83=E6=95=B4=E4=B8=89=E4=B8=AA?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84=E5=88=9D=E5=A7=8B=E5=8C=96=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=EF=BC=88evaIndexScreenDimInitTask)=E6=8E=A5=E5=8F=A3=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=EF=BC=9A(eidim/init-all)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/org/CustomerAgencyEntity.java      |  4 ++
 .../entity/org/CustomerDepartmentEntity.java  |  4 ++
 .../impl/ScreenCustomerAgencyServiceImpl.java |  2 +
 .../impl/ScreenCustomerDeptServiceImpl.java   |  2 +
 .../impl/ScreenCustomerGridServiceImpl.java   |  2 +
 .../mapper/org/CustomerDepartmentDao.xml      | 48 +++++++++++--------
 .../mapper/org/StatsCustomerAgencyDao.xml     |  3 +-
 7 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/org/CustomerAgencyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/org/CustomerAgencyEntity.java
index 7381034578..eaf0c0d52a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/org/CustomerAgencyEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/org/CustomerAgencyEntity.java
@@ -94,4 +94,8 @@ public class CustomerAgencyEntity extends BaseEpmetEntity {
 	 */
 	private String district;
 
+	/**
+	 * 当前组织的上级行政地区编码add0204;举例平阴县370124对应的是济南市3701
+	 */
+	private String parentAreaCode;
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/org/CustomerDepartmentEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/org/CustomerDepartmentEntity.java
index 0f46e25ffd..7e3f481d11 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/org/CustomerDepartmentEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/org/CustomerDepartmentEntity.java
@@ -60,4 +60,8 @@ public class CustomerDepartmentEntity extends BaseEpmetEntity {
      */
 	private Integer totalUser;
 
+	/**
+	 * 扩展属性：V2升级必传参数：当前部门所属行政地区编码,来源于部门所属组织的地区编码
+	 */
+	private String areaCode;
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerAgencyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerAgencyServiceImpl.java
index 2cc97d3256..f89e48740e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerAgencyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerAgencyServiceImpl.java
@@ -139,6 +139,7 @@ public class ScreenCustomerAgencyServiceImpl implements ScreenCustomerAgencyServ
                         exists.setIsDisplay(NumConstant.ONE_STR);
                     }
                     exists.setAllParentNames(e.getAllParentName());
+                    exists.setParentAreaCode(e.getParentAreaCode());
                     updateAgency(exists);
                 }
             }
@@ -240,6 +241,7 @@ public class ScreenCustomerAgencyServiceImpl implements ScreenCustomerAgencyServ
         cae.setPid(e.getPid());
         cae.setPids(e.getPids());
         cae.setSourceType(OrgSourceTypeConstant.INTERNAL);
+        cae.setParentAreaCode(e.getParentAreaCode());
         screenCustomerAgencyDao.insert(cae);
     }
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerDeptServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerDeptServiceImpl.java
index 95e7f066c0..2e12d83d45 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerDeptServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerDeptServiceImpl.java
@@ -75,6 +75,7 @@ public class ScreenCustomerDeptServiceImpl extends BaseServiceImpl<ScreenCustome
                 e.setDeptName(dept.getDepartmentName());
                 e.setParentAgencyId(dept.getAgencyId());
                 e.setSourceType(OrgSourceTypeConstant.INTERNAL);
+                e.setAreaCode(dept.getAreaCode());
                 screenCustomerDeptDao.insert(e);
             }
         }
@@ -87,6 +88,7 @@ public class ScreenCustomerDeptServiceImpl extends BaseServiceImpl<ScreenCustome
                 e.setDeptName(dept.getDepartmentName());
                 e.setDataEndTime(dateStr);
                 e.setCustomerId(dept.getCustomerId());
+                e.setAreaCode(dept.getAreaCode());
                 screenCustomerDeptDao.updateById(e);
             }
         }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java
index e20a0a6709..6655be0a08 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java
@@ -77,6 +77,7 @@ public class ScreenCustomerGridServiceImpl extends BaseServiceImpl<ScreenCustome
                 insertOne.setGridName(grid.getGridName());
                 insertOne.setParentAgencyId(grid.getPid());
                 insertOne.setSourceType(OrgSourceTypeConstant.INTERNAL);
+                insertOne.setAreaCode(grid.getAreaCode());
                 screenCustomerGridDao.insert(insertOne);
             }
         }
@@ -90,6 +91,7 @@ public class ScreenCustomerGridServiceImpl extends BaseServiceImpl<ScreenCustome
                 screenGrid.setCustomerId(grid.getCustomerId());
                 screenGrid.setDataEndTime(dateStr);
                 screenGrid.setGridName(grid.getGridName());
+                screenGrid.setAreaCode(grid.getAreaCode());
                 screenCustomerGridDao.updateById(screenGrid);
             }
         }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerDepartmentDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerDepartmentDao.xml
index 365ae56b8a..0e373b7d3d 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerDepartmentDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerDepartmentDao.xml
@@ -4,15 +4,20 @@
 <mapper namespace="com.epmet.dao.org.CustomerDepartmentDao">
 
     <select id="listDepartmentsByCreatedTime" resultType="com.epmet.entity.org.CustomerDepartmentEntity">
-        SELECT *
-        FROM customer_department
+        SELECT
+            ca.AREA_CODE,
+            dept.*
+        FROM
+        customer_department dept
+        LEFT JOIN customer_agency ca ON (
+        dept.AGENCY_ID = ca.id and ca.DEL_FLAG='0')
         <where>
-            DEL_FLAG = 0
+            dept.DEL_FLAG = 0
             <if test="createdTimeFrom != null">
-                AND CREATED_TIME >= #{createdTimeFrom}
+                AND dept.CREATED_TIME >= #{createdTimeFrom}
             </if>
             <if test="createdTimeTo != null">
-                AND CREATED_TIME &lt; #{createdTimeTo}
+                AND dept.CREATED_TIME &lt; #{createdTimeTo}
             </if>
         </where>
     </select>
@@ -20,20 +25,23 @@
 
     <select id="listDepartmentsByUpdatedTime" resultType="com.epmet.entity.org.CustomerDepartmentEntity">
         select
-            id,
-            customer_id,
-            agency_id,
-            department_name,
-            department_duty,
-            total_user,
-            del_flag,
-            revision,
-            created_by,
-            created_time,
-            updated_by,
-            updated_time
-        from customer_department
-        where UPDATED_TIME > #{startTime}
-            and UPDATED_TIME <![CDATA[<=]]> #{endTime}
+            cd.id,
+            cd.customer_id,
+            cd.agency_id,
+            cd.department_name,
+            cd.department_duty,
+            cd.total_user,
+            cd.del_flag,
+            cd.revision,
+            cd.created_by,
+            cd.created_time,
+            cd.updated_by,
+            cd.updated_time,
+            ca.area_code
+        from customer_department cd
+        LEFT JOIN customer_agency ca ON (
+            cd.AGENCY_ID = ca.id and ca.DEL_FLAG='0')
+        where cd.UPDATED_TIME > #{startTime}
+            and cd.UPDATED_TIME <![CDATA[<=]]> #{endTime}
     </select>
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml
index 9eb57907ea..945b47260e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml
@@ -94,7 +94,8 @@
             total_user,
             province,
             city,
-            district
+            district,
+            PARENT_AREA_CODE as parentAreaCode
             from customer_agency
             where UPDATED_TIME >= #{startTime}
             and UPDATED_TIME <![CDATA[<=]]> #{endTime}