|
@@ -43,8 +43,8 @@
|
|
|
<result column="pic" property="pic"/>
|
|
|
<result column="service_life" property="serviceLife"/>
|
|
|
<result column="next_indate" property="nextIndate"/>
|
|
|
- <collection property="goodsNos" select="selectGoodsNoByGoodsId" javaType="java.util.List" column="{goodId = id}"
|
|
|
- ofType="com.hssx.pcbms.entity.GoodsNo">
|
|
|
+ <collection property="goodsNosVO" select="selectGoodsNoByGoodsId" javaType="java.util.List" column="{goodId = id}"
|
|
|
+ ofType="com.hssx.pcbms.entity.vo.GoodsNoVO">
|
|
|
</collection>
|
|
|
</resultMap>
|
|
|
<!-- 我的资产查询映射结果 -->
|
|
@@ -160,8 +160,8 @@
|
|
|
</where>
|
|
|
order by id desc
|
|
|
</select>
|
|
|
- <resultMap id="GoodsNoMap" type="com.hssx.pcbms.entity.GoodsNo">
|
|
|
- <id column="id" property="id" />
|
|
|
+ <resultMap id="GoodsNoMap" type="com.hssx.pcbms.entity.vo.GoodsNoVO">
|
|
|
+ <id column="nid" property="id"/>
|
|
|
<result column="model_no" property="modelNo" />
|
|
|
<result column="division_code" property="divisionCode" />
|
|
|
<result column="suffix_code" property="suffixCode" />
|
|
@@ -207,14 +207,18 @@
|
|
|
<result column="column_place" property="columnPlace" />
|
|
|
<result column="region" property="region" />
|
|
|
<result column="is_rack" property="isRack" />
|
|
|
+ <result column="username" property="username" />
|
|
|
+ <result column="phone" property="phone" />
|
|
|
</resultMap>
|
|
|
<select id="selectGoodsNoByGoodsId" resultMap="GoodsNoMap">
|
|
|
select
|
|
|
- id, model_no, state,indate, goods_id,user_id, update_indate,
|
|
|
- is_maintain, good_sn_no,
|
|
|
- label_id,model_id, u_bit_num, current_state, alarm_level,is_rack
|
|
|
+ gn.id, gn.model_no, gn.state,gn.indate, gn.goods_id,gn.user_id, gn.update_indate,
|
|
|
+ gn.is_maintain, gn.good_sn_no,gn.user_id,u.name username,gn.is_maintain,u.phone,
|
|
|
+ gn.label_id,gn.model_id, gn.u_bit_num, gn.current_state, gn.alarm_level,gn.is_rack
|
|
|
from
|
|
|
- goods_no
|
|
|
+ goods_no gn
|
|
|
+ left join user u
|
|
|
+ on u.id = gn.user_id
|
|
|
where
|
|
|
goods_id = #{goodId}
|
|
|
</select>
|