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-06-13 20:12:02 +08:00
parent 3873ec9f14
commit 49eec3717f
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsTransferTrace.java
View File

@ -31,8 +31,6 @@ import lombok.Data;
@Data
public class EmisTmsTransferTrace extends BaseEntity
{
private static final long serialVersionUID = 1L;
/* id */
private Long id;
/* 单号 */
@ -41,7 +39,7 @@ public class EmisTmsTransferTrace extends BaseEntity
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date lastTraceDate;
/* 50-签收 */
private String lastWaybliiStatus;
private String lastWaybillStatus;
/* 轨迹信息 */
private String traceInfo;
/* 跟进渠道 */

18
emis-biz/src/main/resources/mapper/EmisTmsTransferTraceMapper.xml
View File

@ -3,12 +3,12 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xdadan.erp.emis.mapper.EmisTmsTransferTraceMapper">
<resultMap type="EmisTmsTransferTrace" id="EmisTmsTransferTraceResult">
<result property="id" column="id" />
<result property="billCode" column="bill_code" />
<result property="lastTraceDate" column="last_trace_date" />
<result property="lastWaybliiStatus" column="last_wayblii_status" />
<result property="lastWaybillStatus" column="last_waybill_status" />
<result property="traceInfo" column="trace_info" />
<result property="chId" column="ch_id" />
<result property="transferBillCode" column="transfer_bill_code" />
@ -16,7 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectEmisTmsTransferTraceVo">
select id, bill_code, last_trace_date, last_wayblii_status, trace_info, ch_id, transfer_bill_code, transfer_express, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_tms_transfer_trace
select id, bill_code, last_trace_date, last_waybill_status, trace_info, ch_id, transfer_bill_code, transfer_express, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_tms_transfer_trace
</sql>
<select id="selectEmisTmsTransferTraceList" parameterType="EmisTmsTransferTrace" resultMap="EmisTmsTransferTraceResult">
@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="id != null "> and id = #{id}</if>
<if test="billCode != null and billCode != ''"> and bill_code =#{billCode}</if>
<if test="lastTraceDate != null "> and last_trace_date = #{lastTraceDate}</if>
<if test="lastWaybliiStatus != null and lastWaybliiStatus != ''"> and last_wayblii_status=#{lastWaybliiStatus}</if>
<if test="lastWaybillStatus != null and lastWaybillStatus != ''"> and last_waybill_status=#{lastWaybillStatus}</if>
<if test="traceInfo != null and traceInfo != ''"> and trace_info like concat('%', #{traceInfo}, '%')</if>
<if test="chId != null and chId != ''"> and ch_id like concat('%', #{chId}, '%')</if>
<if test="transferBillCode != null and transferBillCode != ''"> and transfer_bill_code=#{transferBillCode}</if>
@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
<if test="params.needTrace != null and params.needTrace != '1'">
and last_wayblii_status != '50'
and last_waybill_status != '50'
and DATE_SUB(CURDATE(), INTERVAL 30 DAY) <![CDATA[ <= ]]> date(last_trace_date)
</if>
@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectEmisTmsTransferTraceById" parameterType="Long" resultMap="EmisTmsTransferTraceResult">
select id, bill_code, last_trace_date, last_wayblii_status, trace_info, ch_id, transfer_bill_code, transfer_express, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
select id, bill_code, last_trace_date, last_waybill_status, trace_info, ch_id, transfer_bill_code, transfer_express, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
from emis_tms_transfer_trace a
where a.id = #{id}
</select>
@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="id != null">id,</if>
<if test="billCode != null and billCode != ''">bill_code,</if>
<if test="lastTraceDate != null">last_trace_date,</if>
<if test="lastWaybliiStatus != null and lastWaybliiStatus != ''">last_wayblii_status,</if>
<if test="lastWaybillStatus != null and lastWaybillStatus != ''">last_waybill_status,</if>
<if test="traceInfo != null and traceInfo != ''">trace_info,</if>
<if test="chId != null and chId != ''">ch_id,</if>
<if test="transferBillCode != null and transferBillCode != ''">transfer_bill_code,</if>
@ -100,7 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="id != null">#{id},</if>
<if test="billCode != null and billCode != ''">#{billCode},</if>
<if test="lastTraceDate != null">#{lastTraceDate},</if>
<if test="lastWaybliiStatus != null and lastWaybliiStatus != ''">#{lastWaybliiStatus},</if>
<if test="lastWaybillStatus != null and lastWaybillStatus != ''">#{lastWaybillStatus},</if>
<if test="traceInfo != null and traceInfo != ''">#{traceInfo},</if>
<if test="chId != null and chId != ''">#{chId},</if>
<if test="transferBillCode != null and transferBillCode != ''">#{transferBillCode},</if>
@ -121,7 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="SET" suffixOverrides=",">
<if test="billCode != null and billCode != ''">bill_code = #{billCode},</if>
<if test="lastTraceDate != null">last_trace_date = #{lastTraceDate},</if>
<if test="lastWaybliiStatus != null and lastWaybliiStatus != ''">last_wayblii_status = #{lastWaybliiStatus},</if>
<if test="lastWaybillStatus != null and lastWaybillStatus != ''">last_waybill_status = #{lastWaybillStatus},</if>
<if test="traceInfo != null and traceInfo != ''">trace_info = #{traceInfo},</if>
<if test="chId != null and chId != ''">ch_id = #{chId},</if>
<if test="transferBillCode != null and transferBillCode != ''">transfer_bill_code = #{transferBillCode},</if>