修改油站配置信息

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/controller/PayOrderController.java

@@ -132,6 +132,27 @@ public class PayOrderController extends BaseController
      * @param payOrder
      * @return
      */
+    @PreAuthorize("@ss.hasPermi('station:order:dayOilTypeSources')")
+    @GetMapping("/dayOilTypeSources")
+    public TableDataInfo dayOilTypeSources(PayOrder payOrder)
+    {
+        if(payOrder!=null &&payOrder.getStationId()!=null){
+            SysDept dept =new SysDept();
+            dept.setDeptId(payOrder.getStationId());
+            List<String> list = deptService.selectDeptId(dept);
+            payOrder.setStationIdList(list);
+            payOrder.setStationId(null);
+        }
+        payOrder.setStatus("1");
+        payOrder.setOrderType("1");
+        List<PayOrder> orderList = payOrderService.dayOilTypeSources(payOrder);
+        return getTable(orderList);
+    }
+    /***
+     * 根据油品分类，查询油品的总金额，总升数
+     * @param payOrder
+     * @return
+     */
     @PreAuthorize("@ss.hasPermi('station:order:selectOverViewData')")
     @GetMapping("/selectOverViewData")
     public AjaxResult selectOverViewData(PayOrder payOrder)
@@ -276,9 +297,9 @@ public class PayOrderController extends BaseController
      * @param payOrder
      * @return
      */
