Merge remote-tracking branch 'origin/master_tuzuo' into master_tuzuo

src/main/java/com/sooka/sponest/data/emergency/appmin/enterprise/controller/AppEnterpriseController.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.sooka.sponest.data.emergency.appmin.enterprise.domain.AppEnterpriseVO;
 import com.sooka.sponest.data.emergency.appmin.enterprise.service.AppEnterpriseService;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -37,7 +38,7 @@ public class AppEnterpriseController extends BaseController {
         return AjaxResult.success(getDataTable(list));
     }
 
-    @RequestMapping("getEnterpriseDetails")
+    @GetMapping("getEnterpriseDetails")
     public AjaxResult getEnterpriseDetails(AppEnterpriseVO vo) {
         return appEnterpriseService.getEnterpriseDetails(vo);
     }

src/main/java/com/sooka/sponest/data/emergency/appmin/enterprise/domain/AppEnterpriseVO.java

@@ -1,10 +1,10 @@
 package com.sooka.sponest.data.emergency.appmin.enterprise.domain;
 
-import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
 import lombok.Data;
 
 @Data
-public class AppEnterpriseVO extends BaseEntity {
+public class AppEnterpriseVO extends BaseBusinessEntity {
 
     String week_start;
     String week_end;

src/main/java/com/sooka/sponest/data/emergency/appmin/enterprise/service/impl/AppEnterpriseServiceImpl.java

@@ -5,7 +5,7 @@ import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.datascope.annotation.DataScope;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.model.LoginUser;
-import com.sooka.sponest.data.emergency.appmin.base.AppBaseService;
+import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.emergency.appmin.enterprise.domain.AppEnterpriseVO;
 import com.sooka.sponest.data.emergency.appmin.enterprise.mapper.AppEnterpriseMapper;
 import com.sooka.sponest.data.emergency.appmin.enterprise.service.AppEnterpriseService;
@@ -18,7 +18,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 @Service
-public class AppEnterpriseServiceImpl extends AppBaseService implements AppEnterpriseService {
+public class AppEnterpriseServiceImpl extends BaseServiceImpl implements AppEnterpriseService {
 
     @Resource
     AppEnterpriseMapper appEnterpriseMapper;
@@ -70,11 +70,10 @@ public class AppEnterpriseServiceImpl extends AppBaseService implements AppEnter
 
     @Override
     public AjaxResult getEnterpriseDetails(AppEnterpriseVO vo) {
-        AjaxResult ajaxResult = new AjaxResult();
+        setSookaDataBase(vo);
         try {
-            TBusEnterprise tBusEnterprise = tBusEnterpriseMapper.selectTBusEnterpriseByBusEnterpriseId(vo.getBusEnterpriseId());
-            ajaxResult.put("enterpriseDetails", tBusEnterprise);
-            return ajaxResult;
+            TBusEnterprise tBusEnterprise = tBusEnterpriseMapper.selectTBusEnterpriseByBusEnterpriseId(vo);
+            return AjaxResult.success(tBusEnterprise);
         } catch (Exception e) {
             e.printStackTrace();
             return AjaxResult.error("查询异常");

src/main/java/com/sooka/sponest/data/emergency/appmin/zhenggaijindu/controller/AppZhenggaijinduController.java

@@ -4,6 +4,7 @@ import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.sooka.sponest.data.emergency.appmin.zhenggaijindu.domain.AppZhenggaijinduVO;
 import com.sooka.sponest.data.emergency.appmin.zhenggaijindu.service.AppZhenggaijinduService;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -16,7 +17,7 @@ public class AppZhenggaijinduController extends BaseController {
     @Resource
     AppZhenggaijinduService appZhenggaijinduService;
 
-    @RequestMapping("getZhenggaijindu")
+    @GetMapping("getZhenggaijindu")
     public AjaxResult getZhenggaijindu(AppZhenggaijinduVO vo){
         return appZhenggaijinduService.getZhenggaijinduList(vo);
     }

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

@@ -16,10 +16,10 @@ public interface TBusEnterpriseMapper
     /**
      * 查询企业
      *
-     * @param busEnterpriseId 企业主键
+     * @param vo 企业主键
      * @return 企业
      */
-    public TBusEnterprise selectTBusEnterpriseByBusEnterpriseId(String busEnterpriseId);
+    public TBusEnterprise selectTBusEnterpriseByBusEnterpriseId(Object vo);
 
     /**
      * 查询企业列表

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

@@ -30,15 +30,15 @@
     </select>
 
     <select id="getItemsLast" parameterMap="pm_AppXunjianVO" resultMap="TBusItemsResult">
-select * from t_bus_items
-where parent_id != '0'
-and bus_items_id not in
-(select bus_items_id from  t_bus_items where parent_id in (select bus_items_id from t_bus_items where parent_id='0'))
- and bus_items_id not in
-(
-select bus_items_id from t_bus_enterprise_items_mapping where bus_enterprise_id=#{busEnterpriseId}
- )
- and parent_id = #{parentId}
+        select * from t_bus_items
+        where parent_id != '0'
+        and bus_items_id not in
+        (select bus_items_id from  t_bus_items where parent_id in (select bus_items_id from t_bus_items where parent_id='0'))
+         and bus_items_id not in
+        (
+        select bus_items_id from t_bus_enterprise_items_mapping where bus_enterprise_id=#{busEnterpriseId}
+         )
+         and parent_id = #{parentId}
  </select>
 
     <select id="getBusInspectionIsRiskByEnterpriseCount" parameterMap="pm_AppXunjianVO" resultType="int">

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

@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             e.dept_id,
             e.enterprise_code,
             e.user_id,
-            e.account_id,
+            u.user_name account_id,
             e.business_name,
             e.business_address,
             e.office_address,
@@ -49,14 +49,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             e.create_time,
             e.longitude,
             e.latitude,
-            e.data_status,
-            e.del_flag,
             d.dept_name,
             u.nick_name
         FROM
             t_bus_enterprise e
-        LEFT JOIN sys_dept d ON e.dept_id = d.dept_id
-        LEFT JOIN sys_user u ON e.user_id = u.user_id
+        LEFT JOIN ${database_system}.sys_dept d ON e.dept_id = d.dept_id
+        LEFT JOIN ${database_system}.sys_user u ON e.user_id = u.user_id
     </sql>
 
     <select id="selectTBusEnterpriseList" parameterType="TBusEnterprise" resultMap="TBusEnterpriseResult">
@@ -87,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by e.create_time desc
     </select>
 
-    <select id="selectTBusEnterpriseByBusEnterpriseId" parameterType="String" resultMap="TBusEnterpriseResult">
+    <select id="selectTBusEnterpriseByBusEnterpriseId" parameterType="Object" resultMap="TBusEnterpriseResult">
         <include refid="selectTBusEnterpriseVo"/>
         where bus_enterprise_id = #{busEnterpriseId}
     </select>