Memory_LG 5 달 전
부모
커밋
ab01742d41

+ 1 - 1
src/main/java/com/sooka/sponest/data/emergency/appmin/xunjian/controller/AppXunjianController.java

@@ -53,7 +53,7 @@ public class AppXunjianController {
     }
 
     @RequestMapping("getItems")
-    public AjaxResult getItems(AppXunjianVO vo) {
+    public AjaxResult getItems(@RequestBody AppXunjianVO vo) {
         return appXunjianService.getItems(vo);
     }
 

+ 2 - 1
src/main/java/com/sooka/sponest/data/emergency/domain/TBusTrack.java

@@ -2,6 +2,7 @@ package com.sooka.sponest.data.emergency.domain;
 
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -11,7 +12,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author ruoyi
  * @date 2022-11-15
  */
-public class TBusTrack extends BaseEntity
+public class TBusTrack extends BaseBusinessEntity
 {
     private static final long serialVersionUID = 1L;
 

+ 2 - 1
src/main/java/com/sooka/sponest/data/emergency/service/impl/TBusInspectionServiceImpl.java

@@ -119,7 +119,6 @@ public class TBusInspectionServiceImpl extends BaseServiceImpl implements ITBusI
 
     @Override
     public AjaxResult detail(TBusInspection tBusInspection) {
-        setSookaDataBase(tBusInspection);
         AjaxResult ajaxResult = new AjaxResult();
         try{
             String pictureBasePath = configService.remotegetConfigKey("fileUrl").getData();
@@ -127,6 +126,8 @@ public class TBusInspectionServiceImpl extends BaseServiceImpl implements ITBusI
             //进度信息第一项有照片
             TBusTrack tBusTrack = new TBusTrack();
             tBusTrack.setBusInspectionId(tBusInspection.getBusInspectionId());
+            setSookaDataBase(tBusTrack);
+
             List<TBusTrack> tracks_list = tBusTrackMapper.selectTBusTrackList(tBusTrack);
             List<String> pictures = new ArrayList<>();
             for(TBusTrack tr : tracks_list){

+ 1 - 1
src/main/resources/mapper/emergency/system/TBusTrackMapper.xml

@@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTBusTrackVo">
-        select bus_track_id, bus_log_id, bus_inspection_id, dept_id, user_id, risk_status, bus_track_content, create_time,
+        select t.bus_track_id, t.bus_log_id, t.bus_inspection_id, t.dept_id, s.user_id, t.risk_status, t.bus_track_content, t.create_time,
         s.nick_name ,dict_label risk_status_str
         from t_bus_track t
     </sql>