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

fix

This commit is contained in:
sxu 2023-12-04 13:21:07 +08:00
parent 4291dd51d4
commit 0c392a056c
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java
View File

@ -18,7 +18,7 @@ public interface DevInfoMapper
* @param maId 设备信息主键
* @return 设备信息
*/
public DevInfo selectDevInfoByMaId(Long maId);
public DevInfoVo selectDevInfoByMaId(Long maId);
/**
* 查询设备信息列表

2
zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IDevInfoService.java
View File

@ -18,7 +18,7 @@ public interface IDevInfoService
* @param maId 设备信息主键
* @return 设备信息
*/
public DevInfo selectDevInfoByMaId(Long maId);
public DevInfoVo selectDevInfoByMaId(Long maId);
/**
* 查询设备信息列表

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

@ -29,7 +29,7 @@ public class DevInfoServiceImpl implements IDevInfoService
* @return 设备信息
*/
@Override
public DevInfo selectDevInfoByMaId(Long maId)
public DevInfoVo selectDevInfoByMaId(Long maId)
{
return devInfoMapper.selectDevInfoByMaId(maId);
}

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

@ -3,7 +3,6 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.zlpt.equip.mapper.DevInfoMapper">
<resultMap type="com.bonus.zlpt.common.core.domain.equip.DevInfo" id="DevInfoResult">
<result property="maId" column="ma_id" />
<result property="code" column="code" />
@ -39,8 +38,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectDevInfoList" parameterType="com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo" resultType="com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo">
select d.*,t.type_name,c.company_name
from ma_dev_info d
left join ma_type_info t on d.type_id = t.type_id
left join bm_company_info c on d.own_co = c.company_id
left join ma_type_info t on d.type_id = t.type_id
left join bm_company_info c on d.own_co = c.company_id
<where>
<if test="maId != null "> and d.ma_id = #{maId}</if>
<if test="code != null and code != ''"> and d.code = #{code}</if>
@ -67,9 +66,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<select id="selectDevInfoByMaId" parameterType="Long" resultMap="DevInfoResult">
<include refid="selectDevInfoVo"/>
where ma_id = #{maId}
<select id="selectDevInfoByMaId" parameterType="Long" resultType="com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo">
select d.*,t.type_name,c.company_name
from ma_dev_info d
left join ma_type_info t on d.type_id = t.type_id
left join bm_company_info c on d.own_co = c.company_id
where d.ma_id = #{maId}
</select>
<insert id="insertDevInfo" parameterType="com.bonus.zlpt.common.core.domain.equip.DevInfo">