bug fix

zfjg-api/zfjg-api-manage/src/main/java/com/zfjg/manage/api/dto/enforce/job/EnforcementOrgInfo.java

@@ -0,0 +1,19 @@
+package com.zfjg.manage.api.dto.enforce.job;
+
+
+import com.zfjg.common.core.annotation.Excel;
+import com.zfjg.common.core.utils.StringUtils;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(description = "机构信息")
+public class EnforcementOrgInfo {
+    @ApiModelProperty("机构id")
+    private String orgId;
+
+    @ApiModelProperty("机构名称")
+    private String orgName;
+
+}

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/mapper/enforce/job/EnforceSuperviseMapper.java

@@ -14,6 +14,7 @@ import java.util.List;
  */
 @Mapper
 public interface EnforceSuperviseMapper {
+    List<EnforcementOrgInfo> selectOrgInfoList(@Param("enforceOrgId")String enforceOrgId);
 
     List<EnforcementOrgProcess> selectEnforcementProcess(@Param("pm") EnforcementJobProcessQuery query);
 

zfjg-modules/zfjg-manage/src/main/resources/mapper/enforce/job/EnforceDeductRecordMapper.xml

@@ -107,7 +107,7 @@
         </if>
         ) deductScore
         from enforce_organize eo
-        where eo.enforce_org_id != '55c99876ec0f425aac6925a92cceeb17'
+        where eo.enforce_org_id  not in ('55c99876ec0f425aac6925a92cceeb17','256069491270746112')
         <if test="pm.enforceOrgId  != null  and pm.enforceOrgId != ''">
             and eo.enforce_org_id = #{pm.enforceOrgId}
         </if>

zfjg-modules/zfjg-manage/src/main/resources/mapper/enforce/job/EnforceSuperviseMapper.xml

@@ -29,6 +29,18 @@
         <result property="rate" column="rate"/>
     </resultMap>
 
+    <select id="selectOrgInfoList" resultType="com.zfjg.manage.api.dto.enforce.job.EnforcementOrgInfo">
+        SELECT
+            enforce_org_id orgId,
+            enforce_org_name orgName
+        FROM
+            enforce_organize
+        WHERE
+                enforce_org_id NOT IN ( '55c99876ec0f425aac6925a92cceeb17', '256069491270746112' )
+            <if test="enforceOrgId  != null  and enforceOrgId != ''">
+                and enforce_org_id = #{enforceOrgId}
+            </if>
+    </select>
     <select id="selectEnforcementProcess" resultMap="EnforcementProcessResultMap">
         SELECT
             enforce_org_id orgId,
@@ -48,7 +60,7 @@
                     enforce_job a
                 WHERE
                     a.is_deleted = '0'
-                  AND a.enforce_org_id != '55c99876ec0f425aac6925a92cceeb17'
+                  AND a.enforce_org_id not in ('55c99876ec0f425aac6925a92cceeb17','256069491270746112')
 	             AND job_status = 'ARCHIVED'
                 <if test="pm.enforceOrgId  != null  and pm.enforceOrgId != ''">
                     and a.enforce_org_id = #{pm.enforceOrgId}
@@ -176,7 +188,7 @@
                     enforce_organize eo
                 WHERE
                     eo.is_deleted = 0
-                  AND eo.enforce_org_id != '55c99876ec0f425aac6925a92cceeb17'
+                  AND eo.enforce_org_id not in ('55c99876ec0f425aac6925a92cceeb17','256069491270746112')
                 <if test="pm.enforceOrgId  != null  and pm.enforceOrgId != ''">
                     and ej.enforce_org_id = #{pm.enforceOrgId}
                 </if>
@@ -258,7 +270,7 @@
                 WHERE
                     a.is_deleted = '0'
                   AND a.job_status = 'ARCHIVED'
-                  AND a.enforce_org_id != '55c99876ec0f425aac6925a92cceeb17'
+                  AND a.enforce_org_id not in ('55c99876ec0f425aac6925a92cceeb17','256069491270746112')
                   AND a.job_type = 'NORMAL'
                   and a.time_consuming <![CDATA[ <= ]]> 28800000
                 <if test="pm.enforceOrgId  != null  and pm.enforceOrgId != ''">
@@ -328,6 +340,7 @@
         <if test="pm.endDate != null and pm.endDate !=''">
             AND ej.finish_time <![CDATA[ <= ]]> #{pm.endDate}
         </if>
+        group by ej.id
         ) t order by rate
     </select>