getWarehouseList

src/main/java/com/sooka/sponest/data/emergency/appmin/warehouse/domain/AppWarehouseVO.java

@@ -1,12 +1,13 @@
 package com.sooka.sponest.data.emergency.appmin.warehouse.domain;
 
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
-public class AppWarehouseVO extends BaseEntity {
+public class AppWarehouseVO extends BaseBusinessEntity {
 
     String warehouseName;
     String longitude;

src/main/java/com/sooka/sponest/data/emergency/appmin/warehouse/service/impl/AppWarehouseServiceImpl.java

@@ -1,6 +1,7 @@
 package com.sooka.sponest.data.emergency.appmin.warehouse.service.impl;
 
 import com.ruoyi.common.datascope.annotation.DataScope;
+import com.ruoyi.common.datascope.base.service.BaseService;
 import com.sooka.sponest.data.emergency.appmin.base.AppBaseService;
 import com.sooka.sponest.data.emergency.appmin.warehouse.domain.AppWarehouseVO;
 import com.sooka.sponest.data.emergency.appmin.warehouse.service.AppWarehouseService;
@@ -12,7 +13,7 @@ import javax.annotation.Resource;
 import java.util.List;
 
 @Service
-public class AppWarehouseServiceImpl extends AppBaseService implements AppWarehouseService {
+public class AppWarehouseServiceImpl extends BaseService implements AppWarehouseService {
 
     @Resource
     TBusWarehouseMapper tBusWarehouseMapper;
@@ -25,6 +26,7 @@ public class AppWarehouseServiceImpl extends AppBaseService implements AppWareho
         tBusWarehouse.setLatitude(vo.getLatitude());
         tBusWarehouse.setLongitude(vo.getLongitude());
         tBusWarehouse.setParams(vo.getParams());
+        setSookaDataBase(tBusWarehouse);
         return tBusWarehouseMapper.selectTBusWarehouseListOrderByDistance(tBusWarehouse);
     }
 }

src/main/java/com/sooka/sponest/data/emergency/domain/TBusWarehouse.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.ruoyi.common.datascope.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 2023-01-06
  */
-public class TBusWarehouse extends BaseEntity
+public class TBusWarehouse extends BaseBusinessEntity
 {
     private static final long serialVersionUID = 1L;
 
@@ -45,12 +46,10 @@ public class TBusWarehouse extends BaseEntity
     private String dis;
 
 
-    @Override
     public String getRemark() {
         return remark;
     }
 
-    @Override
     public void setRemark(String remark) {
         this.remark = remark;
     }

src/main/resources/mapper/emergency/appmin/AppXunjianimgMapper.xml

@@ -21,8 +21,8 @@
         (select parent_id from t_bus_items where bus_items_id=i.bus_items_id) ejId,
         (select bus_items_name from t_bus_items where bus_items_id = (select parent_id from t_bus_items where
         bus_items_id=i.bus_items_id)) ejName,
-        (select dict_label from sys_dict_data where dict_value= i.items_type) itemsTypeValue,
-        (select dict_label from sys_dict_data where dict_value=i.risk_status) riskStatusValue,
+        (select dict_label from onest_system.sys_dict_data where dict_value= i.items_type) itemsTypeValue,
+        (select dict_label from onest_system.sys_dict_data where dict_value=i.risk_status) riskStatusValue,
         (select g.bus_enterprise_name from t_bus_log g where g.bus_log_id=i.bus_log_id) busEnterpriseName,
 
         (select attach_url from t_attach