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

逐日统计表添加砂站筛选

dev
xiaocui 2021-04-28 10:40:34 +08:00
parent 0f448353c2
commit 576af2c44a
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -859,23 +859,36 @@ public class OrderStatService {
* @param tm YYYY-MM * @param tm YYYY-MM
* @return * @return
*/ */
public List<Record> mdstat(String tm) { public List<Record> mdstat(String tm,Integer supermarket_id) {
String paramsSql="";
if(supermarket_id!=null){
paramsSql="and t.supermarket_id = ? \n";
}
String sql = "select date_format(t.create_time, '%Y-%m-%d') as date, sum(t.weight) as weight, sum(t.total_price) as totalPrice\n" + String sql = "select date_format(t.create_time, '%Y-%m-%d') as date, sum(t.weight) as weight, sum(t.total_price) as totalPrice\n" +
"from (\n" + "from (\n" +
" select t.create_time, t.weight, t.paid, t.total_price\n" + " select t.create_time, t.weight, t.paid, t.total_price\n" +
" from order_sale t\n" + " from order_sale t\n" +
" where t.state = ? \n" + " where t.state = ? \n" +
paramsSql+
" and t.create_time like ? \n" + " and t.create_time like ? \n" +
" union all\n" + " union all\n" +
" select t.create_time, t.weight, t.paid, t.total_price\n" + " select t.create_time, t.weight, t.paid, t.total_price\n" +
" from order_temp t\n" + " from order_temp t\n" +
" where t.state = ? \n" + " where t.state = ? \n" +
paramsSql+
" and t.create_time like ? \n" + " and t.create_time like ? \n" +
") t\n" + ") t\n" +
"group by date_format(t.create_time, '%Y-%m-%d')\n" + "group by date_format(t.create_time, '%Y-%m-%d')\n" +
"order by date_format(t.create_time, '%Y-%m-%d')"; "order by date_format(t.create_time, '%Y-%m-%d')";
List<Record> dblist;
if(supermarket_id!=null){
dblist = Db.find(sql, OrderStateEnum.RECEIVED.getStateid(),supermarket_id, tm + "%", OrderStateEnum.RECEIVED.getStateid(),supermarket_id, tm + "%");
List<Record> dblist = Db.find(sql, OrderStateEnum.RECEIVED.getStateid(), tm + "%", OrderStateEnum.RECEIVED.getStateid(), tm + "%"); }else {
dblist = Db.find(sql, OrderStateEnum.RECEIVED.getStateid(), tm + "%", OrderStateEnum.RECEIVED.getStateid(), tm + "%");
}
Record total = new Record(); Record total = new Record();
total.set("date", null); total.set("date", null);
@ -913,8 +926,8 @@ public class OrderStatService {
* @param tm YYYY-MM * @param tm YYYY-MM
* @return * @return
*/ */
public Workbook mdstatExport(String tm) { public Workbook mdstatExport(String tm,Integer supermarket_id) {
List<Record> list = mdstat(tm); List<Record> list = mdstat(tm,supermarket_id);
Workbook wb = new XSSFWorkbook(); Workbook wb = new XSSFWorkbook();
Sheet sheet = wb.createSheet("销售月逐日统计"); Sheet sheet = wb.createSheet("销售月逐日统计");

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

@ -178,12 +178,13 @@ public class OrderStatController extends BaseController {
@Before(MonthValidator.class) @Before(MonthValidator.class)
public void mdstat() { public void mdstat() {
String tm = get("tm"); String tm = get("tm");
Integer supermarket_id=getInt("supermarket_id");
int export = getInt("export", 0); int export = getInt("export", 0);
if (export == 0) { if (export == 0) {
renderJson(Result.object(OrderStatService.me.mdstat(tm))); renderJson(Result.object(OrderStatService.me.mdstat(tm,supermarket_id)));
} else { } else {
Workbook wb = OrderStatService.me.mdstatExport(tm); Workbook wb = OrderStatService.me.mdstatExport(tm,supermarket_id);
render(new ExcelRender(tm + "_销售月逐日统计_" + System.currentTimeMillis() + ".xlsx", wb)); render(new ExcelRender(tm + "_销售月逐日统计_" + System.currentTimeMillis() + ".xlsx", wb));
} }
} }