xjm
/
ssjygl-xsct-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aa

dev
wuwenxiong 2021-09-17 09:42:07 +08:00
parent 46ea632571
commit 9ab9bfe8e1
3 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java
View File

@ -29,7 +29,6 @@ public class OrderStatService {
* @param supermarket_id 砂站id * @param supermarket_id 砂站id
* @param trans_co_id 物流公司id * @param trans_co_id 物流公司id
* @param customer_id 客户id * @param customer_id 客户id
* @param customer_name 客户名称
* @param type 订单类型 1 销售（配送）订单， 3 外销（临时）订单 * @param type 订单类型 1 销售（配送）订单， 3 外销（临时）订单
* @param truck_license 车牌号 * @param truck_license 车牌号
* @param isprepaid 是否预付费 * @param isprepaid 是否预付费
@ -40,7 +39,6 @@ public class OrderStatService {
Integer supermarket_id, Integer supermarket_id,
Integer trans_co_id, Integer trans_co_id,
Integer customer_id, Integer customer_id,
String customer_name,
Integer type, Integer type,
String truck_license, String truck_license,
Integer isprepaid, Integer isprepaid,
@ -100,11 +98,8 @@ public class OrderStatService {
if (customer_type_id != null && customer_type_id > 0 && customer_type_id != 99) { if (customer_type_id != null && customer_type_id > 0 && customer_type_id != 99) {
temp_sql += " and c.customer_type_id = ? \n"; temp_sql += " and c.customer_type_id = ? \n";
paraTempList.add(customer_type_id); paraTempList.add(customer_type_id);
} else if(customer_type_id != null && customer_type_id == 99) { } else if(customer_type_id != null && customer_type_id == 99) { // 散户
temp_sql += " and t.customer_id is null \n"; temp_sql += " and t.customer_id is null \n";
} else if (StrKit.notBlank(customer_name) && customer_type_id == null) {
temp_sql += " and t.customer_name like ? \n";
paraTempList.add("%" + customer_name.trim() + "%");
} }
} }
@ -165,7 +160,6 @@ public class OrderStatService {
Integer supermarket_id, Integer supermarket_id,
Integer trans_co_id, Integer trans_co_id,
Integer customer_id, Integer customer_id,
String customer_name,
Integer type, Integer type,
String truck_license, String truck_license,
Integer isprepaid, Integer isprepaid,
@ -177,7 +171,6 @@ public class OrderStatService {
supermarket_id, supermarket_id,
trans_co_id, trans_co_id,
customer_id, customer_id,
customer_name,
type, type,
truck_license, truck_license,
isprepaid, isprepaid,

3
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/stat/sale/OrderStatController.java
View File

@ -18,7 +18,6 @@ public class OrderStatController extends BaseController {
@Before(DayValidator.class) @Before(DayValidator.class)
public void daydetail() { public void daydetail() {
String tm = get("tm"); String tm = get("tm");
String customer_name = get("customer_name");
String truck_license = getUpperCaseVal("truck_license"); String truck_license = getUpperCaseVal("truck_license");
String sn = get("sn"); String sn = get("sn");
Integer supermarket_id = getInt("supermarket_id"); Integer supermarket_id = getInt("supermarket_id");
@ -37,7 +36,6 @@ public class OrderStatController extends BaseController {
supermarket_id, supermarket_id,
trans_co_id, trans_co_id,
customer_id, customer_id,
customer_name,
type, type,
truck_license, truck_license,
isprepaid, isprepaid,
@ -51,7 +49,6 @@ public class OrderStatController extends BaseController {
supermarket_id, supermarket_id,
trans_co_id, trans_co_id,
customer_id, customer_id,
customer_name,
type, type,
truck_license, truck_license,
isprepaid, isprepaid,

3
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/stat/sale/OrderStatController.java
View File

@ -24,7 +24,6 @@ public class OrderStatController extends BaseController {
@Before(DayValidator.class) @Before(DayValidator.class)
public void daydetail() { public void daydetail() {
String tm = get("tm"); String tm = get("tm");
String customer_name = get("customer_name");
String truck_license = getUpperCaseVal("truck_license"); String truck_license = getUpperCaseVal("truck_license");
String sn = get("sn"); String sn = get("sn");
Integer supermarket_id = getInt("supermarket_id"); Integer supermarket_id = getInt("supermarket_id");
@ -54,7 +53,6 @@ public class OrderStatController extends BaseController {
supermarket_id, supermarket_id,
trans_co_id, trans_co_id,
customer_id, customer_id,
customer_name,
type, type,
truck_license, truck_license,
isprepaid, isprepaid,
@ -68,7 +66,6 @@ public class OrderStatController extends BaseController {
supermarket_id, supermarket_id,
trans_co_id, trans_co_id,
customer_id, customer_id,
customer_name,
type, type,
truck_license, truck_license,
isprepaid, isprepaid,