From 97eb09437b2437a4050cb2bc6d7269a0d6ec4e0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com>
Date: Tue, 16 Sep 2025 16:26:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/equipment/mapper/SysDeptMapper.java      |  2 ++
 .../service/impl/ProvinceScreenServiceImpl.java       |  4 ++++
 .../mapper/material/equipment/SysDeptMapper.xml       | 11 ++++++++---
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/mapper/SysDeptMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/mapper/SysDeptMapper.java
index f5763e9..feb8734 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/mapper/SysDeptMapper.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/mapper/SysDeptMapper.java
@@ -28,4 +28,6 @@ public interface SysDeptMapper {
     List<EquipmentDetail> detailsInfo(EquipmentDetail equipmentDetail);
 
     List<NewmydevInfo> listFromDevInfo(String companyId);
+
+    String getCityName(String city);
 }
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/service/impl/ProvinceScreenServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/service/impl/ProvinceScreenServiceImpl.java
index 2efa687..c51d2eb 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/service/impl/ProvinceScreenServiceImpl.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/service/impl/ProvinceScreenServiceImpl.java
@@ -119,6 +119,7 @@ public class ProvinceScreenServiceImpl implements ProvinceScreenService {
                 List<Map<String,Object>> res = new ArrayList<>();
                 for (SysDept sysDeptNew:sysDeptList) {
                         Map<String,Object> dept = new HashMap<>();
+
                         dept.put("deptName",sysDeptNew.getDeptName());
                         devInfoReq.setOwnCo(Math.toIntExact(sysDeptNew.getDeptId()));
                         //装备价值
@@ -139,6 +140,9 @@ public class ProvinceScreenServiceImpl implements ProvinceScreenService {
                         devInfoReq.setTypeId(3);
                         int cableNum = devInfoMapper.getLineNum(devInfoReq);
                         dept.put("cableNum",cableNum);
+                        //所在城市
+                        String cityName = sysDeptMapper.getCityName(sysDeptNew.getCity());
+                        dept.put("cityName",cityName);
                         // 获取装备转换率
                         DeptConfigRateSummary user = new DeptConfigRateSummary();
                         List<DeptConfigRateSummary> list = sysDeptService.selectDeptConfigRatePivot(user);
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/equipment/SysDeptMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/equipment/SysDeptMapper.xml
index afed426..cb29d92 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/equipment/SysDeptMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/equipment/SysDeptMapper.xml
@@ -13,7 +13,8 @@
                d.status,
                d.del_flag,
                d.create_by,
-               d.create_time
+               d.create_time,
+               d.city
         from sys_dept d
     </sql>
     <resultMap type="com.bonus.system.api.domain.SysDept" id="SysDeptResult">
@@ -110,7 +111,7 @@
             grouped.dept_id AS companyId,
             grouped.config_type AS configType,
             grouped.config_value AS configValue,
-            grouped.config_rate AS configRate,
+            if(grouped.config_rate='/',0,grouped.config_rate) AS configRate,
             IFNULL(order_stat.order_count, 0) AS orderCount
         FROM
             (
@@ -119,7 +120,7 @@
                     type_id,
                     config_type,
                     SUM(config_value) AS config_value,
-                    SUM(config_rate) AS config_rate
+                    SUM(if(config_rate='/',0,config_rate)) AS config_rate
                 FROM ma_dept_config
                 GROUP BY dept_id, type_id, config_type
             ) grouped
@@ -236,6 +237,10 @@
         GROUP BY
             mt2.type_id
     </select>
+    <select id="getCityName" resultType="java.lang.String">
+        select name
+        from base_address where code = #{city}
+    </select>
 
 
 </mapper>