md
This commit is contained in:
parent
81b1f38544
commit
8aa695e6e8
@ -635,7 +635,6 @@ public class EmisWaybillController extends EmisBaseController
|
|||||||
@GetMapping("/getMyBizStatList")
|
@GetMapping("/getMyBizStatList")
|
||||||
public AjaxResult getMyBizStatList(EmisWaybill emisWaybill)
|
public AjaxResult getMyBizStatList(EmisWaybill emisWaybill)
|
||||||
{
|
{
|
||||||
startPage();
|
|
||||||
setPrivParams(emisWaybill);
|
setPrivParams(emisWaybill);
|
||||||
|
|
||||||
String empName = getLoginUser().getUser().getEmpName();
|
String empName = getLoginUser().getUser().getEmpName();
|
||||||
|
|||||||
@ -72,6 +72,9 @@ public interface EmisWaybillMapper extends BaseMapper<EmisWaybill>
|
|||||||
public Map getMyBizStatInfo(EmisWaybill emisWaybill);
|
public Map getMyBizStatInfo(EmisWaybill emisWaybill);
|
||||||
|
|
||||||
|
|
||||||
|
public List<Map> getMyBizStatListByCountry(EmisWaybill emisWaybill);
|
||||||
|
|
||||||
|
|
||||||
public List<EmisWaybill> selectWaitDoBillList(EmisWaybill emisWaybill);
|
public List<EmisWaybill> selectWaitDoBillList(EmisWaybill emisWaybill);
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -225,6 +225,15 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<Map> getMyBizStatListByCountry(EmisWaybill emisWaybill)
|
||||||
|
{
|
||||||
|
return emisWaybillMapper.getMyBizStatListByCountry(emisWaybill);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据外援运单获取订单
|
* 根据外援运单获取订单
|
||||||
|
|||||||
@ -1911,6 +1911,75 @@
|
|||||||
|
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
<select id="getMyBizStatListByCountry" parameterType="EmisWaybill" resultType="map">
|
||||||
|
select
|
||||||
|
a.receive_country as receiveCountry,
|
||||||
|
b.name as receiveCountryName,
|
||||||
|
count(1) as totalNum,
|
||||||
|
sum(a.parcel_qty) as totalParcelQty,
|
||||||
|
round(sum(a.bill_weight),2) as totalBillWeight,
|
||||||
|
round(sum(a.total_volume),5) as totalVolume,
|
||||||
|
round(sum(a.volume_weight),2) as totalVolumeWeight,
|
||||||
|
round(sum(a.settlement_weight),2) as totalSettlementWeight,
|
||||||
|
round(sum(a.freight),2) as totalFreight
|
||||||
|
from emis_waybill a,emis_country b
|
||||||
|
<where>
|
||||||
|
a.del_flag='0' and a.order_status !='0' and a.order_status!='2'
|
||||||
|
and a.receive_country=b.code
|
||||||
|
|
||||||
|
<if test="salesmen != null and salesmen != '' " >
|
||||||
|
and a.salesmen=#{salesmen}
|
||||||
|
</if>
|
||||||
|
|
||||||
|
<if test="params.beginDate != null and params.beginDate != ''">
|
||||||
|
and a.send_date <![CDATA[ >= ]]> #{params.beginDate}
|
||||||
|
</if>
|
||||||
|
<if test="params.endDate != null and params.endDate != ''">
|
||||||
|
and a.send_date <![CDATA[ <= ]]> #{params.endDate}
|
||||||
|
</if>
|
||||||
|
|
||||||
|
<if test="salesmen == null and params.privSiteCode != null and params.privSiteCode != '88888'">
|
||||||
|
and (
|
||||||
|
|
||||||
|
a.send_site_code in (
|
||||||
|
SELECT t1.site_code FROM (
|
||||||
|
SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
|
||||||
|
#{params.privSiteCode} ) pd
|
||||||
|
WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
|
||||||
|
UNION
|
||||||
|
SELECT #{params.privSiteCode} FROM dual
|
||||||
|
)
|
||||||
|
or
|
||||||
|
a.dispatch_site_code in (
|
||||||
|
SELECT t1.site_code FROM (
|
||||||
|
SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
|
||||||
|
#{params.privSiteCode} ) pd
|
||||||
|
WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
|
||||||
|
UNION
|
||||||
|
SELECT #{params.privSiteCode} FROM dual
|
||||||
|
)
|
||||||
|
<if test="params.isQueryPrintOrder != null and params.isQueryPrintOrder == 1">
|
||||||
|
or EXISTS (select 1 from emis_tms_scan_record etsr where a.bill_code=etsr.main_bill_code and etsr.scan_site_code=#{params.privSiteCode})
|
||||||
|
</if>
|
||||||
|
|
||||||
|
<if test="custNo != null and custNo != ''">
|
||||||
|
or EXISTS (
|
||||||
|
select 1 from emis_customer_user ecu where a.cust_no=ecu.monthly_pay_code and ecu.owner_site=#{params.privSiteCode}
|
||||||
|
)
|
||||||
|
</if>
|
||||||
|
|
||||||
|
or a.salesmen=#{params.privEmpName}
|
||||||
|
or a.payee=#{params.privEmpName}
|
||||||
|
or a.operate_employee_code=#{params.privEmpCode}
|
||||||
|
or a.take_piece_employee_code=#{params.privEmpCode}
|
||||||
|
)
|
||||||
|
</if>
|
||||||
|
|
||||||
|
</where>
|
||||||
|
group by a.receive_country
|
||||||
|
|
||||||
|
</select>
|
||||||
|
|
||||||
|
|
||||||
<select id="selectPrintWaybillList" parameterType="EmisWaybill" resultMap="EmisWaybillResult">
|
<select id="selectPrintWaybillList" parameterType="EmisWaybill" resultMap="EmisWaybillResult">
|
||||||
<include refid="selectEmisWaybillVo"/>
|
<include refid="selectEmisWaybillVo"/>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user