-    @PreAuthorize("@ss.hasPermi('station:order:listQydata97')")
-    @GetMapping("/listQydata97")
-    public TableDataInfo listQydata97(PayOrder payOrder)
+    @PreAuthorize("@ss.hasPermi('station:order:listQydata98')")
+    @GetMapping("/listQydata98")
+    public TableDataInfo listQydata98(PayOrder payOrder)
     {
         if(payOrder!=null &&payOrder.getStationId()!=null){
             SysDept dept =new SysDept();
@@ -287,7 +308,7 @@ public class PayOrderController extends BaseController
             payOrder.setStationIdList(list);
             payOrder.setStationId(null);
         }
-        payOrder.setOilName("97#");
+        payOrder.setOilName("98#");
         payOrder.setStatus("1");
         payOrder.setOrderType("1");
         List<PayOrder>  orderList = payOrderService.listQydata(payOrder);

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/controller/StationClassStructureController.java

@@ -1,5 +1,9 @@
 package com.yijia.station.controller;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
 import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -7,6 +11,8 @@ import java.text.SimpleDateFormat;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 
+import com.yijia.common.annotation.Excel;
+import com.yijia.common.config.YiJiaConfig;
 import com.yijia.common.core.domain.model.LoginUser;
 import com.yijia.common.exception.CustomException;
 import com.yijia.common.utils.SecurityUtils;
@@ -15,6 +21,11 @@ import com.yijia.station.mapper.PayOrderMapper;
 import com.yijia.station.service.*;
 import com.yijia.station.utils.FeiEPrinterUtil;
 import com.yijia.system.service.ISysUserService;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -42,6 +53,7 @@ import com.yijia.common.core.page.TableDataInfo;
 @RequestMapping("/station/structure")
 public class StationClassStructureController extends BaseController
 {
+    private static final Logger log = LoggerFactory.getLogger(StationClassStructureController.class);
     @Autowired
     private IStationClassStructureService stationClassStructureService;
     @Autowired
@@ -75,7 +87,6 @@ public class StationClassStructureController extends BaseController
     @GetMapping("/listPersonnelStructure")
     public TableDataInfo listPersonnelStructure(StationClassStructure stationClassStructure)
     {
-
         List<StationClassStructure> list = new ArrayList<>();
         if(stationClassStructure!=null &&stationClassStructure.getStationId()!=null ){
           list = stationClassStructureService.listPersonnelStructure(stationClassStructure);
@@ -117,9 +128,333 @@ public class StationClassStructureController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(StationClassStructure stationClassStructure)
     {
-        List<StationClassStructure> list = stationClassStructureService.selectStationClassStructureExport(stationClassStructure);
-        ExcelUtil<StationClassStructure> util = new ExcelUtil<StationClassStructure>(StationClassStructure.class);
-        return util.exportExcel(list, "structure");
+        StationClassesSummary stationClassesSummary =new StationClassesSummary();
+        stationClassesSummary.setStationId(stationClassStructure.getStationId());
+        stationClassesSummary.setClassesNo(stationClassStructure.getClassStructureNo());
+        StationClassesSummary summary= stationClassesSummaryService.selectStationClassesSummary(stationClassesSummary);
+        List<StationClassStructure> listPersonnelPay = stationClassStructureService.listPersonnelPayStructure(stationClassStructure);
+        List<StationClassStructure> oillist = stationClassStructureService.listOilStructure(stationClassStructure);
+        List<StationClassStructure> listPersonnel = stationClassStructureService.listPersonnelStructure(stationClassStructure);
+        StationClassStructure listPersonnelPaySum =stationClassStructureService.listPersonnelPayStructureSum(stationClassStructure);
+        StationClassStructure oillistSum =stationClassStructureService.listOilStructureSum(stationClassStructure);
+        StationClassStructure listPersonnelSum =stationClassStructureService.listPersonnelStructureSum(stationClassStructure);
+        AjaxResult ss = exportExcel( summary,listPersonnel,oillist,listPersonnelPay,listPersonnelPaySum,oillistSum,listPersonnelSum, "structure");
+        return ss;
+    }
+    /**
+     * 对list数据源将其里面的数据导入到excel表单
+     *
+     * @param list 导出数据集合
+     * @param sheetName 工作表的名称
+     * @return 结果
+     */
+    public AjaxResult exportExcel( StationClassesSummary summary,List<StationClassStructure> listP,List<StationClassStructure> listOil,List<StationClassStructure> list,StationClassStructure listPersonnelPaySum,StationClassStructure oillistSum,StationClassStructure listPersonnelSum, String sheetName)
+    {
+        OutputStream out = null;
+        Workbook wb= new SXSSFWorkbook(500);
+        try
+        {
+            Sheet sheet = wb.createSheet("班结数据");
+            sheet.setDefaultColumnWidth(20);//默认列宽20
+            CellStyle style = wb.createCellStyle();
+            CreationHelper createHelper = wb.getCreationHelper();
+            style.setDataFormat(createHelper.createDataFormat().getFormat("yyyy-mm-dd hh:mm:ss"));
+            int rows =listP.size()+listOil.size()+list.size()+10;
+            int personlist =listP.size()+3;
+            int oillist =personlist+3+listOil.size();
+            Cell cell =null;
+            Row row =null;
+            for (int i = 0; i < rows; i++) {
+                if(i == 0) {
+                    row = sheet.createRow(i);
+                    cell = row.createCell(0);
+                    cell.setCellStyle(style);
+                    cell.setCellValue("班结开始时间：");
+                    cell = row.createCell(1);
+                    cell.setCellStyle(style);
+                    cell.setCellValue(summary.getStartDate());
+                    cell = row.createCell(2);
+                    cell.setCellStyle(style);
+                    cell.setCellValue("班结人：");
+                    cell = row.createCell(3);
+                    cell.setCellStyle(style);
+                    cell.setCellValue(summary.getClassesMan());
+                }else if(i == 1){// 生成第一行(表头)
+                     row = sheet.createRow(i);
+                    // 合并单元格CellRangeAddress构造参数依次表示起始行，截至行，起始列， 截至列
+                    sheet.addMergedRegion(new CellRangeAddress(i, i, 0, 5));
+                    cell = row.createCell(0);
+                    cell.setCellStyle(style);
+                    cell.setCellValue("按员工汇总");
+                }else {
+                    if (i == 2) {
+                        row = sheet.createRow(i);
+                        cell = row.createCell(0);
+                        cell.setCellValue("员工姓名");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(1);
+                        cell.setCellValue("负责枪号");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(2);
+                        cell.setCellValue("销量");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(3);
+                        cell.setCellValue("销额");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(4);
+                        cell.setCellValue("销售笔数");
+                        cell.setCellStyle(style);
+                    } else if (i > 2 && i < personlist) {
+                         row = sheet.createRow(i);
+                        int j = i - 3;
+                         cell = row.createCell(0);
+                        cell.setCellValue(listP.get(j).getOilPersonnel());
+                        cell.setCellStyle(style);
+                        cell = row.createCell(1);
+                        cell.setCellValue(listP.get(j).getOilGun());
+                        cell.setCellStyle(style);
+                        cell = row.createCell(2);
+                        cell.setCellValue(listP.get(j).getOrderLiters() + "");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(3);
+                        cell.setCellValue(listP.get(j).getAmt() + "");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(4);
+                        cell.setCellValue(listP.get(j).getOrderNo());
+                        cell.setCellStyle(style);
+                    }else if (i == personlist) {
+                        row = sheet.createRow(i);
+                        cell = row.createCell(0);
+                        cell.setCellValue("合计");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(2);
+                        cell.setCellValue(listPersonnelSum.getOrderLiters()+"");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(3);
+                        cell.setCellValue(listPersonnelSum.getAmt()+"");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(4);
+                        cell.setCellValue(listPersonnelSum.getOrderNo());
+                        cell.setCellStyle(style);
+                    }else if (i == personlist+1) {
+                        row = sheet.createRow(i);
+                        sheet.addMergedRegion(new CellRangeAddress(i, i, 0, 5));
+                        cell = row.createCell(0);
+                        cell.setCellStyle(style);
+                        cell.setCellValue("按油品汇总");
+                    } else if (i == personlist + 2) {
+                        row = sheet.createRow(i);
+                        cell = row.createCell(0);
+                        cell.setCellValue("油品");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(1);
+                        cell.setCellValue("负责枪号");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(2);
+                        cell.setCellValue("销量");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(3);
+                        cell.setCellValue("销额");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(4);
+                        cell.setCellValue("销售笔数");
+                        cell.setCellStyle(style);
+                    } else if (i > personlist+2 && i < oillist) {
+                        row = sheet.createRow(i);
+                        int j = i - personlist-3;
+                        cell = row.createCell(0);
+                        cell.setCellValue(listOil.get(j).getOilName());
+                        cell.setCellStyle(style);
+                        cell = row.createCell(1);
+                        cell.setCellValue(listOil.get(j).getOilGun());
+                        cell.setCellStyle(style);
+                        cell = row.createCell(2);
+                        cell.setCellValue(listOil.get(j).getOrderLiters().toString());
+                        cell.setCellStyle(style);
+                        cell = row.createCell(3);
+                        cell.setCellValue(listOil.get(j).getAmt() + "");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(4);
+                        cell.setCellValue(listOil.get(j).getOrderNo());
+                        cell.setCellStyle(style);
+                    } else if(i==oillist){
+                        row = sheet.createRow(i);
+                        cell = row.createCell(0);
+                        cell.setCellValue("合计");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(2);
+                        cell.setCellValue(oillistSum.getOrderLiters() + "");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(3);
+                        cell.setCellValue(oillistSum.getAmt() + "");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(4);
+                        cell.setCellValue(oillistSum.getOrderNo());
+                        cell.setCellStyle(style);
+                    }else if(i==oillist+1){
+                         row = sheet.createRow(i);
+                        sheet.addMergedRegion(new CellRangeAddress(i, i, 0, 11));
+                         cell = row.createCell(0);
+                        cell.setCellStyle(style);
+                        cell.setCellValue("按员工/支付方式汇总");
+                    }else if(i==oillist+2){
+                        row = sheet.createRow(i);
+                        cell = row.createCell(0);
+                        cell.setCellValue("员工姓名");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(1);
+                        cell.setCellValue("负责枪号");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(2);
+                        cell.setCellValue("微信笔数");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(3);
+                        cell.setCellValue("支付宝笔数");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(4);
+                        cell.setCellValue("现金笔数");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(5);
+                        cell.setCellValue("优惠");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(6);
+                        cell.setCellValue("优惠劵");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(7);
+                        cell.setCellValue("微信金额");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(8);
+                        cell.setCellValue("支付宝金额");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(9);
+                        cell.setCellValue("现金金额");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(10);
+                        cell.setCellValue("会员卡支付");
+                        cell.setCellStyle(style);
+                    }else if(i<rows-1){
+                        int j =i-oillist-3;
+                        row = sheet.createRow(i);
+                        cell = row.createCell(0);
+                        cell.setCellValue(list.get(j).getOilPersonnel());
+                        cell.setCellStyle(style);
+                        cell = row.createCell(1);
+                        cell.setCellValue(list.get(j).getOilGun());
+                        cell.setCellStyle(style);
+                        cell = row.createCell(2);
+                        cell.setCellValue(list.get(j).getWxNum()+"");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(3);
+                        cell.setCellValue(list.get(j).getZfbNum()+"");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(4);
+                        cell.setCellValue(list.get(j).getXjNum()+"");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(5);
+                        cell.setCellValue(list.get(j).getDiscountAmt()+"");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(6);
+                        cell.setCellValue(list.get(j).getDiscountCouponAmt()+"");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(7);
+                        cell.setCellValue(list.get(j).getWxAmt()+"");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(8);
+                        cell.setCellValue(list.get(j).getZfbAmt()+"");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(9);
+                        cell.setCellValue(listP.get(j).getXjAmt()+"");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(10);
+                        cell.setCellValue(list.get(j).getMemberAmt()+"");
+                        cell.setCellStyle(style);
+                    }else{
+                        row = sheet.createRow(i);
+                        cell = row.createCell(0);
+                        cell.setCellValue("合计");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(2);
+                        cell.setCellValue(listPersonnelPaySum.getWxNum()+"");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(3);
+                        cell.setCellValue(listPersonnelPaySum.getZfbNum()+"");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(4);
+                        cell.setCellValue(listPersonnelPaySum.getXjNum()+"");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(5);
+                        cell.setCellValue(listPersonnelPaySum.getDiscountAmt()+"");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(6);
+                        cell.setCellValue(listPersonnelPaySum.getDiscountCouponAmt()+"");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(7);
+                        cell.setCellValue(listPersonnelPaySum.getWxAmt()+"");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(8);
+                        cell.setCellValue(listPersonnelPaySum.getZfbAmt()+"");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(9);
+                        cell.setCellValue(listPersonnelPaySum.getXjAmt()+"");
+                        cell.setCellStyle(style);
+                        cell = row.createCell(10);
+                        cell.setCellValue(listPersonnelPaySum.getMemberAmt()+"");
+                        cell.setCellStyle(style);
+                    }
+                }
+            }
+            String filename = encodingFilename(sheetName);
+            out = new FileOutputStream(getAbsoluteFile(filename));
+            wb.write(out);
+            out.close();// 关闭输出流
+            return AjaxResult.success(filename);
+        }
+        catch (Exception e)
+        {
+            log.error("导出Excel异常{}", e.getMessage());
+            throw new CustomException("导出Excel失败，请联系网站管理员！");
+        }
+        finally
+        {
+            if (wb != null)
+            {
+                try
+                {
+                    wb.close();
+                }
+                catch (IOException e1)
+                {
+                    e1.printStackTrace();
+                }
+            }
+            if (out != null)
+            {
+                try
+                {
+                    out.close();
+                }
+                catch (IOException e1)
+                {
+                    e1.printStackTrace();
+                }
+            }
+        }
+    }
+
+    private String encodingFilename(String filename) {
+         filename = UUID.randomUUID().toString() + "_" + filename + ".xlsx";
+        return filename;
+    }
+
+    public String getAbsoluteFile(String filename)
+    {
+        String downloadPath = YiJiaConfig.getDownloadPath() + filename;
+        File desc = new File(downloadPath);
+        if (!desc.getParentFile().exists())
+        {
+            desc.getParentFile().mkdirs();
+        }
+        return downloadPath;
     }
 
     /**

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/controller/StationClassesSummaryController.java

@@ -23,7 +23,7 @@ import com.yijia.common.utils.poi.ExcelUtil;
 import com.yijia.common.core.page.TableDataInfo;
 
 /**
- * 【请填写功能名称】Controller
+ * 班结汇总Controller
  * 
  * @author yijia
  * @date 2020-12-28
@@ -40,7 +40,7 @@ public class StationClassesSummaryController extends BaseController
     @Autowired
     private ISysDeptService deptService;
     /**
-     * 查询【请填写功能名称】列表
+     * 查询班结汇总列表
      */
     @PreAuthorize("@ss.hasPermi('station:summary:list')")
     @GetMapping("/list")
@@ -59,10 +59,10 @@ public class StationClassesSummaryController extends BaseController
     }
 
     /**
-     * 导出【请填写功能名称】列表
+     * 导出班结汇总列表
      */
     @PreAuthorize("@ss.hasPermi('station:summary:export')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @Log(title = "班结汇总", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(StationClassesSummary stationClassesSummary)
     {
@@ -79,7 +79,7 @@ public class StationClassesSummaryController extends BaseController
     }
 
     /**
-     * 获取【请填写功能名称】详细信息
+     * 获取班结汇总详细信息
      */
     @PreAuthorize("@ss.hasPermi('station:summary:query')")
     @GetMapping(value = "/{id}")
@@ -89,10 +89,10 @@ public class StationClassesSummaryController extends BaseController
     }
 
     /**
-     * 新增【请填写功能名称】
+     * 新增班结汇总
      */
     @PreAuthorize("@ss.hasPermi('station:summary:add')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @Log(title = "班结汇总", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody StationClassesSummary stationClassesSummary)
     {
@@ -100,10 +100,10 @@ public class StationClassesSummaryController extends BaseController
     }
 
     /**
-     * 修改【请填写功能名称】
+     * 修改班结汇总
      */
     @PreAuthorize("@ss.hasPermi('station:summary:edit')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @Log(title = "班结汇总", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody StationClassesSummary stationClassesSummary)
     {
@@ -111,10 +111,10 @@ public class StationClassesSummaryController extends BaseController
     }
 
     /**
-     * 删除【请填写功能名称】
+     * 删除班结汇总
      */
     @PreAuthorize("@ss.hasPermi('station:summary:remove')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+    @Log(title = "班结汇总", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/controller/StationOilPriceController.java

@@ -143,4 +143,14 @@ public class StationOilPriceController extends BaseController
         List<StationOilPrice> list = stationOilPriceService.selectStationOilPriceList(stationOilPrice);
         return getTable(list);
     }
+    /**
+     * 查询当前油站对应的油品名称(不包括非油品)
+     */
+    @PreAuthorize("@ss.hasPermi('station:price:oilNameInfo')")
+    @GetMapping("/oilNameInfo")
+    public TableDataInfo oilNameInfo(StationOilPrice stationOilPrice)
+    {
+        List<StationOilPrice> list = stationOilPriceService.oilNameInfo(stationOilPrice);
+        return getTable(list);
+    }
 }

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/domain/StationClassesSummary.java

@@ -28,13 +28,13 @@ public class StationClassesSummary extends BaseEntity
     private String classesNo;
 
     /** 班次开始时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "班次开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    @Excel(name = "班次开始时间", width = 30, dateFormat = "yyyy-MM-dd hh:mm:ss")
     private Date startDate;
 
     /** 班次结束时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "班次结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    @Excel(name = "班次结束时间", width = 30, dateFormat = "yyyy-MM-dd hh:mm:ss")
     private Date endDate;
 
     /** 油站id */

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/domain/StationPay.java

@@ -75,9 +75,19 @@ public class StationPay extends BaseEntity
     /** 班结是否打印(1,是 2 否) */
     @Excel(name = "班结是否打印(1,是 2 否)")
     private String integralPrintFlag;
+    private String integralFlag;
+
     /**公告*/
     private String notice;
 
+    public String getIntegralFlag() {
+        return integralFlag;
+    }
+
+    public void setIntegralFlag(String integralFlag) {
+        this.integralFlag = integralFlag;
+    }
+
     public String getIntegralPrintFlag() {
         return integralPrintFlag;
     }

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/mapper/PayOrderMapper.java

@@ -131,4 +131,11 @@ public interface PayOrderMapper
      * 查询油站第一笔订单的数据
      */
     public  PayOrder getPayOrderInfoMin(PayOrder payOrder);
+
+    /**
+     * 日报数据详情
+     * @param payOrder
+     * @return
+     */
+    public List<PayOrder> dayOilTypeSources(PayOrder payOrder);
 }

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/mapper/StationClassStructureMapper.java

@@ -117,4 +117,24 @@ public interface StationClassStructureMapper
      * @return
      */
     public List<StationClassStructure> listPayStructure(StationClassStructure classStructure);
+
+    /**
+     * 按员工支付方式汇总
+     * @param stationClassStructure
+     * @return
+     */
+    public StationClassStructure listPersonnelPayStructureSum(StationClassStructure stationClassStructure);
+
+    /**
+     * 按油品方式汇总
+     * @param stationClassStructure
+     * @return
+     */
+    public StationClassStructure listOilStructureSum(StationClassStructure stationClassStructure);
+    /**
+     * 按员工汇总
+     * @param stationClassStructure
+     * @return
+     */
+    public StationClassStructure listPersonnelStructureSum(StationClassStructure stationClassStructure);
 }

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/mapper/StationClassesSummaryMapper.java

@@ -58,4 +58,6 @@ public interface StationClassesSummaryMapper
      * @return 结果
      */
     public int deleteStationClassesSummaryByIds(Long[] ids);
+
+    public StationClassesSummary selectStationClassesSummary(StationClassesSummary stationClassesSummary);
 }

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/mapper/StationOilPriceMapper.java

@@ -58,4 +58,9 @@ public interface StationOilPriceMapper
      * @return 结果
      */
     public int deleteStationOilPriceByIds(Long[] oilPriceIds);
+    /**
+     * 查询当前油站对应的油品名称(不包括非油品)
+     */
+
+    public List<StationOilPrice> oilNameInfo(StationOilPrice stationOilPrice);
 }

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/service/IPayOrderService.java

