diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BPlanEnterprise.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BPlanEnterprise.java index 809b3c2..c1d0c5d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BPlanEnterprise.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseResponse.java index 736d128..e4f63e3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseResponse.java +++ b/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; + /** * 执法层级 */ diff --git a/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml b/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml index 24ae38b..3248400 100644 --- a/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml +++ b/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 and a.enterprise_id = #{enterpriseId} and a.create_id = #{createId} @@ -99,6 +101,7 @@ #{item} + order by lawLevel, law_sort,planned_month+0