From 85039539c8942428c6c5edda51f38b7af0b3ab8f Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 27 Jan 2022 11:18:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=B8=82=E5=8C=97-?=
 =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=88=86=E7=B1=BB=E5=88=86=E6=9E=90=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/controller/ShiBeiICJobController.java | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ShiBeiICJobController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ShiBeiICJobController.java
index d4f114c9ac..0534f38363 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ShiBeiICJobController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ShiBeiICJobController.java
@@ -35,6 +35,8 @@ public class ShiBeiICJobController {
     private StatsProjectService statsProjectService;
     @Autowired
     private RedisUtils redisUtils;
+    @Autowired
+    private com.epmet.service.stats.FactIcuserCategoryAnalysisDailyService userCategoryAnalysisDailyService;
 
     @PostMapping("userPointAndProjectStatus/{bizType}")
     public Result<String> userPointAndProjectStatus(@PathVariable("bizType") String bizType, @RequestBody ExtractOriginFormDTO formDTO) {
@@ -66,6 +68,7 @@ public class ShiBeiICJobController {
     private void executeMethod(String bizType, String customerId, String d) {
         if (bizType.equals(BizTypeEnum.USER.getType())){
             this.extractUserPointData(customerId, d);
+            this.statUserCategoryGridDaily(customerId, d);
         }
         if (bizType.equals(BizTypeEnum.PROJECT.getType())) {
             this.agencyProjectStats(customerId, d);
@@ -103,4 +106,18 @@ public class ShiBeiICJobController {
             log.error("市北-热心市民/党员得分数据写入失败，参数为：{}" + customerId + StrConstant.HYPHEN + dateId, e);
         }
     }
+
+    /**
+     * desc:抽取 用户类别分析数据
+     * @param customerId
+     * @param dateId
+     */
+    private void statUserCategoryGridDaily(String customerId, String dateId) {
+        try {
+            //用户 类别分析
+            userCategoryAnalysisDailyService.statUserCategoryGridDaily(customerId, dateId);
+        } catch (Exception e) {
+            log.error("市北-居民分类分析数据写入失败，参数为：{}" + customerId + StrConstant.HYPHEN + dateId, e);
+        }
+    }
 }

From 5f074419ff94876195fa764c84ce42a249f07836 Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Thu, 27 Jan 2022 11:22:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9Aagency=5Fpids?=
 =?UTF-8?q?=E4=B8=BA""=E7=9A=84=E5=B0=8F=E5=8C=BA=EF=BC=8C=E7=A4=BE?=
 =?UTF-8?q?=E5=8C=BA=E6=9F=A5=E8=AF=A2=E6=90=9C=E4=B8=8D=E5=87=BA=E6=9D=A5?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gov-org-server/src/main/resources/mapper/IcHouseDao.xml  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
index 01e2276fac..32338f7927 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
@@ -130,7 +130,10 @@
         LEFT JOIN ic_building_unit d on a.BUILDING_UNIT_ID = d.ID and d.DEL_FLAG = '0'
         <where>
             <if test="pids != null and pids != ''">
-                AND CONCAT(c.AGENCY_PIDS,':',c.AGENCY_ID) like CONCAT(#{pids},'%')
+                case c.AGENCY_PIDS
+                    when '' then CONCAT(c.AGENCY_ID) like CONCAT(#{pids}, '%')
+                    else CONCAT(c.AGENCY_PIDS, ':', c.AGENCY_ID) like CONCAT(#{pids}, '%')
+                end
             </if>
             <if test="buildingId != null and buildingId.trim() != ''">
                 AND a.BUILDING_ID = #{buildingId}