@@ -129,4 +129,11 @@ public interface IPayOrderService
      * @return
      */
     public PayOrder getPayOrderInfoMin(PayOrder payOrder);
+
+    /**
+     * 日报数据详情
+     * @param payOrder
+     * @return
+     */
+    public List<PayOrder> dayOilTypeSources(PayOrder payOrder);
 }

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/service/IStationClassStructureService.java

@@ -119,4 +119,23 @@ public interface IStationClassStructureService
      */
 
     public List<StationClassStructure> listPayStructure(StationClassStructure classStructure);
+
+    /**
+     * 按员工支付方式汇总
+     * @param stationClassStructure
+     * @return
+     */
+    public StationClassStructure listPersonnelPayStructureSum(StationClassStructure stationClassStructure);
+    /**
+     * 按油品方式汇总
+     * @param stationClassStructure
+     * @return
+     */
+    public StationClassStructure listOilStructureSum(StationClassStructure stationClassStructure);
+    /**
+     * 按员工汇总
+     * @param stationClassStructure
+     * @return
+     */
+    public StationClassStructure listPersonnelStructureSum(StationClassStructure stationClassStructure);
 }

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/service/IStationClassesSummaryService.java

@@ -19,6 +19,10 @@ public interface IStationClassesSummaryService
      */
     public StationClassesSummary selectStationClassesSummaryById(Long id);
 
