根据登录人过滤数据

main
HUOJIN\92525 2025-04-21 11:22:27 +08:00
parent a48d5acc50
commit 5a37fe73aa
15 changed files with 35 additions and 20 deletions

View File

@ -99,6 +99,7 @@ l.currentPosition,
where 1=1
and ( /~ordersAll: {ordersAll} = true~/ )
and (l.executer=#{SESSION_PLATFORM} or l.contractor=#{SESSION_PLATFORM})
and (#{SESSION_USERS_NAME} = 'admin' or o.updateInfo.operatorName = #{SESSION_USERS_NAME})
/~orders.customerOrderNO: AND upper(l.order.customerOrderNO) like upper({orders.customerOrderNO})~/
/~l.ecNo: AND upper(l.ecNo) like upper({l.ecNo})~/
/~shipment.shipmentDepartment: AND (( shipment.shipmentDepartment ={shipment.shipmentDepartment} )

View File

@ -90,6 +90,7 @@ s <date id="l.order.planArriveTime1" title="order.planArriveTime" row=
left join l.company
where l.executer = #{SESSION_PLATFORM} and l.status in( 'UNDISTRIBUTION' )
and l.turnCar=1
and (#{SESSION_USERS_NAME} = 'admin' or l.order.updateInfo.operatorName = #{SESSION_USERS_NAME})
/~l.ecNo: and upper(l.ecNo) like upper({l.ecNo})~/
/~orders.consignor.id: and l.consignor.id = {orders.consignor.id}~/
/~l.fromContact.address: and l.fromContact.address like {l.fromContact.address}~/

View File

@ -102,6 +102,7 @@
where l.executer = #{SESSION_PLATFORM} and l.status in( 'UNDISTRIBUTION','' )
and l.turnCar=0 and l.turnShipment=0 and l.turnDelivery=0
and ((l.order.isShortBarge=0 or l.order.cusBill=1) or (l.order.isShortBarge=1 and l.nodeIndex>1))
and (#{SESSION_USERS_NAME} = 'admin' or l.order.updateInfo.operatorName = #{SESSION_USERS_NAME})
/~l.ecNo: and upper(l.ecNo) like upper({l.ecNo})~/
/~orders.consignor.id: and l.consignor.id = {orders.consignor.id}~/
/~l.fromContact.address: and l.fromContact.address like {l.fromContact.address}~/

View File

@ -116,6 +116,7 @@ or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where d
WHERE 1=1
and shipment.platForm=#{SESSION_PLATFORM}
and shipment.status!='CANCEL'
and (#{SESSION_USERS_NAME} = 'admin' or shipment.operator = #{SESSION_USERS_NAME})
and ((/~shipment.operatorDate :{shipment.operatorDate} ~/=shipment.operatorDate) or ( /~ordersAll: {ordersAll} = true~/ ))
/~shipment.code: AND shipment.code like upper({shipment.code})~/
/~shipment.transportType: AND shipment.transportType = {shipment.transportType}~/

View File

@ -114,6 +114,7 @@ or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where d
and shipment.shipmentDepartment='专线'
and shipment.isShortBarge=false
and shipment.platForm= #{SESSION_PLATFORM}
and (#{SESSION_USERS_NAME} = 'admin' or shipment.operator = #{SESSION_USERS_NAME})
and (shipment.status!='CANCEL' /~shipment.status: or 'CANCEL' = {shipment.status}~/ )
/~shipment.code: AND shipment.code like upper({shipment.code})~/
/~shipment.status: AND shipment.status = {shipment.status}~/

View File

@ -103,6 +103,7 @@
left join orders.toLocation.city.zone toZone
left join orders.routeFee
WHERE pf = #{SESSION_PLATFORM} and orders.isShortBarge=false
and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME})
and (orders.status in('AVAILABLE','TRANS_AVAILABLE') or ( /~ordersAll: {ordersAll} = true~/ ))
/~order.code: AND orders.code like {order.code}~/
/~orders.customerOrderNO: AND orders.customerOrderNO like {orders.customerOrderNO}~/

View File

@ -100,6 +100,7 @@
left join orders.contractor as pf
left join orders.extends1 vt1
where orders.contractor = #{SESSION_PLATFORM}
and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME})
and (orders.status in('AVAILABLE','TRANS_AVAILABLE') or ( /~ordersAll: {ordersAll} = true~/ ))
/~orders.customerOrderNO: AND orders.customerOrderNO like upper({orders.customerOrderNO})~/
/~orders.signNo: AND orders.signNo LIKE {orders.signNo}~/

View File

@ -63,10 +63,9 @@
orders.toName,
orders.status,
orders.arriveTime,
ov.license,
ov.vehicleTypeName,
ov.driver_name,
ov.driver_phone,
orders.vehicleCode,
orders.expectLicense,
orders.driverName,
orders.carPeople,
orders.costStatus,
orders.unit,
@ -85,17 +84,19 @@
orders.mailTime,
orders.description,
orders.imageStatus,
orders.updateInfo.operatorName,
'ORDER',
'ORDER'
FROM Order orders,OrderLegsView ov
FROM Order orders
left join orders.contractor as pf
left join orders.fromLocation as of
left join orders.toLocation as ot
left join orders.routeFee
left join orders.extends1 vt1
where orders.contractor = #{SESSION_PLATFORM} and ov.id=orders.id
and orders.status !='CANCEL'
and (orders.status !='SIGNED' or (/~isAll: {isAll} = true~/))
left join orders.extends1 vt1
where orders.contractor = #{SESSION_PLATFORM}
and orders.status !='CANCEL'
and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME})
and (orders.status !='SIGNED' or (/~isAll: {isAll} = true~/))
/~date1: and (DATE_FORMAT(orders.planFromDate,'%Y-%m-%d') >= #{CLIENT_DATE_SESSION} or (orders.planFromDate) >= {date1})~/
/~orders.customerOrderNO: AND orders.customerOrderNO like upper({orders.customerOrderNO})~/
/~ov.carrierName: AND (ov.shCarrierName LIKE {ov.carrierName} or ov.gysCarrierName LIKE {ov.carrierName})~/
@ -131,7 +132,6 @@ order by orders.planFromDate desc,orders.id desc ]]></datasource>
<column id="ov.license" width="100" title="ov.license" visible="true" horizonAlign="center" verticalAlign="middle" />
<column id="ov.vehicleTypeName" width="80" title="ov.vehicleTypeName" visible="true" horizonAlign="center" verticalAlign="middle" />
<column id="ov.driver_name" width="80" title="ov.driver_name" visible="true" horizonAlign="center" verticalAlign="middle" />
<column id="ov.driver_phone" width="100" title="ov.driver_phone" visible="true" horizonAlign="center" verticalAlign="middle" />
<column id="orders.carPeople" width="60" title="orders.carpeople" visible="true" horizonAlign="left" verticalAlign="middle"/>
<column id="orders.costStatus" title="orders.costStatus" width="80" visible="true" horizonAlign="left" verticalAlign="middle" format="enumFormat" formatParam="FeeStatus"/>
<column id="orders.unit" width="80" title="orders.unit" visible="true" horizonAlign="center" verticalAlign="middle" format="enumFormat" formatParam="MeasureUnit"/>
@ -154,6 +154,7 @@ order by orders.planFromDate desc,orders.id desc ]]></datasource>
<column id="orders.mailTime" width="80" title="orders.mailTime" visible="true" horizonAlign="center" verticalAlign="middle"/>
<column id="orders.description" title="order.description2" visible="true" horizonAlign="left" verticalAlign="middle"/>
<column id="orders.imageStatus" title="orders.imageStatus" visible="true" horizonAlign="left" verticalAlign="middle"/>
<column id="updateInfo.operatorName" title="inputByName" visible="true" horizonAlign="left" verticalAlign="middle"/>
<column id="checkImageView" width="80" title="checkImageView" visible="true" horizonAlign="left" format="lookPictureFormatter"/>
<column id="checkImageDown" width="80" title="checkImageDown" visible="true" horizonAlign="left" format="downloadPictureFormatter"/>
</columns>

