修改导出和排序

ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BPlanEnterprise.java

@@ -216,6 +216,7 @@ public class BPlanEnterprise {
     /**
      * 安全风险等级
      */
+    @TableField(exist = false)
     @ApiModelProperty(value = "安全风险等级")
     private String riskLevel;
 

ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseResponse.java

@@ -149,6 +149,9 @@ public class BPlanEnterpriseResponse extends BaseEntity {
     private String lawLevel;
 
 
+    @ApiModelProperty(value = "安全风险等级")
+    private String riskLevel;
+
     /**
      * 执法层级
      */

ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml

@@ -65,9 +65,11 @@
         a.check_status,
         a.check_id,
         a.check_ageing,
+        c.risk_level,
         CONCAT(d.district,'-', d.county) AS districtcounty
         FROM b_plan_enterprise a
         left join  b_administrative_division d on a.district=d.county_code
+        LEFT JOIN b_enterprise_new c ON a.enterprise_id = c.enterprise_id
         <where>
             <if test="enterpriseId != null  and enterpriseId != ''">and a.enterprise_id = #{enterpriseId}</if>
             <if test="createId != null ">and a.create_id = #{createId}</if>
@@ -99,6 +101,7 @@
                     #{item}
                 </foreach>
             </if>
+            order by lawLevel, law_sort,planned_month+0
         </where>
     </select>
     <delete id="deleteByPlanId">