1

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

@@ -314,6 +314,7 @@ export default {
       open1: false,
       disabled: true,
       state:null,
+      state1 :null,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -512,7 +513,7 @@ export default {
     },
     /* 不予受理 */
     noAcceptance(state) {
-      this.form.state = state;
+      this.form.state1 = state;
       this.open1 = true;
       if (state == 'state_3') {
         this.title = "不予受理";
@@ -522,6 +523,7 @@ export default {
       }
     },
     submit() {
+      this.form.state = this.form.state1
       updateCase(this.form).then(response => {
         if (this.form.state == 'state_3') {
           this.$modal.msgSuccess("不予受理");

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

@@ -242,12 +242,17 @@
             b.person_name personName,
             c.device_id deviceId,
             c.device_name deviceName,
-            SUBSTRING_INDEX( GROUP_CONCAT( DATE_FORMAT(c.start_time,'%Y-%m-%d %h:%m:%s') ORDER BY start_time asc ), ',', 1 ) checkStartTime,
+        <choose>
+            <when test="deviceId != null and deviceId != ''">
+                DATE_FORMAT(c.start_time,'%Y-%m-%d %h:%m:%s') checkStartTime,
+            </when>
+            <otherwise>SUBSTRING_INDEX( GROUP_CONCAT( DATE_FORMAT(c.start_time,'%Y-%m-%d %h:%m:%s') ORDER BY start_time asc ), ',', 1 ) checkStartTime,</otherwise>
+        </choose>
             case WHEN a.is_last = 0 then '否' WHEN a.is_last = 1 THEN '是' end isLast,
             case WHEN a.is_cross_dept = 0 then '否' WHEN a.is_cross_dept = 1 THEN '是' end isCrossDept
         FROM
             lawenforcement_record a
-            left join lawenforcement_person b on a.id = b.record_id and b.main_person = '1'
+            left join lawenforcement_person b on a.id = b.record_id
             left join lawenforcement_record_log c on a.id = c.record_id and b.person_code = c.person_code
         WHERE 1=1
         <choose>