Merge branch 'main' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/Suzhouyingji3Java

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

@@ -125,12 +125,12 @@ public class BPlanEnterpriseResponse extends BaseEntity {
     private String enterpriseName;
 
 
-    /**
-     * 是否重点企业1：是2：否
-     */
-
-    @ApiModelProperty(value = "是否重点企业1：是2：否")
-    private Integer isPoint;
+//    /**
+//     * 是否重点企业1：是2：否
+//     */
+//
+//    @ApiModelProperty(value = "是否重点企业1：是2：否")
+//    private Integer isPoint;
 
 
     /**
@@ -149,6 +149,9 @@ public class BPlanEnterpriseResponse extends BaseEntity {
     private String lawLevel;
 
 
+    @ApiModelProperty(value = "安全风险等级")
+    private String riskLevel;
+
     /**
      * 执法层级
      */
@@ -199,26 +202,26 @@ public class BPlanEnterpriseResponse extends BaseEntity {
     @ApiModelProperty(value = "1当月 2提前 3滞后")
     private Integer checkAgeing;
 
+//
+//    /**
+//     * 1当月 2提前 3滞后
+//     */
+//    @ApiModelProperty(value = "1当月 2提前 3滞后")
+//    private Integer RISK_LEVEL;
+//
+//
+//    /**
+//     * 安全风险等级
+//     */
+//    @ApiModelProperty(value = "安全风险等级")
+//    private String riskLevel;
+//
 
-    /**
-     * 1当月 2提前 3滞后
-     */
-    @ApiModelProperty(value = "1当月 2提前 3滞后")
-    private Integer RISK_LEVEL;
-
-
-    /**
-     * 安全风险等级
-     */
-    @ApiModelProperty(value = "安全风险等级")
-    private String riskLevel;
-
-
-    /**
-     * 标准化等级
-     */
-    @ApiModelProperty(value = "标准化等级")
-    private String standLevel;
+//    /**
+//     * 标准化等级
+//     */
+//    @ApiModelProperty(value = "标准化等级")
+//    private String standLevel;
 
 
     /**

ruoyi-admin/src/main/resources/application.yml

@@ -38,8 +38,9 @@ server:
 # 日志配置
 logging:
   level:
-    com.ruoyi: debug
-    org.springframework: warn
+    com.ruoyi: error
+    org.springframework: error
+    org.hibernate: error
 
 # 用户配置
 user:
@@ -113,7 +114,7 @@ mybatis-plus:
   configuration:
     map-underscore-to-camel-case: true
     cache-enabled: false
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
 # PageHelper分页插件
 pagehelper:

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

@@ -65,15 +65,11 @@
         a.check_status,
         a.check_id,
         a.check_ageing,
-        c.RISK_LEVEL as riskLevel,
-        c.STAND_LEVEL as standLevel,
-        c.EXAMINE_END_TIME as examineEndTime,
-        CONCAT(d.district,'-', d.county) AS districtcounty,
-        CASE WHEN b.ent_code IS NOT NULL THEN 1 ELSE 2 END AS isPoint
+        c.risk_level,
+        CONCAT(d.district,'-', d.county) AS districtcounty
         FROM b_plan_enterprise a
-        LEFT JOIN b_key_enterprise b ON a.enterprise_id = b.ent_code
-        LEFT JOIN b_enterprise_new c ON a.enterprise_id = c.enterprise_id
         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>
@@ -94,7 +90,6 @@
             </if>
 
             <if test="plannedYear != null  and plannedYear != ''">and a.planned_year = #{plannedYear}</if>
-            <if test="isPoint != null ">and a.is_point = #{isPoint}</if>
             <if test="lawHierarchy != null ">and a.law_hierarchy = #{lawHierarchy}</if>
             <if test="status != null ">and a.status = #{status}</if>
             <if test="enterpriseName != null  and enterpriseName != ''">and a.enterprise_name like
@@ -106,8 +101,8 @@
                     #{item}
                 </foreach>
             </if>
+            order by lawLevel, law_sort,planned_month+0
         </where>
-        order by isPoint desc
     </select>
     <delete id="deleteByPlanId">
         delete