Merge remote-tracking branch 'origin/dev'

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/CustomerGridDao.java

@@ -83,6 +83,13 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      **/
     List<GridInfoDTO> selectListGridInfo(String customerId);
 
+    /**
+     * 查询网格id
+     * @param gridId
+     * @return
+     */
+    GridInfoDTO selectGridInfo(String gridId);
+
     /**
      * 查询工作人员网格关系
      * @author zhaoqifeng

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java

@@ -129,6 +129,14 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
                     user.setOrgName(gridInfo.getOrgName());
                     //原始数据Pid使用英文:隔开，大屏数据要求按照英文,隔开
                     user.setAllParentIds(gridInfo.getPids().replaceAll(StrConstant.COLON, StrConstant.COMMA));
+                }else{
+                    //如果网格删了或者组织删了，重新查询一下吧
+                    GridInfoDTO grid = customerGridService.queryGridInfoDTO(user.getGridId());
+                    user.setGridName(grid.getGridName());
+                    user.setOrgId(grid.getAgencyId());
+                    user.setOrgName(grid.getOrgName());
+                    //原始数据Pid使用英文:隔开，大屏数据要求按照英文,隔开
+                    user.setAllParentIds(grid.getPids().replaceAll(StrConstant.COLON, StrConstant.COMMA));
                 }
                 Integer point = pointMap.get(user.getUserId());
                 BigDecimal score = scoreMap.get(user.getUserId());

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerGridService.java

@@ -57,6 +57,13 @@ public interface CustomerGridService extends BaseService<CustomerGridEntity> {
      **/
     List<GridInfoDTO> queryGridInfoList(String customerId);
 
+    /**
+     * 查询网格信息
+     * @param gridId
+     * @return
+     */
+    GridInfoDTO queryGridInfoDTO(String gridId);
+
     /**
      * 查询工作人员网格关系
      * @author zhaoqifeng

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerGridServiceImpl.java

@@ -76,6 +76,15 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         return baseDao.selectListGridInfo(customerId);
     }
 
+    /**
+     * 查询网格信息
+     * @param gridId
+     * @return
+     */
+    public GridInfoDTO queryGridInfoDTO(String gridId){
+        return baseDao.selectGridInfo(gridId);
+    }
+
     /**
      * 查询工作人员网格关系
      *

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml

@@ -94,6 +94,26 @@
             and cg.del_flag='0'
             AND cg.SYNC_FLAG = '1'
     </select>
+
+
+    <select id="selectGridInfo" parameterType="java.lang.String" resultType="com.epmet.dto.org.GridInfoDTO">
+        SELECT
+            cg.ID as GRID_ID,
+            cg.PID as AGENCY_ID,
+            ca.PID AS PID,
+            cg.CUSTOMER_ID,
+            cg.PIDS as PIDS,
+            cg.GRID_NAME,
+            ca.ORGANIZATION_NAME as ORG_NAME
+        FROM
+            customer_grid cg
+            LEFT JOIN customer_agency ca
+            ON (cg.PID = CA.ID)
+        WHERE
+            CG.CUSTOMER_ID =#{customerId}
+            and cg.id = #{gridId}
+    </select>
+
     <select id="getCustomerStaffGridList" resultType="com.epmet.dto.org.CustomerStaffGridDTO">
         SELECT
             ca.CUSTOMER_ID,