隐患考评调整

web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml

@@ -299,7 +299,8 @@
         </if>
 
         GROUP BY ci.id, ci.corp_name
-        ORDER BY ecorp.create_time desc
+        order by  CASE WHEN ci.type = 2 THEN 0 ELSE 1 END,
+        ci.corp_order ASC
     </select>
 
     <select id="userEvalStatisticsPage" resultType="com.zcloud.hidden.evaluation.persistence.dataobject.UserEvalStatisticsDO">
@@ -311,7 +312,7 @@
             u.department_id as departmentId,
             d.name AS departmentName,
             p.post_name AS postName,
-           COUNT(DISTINCT CASE WHEN her.evaluation_result = 2 and her.exchange_flag = 1 THEN h.id END)  AS totalScore,
+           COUNT(DISTINCT CASE WHEN her.evaluation_result = 2  THEN h.id END)  AS totalScore,
             COUNT(DISTINCT CASE WHEN her.exchange_flag = 1 THEN h.id END) AS exchangedScore,
             COUNT(DISTINCT CASE WHEN her.exchange_flag = 0 and her.evaluation_result=2 THEN h.id END) AS notExchangedScore
         FROM evaluation_corp ecorp left join hidden h on ecorp.corpinfo_id = h.corp_id
@@ -424,7 +425,7 @@
                                             OR h.source NOT IN (4,5)
                                         ) THEN h.id END)                           AS checkHiddenCount,
 
-            COUNT(DISTINCT CASE WHEN her.evaluation_result = 2 AND her.exchange_flag = 1 THEN h.id END) AS passHiddenCount,
+            COUNT(DISTINCT CASE WHEN her.evaluation_result = 2  THEN h.id END) AS passHiddenCount,
 
             (
                 COUNT(DISTINCT CASE WHEN h.state = 301
@@ -441,10 +442,10 @@
 
         FROM evaluation_config ec
                  LEFT JOIN corp_info ci
-                           ON ec.corpinfo_id = ci.id AND ci.delete_enum = 0
+                           ON ec.corpinfo_id = ci.id AND ci.delete_enum = 'FALSE'
                  LEFT JOIN hidden h
                            ON h.corp_id = ec.corpinfo_id
-                               AND h.delete_enum = 0
+                               AND h.delete_enum = 'FALSE' and h.state not in ('98','102')
                                AND (
                                   (ec.evaluation_type = 1 AND h.hidden_type IN ('aqyh','rdbaqys','wzcz','wzzh','grfhyp','wdbaqzt','jxsb','hcl','dqsb','gsj','aqbhzz','ss','xf','tzsb','hjdbaqys','zmjdgyxbj','aqbzbs','gkkd','zykjxzzl','eltq','gldqx','wzdhzdlsbdw','wfacs','jypx','aqyh-qt'))
                                       OR
@@ -454,9 +455,9 @@
                            ON her.hidden_id = h.hidden_id
                                AND her.corpinfo_id = ec.corpinfo_id
                                AND her.evaluation_type = ec.evaluation_type
-                               AND her.delete_enum = 0
+                               AND her.delete_enum = 'FALSE'
 
-        WHERE ec.delete_enum = 0
+        WHERE ec.delete_enum = 'FALSE'
           AND ci.use_flag = 1
         <if test="params.corpinfoName != null and params.corpinfoName != ''">
             AND ci.corp_name LIKE CONCAT('%', #{params.corpinfoName}, '%')

web-infrastructure/src/main/resources/mapper/HiddenExchangeInfoMapper.xml

@@ -58,7 +58,7 @@
         <if test="params.exchangeEndTime != null and params.exchangeEndTime != ''">
             AND her.exchange_time &lt;= #{params.exchangeEndTime}
         </if>
-        GROUP BY h.creator_id
+        GROUP BY h.hidden_id
         ORDER BY u.sort, u.create_time desc