From 42bdfa8af4eeb47181101b5b6e2adc4db2d6d04a Mon Sep 17 00:00:00 2001
From: chenrui <1950717904@qq.com>
Date: Mon, 11 Mar 2024 11:40:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=89=A7=E6=B3=95=E9=A2=84?=
 =?UTF-8?q?=E7=BA=A6=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EnterpriseLawEnforcementController.java   | 12 +++++++
 .../code/domain/EnterpriseLawEnforcement.java | 35 +++++++++++++++++++
 .../mapper/EnterpriseLawEnforcementMapper.xml | 11 +++++-
 3 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterpriseLawEnforcementController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterpriseLawEnforcementController.java
index 88c53254..56311bd8 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterpriseLawEnforcementController.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterpriseLawEnforcementController.java
@@ -48,6 +48,18 @@ public class EnterpriseLawEnforcementController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 查询企业端-执法部门预约记录列表
+     */
+    @RequiresPermissions("code:enforcement:queryList")
+    @GetMapping("/queryList")
+    @ResponseBody
+    public ZDResponse queryList(EnterpriseLawEnforcement enterpriseLawEnforcement)
+    {
+        List<EnterpriseLawEnforcement> list = enterpriseLawEnforcementService.selectEnterpriseLawEnforcementList(enterpriseLawEnforcement);
+        return ZDResponse.success("查询成功",list);
+    }
+
 
     /**
      * 新增企业端-执法部门预约记录
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java
index 40a715cf..6a5bc2a6 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java
@@ -24,6 +24,12 @@ public class EnterpriseLawEnforcement extends BaseDomain
     /** 执法部门ID */
     private String lawEnforcementId;
 
+    /** 执法事项 */
+    private String lawEnforcementItem;
+
+    /** 登记编号 */
+    private String lawEnforcementCode;
+
     /** 被执法企业 */
     private String enterpriseName;
 
@@ -47,6 +53,11 @@ public class EnterpriseLawEnforcement extends BaseDomain
      */
     private Integer status;
 
+    /**
+     * 是否删除 0否 1 是
+     */
+    private Integer isDelete;
+
     public void setId(String id) 
     {
         this.id = id;
@@ -141,6 +152,30 @@ public class EnterpriseLawEnforcement extends BaseDomain
         this.status = status;
     }
 
+    public String getLawEnforcementItem() {
+        return lawEnforcementItem;
+    }
+
+    public void setLawEnforcementItem(String lawEnforcementItem) {
+        this.lawEnforcementItem = lawEnforcementItem;
+    }
+
+    public Integer getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(Integer isDelete) {
+        this.isDelete = isDelete;
+    }
+
+    public String getLawEnforcementCode() {
+        return lawEnforcementCode;
+    }
+
+    public void setLawEnforcementCode(String lawEnforcementCode) {
+        this.lawEnforcementCode = lawEnforcementCode;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml
index 9cc8cb56..16b344ac 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml
@@ -19,10 +19,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="userId"    column="user_id"    />
         <result property="deptId"    column="dept_id"    />
         <result property="status"    column="status"    />
+        <result property="lawEnforcementItem"    column="law_enforcement_item"    />
+        <result property="lawEnforcementCode"    column="law_enforcement_code"    />
     </resultMap>
 
     <sql id="selectEnterpriseLawEnforcementVo">
-        select id, law_enforcement, law_enforcement_id, enterprise_name, enterprise_number, enforcement_time, create_time, create_by, law_enforcer, law_enforcer_id, law_enforcer_tel,status from enterprise_law_enforcement
+        select id, law_enforcement, law_enforcement_id, enterprise_name, enterprise_number, enforcement_time, create_time, create_by, law_enforcer, law_enforcer_id, law_enforcer_tel,status,law_enforcement_item,law_enforcement_code from enterprise_law_enforcement
     </sql>
 
     <select id="selectEnterpriseLawEnforcementList" parameterType="EnterpriseLawEnforcement" resultMap="EnterpriseLawEnforcementResult">
@@ -37,6 +39,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="lawEnforcerId != null "> and law_enforcer_id = #{lawEnforcerId}</if>
             <if test="lawEnforcerTel != null  and lawEnforcerTel != ''"> and law_enforcer_tel = #{lawEnforcerTel}</if>
             <if test="status != null"> and status = #{lawEnforcerTel}</if>
+            <if test="lawEnforcementItem != null and lawEnforcementItem != ''"> and law_enforcement_item = #{lawEnforcementItem}</if>
+            <if test="lawEnforcementCode != null and lawEnforcementCode != ''"> and law_enforcement_code = #{lawEnforcementCode}</if>
         </where>
         order by enforcement_time desc
     </select>
@@ -63,6 +67,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null  and userId != ''">user_id,</if>
             <if test="deptId != null  and deptId != ''">dept_id,</if>
             <if test="status != null">status,</if>
+            <if test="lawEnforcementItem != null and lawEnforcementItem != ''">law_enforcement_item,</if>
+            <if test="lawEnforcementCode != null and lawEnforcementCode != ''">law_enforcement_code,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null  and id != ''">#{id},</if>
@@ -79,6 +85,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null  and userId != ''">#{userId},</if>
             <if test="deptId != null  and deptId != ''">#{deptId},</if>
             <if test="deptId != null">#{status},</if>
+            <if test="lawEnforcementItem != null and lawEnforcementItem != ''">#{lawEnforcementItem},</if>
+            <if test="lawEnforcementCode != null and lawEnforcementCode != ''">#{lawEnforcementCode},</if>
          </trim>
     </insert>
 
@@ -96,6 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="lawEnforcerId != null ">law_enforcer_id = #{lawEnforcerId},</if>
             <if test="lawEnforcerTel != null  and lawEnforcerTel != ''">law_enforcer_tel = #{lawEnforcerTel},</if>
             <if test="status != null">status = #{status},</if>
+            <if test="lawEnforcementItem != null and lawEnforcementItem != ''">law_enforcement_item = #{lawEnforcementItem},</if>
         </trim>
         where id = #{id}
     </update>