app 执法

lawenforcement-ui/src/views/lawenforcement/user/index.vue

@@ -241,7 +241,7 @@
         </el-row>
         <el-row :gutter="24">
           <el-col>
-            <el-form-item label="图片" prop="certificate">
+            <el-form-item label="执法证照" prop="certificate">
               <ImageUpload ref="ImageUpload" :limit="1" :fileType="['png', 'jpg', 'jpeg']" :value="form.certificate"
                            @input="getUrl"></ImageUpload>
             </el-form-item>
@@ -325,6 +325,9 @@ export default {
         ],
         deptId: [
           {required: true, message: '所属部门不能为空', trigger: 'change'}
+        ],
+        certificateNumber: [
+          {required: true, message: '执法证号不能为空', trigger: 'change'}
         ]
       },
     };

src/main/java/com/sooka/sponest/lawenforcement/record/controller/LawenforcementRecordController.java

@@ -66,6 +66,12 @@ public class LawenforcementRecordController extends BaseController {
         return getDataTable(list);
     }
 
+    @GetMapping("/getRecordList")
+    public AjaxResult getRecordList(LawenforcementRecord record){
+        startPage();
+        return AjaxResult.success(lawenforcementRecordService.getRecordList(record));
+    }
+
     /**
      * 获取任务数据详细信息
      */
@@ -108,9 +114,10 @@ public class LawenforcementRecordController extends BaseController {
      * @return R
      */
     @GetMapping("/getDeivceList")
-    public R getDeivceList(){
-        VisuForestCloudCameraBO visuForestCloudCameraBO = new VisuForestCloudCameraBO();
-        visuForestCloudCameraBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
+    public R getDeivceList(VisuForestCloudCameraBO visuForestCloudCameraBO){
+        if(visuForestCloudCameraBO.getDeptId() == null){
+            visuForestCloudCameraBO.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
+        }
         return SpringUtils.getBean(RemoteDeviceService.class).selectByCameraId(visuForestCloudCameraBO);
     }
 

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

@@ -267,6 +267,9 @@
         <include refid="selectLawenforcementRecordVo"/>
         <where>
             <if test="jobName != null  and jobName != ''">and job_name like concat('%', #{jobName}, '%')</if>
+            <if test="recordStatus != null adn recordStatus != ''">
+                and record_status = #{recordStatus}
+            </if>
         </where>
         order by create_time desc
     </select>
@@ -534,6 +537,32 @@
         where id = #{recordId}
     </update>
 
+    <select id="getRecordList" parameterType="LawenforcementRecord" resultMap="LawenforcementRecordResult">
+        select
+        lr.id,
+        lr.job_type,
+        lr.job_name,
+        lr.check_start_time,
+        lr.check_end_time,
+        lr.record_status
+        from lawenforcement_record lr
+        left join lawenforcement_person lp on lr.id = lp.record_id
+        <where>
+            <if test="creatorId != null and creatorId !=''">
+                and lp.person_id = #{creatorId}
+            </if>
+            <if test="recordStatus != null and recordStatus != ''">
+                <if test="recordStatus == 'lawenforcement_type_1'">
+                    and lr.record_status in ('lawenforcement_type_1', 'lawenforcement_type_3', 'lawenforcement_type_9')
+                </if>
+                <if test="recordStatus == 'lawenforcement_type_6'">
+                    and lr.record_status = #{recordStatus}
+                </if>
+            </if>
+        </where>
+
+    </select>
+
     <update id="updateLawenforcementRecord" parameterType="LawenforcementRecord">
         update lawenforcement_record
         <trim prefix="SET" suffixOverrides=",">