执法登记+监测预约: 执法依据/检查要求改为选择;

执法人员2/辅助人员数据未上数据库bug修复;

lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/User.java

@@ -153,6 +153,17 @@ public class User extends BaseDomain {
 
     private SysTenant tenant;
 
+    /** 执法证件号 */
+    private String lawCertificateNum;
+
+    public String getLawCertificateNum() {
+        return lawCertificateNum;
+    }
+
+    public void setLawCertificateNum(String lawCertificateNum) {
+        this.lawCertificateNum = lawCertificateNum;
+    }
+
     public SysTenant getTenant() {
         return tenant;
     }

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dict/controller/DictDataController.java

@@ -127,7 +127,7 @@ public class DictDataController extends BaseController
     }
 
     @GetMapping("/queryDict")
-    @RequiresPermissions("system:dict:list")
+//    @RequiresPermissions("system:dict:list")
     @ResponseBody
     public ZDResponse queryDict(DictData dictData)
     {

lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml

@@ -9,6 +9,7 @@
         <result property="deptId" column="dept_id"/>
         <result property="loginName" column="login_name"/>
         <result property="userName" column="user_name"/>
+        <result property="lawCertificateNum" column="law_certificate_num"/>
         <result property="email" column="email"/>
         <result property="phonenumber" column="phonenumber"/>
         <result property="sex" column="sex"/>
@@ -85,7 +86,7 @@
 
     <select id="selectUserList" parameterType="User" resultMap="UserResult">
         select u.user_id, u.dept_id, u.login_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex,
-        u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.type, d.dept_name,
+        u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.type, d.dept_name, u.law_certificate_num,
         d.leader,u.tenant_code,t.tenant_code, t.tenant_name, t.contact_man, t.contact_number, t.address
         from sys_user u
         left join sys_dept d on u.dept_id = d.dept_id
@@ -98,7 +99,11 @@
             AND u.login_name like concat('%', #{loginName}, '%')
         </if>
         <if test="userName != null and userName != ''">
-            AND u.user_name like concat('%', #{userName}, '%')
+            AND (
+                u.user_name like concat('%', #{userName}, '%')
+                or
+                u.law_certificate_num like concat('%', #{userName}, '%')
+            )
         </if>
         <if test="status != null and status != ''">
             AND u.status = #{status}
@@ -293,6 +298,7 @@
             <if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
             <if test="loginName != null and loginName != ''">login_name = #{loginName},</if>
             <if test="userName != null and userName != ''">user_name = #{userName},</if>
+            <if test="lawCertificateNum != null and lawCertificateNum != ''">law_certificate_num = #{lawCertificateNum},</if>
             <if test="email != null and email != ''">email = #{email},</if>
             <if test="phonenumber != null and phonenumber != ''">phonenumber = #{phonenumber},</if>
             <if test="sex != null and sex != ''">sex = #{sex},</if>

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java

@@ -52,6 +52,12 @@ public class EnterpriseLawEnforcement extends BaseDomain
 
     /** 执法人员ID */
     private String lawEnforcerId;
+
+    /** 执法人员姓名2 */
+    private String lawEnforcerTwo;
+
+    /** 执法人员2ID */
+    private String lawEnforcerTwoId;
     /** 备注 */
     private String remark;
 
@@ -286,6 +292,22 @@ public class EnterpriseLawEnforcement extends BaseDomain
         this.dateType = dateType;
     }
 
+    public String getLawEnforcerTwo() {
+        return lawEnforcerTwo;
+    }
+
+    public void setLawEnforcerTwo(String lawEnforcerTwo) {
+        this.lawEnforcerTwo = lawEnforcerTwo;
+    }
+
+    public String getLawEnforcerTwoId() {
+        return lawEnforcerTwoId;
+    }
+
+    public void setLawEnforcerTwoId(String lawEnforcerTwoId) {
+        this.lawEnforcerTwoId = lawEnforcerTwoId;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml

@@ -14,6 +14,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createBy"    column="create_by"    />
         <result property="lawEnforcer"    column="law_enforcer"    />
         <result property="lawEnforcerId"    column="law_enforcer_id"    />
+        <result property="lawEnforcerTwo"    column="law_enforcer_two"    />
+        <result property="lawEnforcerTwoId"    column="law_enforcer_two_id"    />
         <result property="lawEnforcerTel"    column="law_enforcer_tel"    />
         <result property="userId"    column="user_id"    />
         <result property="deptId"    column="dept_id"    />
@@ -24,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectEnterpriseLawEnforcementVo">
-        select id, law_enforcement, law_enforcement_id, enterprise_id, enterprise_name, check_time, create_time, create_by, law_enforcer, law_enforcer_id, remark, user_id, dept_id, is_delete, status, law_enforcement_code, link_man, link_tel, check_item, check_require,enterprise_number from enterprise_law_enforcement
+        select id, law_enforcement, law_enforcement_id, enterprise_id, enterprise_name, check_time, create_time, create_by, law_enforcer, law_enforcer_id, law_enforcer_two, law_enforcer_two_id, remark, user_id, dept_id, is_delete, status, law_enforcement_code, link_man, link_tel, check_item, check_require,enterprise_number from enterprise_law_enforcement
     </sql>
 
     <select id="selectEnterpriseLawEnforcementList" parameterType="EnterpriseLawEnforcement" resultMap="EnterpriseLawEnforcementResult">
@@ -102,6 +104,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createBy != null  and createBy != ''">create_by,</if>
             <if test="lawEnforcer != null  and lawEnforcer != ''">law_enforcer,</if>
             <if test="lawEnforcerId != null  and lawEnforcerId != ''">law_enforcer_id,</if>
+            <if test="lawEnforcerTwo != null  and lawEnforcerTwo != ''">law_enforcer_two,</if>
+            <if test="lawEnforcerTwoId != null  and lawEnforcerTwoId != ''">law_enforcer_two_id,</if>
             <if test="remark != null  and remark != ''">remark,</if>
             <if test="userId != null ">user_id,</if>
             <if test="deptId != null ">dept_id,</if>
@@ -125,6 +129,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createBy != null  and createBy != ''">#{createBy},</if>
             <if test="lawEnforcer != null  and lawEnforcer != ''">#{lawEnforcer},</if>
             <if test="lawEnforcerId != null  and lawEnforcerId != ''">#{lawEnforcerId},</if>
+            <if test="lawEnforcerTwo != null  and lawEnforcerTwo != ''">#{lawEnforcerTwo},</if>
+            <if test="lawEnforcerTwoId != null  and lawEnforcerTwoId != ''">#{lawEnforcerTwoId},</if>
             <if test="remark != null  and remark != ''">#{remark},</if>
             <if test="userId != null ">#{userId},</if>
             <if test="deptId != null ">#{deptId},</if>
@@ -151,6 +157,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createBy != null  and createBy != ''">create_by = #{createBy},</if>
             <if test="lawEnforcer != null  and lawEnforcer != ''">law_enforcer = #{lawEnforcer},</if>
             <if test="lawEnforcerId != null  and lawEnforcerId != ''">law_enforcer_id = #{lawEnforcerId},</if>
+            <if test="lawEnforcerTwo != null  and lawEnforcerTwo != ''">law_enforcer_two = #{lawEnforcerTwo},</if>
+            <if test="lawEnforcerTwoId != null  and lawEnforcerTwoId != ''">law_enforcer_two_id = #{lawEnforcerTwoId},</if>
             <if test="remark != null  and remark != ''">remark = #{remark},</if>
             <if test="userId != null ">user_id = #{userId},</if>
             <if test="deptId != null ">dept_id = #{deptId},</if>