Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/SubAgencyIndexRankYMFormDTO.java

@@ -48,4 +48,9 @@ public class SubAgencyIndexRankYMFormDTO implements Serializable {
      * 月份Id
      */
     private String monthId;
+
+    /**
+     * 组织类型 组织：agency  网格：grid
+     */
+    private String orgType;
 }

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

@@ -13,7 +13,6 @@
             screen_index_data_yearly
         WHERE
             del_flag = '0'
-            AND org_type = 'agency'
             AND org_id = #{agencyId}
             AND year_id = DATE_FORMAT(NOW(),'%Y')
     </select>
@@ -34,6 +33,14 @@
         del_flag = '0'
         AND parent_id = #{agencyId}
         AND year_id = YEAR(CURDATE())
+        <choose>
+            <when test="orgType != null and orgType != ''">
+                AND ORG_TYPE = #{orgType,jdbcType=VARCHAR}
+            </when>
+            <otherwise>
+                AND ORG_TYPE != 'department'
+            </otherwise>
+        </choose>
         <if test="sort == 'asc'">
             ORDER BY index_total ASC
         </if>

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerDeptServiceImpl.java

@@ -61,6 +61,7 @@ public class ScreenCustomerDeptServiceImpl extends BaseServiceImpl<ScreenCustome
      * @param depts2Add
      * @param depts2Update
      */
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public void addAndUpdateDepartments(List<CustomerDepartmentEntity> depts2Add, List<CustomerDepartmentEntity> depts2Update) {
         String dateStr = DateUtils.format(new Date(), "YYYYmmdd");