From 6a1174c58f606c448b5371d7ba3bb7d7d1fb34a4 Mon Sep 17 00:00:00 2001 From: sxu <1539530615@qq.com> Date: Sat, 9 Dec 2023 12:57:17 +0800 Subject: [PATCH 1/4] fix --- .../src/main/resources/mapper/OrderInfoMapper.xml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml b/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml index 2ee2614..fcdd46b 100644 --- a/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml +++ b/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml @@ -44,16 +44,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - - - insert into ma_order_info From 157102a957b47cd33f73ce84dfc6edc6011c2826 Mon Sep 17 00:00:00 2001 From: sxu <1539530615@qq.com> Date: Sat, 9 Dec 2023 13:08:10 +0800 Subject: [PATCH 2/4] fix --- .../zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml b/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml index fcdd46b..1792493 100644 --- a/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml +++ b/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml @@ -95,7 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" address_id, address, duration, - durationType, + duration_type, invoice_type, description, ma_id, From 0c34b37fd6c079d6a3c73971857facda269228c7 Mon Sep 17 00:00:00 2001 From: sxu <1539530615@qq.com> Date: Sat, 9 Dec 2023 14:19:55 +0800 Subject: [PATCH 3/4] fix --- .../zlpt/equip/api/domain/vo/DevInfoVo.java | 8 ++++ .../zlpt/equip/mapper/DevInfoMapper.java | 7 +++- .../service/impl/DevInfoServiceImpl.java | 40 ++++++++++++++----- .../main/resources/mapper/DevInfoMapper.xml | 8 ++++ 4 files changed, 53 insertions(+), 10 deletions(-) diff --git a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/DevInfoVo.java b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/DevInfoVo.java index 50b659a..546046b 100644 --- a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/DevInfoVo.java +++ b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/DevInfoVo.java @@ -69,6 +69,14 @@ public class DevInfoVo extends DevInfo { private String monthLeasePriceOrderBy; // ASC or DESC @ApiModelProperty(value = "搜索装备更新时间排序 ASC or DESC") private String updateTimeOrderBy; // ASC or DESC + @ApiModelProperty(value = "装备分类级别") private Integer level; //ma_type_level 级别: 1,2,3 + @ApiModelProperty(value = "装备状态") private String maStatusStr; + @ApiModelProperty(value = "省份名称") + private String provinceStr; + @ApiModelProperty(value = "市名称") + private String cityStr; + @ApiModelProperty(value = "区名称") + private String areaStr; } diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java index 3d68c71..b071596 100644 --- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java +++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java @@ -5,9 +5,9 @@ import com.bonus.zlpt.common.core.domain.system.SysFile; import com.bonus.zlpt.equip.api.domain.DevInfo; import com.bonus.zlpt.equip.api.domain.dto.InforMationDto; import com.bonus.zlpt.equip.api.domain.vo.DevInfoVo; +import com.bonus.zlpt.system.api.domain.BaseAddress; import com.bonus.zlpt.system.api.domain.SysDic; - /** * 设备信息Mapper接口 * @@ -84,5 +84,10 @@ public interface DevInfoMapper int insertLon(InforMationDto inforMationDto); public List getSysDic(); + public SysDic getSysDicById(Integer id); + + public List getBaseAddress(); + + public String getBaseAddressById(Integer id); } 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 c42fa52..57686a5 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 @@ -8,6 +8,7 @@ import com.bonus.zlpt.equip.api.domain.dto.InforMationDto; import com.bonus.zlpt.equip.api.domain.vo.DevInfoVo; import com.bonus.zlpt.common.core.domain.system.SysFile; import com.bonus.zlpt.common.core.utils.DateUtils; +import com.bonus.zlpt.system.api.domain.BaseAddress; import com.bonus.zlpt.system.api.domain.SysDic; import org.springframework.beans.BeanUtils; import com.bonus.zlpt.equip.mapper.SysFileInfoMapper; @@ -72,8 +73,23 @@ public class DevInfoServiceImpl implements IDevInfoService } Long companyUpNum = devInfoMapper.getCompanyUpNum(devInfoVo.getOwnCo()); devInfoVo.setCompanyUpNum(companyUpNum); + SysDic sysDic = devInfoMapper.getSysDicById(Integer.parseInt(devInfoVo.getMaStatus())); devInfoVo.setMaStatusStr(sysDic.getName()); + + List addressList = devInfoMapper.getBaseAddress(); + 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()); + } + } + // devInfoVo.setProvinceStr(devInfoMapper.getBaseAddressById(devInfoVo.getProvinceId())); } catch (Exception e) { error("fail to get devInfo for files or companyUpNum or maStatusStr" + maId); } @@ -90,21 +106,27 @@ public class DevInfoServiceImpl implements IDevInfoService public List selectDevInfoList(DevInfoVo devInfo) { List list = devInfoMapper.selectDevInfoList(devInfo); - List sysDics = devInfoMapper.getSysDic(); - for (DevInfoVo devInfoVo : list) { - for (SysDic sysDic : sysDics) { - if (devInfoVo.getMaStatus().equals(String.valueOf(sysDic.getId()))) { - devInfoVo.setMaStatusStr(sysDic.getName()); - } - } - } + fillInMaStatusStr(list); return list; } @Override public List selectDevInfoHotList(DevInfoVo devInfo) { - return devInfoMapper.selectDevInfoHotList(devInfo); + List hotList = devInfoMapper.selectDevInfoHotList(devInfo); + fillInMaStatusStr(hotList); + return hotList; + } + + private void fillInMaStatusStr(List hotList) { + List sysDics = devInfoMapper.getSysDic(); + for (DevInfoVo devInfoVo : hotList) { + for (SysDic sysDic : sysDics) { + if (devInfoVo.getMaStatus().equals(String.valueOf(sysDic.getId()))) { + devInfoVo.setMaStatusStr(sysDic.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 95519af..193e3ec 100644 --- a/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml +++ b/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml @@ -354,4 +354,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from sys_dic where id = #{id} + + + + \ No newline at end of file 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 4/4] 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 list = devInfoMapper.selectDevInfoList(devInfo); fillInMaStatusStr(list); + fillInCityStr(list); return list; } @@ -115,13 +116,14 @@ public class DevInfoServiceImpl implements IDevInfoService { List hotList = devInfoMapper.selectDevInfoHotList(devInfo); fillInMaStatusStr(hotList); + fillInCityStr(hotList); return hotList; } - private void fillInMaStatusStr(List hotList) { - List sysDics = devInfoMapper.getSysDic(); - for (DevInfoVo devInfoVo : hotList) { - for (SysDic sysDic : sysDics) { + private void fillInMaStatusStr(List list) { + List 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 list) { + List 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' + + d.is_active='1' + and d.ma_status = #{maStatus} + order by h.search_num