demand: tms-运输管理-漏组批次订单查询-查询条件“增加问题件类型”、“签收状态”，查询返回增加“签收状态、问题件类型、问题件原因”
This commit is contained in:
parent
1c46187532
commit
bb3550638d
@ -52,7 +52,7 @@ public class EmisTmsSiteBatchMiss extends BaseEntity {
|
||||
/* 寄件日期 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date sendDate;
|
||||
/* 签收状态 */
|
||||
/* 签收状态 1已签收 0未签收*/
|
||||
private String blSign;
|
||||
/* 签收时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
@ -126,8 +126,11 @@ public class EmisTmsSiteBatchMiss extends BaseEntity {
|
||||
|
||||
/* 是否问题件 1-是 0-否 */
|
||||
private String blIsQuestion;
|
||||
private String virtualRemark;
|
||||
/* 问题件类型 */
|
||||
private Integer problemType;
|
||||
/* 问题件原因 */
|
||||
private String problemCause;
|
||||
private String virtualRemark;
|
||||
/* 目的地网点代码 */
|
||||
private String dispatchUnderlingSiteCode;
|
||||
// 目的地网点名称
|
||||
|
||||
@ -46,6 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="missType" column="miss_type"/>
|
||||
<result property="virtualRemark" column="virtual_remark" />
|
||||
<result property="problemType" column="problem_type" />
|
||||
<result property="problemCause" column="problem_cause" />
|
||||
<result property="dispatchUnderlingSiteCode" column="dispatch_underling_site_code" />
|
||||
<result property="dispatchUnderlingSiteName" column="dispatch_underling_site_name" />
|
||||
<result property="manual_remark" column="manualRemark" />
|
||||
@ -65,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
w.send_site_code, s1.site_name as send_site_name,s2.site_name as start_site_name,s3.site_name as next_site_name, w.send_country, c1.name as send_country_name, w.destination_code, s4.site_name as dispatch_underling_site_name,w.bl_is_question,
|
||||
l.line_name as line_name,
|
||||
w.receive_country, c2.name as receive_country_name, w.send_date, w.bl_sign, w.sign_date,
|
||||
w.product_type,w.problem_type,w.virtual_remark,w.dispatch_underling_site_code,
|
||||
w.product_type,w.problem_type,w.problem_cause,w.virtual_remark,w.dispatch_underling_site_code,
|
||||
w.payment_type, w.parcel_qty, w.bill_weight, w.total_volume, w.volume_weight,
|
||||
w.settlement_weight, w.freight, w.remark as waybill_remark, w.fee_remark, m.manager, k.trans_manager,
|
||||
w.payee, w.salesmen, u.emp_name as registerManName,
|
||||
@ -101,7 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
w.send_site_code, s1.site_name as send_site_name,s2.site_name as start_site_name,s3.site_name as next_site_name, w.send_country, c1.name as send_country_name, w.destination_code, s4.site_name as dispatch_underling_site_name,w.bl_is_question,
|
||||
l.line_name as line_name,
|
||||
w.receive_country, c2.name as receive_country_name, w.send_date, w.bl_sign, w.sign_date,
|
||||
w.product_type,w.problem_type,w.virtual_remark,w.dispatch_underling_site_code,
|
||||
w.product_type,w.problem_type,w.problem_cause,w.virtual_remark,w.dispatch_underling_site_code,
|
||||
w.payment_type, w.parcel_qty, w.bill_weight, w.total_volume, w.volume_weight,
|
||||
w.settlement_weight, w.freight, w.remark as waybill_remark, w.fee_remark, m.manager, k.trans_manager,
|
||||
w.payee, w.salesmen, u.emp_name as registerManName,
|
||||
@ -192,6 +193,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
w.send_country, c1.name as send_country_name, w.destination_code, s2.site_name as dispatch_underling_site_name, w.bl_is_question,
|
||||
l.line_name as line_name,
|
||||
w.receive_country, c2.name as receive_country_name, w.send_date, w.bl_sign, w.sign_date,
|
||||
w.problem_type, w.problem_cause,
|
||||
w.payment_type, w.parcel_qty, w.bill_weight, w.total_volume, w.volume_weight,
|
||||
w.settlement_weight, w.freight, w.remark as waybill_remark, w.fee_remark,
|
||||
null as manager, null as trans_manager,
|
||||
@ -270,6 +272,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="registerManName != null and registerManName != ''">
|
||||
AND u.emp_name like concat('%', #{registerManName}, '%')
|
||||
</if>
|
||||
<if test="blSign != null and blSign != ''">
|
||||
AND w.bl_sign = #{blSign}
|
||||
</if>
|
||||
<if test="params.problemQueryType != null and params.problemQueryType == 1 and params.problemQueryIds != null and params.problemQueryIds !=''">
|
||||
and exists (
|
||||
select 1 from emis_waybill_problem_info ewpi where b.bill_code=ewpi.bill_code and ewpi.del_flag='0' and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} )
|
||||
)
|
||||
</if>
|
||||
|
||||
<if test="params.problemQueryType != null and params.problemQueryType == 2 and params.problemQueryIds != null and params.problemQueryIds !=''">
|
||||
and not exists (
|
||||
select 1 from emis_waybill_problem_info ewpi where b.bill_code=ewpi.bill_code and ewpi.del_flag='0' and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} )
|
||||
)
|
||||
</if>
|
||||
</where>
|
||||
</when>
|
||||
<otherwise>
|
||||
@ -380,6 +396,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="registerManName != null and registerManName != ''">
|
||||
AND u.emp_name like concat('%', #{registerManName}, '%')
|
||||
</if>
|
||||
<if test="blSign != null and blSign != ''">
|
||||
AND w.bl_sign = #{blSign}
|
||||
</if>
|
||||
<if test="params.problemQueryType != null and params.problemQueryType == 1 and params.problemQueryIds != null and params.problemQueryIds !=''">
|
||||
and exists (
|
||||
select 1 from emis_waybill_problem_info ewpi where m.bill_code=ewpi.bill_code and ewpi.del_flag='0' and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} )
|
||||
)
|
||||
</if>
|
||||
|
||||
<if test="params.problemQueryType != null and params.problemQueryType == 2 and params.problemQueryIds != null and params.problemQueryIds !=''">
|
||||
and not exists (
|
||||
select 1 from emis_waybill_problem_info ewpi where m.bill_code=ewpi.bill_code and ewpi.del_flag='0' and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} )
|
||||
)
|
||||
</if>
|
||||
</where>
|
||||
order by m.bill_code desc
|
||||
</otherwise>
|
||||
@ -402,6 +432,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
w.send_country, c1.name as send_country_name, w.destination_code, s2.site_name as dispatch_underling_site_name, w.bl_is_question,
|
||||
l.line_name as line_name,
|
||||
w.receive_country, c2.name as receive_country_name, w.send_date, w.bl_sign, w.sign_date,
|
||||
w.problem_type, w.problem_cause,
|
||||
w.payment_type, w.parcel_qty, w.bill_weight, w.total_volume, w.volume_weight,
|
||||
w.settlement_weight, w.freight, w.remark as waybill_remark, w.fee_remark,
|
||||
null as manager, null as trans_manager,
|
||||
@ -480,6 +511,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="registerManName != null and registerManName != ''">
|
||||
AND u.emp_name like concat('%', #{registerManName}, '%')
|
||||
</if>
|
||||
<if test="blSign != null and blSign != ''">
|
||||
AND w.bl_sign = #{blSign}
|
||||
</if>
|
||||
<if test="params.problemQueryType != null and params.problemQueryType == 1 and params.problemQueryIds != null and params.problemQueryIds !=''">
|
||||
and exists (
|
||||
select 1 from emis_waybill_problem_info ewpi where b.bill_code=ewpi.bill_code and ewpi.del_flag='0' and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} )
|
||||
)
|
||||
</if>
|
||||
|
||||
<if test="params.problemQueryType != null and params.problemQueryType == 2 and params.problemQueryIds != null and params.problemQueryIds !=''">
|
||||
and not exists (
|
||||
select 1 from emis_waybill_problem_info ewpi where b.bill_code=ewpi.bill_code and ewpi.del_flag='0' and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} )
|
||||
)
|
||||
</if>
|
||||
</where>
|
||||
</when>
|
||||
<otherwise>
|
||||
@ -593,6 +638,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="registerManName != null and registerManName != ''">
|
||||
AND u.emp_name like concat('%', #{registerManName}, '%')
|
||||
</if>
|
||||
<if test="blSign != null and blSign != ''">
|
||||
AND w.bl_sign = #{blSign}
|
||||
</if>
|
||||
<if test="params.problemQueryType != null and params.problemQueryType == 1 and params.problemQueryIds != null and params.problemQueryIds !=''">
|
||||
and exists (
|
||||
select 1 from emis_waybill_problem_info ewpi where m.bill_code=ewpi.bill_code and ewpi.del_flag='0' and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} )
|
||||
)
|
||||
</if>
|
||||
|
||||
<if test="params.problemQueryType != null and params.problemQueryType == 2 and params.problemQueryIds != null and params.problemQueryIds !=''">
|
||||
and not exists (
|
||||
select 1 from emis_waybill_problem_info ewpi where m.bill_code=ewpi.bill_code and ewpi.del_flag='0' and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} )
|
||||
)
|
||||
</if>
|
||||
</where>
|
||||
order by m.bill_code desc
|
||||
</otherwise>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user