From 30b4f4613509cf55cf2d14fcf1325288d4c70035 Mon Sep 17 00:00:00 2001
From: mashuai <mashuai@163.com>
Date: Sat, 2 Dec 2023 12:51:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BmCompanyInfoController.java    |  6 +++---
 .../controller/MaDevInfoController.java        | 18 +++++++++---------
 .../bigscreen/mapper/BmCompanyInfoMapper.java  |  4 ++--
 .../zlpt/bigscreen/mapper/MaDevInfoMapper.java | 12 ++++++------
 .../service/BmCompanyInfoService.java          |  2 +-
 .../bigscreen/service/MaDevInfoService.java    | 12 ++++++------
 .../service/impl/BmCompanyInfoServiceImpl.java |  6 +++---
 .../service/impl/MaDevInfoServiceImpl.java     | 18 +++++++++---------
 .../mapper.bigscreen/BmCompanyInfoMapper.xml   |  6 +++---
 .../mapper.bigscreen/BmMachinistInfoMapper.xml |  6 +++---
 .../mapper.bigscreen/MaDevInfoMapper.xml       |  8 ++++----
 .../mapper.bigscreen/MaOrderInfoMapper.xml     |  2 +-
 12 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/sgzb-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/BmCompanyInfoController.java b/sgzb-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/BmCompanyInfoController.java
