|
|
@@ -11,6 +11,7 @@ import com.alibaba.fastjson.JSONObject;
|
|
|
import com.izouma.zhumj.domain.ShiftHandover;
|
|
|
import com.izouma.zhumj.dto.PageQuery;
|
|
|
import com.izouma.zhumj.dto.report.ShiftReport;
|
|
|
+import com.izouma.zhumj.enums.PayMethod;
|
|
|
import com.izouma.zhumj.excel.CellModel;
|
|
|
import com.izouma.zhumj.excel.ExcelUtil;
|
|
|
import com.izouma.zhumj.excel.RowModel;
|
|
|
@@ -249,7 +250,7 @@ public class ShiftHandoverController extends BaseController {
|
|
|
.addCell(CellModel.builder().startColumn(5).endColumn(6).value("房间").build())
|
|
|
.addCell(CellModel.builder().startColumn(7).endColumn(8).value("发生金额").build())
|
|
|
.addCell(CellModel.builder().startColumn(9).endColumn(11).value("时间").build())
|
|
|
- .addCell(CellModel.builder().startColumn(12).endColumn(14).value("付款方式").build())
|
|
|
+// .addCell(CellModel.builder().startColumn(12).endColumn(14).value("付款方式").build())
|
|
|
.build())
|
|
|
.writeRows(shiftReport.getDepositDetailList().stream().map(depositDetail -> RowModel.Builder()
|
|
|
.addCell(CellModel.builder().startColumn(0).endColumn(1)
|
|
|
@@ -261,9 +262,10 @@ public class ShiftHandoverController extends BaseController {
|
|
|
.value(depositDetail.getAmount().toString()).build())
|
|
|
.addCell(CellModel.builder().startColumn(9).endColumn(11).value(DateTimeUtils
|
|
|
.format(depositDetail.getTime(), DateTimeUtils.DATE_TIME_HHMMSS_FORMAT)).build())
|
|
|
- .addCell(CellModel.builder().startColumn(12).endColumn(14)
|
|
|
- .value(depositDetail.getPayMethod().getDescription())
|
|
|
- .build())
|
|
|
+// .addCell(CellModel.builder().startColumn(12).endColumn(14)
|
|
|
+// .value(Optional.ofNullable(depositDetail.getPayMethod()).orElse(PayMethod.CASH)
|
|
|
+// .getDescription())
|
|
|
+// .build())
|
|
|
.build()).collect(Collectors.toList()))
|
|
|
.to(response.getOutputStream());
|
|
|
}
|