+    public StationClassesSummary selectStationClassesSummary(StationClassesSummary stationClassesSummary);
+
+
+
     /**
      * 查询【请填写功能名称】列表
      * 

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/service/IStationOilPriceService.java

@@ -58,4 +58,6 @@ public interface IStationOilPriceService
      * @return 结果
      */
     public int deleteStationOilPriceById(Long oilPriceId);
+
+    public List<StationOilPrice> oilNameInfo(StationOilPrice stationOilPrice);
 }

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/service/impl/PayOrderServiceImpl.java

@@ -200,4 +200,15 @@ public class PayOrderServiceImpl implements IPayOrderService
         return payOrderMapper.getPayOrderInfoMin(payOrder);
     }
 
+
+    /**
+     * 日报数据汇总
+     * @param payOrder
+     * @return
+     */
+    @Override
+    public List<PayOrder> dayOilTypeSources(PayOrder payOrder) {
+        return payOrderMapper.dayOilTypeSources(payOrder);
+    }
+
 }

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/service/impl/StationClassStructureServiceImpl.java

@@ -171,4 +171,34 @@ public class StationClassStructureServiceImpl implements IStationClassStructureS
         return stationClassStructureMapper.listPayStructure(classStructure);
     }
 
+    /**
+     * 按员工支付方式汇总
+     * @param stationClassStructure
+     * @return
+     */
+
+    @Override
+    public StationClassStructure listPersonnelPayStructureSum(StationClassStructure stationClassStructure) {
+        return stationClassStructureMapper.listPersonnelPayStructureSum(stationClassStructure);
+    }
+    /**
+     * 按油品方式汇总
+     * @param stationClassStructure
+     * @return
+     */
+    @Override
+    public StationClassStructure listOilStructureSum(StationClassStructure stationClassStructure) {
+        return stationClassStructureMapper.listOilStructureSum(stationClassStructure);
+    }
+
+    /**
+     * 按员工汇总
+     * @param stationClassStructure
+     * @return
+     */
+    @Override
+    public StationClassStructure listPersonnelStructureSum(StationClassStructure stationClassStructure) {
+        return stationClassStructureMapper.listPersonnelStructureSum(stationClassStructure);
+    }
+
 }

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/service/impl/StationClassesSummaryServiceImpl.java

