Browse Source

完善移动端工单流程

Memory_LG 7 tháng trước cách đây
mục cha
commit
b897ea6395

+ 1 - 0
src/main/java/com/sooka/sponest/lawenforcement/record/domain/bo/LawenforcementBindDeviceBO.java

@@ -13,4 +13,5 @@ public class LawenforcementBindDeviceBO {
     private String deviceId;
     private String deviceId;
     private String deviceName;
     private String deviceName;
     private String userId;
     private String userId;
+    private String recordStatus;
 }
 }

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

@@ -331,8 +331,8 @@ public class LawenforcementRecordServiceImpl extends BaseServiceImpl implements
         if (null == record.getCreatorId() || record.getCreatorId().isEmpty()) {
         if (null == record.getCreatorId() || record.getCreatorId().isEmpty()) {
             record.setCreatorId(SecurityUtils.getLoginUser().getSysUser().getUserId().toString());
             record.setCreatorId(SecurityUtils.getLoginUser().getSysUser().getUserId().toString());
         }
         }
-
-        return recordMapper.getRecordList(record);
+        List<LawenforcementRecord> recordList = recordMapper.getRecordList(record);
+        return recordList;
     }
     }
 
 
     /**
     /**

+ 4 - 11
src/main/resources/mapper/lawenforcement/LawenforcementRecordMapper.xml

@@ -534,7 +534,7 @@
 
 
     <update id="updateRecordStatus" parameterType="LawenforcementBindDeviceBO">
     <update id="updateRecordStatus" parameterType="LawenforcementBindDeviceBO">
         update lawenforcement_record
         update lawenforcement_record
-        set record_status = 'lawenforcement_type_2'
+        set record_status = #{recordStatus}
         where id = #{recordId}
         where id = #{recordId}
     </update>
     </update>
 
 
@@ -549,19 +549,12 @@
     </select>
     </select>
 
 
     <update id="startRecord" parameterType="LawenforcementBindDeviceBO">
     <update id="startRecord" parameterType="LawenforcementBindDeviceBO">
-        update lawenforcement_record set record_status = 'lawenforcement_type_6'
+        update lawenforcement_record set record_status = #{recordStatus}
         where id = #{recordId}
         where id = #{recordId}
     </update>
     </update>
 
 
     <select id="getRecordList" parameterType="LawenforcementRecord" resultMap="LawenforcementRecordResult">
     <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
+        select lr.* from lawenforcement_record lr
         left join lawenforcement_person lp on lr.id = lp.record_id
         left join lawenforcement_person lp on lr.id = lp.record_id
         <where>
         <where>
             <if test="creatorId != null and creatorId !=''">
             <if test="creatorId != null and creatorId !=''">
@@ -569,7 +562,7 @@
             </if>
             </if>
             <if test="recordStatus != null and recordStatus != ''">
             <if test="recordStatus != null and recordStatus != ''">
                 <if test="recordStatus == 'lawenforcement_type_1'">
                 <if test="recordStatus == 'lawenforcement_type_1'">
-                    and lr.record_status in ('lawenforcement_type_1', 'lawenforcement_type_3', 'lawenforcement_type_9')
+                    and lr.record_status in ('lawenforcement_type_1', 'lawenforcement_type_3')
                 </if>
                 </if>
                 <if test="recordStatus == 'lawenforcement_type_6'">
                 <if test="recordStatus == 'lawenforcement_type_6'">
                     and lr.record_status = #{recordStatus}
                     and lr.record_status = #{recordStatus}