pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml
@@ -250,7 +250,7 @@ <!--获取指定日期、指定收银员、指定支付方式实收金额合计--> <select id="getPaymentSums" resultType="java.lang.Float"> SELECT SUM(ope.trade_amount) AS tradeAmount (SUM(ope.trade_amount) + SUM(ope.card_cost)) AS tradeAmount FROM se_card_operate ope <where> AND ope.operate_valid = 2 @@ -305,6 +305,7 @@ INNER JOIN ba_user us ON us.id = ope.operator <where> AND ope.operate_type IN(1,2,3,4,5) AND ope.operate_valid = 2 <if test = "cashierId != null and cashierId > 0"> AND us.id = #{cashierId} </if> pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java
@@ -226,19 +226,12 @@ @SneakyThrows(IOException.class) @RequestMapping(value = "/export", method = RequestMethod.GET) public void export(HttpServletResponse response, QueryVo vo) { //setExcelRespProp(response, "控制器列表"); List<VoController> controllerList = controllerSv.export(vo); ExcelUtil.setExcelRespProp(response, "控制器列表" + LocalDate.now()); EasyExcel.write(response.getOutputStream(), VoController.class) .registerWriteHandler(new CellWriteHandler("控制器列表")) .sheet("控制器") .doWrite(controllerList); //EasyExcel.write(response.getOutputStream()) // .head(VoController.class) // .excelType(ExcelTypeEnum.XLSX) // .sheet("控制器列表") // .doWrite(memberList); } /**
