产品数据上报接口

组织数据上报接口修改

epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenPublicDataDao.xml

@@ -7,7 +7,7 @@
         SELECT sd.`id` AS agencyId,
                sd.`name` AS agencyName,
           case when sd.type_key = 'street_party' then 0 else sd.`pid` end AS pid,
-          case when sd.type_key = 'street_party' then 0 else sd.`pids` end AS pids,
+          case when sd.type_key = 'street_party' then 0 else SUBSTRING_INDEX(sd.pids, ',', -1) end AS pids,
                CASE WHEN sd2.`name` IS NULL
            AND sd1.`name` IS NULL THEN sd.`name` WHEN sd2.`name` IS NULL THEN CONCAT(sd1.`name`, '-', sd.`name`) ELSE CONCAT(IFNULL(sd2.`name`, ''), '-', IFNULL(sd1.`name`, ''), '-', sd.`name`) END AS allParentNames,
                  '' AS areaMarks,
@@ -32,7 +32,7 @@
         SELECT sd.`id` AS gridId,
                sd.`name` AS gridName,
                sd.`pid` AS parentAgencyId,
-               sd.`pids` AS allParentIds,
+               SUBSTRING_INDEX(sd.pids, ',', -1) AS allParentIds,
                '' AS areaMarks,
                '' AS centerMark,
                '' AS partyMark,

epdc-cloud-client-yushan

@@ -1 +1 @@
-Subproject commit 39a765ce9d8a0ff9f4de4d045f2ce0332582bb53
+Subproject commit d919a78617e83128f5e69428e10e89d22e2e6968

epdc-cloud-commons-yushan

@@ -1 +1 @@
-Subproject commit 1f93308c2985b4924ea280a3d79d567789c325b3
+Subproject commit 99e4e9b22ede63c92448a14fdd01c74894735411