@@ -31,6 +31,11 @@ public class StationClassesSummaryServiceImpl implements IStationClassesSummaryS
         return stationClassesSummaryMapper.selectStationClassesSummaryById(id);
     }
 
+    @Override
+    public StationClassesSummary selectStationClassesSummary(StationClassesSummary stationClassesSummary) {
+        return stationClassesSummaryMapper.selectStationClassesSummary(stationClassesSummary);
+    }
+
     /**
      * 查询【请填写功能名称】列表
      * 

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/service/impl/StationOilPriceServiceImpl.java

@@ -90,4 +90,12 @@ public class StationOilPriceServiceImpl implements IStationOilPriceService
     {
         return stationOilPriceMapper.deleteStationOilPriceById(oilPriceId);
     }
+
+    /**
+     * 查询当前油站对应的油品名称(不包括非油品)
+     */
+    @Override
+    public List<StationOilPrice> oilNameInfo(StationOilPrice stationOilPrice) {
+        return stationOilPriceMapper.oilNameInfo(stationOilPrice);
+    }
 }

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/service/impl/StationPayServiceImpl.java

@@ -147,6 +147,7 @@ public class StationPayServiceImpl implements IStationPayService
             pay.setIsNoOil(list.get(0).getIsNoOil());
             pay.setNotice(list.get(0).getNotice());
             pay.setIntegralPrintFlag(list.get(0).getIntegralPrintFlag());
