bonus
/
Zlpt-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交相关代码

This commit is contained in:
zfhai 2023-12-10 00:32:11 +08:00
parent e3e65ef562
commit 86c58c72c4
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java
View File

@ -15,6 +15,7 @@ import com.bonus.zlpt.equip.api.enums.MaStatusEnum;
import com.bonus.zlpt.system.api.domain.BaseAddress; import com.bonus.zlpt.system.api.domain.BaseAddress;
import com.bonus.zlpt.system.api.domain.SysDic; import com.bonus.zlpt.system.api.domain.SysDic;
import com.bonus.zlpt.system.api.model.LoginUser; import com.bonus.zlpt.system.api.model.LoginUser;
import io.swagger.models.auth.In;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import com.bonus.zlpt.equip.mapper.SysFileInfoMapper; import com.bonus.zlpt.equip.mapper.SysFileInfoMapper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -86,13 +87,13 @@ public class DevInfoServiceImpl implements IDevInfoService
List<BaseAddress> addressList = devInfoMapper.getBaseAddress(); List<BaseAddress> addressList = devInfoMapper.getBaseAddress();
for (BaseAddress address : addressList) { for (BaseAddress address : addressList) {
if (String.valueOf(devInfoVo.getProvinceId()).equals(String.valueOf(address.getCode()))) { if (devInfoVo.getProvinceId().equals(Integer.valueOf(address.getCode()))) {
devInfoVo.setProvinceStr(address.getName()); devInfoVo.setProvinceStr(address.getName());
} }
if (String.valueOf(devInfoVo.getCityId()).equals(String.valueOf(address.getCode()))) { if (devInfoVo.getCityId().equals(Integer.valueOf(address.getCode()))) {
devInfoVo.setCityStr(address.getName()); devInfoVo.setCityStr(address.getName());
} }
if (String.valueOf(devInfoVo.getAreaId()).equals(String.valueOf(address.getCode()))) { if (devInfoVo.getAreaId().equals(Integer.valueOf(address.getCode()))) {
devInfoVo.setAreaStr(address.getName()); devInfoVo.setAreaStr(address.getName());
} }
} }
@ -195,7 +196,7 @@ public class DevInfoServiceImpl implements IDevInfoService
// if (String.valueOf(devInfoVo.getProvinceId()).equals(String.valueOf(address.getId()))) { // if (String.valueOf(devInfoVo.getProvinceId()).equals(String.valueOf(address.getId()))) {
// devInfoVo.setProvinceStr(address.getName()); // devInfoVo.setProvinceStr(address.getName());
// } // }
if (String.valueOf(devInfoVo.getCityId()).equals(String.valueOf(address.getCode()))) { if (devInfoVo.getCityId().equals(Integer.valueOf(address.getCode()))) {
devInfoVo.setCityStr(address.getName()); devInfoVo.setCityStr(address.getName());
} }
// if (String.valueOf(devInfoVo.getAreaId()).equals(String.valueOf(address.getId()))) { // if (String.valueOf(devInfoVo.getAreaId()).equals(String.valueOf(address.getId()))) {

4
zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
View File

@ -47,6 +47,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
creator, update_time, update_by, specification, deposit, is_operator, is_active, update_time, update_by from ma_dev_info creator, update_time, update_by, specification, deposit, is_operator, is_active, update_time, update_by from ma_dev_info
</sql> </sql>
<select id="selectDevInfoList" parameterType="com.bonus.zlpt.equip.api.domain.vo.DevInfoVo" resultType="com.bonus.zlpt.equip.api.domain.vo.DevInfoVo"> <select id="selectDevInfoList" parameterType="com.bonus.zlpt.equip.api.domain.vo.DevInfoVo" resultType="com.bonus.zlpt.equip.api.domain.vo.DevInfoVo">
select d.*,mt1.type_name as device_name, mt2.type_name as group_name, mt3.type_name as type_name,c.company_name select d.*,mt1.type_name as device_name, mt2.type_name as group_name, mt3.type_name as type_name,c.company_name
from ma_dev_info d from ma_dev_info d
@ -438,7 +440,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="getBaseAddress" resultType="com.bonus.zlpt.system.api.domain.BaseAddress"> <select id="getBaseAddress" resultType="com.bonus.zlpt.system.api.domain.BaseAddress">
select id,name from base_address where status = 1 select id,name,code from base_address where status = 1
</select> </select>
<select id="getBaseAddressById" resultType="String"> <select id="getBaseAddressById" resultType="String">