Merge branch 'dev_screen_data_2.0' into dev_temp

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml

@@ -60,7 +60,7 @@
             del_flag = '0'
         <if test="orgType != null and orgType !=''">
             <if test="orgType == 'agency'">
-                AND org_id = #{orgId}
+                AND all_parent_ids LIKE CONCAT('%',#{orgId},'%')
             </if>
             <if test="orgType == 'grid'">
                 AND grid_id = #{orgId}
@@ -76,7 +76,6 @@
             org_id AS "agencyId",
             org_name AS "agencyName",
             grid_id AS "gridId",
-            grid_name AS "gridName",
             user_id AS "userId",
             user_name AS "userName",
             round(index_score, 1) AS "indexScore"
@@ -87,7 +86,7 @@
         AND party_flag = '1'<!-- 是否是党员标志：1是。0不是党员 -->
         <if test="orgType != null and orgType !=''">
             <if test="orgType == 'agency'">
-                AND org_id = #{orgId}
+                AND all_parent_ids LIKE CONCAT('%',#{orgId},'%')
             </if>
             <if test="orgType == 'grid'">
                 AND grid_id = #{orgId}

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml

@@ -177,7 +177,7 @@
                 WHERE
                     pp.OPERATION = 'close'
                     <if test="date != null and date.trim() != ''">
-                        AND pp.CREATED_TIME = #{date}
+                        AND DATE_FORMAT(pp.CREATED_TIME , '%Y%m%d') = #{date}
                     </if>
 
             ) a