Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud

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);
+        }
+    }
 }

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}