From 47a6aacc659162a1bc01fa9ae6e076471027bd43 Mon Sep 17 00:00:00 2001
From: dongdingding <207595406@qq.com>
Date: Wed, 13 Dec 2023 14:08:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=82=B9=E4=BC=81=E4=B8=9A=E5=92=8C?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E8=A1=A8=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BKeyEnterpriseController.java  | 24 +++---
 .../entity/BKeyEnterprise.java                |  6 --
 .../entity/BPlanEnterprise.java               | 65 +++++++++++++++-
 .../mapper/BKeyEnterpriseMapper.java          | 16 ++--
 .../service/BKeyEnterpriseService.java        | 18 ++---
 .../impl/BKeyEnterpriseServiceImpl.java       | 15 ++--
 .../mapper/yingji/BKeyEnterpriseMapper.xml    |  4 +-
 .../mapper/yingji/BPlanEnterpriseMapper.xml   | 75 ++++++++-----------
 8 files changed, 131 insertions(+), 92 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/BKeyEnterpriseController.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/BKeyEnterpriseController.java
index efc087c..46424c8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/BKeyEnterpriseController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/BKeyEnterpriseController.java
@@ -109,17 +109,17 @@ public class BKeyEnterpriseController extends BaseController {
         return AjaxResult.success();
     }
 
-
-    /**
-     * 根据行政区划代码查询重点企业数量
-     *
-     * @param district 行政区划代码
-     * @return 结果集合
-     */
-    @GetMapping("/getBydistrict")
-    @ApiOperation(value = "根据行政区划代码查询重点企业数量")
-    public AjaxResult getBydistrict(@RequestParam("district") String district) {
-        return success(bKeyEnterpriseService.getBydistrict(district));
-    }
+//
+//    /**
+//     * 根据行政区划代码查询重点企业数量
+//     *
+//     * @param district 行政区划代码
+//     * @return 结果集合
+//     */
+//    @GetMapping("/getBydistrict")
+//    @ApiOperation(value = "根据行政区划代码查询重点企业数量")
+//    public AjaxResult getBydistrict(@RequestParam("district") String district) {
+//        return success(bKeyEnterpriseService.getBydistrict(district));
+//    }
 }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BKeyEnterprise.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BKeyEnterprise.java