View File

@ -99,6 +99,7 @@ l.currentPosition,
where 1=1
and ( /~ordersAll: {ordersAll} = true~/ )
and (l.executer=#{SESSION_PLATFORM} or l.contractor=#{SESSION_PLATFORM})
and (#{SESSION_USERS_NAME} = 'admin' or o.updateInfo.operatorName = #{SESSION_USERS_NAME})
/~orders.customerOrderNO: AND upper(l.order.customerOrderNO) like upper({orders.customerOrderNO})~/
/~l.ecNo: AND upper(l.ecNo) like upper({l.ecNo})~/
/~shipment.shipmentDepartment: AND (( shipment.shipmentDepartment ={shipment.shipmentDepartment} )

View File

@ -90,6 +90,7 @@ s <date id="l.order.planArriveTime1" title="order.planArriveTime" row=
left join l.company
where l.executer = #{SESSION_PLATFORM} and l.status in( 'UNDISTRIBUTION' )
and l.turnCar=1
and (#{SESSION_USERS_NAME} = 'admin' or l.order.updateInfo.operatorName = #{SESSION_USERS_NAME})
/~l.ecNo: and upper(l.ecNo) like upper({l.ecNo})~/
/~orders.consignor.id: and l.consignor.id = {orders.consignor.id}~/
/~l.fromContact.address: and l.fromContact.address like {l.fromContact.address}~/

View File

@ -102,6 +102,7 @@
where l.executer = #{SESSION_PLATFORM} and l.status in( 'UNDISTRIBUTION','' )
and l.turnCar=0 and l.turnShipment=0 and l.turnDelivery=0
and ((l.order.isShortBarge=0 or l.order.cusBill=1) or (l.order.isShortBarge=1 and l.nodeIndex>1))
and (#{SESSION_USERS_NAME} = 'admin' or l.order.updateInfo.operatorName = #{SESSION_USERS_NAME})
/~l.ecNo: and upper(l.ecNo) like upper({l.ecNo})~/
/~orders.consignor.id: and l.consignor.id = {orders.consignor.id}~/
/~l.fromContact.address: and l.fromContact.address like {l.fromContact.address}~/

View File

@ -114,6 +114,7 @@ or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where d
and shipment.shipmentDepartment='专线'
and shipment.isShortBarge=false
and shipment.platForm= #{SESSION_PLATFORM}
and (#{SESSION_USERS_NAME} = 'admin' or shipment.operator = #{SESSION_USERS_NAME})
and (shipment.status!='CANCEL' /~shipment.status: or 'CANCEL' = {shipment.status}~/ )
/~shipment.code: AND shipment.code like upper({shipment.code})~/
/~shipment.status: AND shipment.status = {shipment.status}~/

View File

@ -103,6 +103,7 @@
left join orders.toLocation.city.zone toZone
left join orders.routeFee
WHERE pf = #{SESSION_PLATFORM} and orders.isShortBarge=false
and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME})
and (orders.status in('AVAILABLE','TRANS_AVAILABLE') or ( /~ordersAll: {ordersAll} = true~/ ))
/~order.code: AND orders.code like {order.code}~/
/~orders.customerOrderNO: AND orders.customerOrderNO like {orders.customerOrderNO}~/

View File

@ -100,6 +100,7 @@
left join orders.contractor as pf
left join orders.extends1 vt1
where orders.contractor = #{SESSION_PLATFORM}
and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME})
and (orders.status in('AVAILABLE','TRANS_AVAILABLE') or ( /~ordersAll: {ordersAll} = true~/ ))
/~orders.customerOrderNO: AND orders.customerOrderNO like upper({orders.customerOrderNO})~/
/~orders.signNo: AND orders.signNo LIKE {orders.signNo}~/

View File

@ -63,10 +63,9 @@
orders.toName,
orders.status,
orders.arriveTime,
ov.license,
ov.vehicleTypeName,
ov.driver_name,
ov.driver_phone,
orders.vehicleCode,
orders.expectLicense,
orders.driverName,
orders.carPeople,
orders.costStatus,
orders.unit,
@ -85,17 +84,19 @@
orders.mailTime,
orders.description,
orders.imageStatus,
orders.updateInfo.operatorName,
'ORDER',
'ORDER'
FROM Order orders,OrderLegsView ov
FROM Order orders
left join orders.contractor as pf
left join orders.fromLocation as of
left join orders.toLocation as ot
left join orders.routeFee
left join orders.extends1 vt1
where orders.contractor = #{SESSION_PLATFORM} and ov.id=orders.id
and orders.status !='CANCEL'
and (orders.status !='SIGNED' or (/~isAll: {isAll} = true~/))
left join orders.extends1 vt1
where orders.contractor = #{SESSION_PLATFORM}
and orders.status !='CANCEL'
and (#{SESSION_USERS_NAME} = 'admin' or orders.updateInfo.operatorName = #{SESSION_USERS_NAME})
and (orders.status !='SIGNED' or (/~isAll: {isAll} = true~/))
/~date1: and (DATE_FORMAT(orders.planFromDate,'%Y-%m-%d') >= #{CLIENT_DATE_SESSION} or (orders.planFromDate) >= {date1})~/
/~orders.customerOrderNO: AND orders.customerOrderNO like upper({orders.customerOrderNO})~/
/~ov.carrierName: AND (ov.shCarrierName LIKE {ov.carrierName} or ov.gysCarrierName LIKE {ov.carrierName})~/
@ -131,7 +132,6 @@ order by orders.planFromDate desc,orders.id desc ]]></datasource>
<column id="ov.license" width="100" title="ov.license" visible="true" horizonAlign="center" verticalAlign="middle" />
<column id="ov.vehicleTypeName" width="80" title="ov.vehicleTypeName" visible="true" horizonAlign="center" verticalAlign="middle" />
<column id="ov.driver_name" width="80" title="ov.driver_name" visible="true" horizonAlign="center" verticalAlign="middle" />
<column id="ov.driver_phone" width="100" title="ov.driver_phone" visible="true" horizonAlign="center" verticalAlign="middle" />
<column id="orders.carPeople" width="60" title="orders.carpeople" visible="true" horizonAlign="left" verticalAlign="middle"/>
<column id="orders.costStatus" title="orders.costStatus" width="80" visible="true" horizonAlign="left" verticalAlign="middle" format="enumFormat" formatParam="FeeStatus"/>
<column id="orders.unit" width="80" title="orders.unit" visible="true" horizonAlign="center" verticalAlign="middle" format="enumFormat" formatParam="MeasureUnit"/>
@ -154,6 +154,7 @@ order by orders.planFromDate desc,orders.id desc ]]></datasource>
<column id="orders.mailTime" width="80" title="orders.mailTime" visible="true" horizonAlign="center" verticalAlign="middle"/>
<column id="orders.description" title="order.description2" visible="true" horizonAlign="left" verticalAlign="middle"/>
<column id="orders.imageStatus" title="orders.imageStatus" visible="true" horizonAlign="left" verticalAlign="middle"/>
<column id="updateInfo.operatorName" title="inputByName" visible="true" horizonAlign="left" verticalAlign="middle"/>
<column id="checkImageView" width="80" title="checkImageView" visible="true" horizonAlign="left" format="lookPictureFormatter"/>
<column id="checkImageDown" width="80" title="checkImageDown" visible="true" horizonAlign="left" format="downloadPictureFormatter"/>
</columns>