|
|
@@ -6,8 +6,8 @@
|
|
|
<resultMap id="ResultMap" type="org.sky.scientific.pojo.entity.XmFinanceEntity">
|
|
|
<id column="id" property="id"/>
|
|
|
<result column="xm_id" property="xmId"/>
|
|
|
- <result column="xmbh" property="xmbh"/>
|
|
|
- <result column="xmmc" property="xmmc"/>
|
|
|
+ <result column="XMBH" property="xmbh"/>
|
|
|
+ <result column="XMMC" property="xmmc"/>
|
|
|
<result column="type" property="type"/>
|
|
|
<result column="create_user" property="createUser"/>
|
|
|
<result column="create_dept" property="createDept"/>
|
|
|
@@ -38,7 +38,6 @@
|
|
|
COALESCE((SELECT bgrz.BGHDZ FROM kd_xm_bgrz bgrz WHERE bgrz.XM_ID = xm.id AND bgrz.ZDMC = 'XMKSSJ' AND DATE_FORMAT(bgrz.BGSXSJ,'%Y') <![CDATA[<=]]> #{ew.yearAndMonth} ORDER BY bgrz.BGSXSJ DESC LIMIT 1),XMKSSJ) AS XMKSSJ,
|
|
|
COALESCE((SELECT bgrz.BGHDZ FROM kd_xm_bgrz bgrz WHERE bgrz.XM_ID = xm.id AND bgrz.ZDMC = 'XMJSSJ' AND DATE_FORMAT(bgrz.BGSXSJ,'%Y') <![CDATA[<=]]> #{ew.yearAndMonth} ORDER BY bgrz.BGSXSJ DESC LIMIT 1),XMJSSJ) AS XMJSSJ
|
|
|
FROM kd_xm xm
|
|
|
- WHERE #{ew.yearAndMonth} between XMKSSJ and XMJSSJ
|
|
|
) xm ON xm.id = kxf.xm_id
|
|
|
WHERE kxf.year_and_month = #{ew.yearAndMonth} and kxf.type = #{ew.type}
|
|
|
<if test="ew.xmmc!=null and ew.xmmc!=''">and xm.XMMC like concat('%',#{ew.xmmc},'%')</if>
|