From be6ce9ea0651df1dbd6d4e9388679cc9daaf0453 Mon Sep 17 00:00:00 2001
From: sxu <1539530615@qq.com>
Date: Sat, 9 Dec 2023 14:44:36 +0800
Subject: [PATCH] fix

---
 .../service/impl/DevInfoServiceImpl.java      | 27 ++++++++++++++++---
 .../main/resources/mapper/DevInfoMapper.xml   |  5 +++-
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java
index 57686a5..f8c1487 100644
--- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java
+++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java
@@ -107,6 +107,7 @@ public class DevInfoServiceImpl implements IDevInfoService
     {
         List<DevInfoVo> list = devInfoMapper.selectDevInfoList(devInfo);
         fillInMaStatusStr(list);
+        fillInCityStr(list);
         return list;
     }
 
@@ -115,13 +116,14 @@ public class DevInfoServiceImpl implements IDevInfoService
     {
         List<DevInfoVo> hotList = devInfoMapper.selectDevInfoHotList(devInfo);
         fillInMaStatusStr(hotList);
+        fillInCityStr(hotList);
         return hotList;
     }
 
-    private void fillInMaStatusStr(List<DevInfoVo> hotList) {
-        List<SysDic> sysDics = devInfoMapper.getSysDic();
-        for (DevInfoVo devInfoVo : hotList) {
-            for (SysDic sysDic : sysDics) {
+    private void fillInMaStatusStr(List<DevInfoVo> list) {
+        List<SysDic> sysDicList = devInfoMapper.getSysDic();
+        for (DevInfoVo devInfoVo : list) {
+            for (SysDic sysDic : sysDicList) {
                 if (devInfoVo.getMaStatus().equals(String.valueOf(sysDic.getId()))) {
                     devInfoVo.setMaStatusStr(sysDic.getName());
                 }
@@ -129,6 +131,23 @@ public class DevInfoServiceImpl implements IDevInfoService
         }
     }
 
+    private void fillInCityStr(List<DevInfoVo> list) {
+        List<BaseAddress> addressList = devInfoMapper.getBaseAddress();
+        for (DevInfoVo devInfoVo : list) {
+            for (BaseAddress address : addressList) {
+//                if (String.valueOf(devInfoVo.getProvinceId()).equals(String.valueOf(address.getId()))) {
+//                    devInfoVo.setProvinceStr(address.getName());
+//                }
+                if (String.valueOf(devInfoVo.getCityId()).equals(String.valueOf(address.getId()))) {
+                    devInfoVo.setCityStr(address.getName());
+                }
+//                if (String.valueOf(devInfoVo.getAreaId()).equals(String.valueOf(address.getId()))) {
+//                    devInfoVo.setAreaStr(address.getName());
+//                }
+            }
+        }
+    }
+
     /**
      * 新增设备信息
      * 
diff --git a/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml b/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
index 193e3ec..085bfb5 100644
--- a/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
+++ b/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
@@ -139,7 +139,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  left join bm_company_info c on d.own_co = c.company_id
                  left join ma_hot_search h on d.ma_id = h.ma_id
                  left join ma_type_info ti on d.type_id = ti.type_id
-            where  d.is_active='1'
+        <where>
+            d.is_active='1'
+            <if test="maStatus != null  and maStatus != ''"> and d.ma_status = #{maStatus}</if>
+        </where>
         order by h.search_num
     </select>
 <!--    <select id="selectDevInfoHotList" parameterType="com.bonus.zlpt.equip.api.domain.vo.DevInfoVo" resultType="com.bonus.zlpt.equip.api.domain.vo.DevInfoVo">-->