index 5c28ff0..1c3e5b8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BKeyEnterprise.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BKeyEnterprise.java
@@ -110,12 +110,6 @@ public class BKeyEnterprise implements Serializable {
     @Excel(name = "企业名称")
     private String enterpriseName;
 
-    /**
-     * 行政区划
-     */
-    @ApiModelProperty(value = "行政区划")
-    @Excel(name = "行政区划")
-    private String district;
 
 
 }
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 31232bc..f33100d 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
@@ -135,7 +135,7 @@ public class BPlanEnterprise implements Serializable {
     private Integer isPoint;
 
     /**
-     *企业主表名称
+     * 企业主表名称
      */
     @TableField(exist = false)
     @ApiModelProperty(value = "企业主表名称")
@@ -149,5 +149,68 @@ public class BPlanEnterprise implements Serializable {
     @ApiModelProperty(value = "企业名称")
     private String enterpriseName;
 
+
+    /**
+     * 执法排序
+     */
+    @ApiModelProperty(value = "执法排序")
+    private Long lawSort;
+
+
+    /**
+     * 执法地区
+     */
+    @ApiModelProperty(value = "执法地区")
+    private String lawAreas;
+
+
+    /**
+     * 执法级别
+     */
+    @ApiModelProperty(value = "执法级别")
+    private String lawLevel;
+
+
+    /**
+     * 执法层级
+     */
+    @ApiModelProperty(value = "执法层级")
+    private String lawHierarchy;
+
+
+    /**
+     * 计划月份
+     */
+    @ApiModelProperty(value = "计划月份")
+    private String plannedMonth;
+
+
+    /**
+     * 0：草稿 1：正式
+     */
+    @ApiModelProperty(value = "0：草稿 1：正式")
+    private Integer status;
+
+
+    /**
+     * 0：未检查 1：已检查
+     */
+    @ApiModelProperty(value = "0：未检查 1：已检查")
+    private Integer checkStatus;
+
+
+    /**
+     * 检查id
+     */
+    @ApiModelProperty(value = "检查id")
+    private Integer checkId;
+
+
+    /**
+     * 1当月 2提前 3滞后
+     */
+    @ApiModelProperty(value = "1当月 2提前 3滞后")
+    private Integer checkAgeing;
+
 }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BKeyEnterpriseMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BKeyEnterpriseMapper.java
index 3db3c4d..b238a1c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BKeyEnterpriseMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BKeyEnterpriseMapper.java
@@ -46,14 +46,14 @@ public interface BKeyEnterpriseMapper extends BaseMapper<BKeyEnterprise> {
 
 
 
-    /**
-     * 根据行政区划代码查询重点企业数量
-     *
-     * @param district 行政区划代码
-     * @return 结果集合
-     */
-
-    Integer getBydistrict(String district);
+//    /**
+//     * 根据行政区划代码查询重点企业数量
+//     *
+//     * @param district 行政区划代码
+//     * @return 结果集合
+//     */
+//
+//    Integer getBydistrict(String district);
 }
 
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/BKeyEnterpriseService.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/BKeyEnterpriseService.java
index dba1517..4e3932d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/BKeyEnterpriseService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/BKeyEnterpriseService.java
@@ -38,14 +38,14 @@ public interface BKeyEnterpriseService extends IService<BKeyEnterprise> {
 
     BKeyEnterprise getByentCode(String entCode);
 
-
-    /**
-     * 根据行政区划代码查询重点企业数量
-     *
-     * @param district 行政区划代码
-     * @return 结果集合
-     */
-
-    Integer getBydistrict(String district);
+//
+//    /**
+//     * 根据行政区划代码查询重点企业数量
+//     *
+//     * @param district 行政区划代码
+//     * @return 结果集合
+//     */
+//
+//    Integer getBydistrict(String district);
 }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BKeyEnterpriseServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BKeyEnterpriseServiceImpl.java
index d591751..c0aa946 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BKeyEnterpriseServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BKeyEnterpriseServiceImpl.java
@@ -34,11 +34,6 @@ public class BKeyEnterpriseServiceImpl extends ServiceImpl<BKeyEnterpriseMapper,
         StringBuilder successMsg = new StringBuilder();
         if (!bKeyEnterpriseList.isEmpty()) {
             for (BKeyEnterprise bKeyEnterprise : bKeyEnterpriseList) {
-                //根据entcode获取行政区划代码
-                String entCode = bKeyEnterprise.getEntCode();
-                if (entCode!=null){
-                    bKeyEnterprise.setDistrict(iSzEntBasicInfoService.getDistrict(entCode));
-                }
                 baseMapper.bKeyEnterpriseAdd(bKeyEnterprise);
             }
             successMsg.append("导入成功");
@@ -62,11 +57,11 @@ public class BKeyEnterpriseServiceImpl extends ServiceImpl<BKeyEnterpriseMapper,
     public BKeyEnterprise getByentCode(String entCode) {
         return bKeyEnterpriseMapper.getByentCode(entCode);
     }
-
-    @Override
-    public Integer getBydistrict(String district) {
-        return bKeyEnterpriseMapper.getBydistrict(district);
-    }
+//
+//    @Override
+//    public Integer getBydistrict(String district) {
+//        return bKeyEnterpriseMapper.getBydistrict(district);
+//    }
 
 
 }
diff --git a/ruoyi-system/src/main/resources/mapper/yingji/BKeyEnterpriseMapper.xml b/ruoyi-system/src/main/resources/mapper/yingji/BKeyEnterpriseMapper.xml
index ec6f1a1..7e6b8de 100644
--- a/ruoyi-system/src/main/resources/mapper/yingji/BKeyEnterpriseMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/yingji/BKeyEnterpriseMapper.xml
@@ -11,13 +11,13 @@
             <if test="entCode != null">ent_code,</if>
             <if test="year != null">year,</if>
             <if test="enterpriseName != null">enterprise_name,</if>
-            <if test="district!= null">district,</if>
+
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="entCode != null">#{entCode},</if>
             <if test="year != null">#{year},</if>
             <if test="enterpriseName != null">#{enterpriseName},</if>
-            <if test="district != null">#{district},</if>
+
         </trim>
 
     </insert>
diff --git a/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml b/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml
index 083838a..80f12ea 100644
--- a/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml
@@ -4,25 +4,25 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.programManagement.mapper.BPlanEnterpriseMapper">
 
-    <resultMap type="BPlanEnterprise" id="BPlanEnterpriseResult">
-        <result property="id" column="id"/>
-        <result property="enterpriseId" column="enterprise_id"/>
-        <result property="createId" column="create_id"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateId" column="update_id"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="remark" column="remark"/>
-        <result property="userId" column="user_id"/>
-        <result property="deptId" column="dept_id"/>
-        <result property="district" column="district"/>
-        <result property="plannedYear" column="planned_year"/>
-        <result property="planName" column="plan_name"/>
-        <result property="planContent" column="plan_content"/>
-        <result property="isPoint" column="is_point"/>
-        <result property="enterpriseName" column="enterprise_name"/>
-    </resultMap>
+<!--    <resultMap type="BPlanEnterprise" id="BPlanEnterpriseResult">-->
+<!--        <result property="id" column="id"/>-->
+<!--        <result property="enterpriseId" column="enterprise_id"/>-->
+<!--        <result property="createId" column="create_id"/>-->
+<!--        <result property="createBy" column="create_by"/>-->
+<!--        <result property="createTime" column="create_time"/>-->
+<!--        <result property="updateId" column="update_id"/>-->
+<!--        <result property="updateBy" column="update_by"/>-->
+<!--        <result property="updateTime" column="update_time"/>-->
+<!--        <result property="remark" column="remark"/>-->
+<!--        <result property="userId" column="user_id"/>-->
+<!--        <result property="deptId" column="dept_id"/>-->
+<!--        <result property="district" column="district"/>-->
+<!--        <result property="plannedYear" column="planned_year"/>-->
+<!--        <result property="planName" column="plan_name"/>-->
+<!--        <result property="planContent" column="plan_content"/>-->
+<!--        <result property="isPoint" column="is_point"/>-->
+<!--        <result property="enterpriseName" column="enterprise_name"/>-->
+<!--    </resultMap>-->
     <sql id="selectBPlanEnterpriseVo">
         select id,
                enterprise_id,
@@ -40,11 +40,20 @@
                plan_name,
                plan_content,
                is_point,
-               enterprise_name
+               enterprise_name,
+               law_sort,
+               law_areas,
+               law_level,
+               law_hierarchy,
+               planned_month,
+               status,
+               check_status,
+               check_id,
+               check_ageing
         from b_plan_enterprise
     </sql>
 
-    <select id="selectBPlanEnterpriseList" parameterType="BPlanEnterprise" resultMap="BPlanEnterpriseResult">
+    <select id="selectBPlanEnterpriseList" parameterType="BPlanEnterprise" resultType="BPlanEnterprise">
         <include refid="selectBPlanEnterpriseVo"/>
         <where>
             <if test="enterpriseId != null  and enterpriseId != ''">and enterprise_id = #{enterpriseId}</if>
@@ -68,29 +77,7 @@
     </delete>
 
     <select id="getZhifa" resultType="com.ruoyi.programManagement.entity.response.BPlanEnterpriseZhifaResponse">
-        -- SELECT
-        -- s.*
-        -- FROM
-        -- (
-        -- SELECT
-        -- a.*,
-        -- a.planned_year AS plannedYear,
-        -- b.id AS longId,
-        -- b.EXAMINE_START_TIME,
-        -- b.EXAMINE_END_TIME,
-        -- b.ENTPR_NAME as entprName,
-        -- CASE
-        -- WHEN b.USC_CODE IS NOT NULL
-        -- AND SUBSTRING( a.planned_year, 1, 7 ) = SUBSTRING( b.EXAMINE_START_TIME, 1, 7 )
-        -- THEN 1
-        -- ELSE 2
-        -- END AS checkStatus
-        -- FROM
-        -- b_plan_enterprise a
-        -- LEFT JOIN sz_enfor_examine b ON a.enterprise_id = b.USC_CODE
-        -- WHERE
-        -- b.USC_CODE IS NOT NULL
-        -- ) s
+
         SELECT s.*
         FROM (
         SELECT