index 1ed9bdb..e6a6de2 100644
--- a/sgzb-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/BmCompanyInfoController.java
+++ b/sgzb-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/BmCompanyInfoController.java
@@ -40,13 +40,13 @@ public class BmCompanyInfoController extends BaseController {
 
     /**
      * 根据企业类型查询对应数量
-     * @param bmCompanyInfo
+     * @param
      * @return
      */
     @GetMapping("/type-list")
-    public AjaxResult typeList(BmCompanyInfo bmCompanyInfo)
+    public AjaxResult typeList()
     {
-        List<CoTypeVo> list = bmCompanyInfoService.selectTypeList(bmCompanyInfo);
+        List<CoTypeVo> list = bmCompanyInfoService.selectTypeList();
         return success(list);
     }
 
diff --git a/sgzb-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/MaDevInfoController.java b/sgzb-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/MaDevInfoController.java
index 491207f..6bb5399 100644
--- a/sgzb-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/MaDevInfoController.java
+++ b/sgzb-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/MaDevInfoController.java
@@ -40,25 +40,25 @@ public class MaDevInfoController extends BaseController {
 
     /**
      * 根据类型查询设备总数
-     * @param maDevInfo
+     * @param
      * @return
      */
     @GetMapping("/type-list")
-    public AjaxResult typeList(MaDevInfo maDevInfo)
+    public AjaxResult typeList()
     {
-        List<TypeVo> list = maDevInfoService.selectTypeList(maDevInfo);
+        List<TypeVo> list = maDevInfoService.selectTypeList();
         return success(list);
     }
 
     /**
      * 根据设备类型查询数量
-     * @param maDevInfo
+     * @param
      * @return
      */
     @GetMapping("/matype-list")
-    public AjaxResult maTypeList(MaDevInfo maDevInfo)
+    public AjaxResult maTypeList()
     {
-        List<TypeVo> list = maDevInfoService.selectMaTypeList(maDevInfo);
+        List<TypeVo> list = maDevInfoService.selectMaTypeList();
         return success(list);
     }
 
@@ -78,9 +78,9 @@ public class MaDevInfoController extends BaseController {
      * @return
      */
     @GetMapping("/ma-list")
-    public AjaxResult maList(MaDevInfo maDevInfo)
+    public AjaxResult maList()
     {
-        List<CompanyInfoVo> maDevInfos = maDevInfoService.selectmaList(maDevInfo);
+        List<CompanyInfoVo> maDevInfos = maDevInfoService.selectmaList();
         return success(maDevInfos);
     }
 
@@ -89,7 +89,7 @@ public class MaDevInfoController extends BaseController {
      * @return
      */
     @GetMapping("/hot-list")
-    public AjaxResult maList()
+    public AjaxResult hotList()
     {
         List<CompanyInfoVo> maHotInfos = maDevInfoService.selecthotList();
         return success(maHotInfos);
diff --git a/sgzb-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/mapper/BmCompanyInfoMapper.java b/sgzb-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/mapper/BmCompanyInfoMapper.java
index 9a3857b..690ea95 100644
--- a/sgzb-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/mapper/BmCompanyInfoMapper.java
+++ b/sgzb-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/mapper/BmCompanyInfoMapper.java
@@ -24,10 +24,10 @@ public interface BmCompanyInfoMapper {
 
     /**
      * 根据企业类型查询对应数量
-     * @param bmCompanyInfo
+     * @param
      * @return
      */
-    List<CoTypeVo> selectTypeList(BmCompanyInfo bmCompanyInfo);
+    List<CoTypeVo> selectTypeList();
 
     /**
      * 根据企业类型所属查询设备类型数量及经纬度
diff --git a/sgzb-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/mapper/MaDevInfoMapper.java b/sgzb-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/mapper/MaDevInfoMapper.java
index eec4275..1d718be 100644
--- a/sgzb-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/mapper/MaDevInfoMapper.java
+++ b/sgzb-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/mapper/MaDevInfoMapper.java
@@ -26,10 +26,10 @@ public interface MaDevInfoMapper {
 
     /**
      * 查询设备状态为在租的设备名称及数量
-     * @param maDevInfo
+     * @param
      * @return
      */
-    List<CompanyInfoVo> selectmaList(MaDevInfo maDevInfo);
+    List<CompanyInfoVo> selectmaList();
 
     /**
      * 查询平台入驻设备总数
@@ -39,17 +39,17 @@ public interface MaDevInfoMapper {
 
     /**
      * 根据类型查询设备总数
-     * @param maDevInfo
+     * @param
      * @return
      */
-    List<TypeVo> selectTypeList(MaDevInfo maDevInfo);
+    List<TypeVo> selectTypeList();
 
     /**
      * 根据设备类型查询数量
-     * @param maDevInfo
+     * @param
      * @return
      */
-    List<TypeVo> selectMaTypeList(MaDevInfo maDevInfo);
+    List<TypeVo> selectMaTypeList();
 
     /**
      * 查询公司对应的热门设备数量
diff --git a/sgzb-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/BmCompanyInfoService.java b/sgzb-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/BmCompanyInfoService.java
index bff1766..4af33d5 100644
--- a/sgzb-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/BmCompanyInfoService.java
+++ b/sgzb-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/BmCompanyInfoService.java
@@ -26,7 +26,7 @@ public interface BmCompanyInfoService {
      * @param bmCompanyInfo
      * @return
      */
-    List<CoTypeVo> selectTypeList(BmCompanyInfo bmCompanyInfo);
+    List<CoTypeVo> selectTypeList();
 
     /**
      * 根据企业类型所属查询设备类型数量及经纬度
diff --git a/sgzb-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/MaDevInfoService.java b/sgzb-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/MaDevInfoService.java
index da73d42..2f48d98 100644
--- a/sgzb-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/MaDevInfoService.java
+++ b/sgzb-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/MaDevInfoService.java
@@ -24,10 +24,10 @@ public interface MaDevInfoService {
 
     /**
      * 查询设备状态为在租的设备名称及数量
-     * @param maDevInfo
+     * @param
      * @return
      */
-    List<CompanyInfoVo> selectmaList(MaDevInfo maDevInfo);
+    List<CompanyInfoVo> selectmaList();
 
     /**
      * 查询平台入驻设备总数
@@ -37,17 +37,17 @@ public interface MaDevInfoService {
 
     /**
      * 根据类型查询设备总数
-     * @param maDevInfo
+     * @param
      * @return
      */
-    List<TypeVo> selectTypeList(MaDevInfo maDevInfo);
+    List<TypeVo> selectTypeList();
 
     /**
      * 根据设备类型查询数量
-     * @param maDevInfo
+     * @param
      * @return
      */
-    List<TypeVo> selectMaTypeList(MaDevInfo maDevInfo);
+    List<TypeVo> selectMaTypeList();
 
     /**
      * 查询公司对应的热门设备数量
diff --git a/sgzb-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/impl/BmCompanyInfoServiceImpl.java b/sgzb-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/impl/BmCompanyInfoServiceImpl.java
index a5430a1..cdaa46f 100644
--- a/sgzb-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/impl/BmCompanyInfoServiceImpl.java
+++ b/sgzb-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/impl/BmCompanyInfoServiceImpl.java
@@ -32,12 +32,12 @@ public class BmCompanyInfoServiceImpl implements BmCompanyInfoService {
 
     /**
      * 根据企业类型查询对应数量
-     * @param bmCompanyInfo
+     * @param
      * @return
      */
     @Override
-    public List<CoTypeVo> selectTypeList(BmCompanyInfo bmCompanyInfo) {
-        return bmCompanyInfoMapper.selectTypeList(bmCompanyInfo);
+    public List<CoTypeVo> selectTypeList() {
+        return bmCompanyInfoMapper.selectTypeList();
     }
 
     /**
diff --git a/sgzb-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/impl/MaDevInfoServiceImpl.java b/sgzb-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/impl/MaDevInfoServiceImpl.java
index da03213..753affc 100644
--- a/sgzb-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/impl/MaDevInfoServiceImpl.java
+++ b/sgzb-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/impl/MaDevInfoServiceImpl.java
@@ -34,12 +34,12 @@ public class MaDevInfoServiceImpl implements MaDevInfoService {
 
     /**
      * 查询设备状态为在租的设备名称及数量
-     * @param maDevInfo
+     * @param
      * @return
      */
     @Override
-    public List<CompanyInfoVo> selectmaList(MaDevInfo maDevInfo) {
-        return maDevInfoMapper.selectmaList(maDevInfo);
+    public List<CompanyInfoVo> selectmaList() {
+        return maDevInfoMapper.selectmaList();
     }
 
     /**
@@ -53,22 +53,22 @@ public class MaDevInfoServiceImpl implements MaDevInfoService {
 
     /**
      * 根据类型查询设备总数
-     * @param maDevInfo
+     * @param
      * @return
      */
     @Override
-    public List<TypeVo> selectTypeList(MaDevInfo maDevInfo) {
-        return maDevInfoMapper.selectTypeList(maDevInfo);
+    public List<TypeVo> selectTypeList() {
+        return maDevInfoMapper.selectTypeList();
     }
 
     /**
      * 根据设备类型查询数量
-     * @param maDevInfo
+     * @param
      * @return
      */
     @Override
-    public List<TypeVo> selectMaTypeList(MaDevInfo maDevInfo) {
-        return maDevInfoMapper.selectMaTypeList(maDevInfo);
+    public List<TypeVo> selectMaTypeList() {
+        return maDevInfoMapper.selectMaTypeList();
     }
 
     /**
diff --git a/sgzb-modules/zlpt-bigScreen/src/main/resources/mapper.bigscreen/BmCompanyInfoMapper.xml b/sgzb-modules/zlpt-bigScreen/src/main/resources/mapper.bigscreen/BmCompanyInfoMapper.xml
index 2166c6a..746684b 100644
--- a/sgzb-modules/zlpt-bigScreen/src/main/resources/mapper.bigscreen/BmCompanyInfoMapper.xml
+++ b/sgzb-modules/zlpt-bigScreen/src/main/resources/mapper.bigscreen/BmCompanyInfoMapper.xml
@@ -9,10 +9,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectTypeList" resultType="com.bonus.zlpt.bigscreen.domain.vo.CoTypeVo">
-            SELECT co_type as coType, COUNT(*) AS count
+            SELECT company_type as coType, COUNT(*) AS count
             FROM bm_company_info
-            WHERE co_type IN ('社会企业', '南网集团企业', '南网控股企业')
-            GROUP BY co_type
+            WHERE company_type IN ('社会企业', '南网集团企业', '南网控股企业')
+            GROUP BY company_type
     </select>
 
     <select id="selectColtdList" resultType="com.bonus.zlpt.bigscreen.domain.vo.ColtdTypeVo">
diff --git a/sgzb-modules/zlpt-bigScreen/src/main/resources/mapper.bigscreen/BmMachinistInfoMapper.xml b/sgzb-modules/zlpt-bigScreen/src/main/resources/mapper.bigscreen/BmMachinistInfoMapper.xml
index 6a590ca..a17bef1 100644
--- a/sgzb-modules/zlpt-bigScreen/src/main/resources/mapper.bigscreen/BmMachinistInfoMapper.xml
+++ b/sgzb-modules/zlpt-bigScreen/src/main/resources/mapper.bigscreen/BmMachinistInfoMapper.xml
@@ -5,10 +5,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.bonus.zlpt.bigscreen.mapper.BmMachinistInfoMapper">
 
     <select id="selectMachinistInfoList" resultType="com.bonus.zlpt.bigscreen.domain.vo.CompanyInfoVo">
-        SELECT c.co_ltd AS ownCo, COUNT(*) AS count
+        SELECT c.company_ltd AS ownCo, COUNT(*) AS count
         FROM bm_company_info c
-        LEFT JOIN bm_machinist_info m ON c.co_name = m.own_co
-        GROUP BY c.co_ltd
+        LEFT JOIN bm_operator_info m ON c.company_name = m.own_co
+        GROUP BY c.company_ltd
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/sgzb-modules/zlpt-bigScreen/src/main/resources/mapper.bigscreen/MaDevInfoMapper.xml b/sgzb-modules/zlpt-bigScreen/src/main/resources/mapper.bigscreen/MaDevInfoMapper.xml
index 277e976..deecedc 100644
--- a/sgzb-modules/zlpt-bigScreen/src/main/resources/mapper.bigscreen/MaDevInfoMapper.xml
+++ b/sgzb-modules/zlpt-bigScreen/src/main/resources/mapper.bigscreen/MaDevInfoMapper.xml
@@ -6,11 +6,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectMaDevInfoList" resultType="com.bonus.zlpt.bigscreen.domain.vo.CoTypeVo">
 
-        SELECT bc.co_ltd AS title, COUNT(*) AS Count
+        SELECT bc.company_ltd AS title, COUNT(*) AS Count
         FROM ma_dev_info md
-            JOIN bm_company_info bc ON md.own_co = bc.co_name
+            JOIN bm_company_info bc ON md.own_co = bc.company_id
         WHERE md.ma_status = '自有'
-        GROUP BY bc.co_ltd
+        GROUP BY bc.company_ltd
 
     </select>
 
@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selecthotList" resultType="com.bonus.zlpt.bigscreen.domain.vo.CompanyInfoVo">
         SELECT md.own_co AS ownCo, COUNT(*) AS count
         FROM ma_hot_search hs
-        LEFT JOIN ma_dev_info md ON hs.ma_id = CAST(md.ma_id AS VARCHAR)
+        LEFT JOIN ma_dev_info md ON hs.ma_id = md.ma_id
         GROUP BY md.own_co
         ORDER BY count DESC
     </select>
diff --git a/sgzb-modules/zlpt-bigScreen/src/main/resources/mapper.bigscreen/MaOrderInfoMapper.xml b/sgzb-modules/zlpt-bigScreen/src/main/resources/mapper.bigscreen/MaOrderInfoMapper.xml
index 94025cf..774b71e 100644
--- a/sgzb-modules/zlpt-bigScreen/src/main/resources/mapper.bigscreen/MaOrderInfoMapper.xml
+++ b/sgzb-modules/zlpt-bigScreen/src/main/resources/mapper.bigscreen/MaOrderInfoMapper.xml
@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selecttodayList" resultType="com.bonus.zlpt.bigscreen.domain.vo.MaOrderVo">
         SELECT COUNT(*) AS count,
-        SUM(money) AS money
+        SUM(cost) AS money
         FROM ma_order_info
         WHERE DATE(time) = CURDATE()
     </select>