app 执法

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

@@ -127,4 +127,6 @@ public interface LawenforcementRecordMapper {
     Map<String, Object> getIsMainPerson(LawenforcementBindDeviceBO record);
 
     void startRecord(LawenforcementBindDeviceBO record);
+
+    List<LawenforcementRecord> getRecordList(LawenforcementRecord record);
 }

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

@@ -99,4 +99,5 @@ public interface ILawenforcementRecordService {
      */
     int updateRecordLogEndTime(LawenforcementBindDeviceBO bo);
 
+    List<LawenforcementRecord> getRecordList(LawenforcementRecord record);
 }

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

@@ -193,7 +193,7 @@ public class LawenforcementRecordServiceImpl implements ILawenforcementRecordSer
     @Override
     public int addRecordLog(LawenforcementBindDeviceBO record) {
         if(null == record.getUserId() || record.getUserId().isEmpty()){
-            record.setUserId(SecurityUtils.getUserId().toString());
+            record.setUserId(SecurityUtils.getLoginUser().getSysUser().getUserId().toString());
         }
         Map<String, Object> userCodeByUserId = userMapper.getUserCodeByUserId(record.getUserId());
         record.setPersonCode(MapUtils.getString(userCodeByUserId,"personCode"));
@@ -301,6 +301,15 @@ public class LawenforcementRecordServiceImpl implements ILawenforcementRecordSer
         return i;
     }
 
+    @Override
+    public List<LawenforcementRecord> getRecordList(LawenforcementRecord record) {
+        if(null == record.getCreatorId() || record.getCreatorId().isEmpty()){
+            record.setCreatorId(SecurityUtils.getLoginUser().getSysUser().getUserId().toString());
+        }
+
+        return recordMapper.getRecordList(record);
+    }
+
     /**
      * 新增工单方法：对接省平台数据
      *

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

@@ -114,7 +114,7 @@
             IFNULL(r.total, 0) total,
             IFNULL(c.lian, 0) lian
         FROM (
-        <foreach item="date" collection="dates" open="select" separator="union" close="">
+        <foreach item="date" collection="dates" open="select " separator="union select" close="">
             #{date} d
         </foreach>
         ) a