+            pay.setIntegralFlag(list.get(0).getIntegralFlag());
             StationPic stationPic =new StationPic();
             stationPic.setStationId(pay.getStationId());
             stationPic.setParentId(pay.getPayId());

Yijia-SaaS/yijia-station/src/main/resources/mapper/station/PayOrderMapper.xml

@@ -221,6 +221,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         GROUP BY oil_type
     </select>
+    <select id="dayOilTypeSources" parameterType="Long" resultMap="PayOrderResult">
+        SELECT  oil_name,GROUP_CONCAT(DISTINCT oil_gun) as oil_gun,sum(order_liters) as order_liters,SUM(receivable_amt) as receivable_amt,
+        sum(discount_amt) as discount_amt,sum(discount_coupon_amt) as discount_coupon_amt,sum(amt) as amt,
+        sum(member_amt) as member_amt,sum(wx_amt) as wx_amt,sum(zfb_amt) as zfb_amt
+        from pay_order
+        <where>
+            <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="status != null "> and status = #{status}</if>
+            <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
+            <if test="createdDate != null "> and created_date = #{createdDate}</if>
+            <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%Y-%m-%d %H:%i:%s')
+            </if>
+            <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                AND date_format(created_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
+            </if>
+            <if test="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        GROUP BY oil_name
+    </select>
     <select id="selectOverViewData" parameterType="Long" resultMap="PayOrderResult">
         SELECT SUM(wx_amt) as wx_amt,sum(zfb_amt) as zfb_amt, sum(pos_amt) as pos_amt, sum(xj_amt) as xj_amt,sum(didi_app_amt) as didi_app_amt,sum(ty_app_amt) as ty_app_amt,sum(other_amt) as other_amt,sum(member_amt) as member_amt
         from pay_order

Yijia-SaaS/yijia-station/src/main/resources/mapper/station/StationClassStructureMapper.xml

@@ -198,7 +198,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
 		GROUP BY pay_type,dict_label
     </select>
-<!--  导出数据-->
+<!--  根据支付方式汇总数据-->
+    <select id="listOilStructureSum" parameterType="StationClassStructure" resultMap="StationClassStructureResult">
+        SELECT SUM(amt) as amt,SUM(amt) as amt,SUM(order_liters)  as order_liters,sum(order_no) as order_no
+        from (SELECT a.station_id, a.oil_name,GROUP_CONCAT(DISTINCT oil_gun) as oil_gun,ROUND(SUM(a.amt),2) as amt,ROUND(SUM(a.receivable_amt),2) as receivable_amt,ROUND(SUM(a.received_amt),2) as received_amt,ROUND(SUM(order_liters),2) as order_liters,ROUND(SUM(a.discount_amt),2) as discount_amt ,COUNT(order_no) as order_no,a.class_start_date,a.class_structure_date,a.class_structure_man,sum(a.print_num) print_num
+        from station_class_structure a
+        <where>
+            <if test="stationId != null "> and a.station_id = #{stationId}</if>
+            <if test="classStructureNo != null and classStructureNo != ''"> and class_structure_no = #{classStructureNo}</if>
+        </where>
+        GROUP BY a.oil_name,a.station_id,a.class_start_date,a.class_structure_date,a.class_structure_man) c
+    </select>
+
+    <!--按员工/支付方式汇总数据-->
+    <select id="listPersonnelPayStructureSum" parameterType="StationClassStructure" resultMap="StationClassStructureResult">
+        SELECT sum(wx_num) wx_num,sum(zfb_num) zfb_num,sum(xj_num) xj_num,sum(discount_amt) discount_amt,SUM(discount_coupon_amt) discount_coupon_amt,SUM(wx_amt) wx_amt,SUM(zfb_amt) zfb_amt,SUM(xj_amt) xj_amt,sum(member_amt) member_amt
+        from (SELECT oil_personnel,GROUP_CONCAT(DISTINCT oil_gun) oil_gun,count(wx_amt) wx_num,count(zfb_amt) zfb_num,count(xj_amt) xj_num,sum(discount_amt) discount_amt,SUM(discount_coupon_amt) discount_coupon_amt,SUM(wx_amt) wx_amt,SUM(zfb_amt) zfb_amt,SUM(xj_amt) xj_amt,sum(member_amt) member_amt
+        from  station_class_structure
+        <where>
+            <if test="stationId != null and stationId != ''"> and station_id = #{stationId}</if>
+            <if test="classStructureNo != null and classStructureNo != ''"> and class_structure_no = #{classStructureNo}</if>
+            <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
+        </where>
+        GROUP BY oil_personnel) a
+    </select>
+
+    <select id="listPersonnelStructureSum" parameterType="StationClassStructure" resultMap="StationClassStructureResult">
+        SELECT SUM(amt) as amt,SUM(order_liters) as order_liters,SUM(order_no) as order_no
+        from ( SELECT a.oil_personnel,GROUP_CONCAT(DISTINCT a.oil_gun) as oil_gun,ROUND(SUM(a.amt),2) as amt,ROUND(SUM(order_liters),2) as order_liters,COUNT(order_no) as order_no
+        from station_class_structure a
+        <where>
+            <if test="stationId != null "> and a.station_id = #{stationId}</if>
+            <if test="classStructureNo != null and classStructureNo != ''"> and class_structure_no = #{classStructureNo}</if>
+            <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
+        </where>
+        GROUP BY a.oil_personnel ) b
+    </select>
     <select id="selectStationClassStructureExport" parameterType="StationClassStructure" resultMap="StationClassStructureResult">
         <include refid="selectStationClassStructureVo"/>
         <where>
@@ -242,9 +277,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="memberAmt != null "> and member_amt = #{memberAmt}</if>
             <if test="carNo != null  and carNo != ''"> and car_no = #{carNo}</if>
             <if test="customerPhone != null  and customerPhone != ''"> and customer_phone = #{customerPhone}</if>
-            <if test="likePayDate != null  and likePayDate != ''">
-              and date_format(pay_date,'%Y-%m-%d') = date_format(#{likePayDate},'%Y-%m-%d')
-            </if>
         </where>
         order by  id desc
     </select>

Yijia-SaaS/yijia-station/src/main/resources/mapper/station/StationClassesSummaryMapper.xml

@@ -55,7 +55,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by id desc
     </select>
-    
+    <select id="selectStationClassesSummary" parameterType="StationClassesSummary" resultMap="StationClassesSummaryResult">
+        <include refid="selectStationClassesSummaryVo"/>
+        <where>
+            <if test="classesNo != null  and classesNo != ''"> and classes_no = #{classesNo}</if>
+            <if test="startDate != null "> and start_date = #{startDate}</if>
+            <if test="endDate != null "> and end_date = #{endDate}</if>
+            <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
+            <if test="orderNum != null "> and order_num = #{orderNum}</if>
+            <if test="printNum != null "> and print_num = #{printNum}</if>
+            <if test="saleLiters != null "> and sale_liters = #{saleLiters}</if>
+            <if test="saleAmt != null "> and sale_amt = #{saleAmt}</if>
+            <if test="amt != null "> and amt = #{amt}</if>
+            <if test="discountAmt != null "> and discount_amt = #{discountAmt}</if>
+            <if test="wxAmt != null "> and wx_amt = #{wxAmt}</if>
+            <if test="zfbAmt != null "> and zfb_amt = #{zfbAmt}</if>
+            <if test="dzkAmt != null "> and dzk_amt = #{dzkAmt}</if>
+            <if test="classesMan != null  and classesMan != ''"> and classes_man = #{classesMan}</if>
+            <if test="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        order by id desc
+        limit 1;
+    </select>
+
     <select id="selectStationClassesSummaryById" parameterType="Long" resultMap="StationClassesSummaryResult">
         <include refid="selectStationClassesSummaryVo"/>
         where id = #{id}

Yijia-SaaS/yijia-station/src/main/resources/mapper/station/StationOilPriceMapper.xml

@@ -34,6 +34,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
         </where>
     </select>
+    <select id="oilNameInfo" parameterType="StationOilPrice" resultMap="StationOilPriceResult">
+        <include refid="selectStationOilPriceVo"/>
+        <where>
+            <if test="oilName != null  and oilName != ''"> and oil_name like concat('%', #{oilName}, '%')</if>
+            <if test="oilPrice != null  and oilPrice != ''"> and oil_price = #{oilPrice}</if>
+            <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="stationNanme != null  and stationNanme != ''"> and station_nanme = #{stationNanme}</if>
+            <if test="date != null "> and date = #{date}</if>
+            <if test="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            and oil_name!="非油品"
+        </where>
+    </select>
+
     
     <select id="selectStationOilPriceById" parameterType="Long" resultMap="StationOilPriceResult">
         <include refid="selectStationOilPriceVo"/>

Yijia-SaaS/yijia-station/src/main/resources/mapper/station/StationPayMapper.xml

@@ -22,10 +22,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isNoOil"    column="is_no_oil"    />
         <result property="notice"    column="notice"    />
         <result property="integralPrintFlag"    column="integral_print_flag"    />
+        <result property="integralFlag"    column="integral_flag"    />
     </resultMap>
 
     <sql id="selectStationPayVo">
-        select pay_id, pay_mode, station_id, station_name, image_photos_flag, card_enabled_flag, activity_pic, preferential_way_share_flag, other_preferential_way, pay_print_num, pay_callback_page, ws_print_flag, print_setting, discount_setting, is_no_oil,notice,integral_print_flag from station_pay
+        select integral_flag,pay_id, pay_mode, station_id, station_name, image_photos_flag, card_enabled_flag, activity_pic, preferential_way_share_flag, other_preferential_way, pay_print_num, pay_callback_page, ws_print_flag, print_setting, discount_setting, is_no_oil,notice,integral_print_flag from station_pay
     </sql>
 
     <select id="selectStationPayList" parameterType="StationPay" resultMap="StationPayResult">
@@ -47,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isNoOil != null  and isNoOil != ''"> and is_no_oil = #{isNoOil}</if>
             <if test="notice != null  and notice != ''"> and notice = #{notice}</if>
             <if test="integralPrintFlag != null  and integralPrintFlag != ''"> and integral_print_flag = #{integralPrintFlag}</if>
+            <if test="integralFlag != null  and integralFlag != ''"> and integral_flag = #{integralFlag}</if>
             <if test="stationIdList != null ">
                 and station_id in
                 <foreach item="item" index="index" collection="stationIdList"
@@ -82,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isNoOil != null">is_no_oil,</if>
             <if test="notice != null">notice,</if>
             <if test="integralPrintFlag != null">integral_print_flag,</if>
+            <if test="integralFlag != null">integral_flag,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="payMode != null">#{payMode},</if>
@@ -100,6 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isNoOil != null">#{isNoOil},</if>
             <if test="notice != null">#{notice},</if>
             <if test="integralPrintFlag != null">#{integralPrintFlag},</if>
+            <if test="integralFlag != null">#{integralFlag},</if>
          </trim>
     </insert>
 
@@ -122,6 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isNoOil != null">is_no_oil = #{isNoOil},</if>
             <if test="notice != null">notice = #{notice},</if>
             <if test="integralPrintFlag != null">  integral_print_flag = #{integralPrintFlag},</if>
+            <if test="integralFlag != null">  integral_flag = #{integralFlag},</if>
         </trim>
         where pay_id = #{payId}
     </update>