aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-08-15 16:50:04 +08:00
parent 8c4b4ac75f
commit 41af266927
2 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java
View File

@ -169,11 +169,6 @@ public class Kd100Helper {
} }
/** /**
* 业务数据加密 --> param + key + customer 的顺序进行MD5加密（注意加密后字符串一定要转大写） * 业务数据加密 --> param + key + customer 的顺序进行MD5加密（注意加密后字符串一定要转大写）
* @param timestamp * @param timestamp

55
emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
View File

@ -470,22 +470,22 @@
<include refid="selectEmisWaybillVo"/> <include refid="selectEmisWaybillVo"/>
where FIND_IN_SET(`bill_code`,#{billCode}) where FIND_IN_SET(`bill_code`,#{billCode})
ORDER BY
<if test="params.orderSnSortList != null and params.orderSnSortList.size >0 "> <if test="params.orderSnSortList != null and params.orderSnSortList.size >0 ">
FIELD ORDER BY FIELD
<foreach collection="params.orderSnSortList" item="item" open="(order_sn," separator="," close=")"> <foreach collection="params.orderSnSortList" item="item" open="(order_sn," separator="," close=")">
#{item} #{item}
</foreach> </foreach>
,
</if> </if>
<if test="params.billCodeSortList != null and params.billCodeSortList.size >0 "> <if test="params.billCodeSortList != null and params.billCodeSortList.size >0 ">
FIELD ORDER BY FIELD
<foreach collection="params.billCodeSortList" item="item" open="(bill_code," separator="," close=")"> <foreach collection="params.billCodeSortList" item="item" open="(bill_code," separator="," close=")">
#{item} #{item}
</foreach> </foreach>
,
</if> </if>
a.create_time desc <if test="params.billCodeSortList == null">
ORDER BY a.send_date desc
</if>
</select> </select>
<select id="selectOrderList" parameterType="EmisWaybill" resultMap="EmisWaybillResult"> <select id="selectOrderList" parameterType="EmisWaybill" resultMap="EmisWaybillResult">
@ -790,22 +790,23 @@
</where> </where>
ORDER BY
<if test="params.orderSnSortList != null and params.orderSnSortList.size >0 "> <if test="params.orderSnSortList != null and params.orderSnSortList.size >0 ">
FIELD ORDER BY FIELD
<foreach collection="params.orderSnSortList" item="item" open="(order_sn," separator="," close=")"> <foreach collection="params.orderSnSortList" item="item" open="(order_sn," separator="," close=")">
#{item} #{item}
</foreach> </foreach>
,
</if> </if>
<if test="params.billCodeSortList != null and params.billCodeSortList.size >0 "> <if test="params.billCodeSortList != null and params.billCodeSortList.size >0 ">
FIELD ORDER BY FIELD
<foreach collection="params.billCodeSortList" item="item" open="(bill_code," separator="," close=")"> <foreach collection="params.billCodeSortList" item="item" open="(bill_code," separator="," close=")">
#{item} #{item}
</foreach> </foreach>
,
</if> </if>
a.create_time desc
<if test="params.billCodeSortList == null ">
ORDER BY a.send_date desc
</if>
</select> </select>
<select id="selectEmisWaybillList" parameterType="EmisWaybill" resultMap="EmisWaybillResult"> <select id="selectEmisWaybillList" parameterType="EmisWaybill" resultMap="EmisWaybillResult">
@ -1106,22 +1107,26 @@
</where> </where>
ORDER BY
<if test="params.orderSnSortList != null and params.orderSnSortList.size >0 "> <if test="params.orderSnSortList != null and params.orderSnSortList.size >0 ">
FIELD ORDER BY FIELD
<foreach collection="params.orderSnSortList" item="item" open="(order_sn," separator="," close=")"> <foreach collection="params.orderSnSortList" item="item" open="(order_sn," separator="," close=")">
#{item} #{item}
</foreach> </foreach>
,
</if> </if>
<if test="params.billCodeSortList != null and params.billCodeSortList.size >0 "> <if test="params.billCodeSortList != null and params.billCodeSortList.size >0 ">
FIELD ORDER BY FIELD
<foreach collection="params.billCodeSortList" item="item" open="(bill_code," separator="," close=")"> <foreach collection="params.billCodeSortList" item="item" open="(bill_code," separator="," close=")">
#{item} #{item}
</foreach> </foreach>
,
</if> </if>
a.create_time desc
<if test="params.billCodeSortList == null ">
ORDER BY a.send_date desc
</if>
-- a.create_time desc
</select> </select>
<!-- 寄件网点寄件统计--> <!-- 寄件网点寄件统计-->
@ -1619,22 +1624,24 @@
</where> </where>
ORDER BY
<if test="params.orderSnSortList != null and params.orderSnSortList.size >0 "> <if test="params.orderSnSortList != null and params.orderSnSortList.size >0 ">
FIELD ORDER BY FIELD
<foreach collection="params.orderSnSortList" item="item" open="(order_sn," separator="," close=")"> <foreach collection="params.orderSnSortList" item="item" open="(order_sn," separator="," close=")">
#{item} #{item}
</foreach> </foreach>
,
</if> </if>
<if test="params.billCodeSortList != null and params.billCodeSortList.size >0 "> <if test="params.billCodeSortList != null and params.billCodeSortList.size >0 ">
FIELD ORDER BY FIELD
<foreach collection="params.billCodeSortList" item="item" open="(bill_code," separator="," close=")"> <foreach collection="params.billCodeSortList" item="item" open="(bill_code," separator="," close=")">
#{item} #{item}
</foreach> </foreach>
,
</if> </if>
a.create_time desc
<if test="params.billCodeSortList == null ">
ORDER BY a.send_date desc
</if>
</select> </select>
<!-- where take_piece_employee_code is not null--> <!-- where take_piece_employee_code is not null-->