案件填报页面取消新增按钮;

案件页面取消回车刷新页面;
app工单列表查询修复bug

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

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
       <el-form-item label="任务名称" prop="jobName">
         <el-input
           v-model="queryParams.jobName"
@@ -17,7 +17,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <el-col :span="1.5" v-if="isRegister === 0">
         <el-button
           type="primary"
           plain
@@ -120,7 +120,7 @@
             v-if="(scope.row.recordStatus === 'lawenforcement_type_2' || scope.row.recordStatus === 'lawenforcement_type_5') && scope.row.isRegister ==='1' && isRegister === '1'"
             v-hasPermi="['lawenforcement:record:edit']" size="mini" type="text" icon="el-icon-paper-plus"
             @click="registerLiAn(scope.row)">
-            立案
+            案件填报
           </el-button>
         </template>
       </el-table-column>
@@ -468,7 +468,7 @@ export default {
   },
   created() {
     this.queryParams.isRegister = this.$route.query.isRegister;
-    this.isRegister = this.$route.query.isRegister;
+    this.isRegister = this.$route.query.isRegister?this.$route.query.isRegister:0;
     this.getList();
     this.getTreeselectToDept();
   },

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

@@ -23,7 +23,9 @@ public class LawenforcementRecordLog extends BaseEntity {
     private Date endTime;
     private String deptName;
 
-    public LawenforcementRecordLog(String id, String personCode, String recordId, String deviceId, String deviceName, Date startTime, Date endTime) {
+    private String recordState;
+
+    public LawenforcementRecordLog(String id, String personCode, String recordId, String deviceId, String deviceName, Date startTime, Date endTime, String recordState) {
         this.id = id;
         this.personCode = personCode;
         this.recordId = recordId;
@@ -31,5 +33,6 @@ public class LawenforcementRecordLog extends BaseEntity {
         this.deviceName = deviceName;
         this.startTime = startTime;
         this.endTime = endTime;
+        this.recordState = recordState;
     }
 }

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

@@ -72,7 +72,7 @@ public class LawenforcementRecordServiceImpl extends BaseServiceImpl implements
     @Override
     public int insertEnforceLawInfoByList(JSONArray records) {
         log.error("============================================数据开始===================================================");
-        log.error("接受到的报文数据长度===>{}",records.size());
+        log.error("接受到的报文数据长度===>{}", records.size());
         //存储原始报文
         return insertJsonData(records);
     }
@@ -177,21 +177,17 @@ public class LawenforcementRecordServiceImpl extends BaseServiceImpl implements
         Map<String, Object> userCodeByUserId = userMapper.getUserCodeByUserId(record.getUserId());
         record.setPersonCode(MapUtils.getString(userCodeByUserId, "personCode"));
 
-        //检查当前绑定设备的执法人是否为主办人
-//        Map<String, Object> isMainPerson = recordMapper.getIsMainPerson(record);
         //将设备与人员绑定
         int i = recordMapper.bindDeviceToPerson(record);
 
-        LawenforcementRecordLog lawenforcementRecordLog = new LawenforcementRecordLog(IdUtils.fastSimpleUUID(), record.getPersonCode(), record.getRecordId(), record.getDeviceId(), record.getDeviceName(), new Date(), null);
-        //将工单执行记录，写入到日志表中：数据id、任务id、执法人编号、设备编号、开始时间
+        LawenforcementRecordLog lawenforcementRecordLog = new LawenforcementRecordLog(IdUtils.fastSimpleUUID(), record.getPersonCode(), record.getRecordId(), record.getDeviceId(), record.getDeviceName(), new Date(), null, "0");
+        //将工单执行记录，写入到日志表中：数据id、任务id、执法人编号、设备编号、开始时间、子任务状态
         recordMapper.addRecordLog(lawenforcementRecordLog);
-        //判断是否为主办人，如果是主办人则开始工单
-//        if ("1".equals(MapUtils.getString(isMainPerson, "mainPerson"))) {
+        //修改工单状态为执法中
         recordMapper.startRecord(record);
         //绑定设备后关闭定时任务
         deviceService.cancelTask(lawenforcementRecordLog.getDeviceId());
         deviceService.setOpenedDevice(lawenforcementRecordLog.getDeviceId());
-//        }
         return i;
     }
 
@@ -264,12 +260,8 @@ public class LawenforcementRecordServiceImpl extends BaseServiceImpl implements
         Map<String, Object> userCodeByUserId = userMapper.getUserCodeByUserId(record.getUserId());
         record.setPersonCode(MapUtils.getString(userCodeByUserId, "personCode"));
 
-        //检查当前绑定设备的执法人是否为主办人
-//        Map<String, Object> isMainPerson = recordMapper.getIsMainPerson(record);
-//        if ("1".equals(MapUtils.getString(isMainPerson, "mainPerson"))) {
-            //设置任务完成状态
-            recordMapper.updateRecordStatus(record);
-//        }
+        //设置任务完成状态
+        recordMapper.updateRecordStatus(record);
 
         //设置任务结束时间
         int i = recordMapper.updateRecordLogEndTime(record);
@@ -292,21 +284,21 @@ public class LawenforcementRecordServiceImpl extends BaseServiceImpl implements
         //查询任务集合
         List<LawenforcementRecord> recordList = recordMapper.getRecordList(record);
         //处理工单状态
-        recordList.forEach(data->{
-            if(StringUtils.isNotEmpty(record.getRecordStatus())){
+        recordList.forEach(data -> {
+            if (StringUtils.isNotEmpty(record.getRecordStatus())) {
                 //查询带执法
-                if(DAI_ZHI_FA.equals(record.getRecordStatus())){
+                if (DAI_ZHI_FA.equals(record.getRecordStatus())) {
                     //查询结果中可能存在已经进行中的任务;需要修改为带执法状态
-                    if(ZHI_FA_ZHONG.equals(data.getRecordStatus())){
+                    if (ZHI_FA_ZHONG.equals(data.getRecordStatus())) {
                         data.setRecordStatus(DAI_ZHI_FA);
-                    }else if(ER_CI_ZHI_FA.equals(data.getRecordStatus())){
+                    } else if (ER_CI_ZHI_FA.equals(data.getRecordStatus())) {
                         data.setRecordStatus(ZHI_FA_YI_CHANG);
                     }
-                //查询执法进行中
-                }else if(ZHI_FA_ZHONG.equals(record.getRecordStatus())){
-                    if(ZHI_FA_WAN_CHENG.equals(data.getRecordStatus())){
+                    //查询执法进行中
+                } else if (ZHI_FA_ZHONG.equals(record.getRecordStatus())) {
+                    if (ZHI_FA_WAN_CHENG.equals(data.getRecordStatus())) {
                         data.setRecordStatus(ZHI_FA_ZHONG);
-                    }else if(ER_CI_ZHI_FA_WAN_CHENG.equals(data.getRecordStatus())){
+                    } else if (ER_CI_ZHI_FA_WAN_CHENG.equals(data.getRecordStatus())) {
                         data.setRecordStatus(ER_CI_ZHI_FA);
                     }
 
@@ -342,7 +334,7 @@ public class LawenforcementRecordServiceImpl extends BaseServiceImpl implements
                 idArray.add(message.getString("id"));
                 recordMap.put(message.getString("id"), message);
             }
-            log.info("本次数据的id集合===>{}",idArray);
+            log.info("本次数据的id集合===>{}", idArray);
 
             //遍历报文数据,存储需要的信息
            /* recordListMessage.forEach(message->{
@@ -352,7 +344,7 @@ public class LawenforcementRecordServiceImpl extends BaseServiceImpl implements
 
             //调用获取数据方法,查出存在的数据
             List<Map<String, Object>> existMessage = recordMapper.getExistMessage(idArray);
-            log.error("获取存在的数据量===>{}",existMessage.size());
+            log.error("获取存在的数据量===>{}", existMessage.size());
 
             //对存在的数据进行遍历更新;并且在recordMap中移除已经更新的数据
             existMessage.forEach(existMap -> {
@@ -367,7 +359,7 @@ public class LawenforcementRecordServiceImpl extends BaseServiceImpl implements
                     addMessage.put("updateTime", simpleDateFormat.format(new Date()));
                     addMessage.put("dataUpdateTime", message.getString("updateTime"));
                     recordMapper.updateJsonData(addMessage);
-                }else{
+                } else {
                     log.error("时间相同====>数据id===>{};获取的报文数据:{}<<>>;mysql数据:{}", message.getString("id"), message, existMap);
                 }
 
@@ -468,7 +460,7 @@ public class LawenforcementRecordServiceImpl extends BaseServiceImpl implements
     @Override
     public LawenforcementFillFormBO getFillForm(LawenforcementFillFormBO fillFormBO) {
         LawenforcementFillFormBO fillForm = recordMapper.getFillForm(fillFormBO);
-        if (fillForm!=null) {
+        if (fillForm != null) {
             StringBuilder newDiles = new StringBuilder();
             String filename = fillForm.getAttachName();
             newDiles.append(fillForm.getAttachPath()).append("+").append(filename);

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

@@ -496,6 +496,7 @@
             <if test="deviceName != null">device_name,</if>
             <if test="startTime != null">start_time,</if>
             <if test="endTime != null">end_time,</if>
+            <if test="recordState != null">record_state,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -505,6 +506,7 @@
             <if test="deviceName != null">#{deviceName},</if>
             <if test="startTime != null">#{startTime},</if>
             <if test="endTime != null">#{endTime},</if>
+            <if test="recordState != null">#{recordState},</if>
         </trim>
     </insert>
 
@@ -553,7 +555,7 @@
     </update>
 
     <update id="updateRecordLogEndTime" parameterType="LawenforcementBindDeviceBO">
-        update lawenforcement_record_log set end_time = NOW()
+        update lawenforcement_record_log set end_time = NOW(), record_state = '1'
         WHERE end_time is null and record_id = #{recordId} and person_code = #{personCode}
     </update>
 
@@ -571,7 +573,7 @@
         select lr.* from
         lawenforcement_record lr
         LEFT JOIN lawenforcement_person lp on lr.id = lp.record_id
-        LEFT JOIN lawenforcement_record_log lrl on lr.id = lrl.record_id and lp.person_code = lrl.person_code
+        LEFT JOIN lawenforcement_record_log lrl on lr.id = lrl.record_id and lp.person_code = lrl.person_code and lrl.record_state != 1
         <where>
             <if test="jobName != null and jobName != ''">
                 and job_name LIKE concat('%', #{jobName}, '%')
@@ -581,14 +583,13 @@
             </if>
             <if test="recordStatus != null and recordStatus != ''">
                 <if test="recordStatus == 'lawenforcement_type_1'">
-                    AND lp.person_code = #{personCode} and start_time is null and lr.record_status not in ('lawenforcement_type_2','lawenforcement_type_5')
+                    and start_time is null and lr.record_status not in ('lawenforcement_type_2','lawenforcement_type_5')
                 </if>
                 <if test="recordStatus == 'lawenforcement_type_6'">
-                    AND lp.person_code = #{personCode} AND lrl.end_time is null and lrl.start_time is not null
-                    and lr.record_status in ('lawenforcement_type_4','lawenforcement_type_6')
+                    AND lrl.end_time is null and lrl.start_time is not null
                 </if>
                 <if test="recordStatus == 'lawenforcement_type_2'">
-                    AND lp.person_code = #{personCode} AND lrl.end_time is not null
+                   AND lrl.end_time is not null
                 </if>
             </if>
         </where>