|
|
@ -26,6 +26,8 @@ |
|
|
|
<result column="isDel" jdbcType="VARCHAR" property="isdel"/> |
|
|
|
<result column="isDel" jdbcType="VARCHAR" property="isdel"/> |
|
|
|
<result column="origin_order_id" jdbcType="VARCHAR" property="originOrderId"/> |
|
|
|
<result column="origin_order_id" jdbcType="VARCHAR" property="originOrderId"/> |
|
|
|
<result column="bzdh" jdbcType="VARCHAR" property="bzdh"/> |
|
|
|
<result column="bzdh" jdbcType="VARCHAR" property="bzdh"/> |
|
|
|
|
|
|
|
<result column="kb" jdbcType="VARCHAR" property="kb"/> |
|
|
|
|
|
|
|
<result column="pzgzrq" jdbcType="VARCHAR" property="pzgzrq"/> |
|
|
|
</resultMap> |
|
|
|
</resultMap> |
|
|
|
|
|
|
|
|
|
|
|
<resultMap id="queryOriginOrderCompareResultMap" type="com.dxhy.order.consumer.modules.order.model.bo.OriginOrderExtendCompareBO"> |
|
|
|
<resultMap id="queryOriginOrderCompareResultMap" type="com.dxhy.order.consumer.modules.order.model.bo.OriginOrderExtendCompareBO"> |
|
|
@ -179,7 +181,9 @@ |
|
|
|
op.ghf_mc, |
|
|
|
op.ghf_mc, |
|
|
|
op.id, |
|
|
|
op.id, |
|
|
|
op.num, |
|
|
|
op.num, |
|
|
|
op.bzdh |
|
|
|
op.bzdh, |
|
|
|
|
|
|
|
op.kb, |
|
|
|
|
|
|
|
op.pzgzrq |
|
|
|
FROM order_orgin_extend_info ooe |
|
|
|
FROM order_orgin_extend_info ooe |
|
|
|
LEFT JOIN |
|
|
|
LEFT JOIN |
|
|
|
order_process_info op ON ooe.origin_order_id = op.order_info_id |
|
|
|
order_process_info op ON ooe.origin_order_id = op.order_info_id |
|
|
@ -292,6 +296,15 @@ |
|
|
|
<if test="map.bzdh !=null and map.bzdh !='' "> |
|
|
|
<if test="map.bzdh !=null and map.bzdh !='' "> |
|
|
|
and op.bzdh = #{map.bzdh,jdbcType=VARCHAR} |
|
|
|
and op.bzdh = #{map.bzdh,jdbcType=VARCHAR} |
|
|
|
</if> |
|
|
|
</if> |
|
|
|
|
|
|
|
<if test="map.kb !=null and map.kb !='' "> |
|
|
|
|
|
|
|
and op.kb = #{map.kb,jdbcType=VARCHAR} |
|
|
|
|
|
|
|
</if> |
|
|
|
|
|
|
|
<if test="map.pzgzrqBegin !=null and map.pzgzrqBegin != ''"> |
|
|
|
|
|
|
|
and op.pzgzrq >= #{map.pzgzrqBegin} |
|
|
|
|
|
|
|
</if> |
|
|
|
|
|
|
|
<if test="map.pzgzrqEnd !=null and map.pzgzrqEnd != ''"> |
|
|
|
|
|
|
|
and #{map.pzgzrqEnd} >= op.pzgzrq |
|
|
|
|
|
|
|
</if> |
|
|
|
<if test="shList != null and shList.size() == 0"> |
|
|
|
<if test="shList != null and shList.size() == 0"> |
|
|
|
and op.xhf_nsrsbh = '' |
|
|
|
and op.xhf_nsrsbh = '' |
|
|
|
</if> |
|
|
|
</if> |
|
|
@ -365,6 +378,15 @@ |
|
|
|
<if test="map.bzdh != null and map.bzdh != ''"> |
|
|
|
<if test="map.bzdh != null and map.bzdh != ''"> |
|
|
|
and op.bzdh = #{map.bzdh,jdbcType=VARCHAR} |
|
|
|
and op.bzdh = #{map.bzdh,jdbcType=VARCHAR} |
|
|
|
</if> |
|
|
|
</if> |
|
|
|
|
|
|
|
<if test="map.kb !=null and map.kb !='' "> |
|
|
|
|
|
|
|
and op.kb = #{map.kb,jdbcType=VARCHAR} |
|
|
|
|
|
|
|
</if> |
|
|
|
|
|
|
|
<if test="map.pzgzrqBegin !=null and map.pzgzrqBegin != ''"> |
|
|
|
|
|
|
|
and op.pzgzrq >= #{map.pzgzrqBegin} |
|
|
|
|
|
|
|
</if> |
|
|
|
|
|
|
|
<if test="map.pzgzrqEnd !=null and map.pzgzrqEnd != ''"> |
|
|
|
|
|
|
|
and #{map.pzgzrqEnd} >= op.pzgzrq |
|
|
|
|
|
|
|
</if> |
|
|
|
|
|
|
|
|
|
|
|
<if test="shList != null and shList.size() == 0"> |
|
|
|
<if test="shList != null and shList.size() == 0"> |
|
|
|
and op.xhf_nsrsbh = '' |
|
|
|
and op.xhf_nsrsbh = '' |
|
|
|