执法案件更换设备;

工单完成状态转存疑整改

lawenforcement-ui/src/api/lawenforcement/record.js

@@ -128,3 +128,13 @@ export function getDahuaVideoServer() {
     method: 'get',
   })
 }
+
+// export function setRecordStatus()
+
+export function setRecordStatus(data){
+  return request({
+    url: '/sooka-sponest-lawenforcement/record/setRecrodState',
+    method: 'post',
+    data: data
+  })
+}

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

@@ -93,6 +93,11 @@
                 填报
               </el-dropdown-item>
               <el-dropdown-item
+                v-if="(scope.row.recordStatus === 'lawenforcement_type_2') && scope.row.isRegister ==='0'"
+                command="setStatus" icon="el-icon-edit" v-hasPermi="['lawenforcement:record:edit']">
+                整改
+              </el-dropdown-item>
+              <el-dropdown-item
                 v-if="scope.row.createMethod === 4 && scope.row.recordStatus === 'lawenforcement_type_1'" command="edit"
                 icon="el-icon-edit" v-hasPermi="['lawenforcement:record:edit']">
                 修改
@@ -368,7 +373,15 @@
 </template>
 
 <script>
-import {addRecord, delRecord, getFillForm, getRecord, listRecord, updateRecord} from "@/api/lawenforcement/record";
+import {
+  addRecord,
+  delRecord,
+  getFillForm,
+  getRecord,
+  listRecord,
+  setRecordStatus,
+  updateRecord
+} from "@/api/lawenforcement/record";
 import moment from "moment/moment";
 import DetailsVue from "@/views/lawenforcement/record/DetailsVue.vue";
 import Distribute from "@/views/lawenforcement/record/distribute.vue";
@@ -669,6 +682,9 @@ export default {
         case 'fillForm':
           this.fillFormHandle(row, 0)
           break;
+        case 'setStatus':
+          this.setStatus(row)
+          break;
         default:
           break
       }
@@ -728,6 +744,19 @@ export default {
       this.fillFormRecordName = row.jobName
       this.fillFormDialog = true;
     },
+    /** 存在风险隐患整改 */
+    setStatus(row){
+      let o ={
+        recordId: row.id,
+        recordStatus: 'lawenforcement_type_3'
+      }
+      setRecordStatus(o).then(res=>{
+        console.log(res)
+
+        this.getList();
+        this.$modal.msgSuccess("设置成功");
+      })
+    },
     //审批
     approval(row) {
       getFillForm({recordId: row.id}).then(res => {

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

@@ -183,4 +183,9 @@ public class LawenforcementRecordController extends BaseController {
     public AjaxResult getFillForm(LawenforcementFillFormBO fillFormBO){
         return AjaxResult.success(lawenforcementRecordService.getFillForm(fillFormBO));
     }
+
+    @PostMapping("/setRecrodState")
+    public AjaxResult setRecordState(@RequestBody LawenforcementBindDeviceBO bindDeviceBO){
+        return toAjax(lawenforcementRecordService.setRecordState(bindDeviceBO));
+    }
 }

src/main/java/com/sooka/sponest/lawenforcement/record/domain/bo/LawenforcementBindDeviceBO.java

@@ -14,4 +14,9 @@ public class LawenforcementBindDeviceBO {
     private String deviceName;
     private String userId;
     private String recordStatus;
+
+    public LawenforcementBindDeviceBO(String recordId, String personCode) {
+        this.recordId = recordId;
+        this.personCode = personCode;
+    }
 }

src/main/java/com/sooka/sponest/lawenforcement/record/mapper/LawenforcementRecordMapper.java

@@ -153,4 +153,9 @@ public interface LawenforcementRecordMapper {
     int getTotal();
 
     List<Map<String, Object>> getJsonDataMessageByPage(@Param("pageNum") int pageNum, @Param("pageSize") int pageSize);
+
+    int setRecordState(LawenforcementBindDeviceBO bindDeviceBO);
+
+    void stopRecord(LawenforcementBindDeviceBO bindDeviceBO);
+
 }

src/main/java/com/sooka/sponest/lawenforcement/record/service/ILawenforcementRecordService.java

@@ -120,4 +120,6 @@ public interface ILawenforcementRecordService {
     int getTotal();
 
     List<Map<String, Object>> getJsonDataMessageByPage(int pageNum, int pageSize);
+
+    int setRecordState(LawenforcementBindDeviceBO bindDeviceBO);
 }

src/main/java/com/sooka/sponest/lawenforcement/record/service/impl/LawenforcementRecordServiceImpl.java

@@ -180,8 +180,13 @@ public class LawenforcementRecordServiceImpl extends BaseServiceImpl implements
         //将设备与人员绑定
         int i = recordMapper.bindDeviceToPerson(record);
 
-        LawenforcementRecordLog lawenforcementRecordLog = new LawenforcementRecordLog(IdUtils.fastSimpleUUID(), record.getPersonCode(), record.getRecordId(), record.getDeviceId(), record.getDeviceName(), new Date(), null, "0");
+        //更换绑定设备:结束上一次的工单
+        LawenforcementBindDeviceBO lawenforcementBindDeviceBO = new LawenforcementBindDeviceBO(record.getRecordId(), record.getPersonCode());
+        recordMapper.stopRecord(lawenforcementBindDeviceBO);
+
+
         //将工单执行记录，写入到日志表中：数据id、任务id、执法人编号、设备编号、开始时间、子任务状态
+        LawenforcementRecordLog lawenforcementRecordLog = new LawenforcementRecordLog(IdUtils.fastSimpleUUID(), record.getPersonCode(), record.getRecordId(), record.getDeviceId(), record.getDeviceName(), new Date(), null, "0");
         recordMapper.addRecordLog(lawenforcementRecordLog);
         //修改工单状态为执法中
         recordMapper.startRecord(record);
@@ -468,4 +473,12 @@ public class LawenforcementRecordServiceImpl extends BaseServiceImpl implements
         }
         return fillForm;
     }
+
+    @Override
+    public int setRecordState(LawenforcementBindDeviceBO bindDeviceBO) {
+        //关闭为完成的工单
+        recordMapper.stopRecord(bindDeviceBO);
+        //设置工单状态为存在隐患整改
+        return recordMapper.setRecordState(bindDeviceBO);
+    }
 }

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

@@ -779,4 +779,22 @@
         limit 1
     </select>
 
+    <update id="stopRecord" parameterType="LawenforcementBindDeviceBO">
+        update lawenforcement_record_log set end_time = NOW(), record_state = '1'
+        <where>
+            and end_time is null
+            <if test="recordId != null and recordId != ''">
+                and record_id = #{recordId}
+            </if>
+            <if test="personCode != null and personCode != ''">
+                and person_code = #{personCode}
+            </if>
+        </where>
+    </update>
+
+    <update id="setRecordState" parameterType="LawenforcementBindDeviceBO">
+        update lawenforcement_record set record_status = #{recordStatus}
+        where id = #{recordId}
+    </update>
+
 </mapper>