Fedex / iClear-Connect-Pre-Clearance

Go to a project
Toggle navigation Toggle navigation pinning
zelong.shao
371b0f4f 1 parent cf1a08a8

customer|查询调整

Inline Side-by-side
Showing 2 changed files with 14 additions and 90 deletions
<?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">
<mapper namespace="com.fedex.connect.customer.repository.dao.ConsignmentExtMapper">
<resultMap id="BaseResultMap" type="com.fedex.connect.common.model.biz.Consignment">
<id column="ID" jdbcType="NUMERIC" property="id" />
<result column="CONSIGNMENT_CODE" jdbcType="VARCHAR" property="consignmentCode" />
<result column="SHIP_DATE" jdbcType="TIMESTAMP" property="shipDate" />
<result column="SHIPPER_COUNTRY" jdbcType="VARCHAR" property="shipperCountry" />
<result column="RECIPIENT_COUNTRY" jdbcType="VARCHAR" property="recipientCountry" />
<result column="DEST_IATA_CODE" jdbcType="VARCHAR" property="destIataCode" />
<result column="COUNT_ORIGIN" jdbcType="VARCHAR" property="countOrigin" />
<result column="DESTINATION_COUNTRY" jdbcType="VARCHAR" property="destinationCountry" />
<result column="CUSTOMS_CURRENCY" jdbcType="VARCHAR" property="customsCurrency" />
<result column="CUSTOMS_VALUE" jdbcType="NUMERIC" property="customsValue" />
<result column="WEIGHT" jdbcType="NUMERIC" property="weight" />
<result column="WEIGHTUNIT" jdbcType="NUMERIC" property="weightunit" />
<result column="SCANDATE" jdbcType="TIMESTAMP" property="scandate" />
<result column="SHIPPER_CONTACT_NAME" jdbcType="VARCHAR" property="shipperContactName" />
<result column="SHIPPER_PHONE" jdbcType="VARCHAR" property="shipperPhone" />
<result column="SHIPPER_ACCOUNT" jdbcType="VARCHAR" property="shipperAccount" />
<result column="SHIPPER_COMPANY" jdbcType="VARCHAR" property="shipperCompany" />
<result column="SHIPPER_ADDR_LINE1" jdbcType="VARCHAR" property="shipperAddrLine1" />
<result column="SHIPPER_ADDR_LINE2" jdbcType="VARCHAR" property="shipperAddrLine2" />
<result column="SHIPPER_CITY" jdbcType="VARCHAR" property="shipperCity" />
<result column="SHIPPER_EMAIL" jdbcType="VARCHAR" property="shipperEmail" />
<result column="RECIPIENT_CONTACT_NAME" jdbcType="VARCHAR" property="recipientContactName" />
<result column="RECIPIENT_PHONE" jdbcType="VARCHAR" property="recipientPhone" />
<result column="RECIPIENT_COMPANY" jdbcType="VARCHAR" property="recipientCompany" />
<result column="RECIPIENT_ADDR_LINE1" jdbcType="VARCHAR" property="recipientAddrLine1" />
<result column="RECIPIENT_ADDR_LINE2" jdbcType="VARCHAR" property="recipientAddrLine2" />
<result column="RECIPIENT_ADDR_LINE3" jdbcType="VARCHAR" property="recipientAddrLine3" />
<result column="RECIPIENT_CITY" jdbcType="VARCHAR" property="recipientCity" />
<result column="FIRST_COMMIT_TIME" jdbcType="TIMESTAMP" property="firstCommitTime" />
<result column="FIRST_SUBMITTER_ID" jdbcType="NUMERIC" property="firstSubmitterId" />
<result column="FIRST_SUBMITTER" jdbcType="VARCHAR" property="firstSubmitter" />
<result column="COMMIT_TIME" jdbcType="TIMESTAMP" property="commitTime" />
<result column="SUBMITTER_ID" jdbcType="NUMERIC" property="submitterId" />
<result column="SUBMITTER" jdbcType="VARCHAR" property="submitter" />
<result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
<result column="CREATE_USER_ID" jdbcType="NUMERIC" property="createUserId" />
<result column="CREATE_USER_NAME" jdbcType="VARCHAR" property="createUserName" />
<result column="MODIFY_TIME" jdbcType="TIMESTAMP" property="modifyTime" />
<result column="MODIFY_USER_ID" jdbcType="NUMERIC" property="modifyUserId" />
<result column="MODIFY_USER_NAME" jdbcType="VARCHAR" property="modifyUserName" />
<result column="CE_INFO_ID" jdbcType="NUMERIC" property="ceInfoId" />
</resultMap>
<select id="findConsignments" resultType="com.fedex.connect.common.model.biz.Consignment">
SELECT c.*
FROM T_BIZ_USER_CONSIGNMENT_MAPPING m
JOIN T_BIZ_CONSIGNMENT c ON m.consignment_id = c.id
WHERE m.user_id = #{userId}
<if test="createTimeFrom != null and createTimeFrom != ''">
AND c.CREATE_TIME &gt;= TO_DATE(#{createTimeFrom}, 'YYYY-MM-DD HH24:MI:SS')
</if>
<if test="createTimeTo != null and createTimeTo != ''">
AND c.CREATE_TIME &lt;= TO_DATE(#{createTimeTo}, 'YYYY-MM-DD HH24:MI:SS')
</if>
<if test="consignmentCodeList != null and consignmentCodeList.size() != 0">
AND c.CONSIGNMENT_CODE IN
<foreach collection="consignmentCodeList" item="item" separator="," open="(" close=")">
#{item}
</foreach>
</if>
UNION
SELECT c.*
SELECT DISTINCT c.*
FROM T_BIZ_CONSIGNMENT c
WHERE c.user_uuid = #{uuid,jdbcType=VARCHAR} <!-- 明确指定 jdbcType -->
LEFT JOIN T_BIZ_USER_CONSIGNMENT_MAPPING m ON c.id = m.consignment_id
WHERE
(
(m.user_id = #{userId} AND m.consignment_id IS NOT NULL)
OR c.user_uuid = #{uuid,jdbcType=VARCHAR}
)
<if test="createTimeFrom != null and createTimeFrom != ''">
AND c.CREATE_TIME &gt;= TO_DATE(#{createTimeFrom}, 'YYYY-MM-DD HH24:MI:SS')
</if>
......@@ -84,30 +27,14 @@
<select id="findAllCount" resultType="java.lang.Long">
SELECT COUNT(*)
FROM (
SELECT c.id AS consignment_id
FROM T_BIZ_USER_CONSIGNMENT_MAPPING m
JOIN T_BIZ_CONSIGNMENT c ON m.consignment_id = c.id
WHERE m.user_id = #{userId}
<if test="createTimeFrom != null and createTimeFrom != ''">
AND c.CREATE_TIME &gt;= TO_DATE(#{createTimeFrom}, 'YYYY-MM-DD HH24:MI:SS')
</if>
<if test="createTimeTo != null and createTimeTo != ''">
AND c.CREATE_TIME &lt;= TO_DATE(#{createTimeTo}, 'YYYY-MM-DD HH24:MI:SS')
</if>
<if test="consignmentCodeList != null and consignmentCodeList.size() != 0">
AND c.CONSIGNMENT_CODE IN
<foreach collection="consignmentCodeList" item="item" separator="," open="(" close=")">
#{item}
</foreach>
</if>
UNION
SELECT c.id AS consignment_id
SELECT COUNT(DISTINCT c.id)
FROM T_BIZ_CONSIGNMENT c
WHERE c.user_uuid = #{uuid,jdbcType=VARCHAR}
LEFT JOIN T_BIZ_USER_CONSIGNMENT_MAPPING m ON c.id = m.consignment_id
WHERE
(
(m.user_id = #{userId} AND m.consignment_id IS NOT NULL)
OR c.user_uuid = #{uuid,jdbcType=VARCHAR}
)
<if test="createTimeFrom != null and createTimeFrom != ''">
AND c.CREATE_TIME &gt;= TO_DATE(#{createTimeFrom}, 'YYYY-MM-DD HH24:MI:SS')
</if>
......@@ -120,7 +47,6 @@
#{item}
</foreach>
</if>
) combined_results
</select>
......
......@@ -52,8 +52,6 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS
List<Consignment> consignments = consignmentExtRepository.findConsignments(query);
pageResult.setList(consignments);
}
List<Consignment> consignments = consignmentExtRepository.findConsignments(query);
pageResult.setList(consignments);
return ResponseVo.succ(pageResult);
}
......