|
|
@@ -22,9 +22,10 @@
|
|
|
|
|
|
<select id="selectListByYearAndMonth"
|
|
|
resultMap="ResultMap">
|
|
|
- SELECT xa.*,asset.zcbm
|
|
|
+ SELECT xa.*,asset.zcbm,t.user_name as user_name
|
|
|
FROM kd_xm_intangible_asset xa
|
|
|
inner JOIN kd_asset asset ON xa.ZCBM=asset.ZCBM and asset.year_and_month = #{yearAndMonth}
|
|
|
+ LEFT JOIN kd_technician t on t.unicode=xa.user_unicode and t.year_and_month = #{ew.yearAndMonth}
|
|
|
LEFT JOIN
|
|
|
(
|
|
|
SELECT
|
|
|
@@ -38,10 +39,11 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="selectPageByYearAndMonth" resultMap="ResultMap">
|
|
|
- SELECT xa.*,xm.xmmc, xm.xmbh,
|
|
|
+ SELECT xa.*,xm.xmmc, xm.xmbh,t.user_name as user_name,
|
|
|
<include refid="org.sky.scientific.mapper.AssetMapper.basicColumns"/>
|
|
|
FROM kd_xm_intangible_asset xa
|
|
|
LEFT JOIN kd_asset asset ON xa.asset_id = asset.id
|
|
|
+ LEFT JOIN kd_technician t on t.unicode=xa.user_unicode and t.year_and_month = #{ew.yearAndMonth}
|
|
|
LEFT JOIN
|
|
|
(
|
|
|
SELECT
|
|
|
@@ -63,9 +65,10 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="selectPageByYear" resultMap="ResultMap">
|
|
|
- SELECT xa.xm_id, xa.asset_id, <include refid="org.sky.scientific.mapper.AssetMapper.basicColumns"/>
|
|
|
+ SELECT xa.xm_id, xa.asset_id, t.user_name as user_name,<include refid="org.sky.scientific.mapper.AssetMapper.basicColumns"/>
|
|
|
FROM kd_xm_intangible_asset xa
|
|
|
LEFT JOIN kd_asset asset ON xa.asset_id = asset.id
|
|
|
+ LEFT JOIN kd_technician t on t.unicode=xa.user_unicode and t.year_and_month = #{ew.yearAndMonth}
|
|
|
LEFT JOIN
|
|
|
(
|
|
|
SELECT
|