|
|
@ -1,43 +1,44 @@
|
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
|
|
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
|
|
|
<mapper namespace="com.glxp.api.dao.collect.IoCollectOrderBackupMapper">
|
|
|
|
<mapper namespace="com.glxp.api.dao.collect.IoCollectOrderBackupMapper">
|
|
|
|
|
|
|
|
|
|
|
|
<select id="filterList" resultType="com.glxp.api.res.collect.IoCollectOrderResponse">
|
|
|
|
<select id="filterList" resultType="com.glxp.api.res.collect.IoCollectOrderResponse">
|
|
|
|
SELECT icob.billNo,
|
|
|
|
SELECT icob.billNo,
|
|
|
|
icob.busType,
|
|
|
|
icob.busType,
|
|
|
|
icob.fromType,
|
|
|
|
icob.fromType,
|
|
|
|
icob.fromTypeDesc,
|
|
|
|
icob.fromTypeDesc,
|
|
|
|
icob.fromCorp,
|
|
|
|
icob.fromCorp,
|
|
|
|
icob.billTime,
|
|
|
|
icob.billTime,
|
|
|
|
icob.orderCirType,
|
|
|
|
icob.orderCirType,
|
|
|
|
icob.createTime,
|
|
|
|
icob.createTime,
|
|
|
|
icob.workPlaceCode,
|
|
|
|
icob.workPlaceCode,
|
|
|
|
icob.remark,
|
|
|
|
icob.remark,
|
|
|
|
icob.createUser,
|
|
|
|
icob.createUser,
|
|
|
|
icob.updateTime,
|
|
|
|
icob.updateTime,
|
|
|
|
icob.updateUser,
|
|
|
|
icob.updateUser,
|
|
|
|
icob.tagStatus,
|
|
|
|
icob.tagStatus,
|
|
|
|
icob.splitStatus,
|
|
|
|
icob.splitStatus,
|
|
|
|
icob.invAlert,
|
|
|
|
icob.invAlert,
|
|
|
|
icob.splitMsg,
|
|
|
|
icob.splitMsg,
|
|
|
|
icob.fromCorpName,
|
|
|
|
icob.fromCorpName,
|
|
|
|
icob.shipperName,
|
|
|
|
icob.shipperName,
|
|
|
|
icob.thrBusType,
|
|
|
|
icob.thrBusType,
|
|
|
|
icob.shipper,
|
|
|
|
icob.shipper,
|
|
|
|
icob.tagMsg,
|
|
|
|
icob.tagMsg,
|
|
|
|
sys_workplace_document.busName busTypeName,
|
|
|
|
sys_workplace_document.busName busTypeName,
|
|
|
|
sw.workplaceName,
|
|
|
|
sw.workplaceName,
|
|
|
|
icob.id,
|
|
|
|
icob.id,
|
|
|
|
icob.orderTime,
|
|
|
|
icob.orderTime,
|
|
|
|
icob.uploadStatus,
|
|
|
|
icob.uploadStatus,
|
|
|
|
icob.uploadError,
|
|
|
|
icob.uploadError,
|
|
|
|
icob.errorMsg,
|
|
|
|
icob.errorMsg,
|
|
|
|
row_number() over ( order by case when icob.orderTime is null then icob.createTime else icob.orderTime end desc )
|
|
|
|
row_number() over ( order by case
|
|
|
|
as orderSequence
|
|
|
|
when icob.orderTime is null then icob.createTime
|
|
|
|
|
|
|
|
else icob.orderTime end desc )
|
|
|
|
|
|
|
|
as orderSequence
|
|
|
|
FROM io_collect_order_backup icob
|
|
|
|
FROM io_collect_order_backup icob
|
|
|
|
left join sys_workplace_document on icob.busType = sys_workplace_document.documentTypeCode
|
|
|
|
left join sys_workplace_document on icob.busType = sys_workplace_document.documentTypeCode
|
|
|
|
left join basic_corp bc on icob.fromCorp = bc.erpId
|
|
|
|
left join basic_corp bc on icob.fromCorp = bc.erpId
|
|
|
|
left join sys_workplace sw on icob.workPlaceCode = sw.workplaceId
|
|
|
|
left join sys_workplace sw on icob.workPlaceCode = sw.workplaceId
|
|
|
|
<where>
|
|
|
|
<where>
|
|
|
|
<if test="billNo != '' and billNo != null">
|
|
|
|
<if test="billNo != '' and billNo != null">
|
|
|
|
AND billNo LIKE concat('%', #{billNo}, '%')
|
|
|
|
AND billNo LIKE concat('%', #{billNo}, '%')
|
|
|
@ -51,9 +52,6 @@
|
|
|
|
<if test="fromCorp != '' and fromCorp != null">
|
|
|
|
<if test="fromCorp != '' and fromCorp != null">
|
|
|
|
AND fromCorp LIKE concat('%', #{fromCorp}, '%')
|
|
|
|
AND fromCorp LIKE concat('%', #{fromCorp}, '%')
|
|
|
|
</if>
|
|
|
|
</if>
|
|
|
|
<if test="collectCode != null and collectCode != ''">
|
|
|
|
|
|
|
|
AND collectCode = #{collectCode}
|
|
|
|
|
|
|
|
</if>
|
|
|
|
|
|
|
|
<if test="busType != null and busType != ''">
|
|
|
|
<if test="busType != null and busType != ''">
|
|
|
|
AND busType = #{busType}
|
|
|
|
AND busType = #{busType}
|
|
|
|
</if>
|
|
|
|
</if>
|
|
|
@ -68,15 +66,15 @@
|
|
|
|
</if>
|
|
|
|
</if>
|
|
|
|
<if test="unionKey != null">
|
|
|
|
<if test="unionKey != null">
|
|
|
|
AND (
|
|
|
|
AND (
|
|
|
|
icob.billNo like concat('%', #{unionKey}, '%')
|
|
|
|
icob.billNo like concat('%', #{unionKey}, '%')
|
|
|
|
or icob.fromCorp like concat('%', #{unionKey}, '%')
|
|
|
|
or icob.fromCorp like concat('%', #{unionKey}, '%')
|
|
|
|
or icob.fromCorpName like concat('%', #{unionKey}, '%')
|
|
|
|
or icob.fromCorpName like concat('%', #{unionKey}, '%')
|
|
|
|
or icob.backupOrderRemark1 like concat('%', #{unionKey}, '%')
|
|
|
|
or icob.backupOrderRemark1 like concat('%', #{unionKey}, '%')
|
|
|
|
or icob.backupOrderRemark2 like concat('%', #{unionKey}, '%')
|
|
|
|
or icob.backupOrderRemark2 like concat('%', #{unionKey}, '%')
|
|
|
|
or icob.backupOrderRemark3 like concat('%', #{unionKey}, '%')
|
|
|
|
or icob.backupOrderRemark3 like concat('%', #{unionKey}, '%')
|
|
|
|
or icob.backupOrderRemark4 like concat('%', #{unionKey}, '%')
|
|
|
|
or icob.backupOrderRemark4 like concat('%', #{unionKey}, '%')
|
|
|
|
or icob.backupOrderRemark5 like concat('%', #{unionKey}, '%')
|
|
|
|
or icob.backupOrderRemark5 like concat('%', #{unionKey}, '%')
|
|
|
|
or icob.backupOrderRemark6 like concat('%', #{unionKey}, '%'))
|
|
|
|
or icob.backupOrderRemark6 like concat('%', #{unionKey}, '%'))
|
|
|
|
</if>
|
|
|
|
</if>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -93,7 +91,7 @@
|
|
|
|
</foreach>
|
|
|
|
</foreach>
|
|
|
|
</if>
|
|
|
|
</if>
|
|
|
|
<if test="invAlert != null">
|
|
|
|
<if test="invAlert != null">
|
|
|
|
and icob.invAlert =#{invAlert}
|
|
|
|
and icob.invAlert = #{invAlert}
|
|
|
|
</if>
|
|
|
|
</if>
|
|
|
|
<if test="invAlerts != null and invAlerts.size() > 0">
|
|
|
|
<if test="invAlerts != null and invAlerts.size() > 0">
|
|
|
|
and icob.invAlert in
|
|
|
|
and icob.invAlert in
|
|
|
@ -106,10 +104,10 @@
|
|
|
|
</if>
|
|
|
|
</if>
|
|
|
|
<if test="keyWords != null and keyWords != ''">
|
|
|
|
<if test="keyWords != null and keyWords != ''">
|
|
|
|
and (icob.billNo like concat('%', #{keyWords}, '%')
|
|
|
|
and (icob.billNo like concat('%', #{keyWords}, '%')
|
|
|
|
or icob.fromCorp like concat('%', #{keyWords}, '%')
|
|
|
|
or icob.fromCorp like concat('%', #{keyWords}, '%')
|
|
|
|
or icob.workPlaceCode like concat('%', #{keyWords}, '%')
|
|
|
|
or icob.workPlaceCode like concat('%', #{keyWords}, '%')
|
|
|
|
or icob.busType like concat('%', #{keyWords}, '%')
|
|
|
|
or icob.busType like concat('%', #{keyWords}, '%')
|
|
|
|
or icob.fromType like concat('%', #{keyWords}, '%'))
|
|
|
|
or icob.fromType like concat('%', #{keyWords}, '%'))
|
|
|
|
</if>
|
|
|
|
</if>
|
|
|
|
<if test="shipperName != '' and shipperName != null">
|
|
|
|
<if test="shipperName != '' and shipperName != null">
|
|
|
|
AND icob.shipperName LIKE concat('%', #{shipperName}, '%')
|
|
|
|
AND icob.shipperName LIKE concat('%', #{shipperName}, '%')
|
|
|
@ -120,19 +118,18 @@
|
|
|
|
<if test="fromCorpName != '' and fromCorpName != null">
|
|
|
|
<if test="fromCorpName != '' and fromCorpName != null">
|
|
|
|
AND icob.fromCorpName LIKE concat('%', #{fromCorpName}, '%')
|
|
|
|
AND icob.fromCorpName LIKE concat('%', #{fromCorpName}, '%')
|
|
|
|
</if>
|
|
|
|
</if>
|
|
|
|
<if test="startTime != null">
|
|
|
|
<if test="startTime != null and startTime != ''">
|
|
|
|
<![CDATA[
|
|
|
|
<![CDATA[
|
|
|
|
and icob.billTime >= DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S')
|
|
|
|
and icob.billTime >= DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S')
|
|
|
|
]]>
|
|
|
|
]]>
|
|
|
|
</if>
|
|
|
|
</if>
|
|
|
|
<if test="endTime != null">
|
|
|
|
<if test="endTime != null and endTime != ''">
|
|
|
|
<![CDATA[
|
|
|
|
<![CDATA[
|
|
|
|
and icob.billTime <= DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')
|
|
|
|
and icob.billTime <= DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')
|
|
|
|
]]>
|
|
|
|
]]>
|
|
|
|
</if>
|
|
|
|
</if>
|
|
|
|
</where>
|
|
|
|
</where>
|
|
|
|
GROUP BY
|
|
|
|
GROUP BY icob.billNo
|
|
|
|
icob.billNo
|
|
|
|
|
|
|
|
order by case when icob.orderTime is null then icob.createTime else icob.orderTime end desc
|
|
|
|
order by case when icob.orderTime is null then icob.createTime else icob.orderTime end desc
|
|
|
|
</select>
|
|
|
|
</select>
|
|
|
|
</mapper>
|
|
|
|
</mapper>
|
|
|
|