Merge remote-tracking branch 'origin/dev_data_fusion' into develop

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java

@@ -389,6 +389,10 @@ public class ProjectServiceImpl implements ProjectService {
             }
             formDTO.setAreaCode(agencyResult.getData().getAreaCode());
         }*/
+        // 只有平阴根据areaCode查询，其余的还是按照agencyId查询
+        if (StringUtils.isNotBlank(formDTO.getAreaCode()) && !"370124".equals(formDTO.getAreaCode())) {
+            formDTO.setAreaCode(StrConstant.EPMETY_STR);
+        }
         // 3、升级原来的列表查询接口
         PageHelper.startPage(null == formDTO.getPageNo() ? NumConstant.ONE : formDTO.getPageNo(), formDTO.getTopNum());
         List<ProjectDifficultRankResultDTO> result = projectDao.difficultyRankV2(formDTO);

epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml

@@ -299,8 +299,11 @@
                     </otherwise>
                 </choose>
             </if>
-            <if test="status!= null and status != ''">
-                AND sdd1.EVENT_STATUS_CODE = #{status}
+            <if test="status!= null and status == 'pending'">
+                AND sdd1.EVENT_STATUS_CODE  in('pending','0')
+            </if>
+            <if test="status!= null and status == 'closed'">
+                AND sdd1.EVENT_STATUS_CODE  in('closed','10','5')
             </if>
             union
             select sca.AREA_CODE,sdd2.* from screen_difficulty_data sdd2
@@ -322,8 +325,11 @@
                     </otherwise>
                 </choose>
             </if>
-            <if test="status!= null and status != ''">
-                AND sdd2.EVENT_STATUS_CODE = #{status}
+            <if test="status!= null and status == 'pending'">
+                AND sdd2.EVENT_STATUS_CODE  in('pending','0')
+            </if>
+            <if test="status!= null and status == 'closed'">
+                AND sdd2.EVENT_STATUS_CODE  in('closed','10','5')
             </if>
         ) diff
         ORDER BY