应急

src/main/java/com/sooka/sponest/data/emergency/appmin/xunjian/service/impl/AppXunjianServiceImpl.java

@@ -478,7 +478,10 @@ public class AppXunjianServiceImpl extends BaseServiceImpl implements AppXunjian
     public AjaxResult saveFCTZS(AppFctzsVO vo) {
         try {
             String logId = vo.getTzsFcyjgzs().getLogId();
-            TBusLog tBusLog = tBusLogMapper.selectTBusLogByBusLogId(logId);
+            TBusInspection tBusInspection  = new TBusInspection();
+            setSookaDataBase(tBusInspection);
+            tBusInspection.setBusLogId(logId);
+            TBusLog tBusLog = tBusLogMapper.selectTBusLogByBusLogId(tBusInspection);
             setSookaDataBase(tBusLog);
             vo.getTzsFcyjgzs().setEnterpriseId(tBusLog.getBusEnterpriseId());
             vo.getTzsFcyjgzs().setEnterpriseName(tBusLog.getBusEnterpriseName());
@@ -524,7 +527,10 @@ public class AppXunjianServiceImpl extends BaseServiceImpl implements AppXunjian
     public AjaxResult getFCTZSdetail(AppFctzsVO vo) {
         try {
             Map map = new HashMap();
-            TBusLog tBusLog = tBusLogMapper.selectTBusLogByBusLogId(vo.getLogId());
+            TBusInspection tBusInspection  = new TBusInspection();
+            setSookaDataBase(tBusInspection);
+            tBusInspection.setBusLogId(vo.getLogId());
+            TBusLog tBusLog = tBusLogMapper.selectTBusLogByBusLogId(tBusInspection);
             TTzsXhxqzggzs tTzsXhxqzggzs = new TTzsXhxqzggzs();
             tTzsXhxqzggzs.setLogId(tBusLog.getBusLogId());
             List<TTzsXhxqzggzs> tzs = tTzsXhxqzggzsMapper.selectTTzsXhxqzggzsList(tTzsXhxqzggzs);
@@ -585,7 +591,8 @@ public class AppXunjianServiceImpl extends BaseServiceImpl implements AppXunjian
             TBusInspection tBusInspection = new TBusInspection();
             tBusInspection.setBusInspectionId(inp.getBusInspectionId());
             List<TBusInspection> log_list = tBusInspectionMapper.selectTBusInspectionList(tBusInspection);
-            TBusLog tBusLog = tBusLogMapper.selectTBusLogByBusLogId(inp.getBusLogId());
+            setSookaDataBase(inp);
+            TBusLog tBusLog = tBusLogMapper.selectTBusLogByBusLogId(inp);
             String y_risk_status = tBusLog.getRiskStatus();
             for(TBusInspection i:log_list){
                 if(i.getRiskStatus().equals("risk_status_2")){

src/main/java/com/sooka/sponest/data/emergency/domain/TBusInspection.java

@@ -3,6 +3,7 @@ package com.sooka.sponest.data.emergency.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -18,7 +19,7 @@ import java.util.Date;
 @Data
 public class
 
-TBusInspection extends BaseEntity
+TBusInspection extends BaseBusinessEntity
 {
     private static final long serialVersionUID = 1L;
 

src/main/java/com/sooka/sponest/data/emergency/mapper/TBusLogMapper.java

@@ -1,5 +1,6 @@
 package com.sooka.sponest.data.emergency.mapper;
 
+import com.sooka.sponest.data.emergency.domain.TBusInspection;
 import com.sooka.sponest.data.emergency.domain.TBusLog;
 import com.sooka.sponest.data.emergency.domain.vo.ExportVo;
 
@@ -16,10 +17,10 @@ public interface TBusLogMapper
     /**
      * 查询日志
      *
-     * @param busLogId 日志主键
+     * @param vo 日志主键
      * @return 日志
      */
-    public TBusLog selectTBusLogByBusLogId(String busLogId);
+    public TBusLog selectTBusLogByBusLogId(Object vo);
 
     /**
      * 查询日志列表

src/main/java/com/sooka/sponest/data/emergency/service/impl/TBusLogServiceImpl.java

@@ -1,6 +1,8 @@
 package com.sooka.sponest.data.emergency.service.impl;
 
 import com.ruoyi.common.datascope.annotation.DataScope;
+import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
+import com.sooka.sponest.data.emergency.domain.TBusInspection;
 import com.sooka.sponest.data.emergency.domain.TBusLog;
 import com.sooka.sponest.data.emergency.domain.vo.ExportVo;
 import com.sooka.sponest.data.emergency.mapper.TBusLogMapper;
@@ -17,7 +19,7 @@ import java.util.List;
  * @date 2022-11-15
  */
 @Service
-public class TBusLogServiceImpl implements ITBusLogService
+public class TBusLogServiceImpl extends BaseServiceImpl implements ITBusLogService
 {
     @Resource
     private TBusLogMapper tBusLogMapper;
@@ -31,7 +33,10 @@ public class TBusLogServiceImpl implements ITBusLogService
     @Override
     public TBusLog selectTBusLogByBusLogId(String busLogId)
     {
-        return tBusLogMapper.selectTBusLogByBusLogId(busLogId);
+        TBusInspection tBusInspection  = new TBusInspection();
+        setSookaDataBase(tBusInspection);
+        tBusInspection.setBusLogId(busLogId);
+        return tBusLogMapper.selectTBusLogByBusLogId(tBusInspection);
     }
 
     /**

src/main/resources/mapper/emergency/system/TBusLogMapper.xml

@@ -69,7 +69,7 @@
         (case is_risk when 1  then  '有' else '无'  end) is_risk_value,
         bus_enterprise_id, bus_enterprise_name,
         risk_status,
-        (select dict_label from sys_dict_data where dict_value=risk_status) risk_status_value,
+        (select dict_label from ${database_system}.sys_dict_data where dict_value=risk_status) risk_status_value,
         longitude, latitude,create_time,bus_patrolstation_id,bus_patrolstation_name,
          date_format(create_time,'%Y-%m-%d %H:%m:%s') create_time_str from t_bus_log
     </sql>