Merge remote-tracking branch 'origin/dev_temp' 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/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   data-report-server:
     container_name: data-report-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.94
+    image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.95
 
     ports:
       - "8109:8109"

epmet-module/data-report/data-report-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.94</version>
+    <version>0.3.95</version>
     <artifactId>data-report-server</artifactId>
 
     <parent>

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");

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml

@@ -234,7 +234,7 @@
             ip.created_time as createTime,
             (case when i.RESOLVE_TYPE = 'resolved' then 'closed_resolved'
               when i.RESOLVE_TYPE = 'unresolved' then 'closed_unresolved'
-              else i.ISSUE_STATUS end ) AS actionCode
+              else ip.ISSUE_STATUS end ) AS actionCode
         FROM
             issue_process ip
             LEFT JOIN issue i ON i.id = ip.issue_id