回退版本

src/main/java/com/sooka/sponest/lawenforcement/record/domain/LawenforcementRecord.java

@@ -57,6 +57,8 @@ public class LawenforcementRecord{
     @Excel(name = "任务创建部门名称")
     private String deptName;
 
+    private List<String> deptNameList;
+
     /**
      * 地区ID
      */

src/main/resources/mapper/lawenforcement/LawenforcementRecordMapper.xml

@@ -292,33 +292,37 @@
 
     <select id="selectLawenforcementRecordList" parameterType="LawenforcementRecord"
             resultMap="LawenforcementRecordResult">
-        <include refid="selectLawenforcementRecordVo"/>
+        select a.id, a.job_type, a.creator_id, a.creator_name, a.dept_id, a.dept_name, a.area_id, a.job_name, a.check_type, a.check_object_type, a.check_object_id, a.check_object_code, a.check_object_name,
+               a.check_object_phone, a.check_start_time, a.check_end_time, a.subitem_count, a.remark, a.verify, a.unable_verify_reason, a.scan_id, a.scan_name, a.scan_time, a.verify_people_id,
+               a.verify_people_name, a.verify_time, a.evaluation, a.evaluation_content, a.evaluation_time, a.result, a.result_time, a.result_person_id, a.status, a.create_time, a.create_by,
+               a.is_last, a.job_id, a.last_job_type, a.source, a.create_method, a.is_cross_dept, a.device_id, a.device_name, a.record_status, a.is_register
+        from lawenforcement_record a
         <where>
-            <if test="jobName != null  and jobName != ''">and job_name like concat('%', #{jobName}, '%')</if>
-            <if test="jobType != null  and jobType != ''">and job_type like concat('%', #{jobType}, '%')</if>
-            <if test="creatorName != null  and creatorName != ''">and creator_name like concat('%', #{creatorName}, '%')</if>
-            <if test="deptName != null  and deptName != ''">and dept_name like concat('%', #{deptName}, '%')</if>
-            <if test="checkObjectCode != null  and checkObjectCode != ''">and check_object_code like concat('%', #{checkObjectCode}, '%')</if>
-            <if test="checkObjectName != null  and checkObjectName != ''">and check_object_name like concat('%', #{checkObjectName}, '%')</if>
-            <if test="checkStartTime != null  and checkStartTime != ''">and check_start_time &gt;= #{checkStartTime}</if>
-            <if test="checkEndTime != null  and checkEndTime != ''">and check_end_time &lt;= #{checkEndTime}</if>
-            <if test="createMethod != null  and createMethod != ''">and create_method like concat('%', #{createMethod}, '%')</if>
+            <if test="jobName != null  and jobName != ''">and a.job_name like concat('%', #{jobName}, '%')</if>
+            <if test="jobType != null  and jobType != ''">and a.job_type like concat('%', #{jobType}, '%')</if>
+            <if test="creatorName != null  and creatorName != ''">and a.creator_name like concat('%', #{creatorName}, '%')</if>
+            <if test="deptName != null  and deptName != ''">and a.dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="checkObjectCode != null  and checkObjectCode != ''">and a.check_object_code like concat('%', #{checkObjectCode}, '%')</if>
+            <if test="checkObjectName != null  and checkObjectName != ''">and a.check_object_name like concat('%', #{checkObjectName}, '%')</if>
+            <if test="checkStartTime != null  and checkStartTime != ''">and a.check_start_time &gt;= #{checkStartTime}</if>
+            <if test="checkEndTime != null  and checkEndTime != ''">and a.check_end_time &lt;= #{checkEndTime}</if>
+            <if test="createMethod != null  and createMethod != ''">and a.create_method like concat('%', #{createMethod}, '%')</if>
             <if test="recordStatus != null and recordStatus != ''">
-                and record_status = #{recordStatus}
+                and a.record_status = #{recordStatus}
             </if>
-            <if test="isRegister != null  and isRegister != ''">and is_register= #{isRegister}</if>
+            <if test="isRegister != null  and isRegister != ''">and a.is_register= #{isRegister}</if>
             <if test="isRegisterRecord != null  and isRegisterRecord != ''">
                 <choose>
                     <when test="isRegisterRecord == 3">
-                        and is_register != '0'
+                        and a.is_register != '0'
                     </when>
                     <otherwise>
-                        and is_register = #{isRegisterRecord}
+                        and a.is_register = #{isRegisterRecord}
                     </otherwise>
                 </choose>
             </if>
         </where>
-        order by create_time desc
+        order by a.create_time desc
     </select>
 
     <select id="getDetailById" parameterType="string" resultMap="detailMapResult">