From 0e420d68f407fde240709ac1800da20b0bb99490 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 09 六月 2026 16:06:16 +0800
Subject: [PATCH] feat：反审核操作。可以对已审核的订单进行反审核，反审核的时候可以选择作废还是重新生成一条，并记录反审核描述。选择作废的话则不生成新增订单。选择重新生成的话则跳转到新增台账页面对反审核的销售产品进行编辑保存重新生成一条新增的订单。反审核的订单即使是发货了还是可以反审核，并且需要将对应的入库、出库、发货进行作废。
---
src/main/java/com/ruoyi/staff/controller/PersonalShiftController.java | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/controller/PersonalShiftController.java b/src/main/java/com/ruoyi/staff/controller/PersonalShiftController.java
index 85ff013..130d588 100644
--- a/src/main/java/com/ruoyi/staff/controller/PersonalShiftController.java
+++ b/src/main/java/com/ruoyi/staff/controller/PersonalShiftController.java
@@ -17,6 +17,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.NotNull;
import java.util.Collection;
@@ -67,31 +68,42 @@
@ApiOperation(value = "瀵煎嚭")
@GetMapping("export")
public void exportToExcel(@NotNull(message = "鏃堕棿涓嶈兘涓虹┖锛�") String time, String userName, Integer sysDeptId, Boolean isMonth, HttpServletResponse response) throws Exception {
- Map<Object, Object> data;
+ ServletOutputStream out = response.getOutputStream();
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
- response.setHeader("requestType","excel");
- response.setHeader("Access-Control-Expose-Headers", "requestType");
+ response.setCharacterEncoding("utf-8");
+ response.setHeader("Content-Disposition", "attachment;filename*=UTF-8''" + time + ".xlsx");
+
if (!isMonth) {
- data = personalShiftService.exportToYearExcel(time, userName, sysDeptId);
- // 璁剧疆鍗曞厓鏍兼牱寮�
- HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(StyleYearUtils.getHeadStyle(), StyleYearUtils.getContentStyle());
- // 淇濆瓨鍒扮涓�涓猻heet涓�
- EasyExcel.write(response.getOutputStream())
+ Map<Object, Object> data = personalShiftService.exportToYearExcel(time, userName, sysDeptId);
+
+ HorizontalCellStyleStrategy style = new HorizontalCellStyleStrategy(
+ StyleYearUtils.getHeadStyle(),
+ StyleYearUtils.getContentStyle()
+ );
+
+ EasyExcel.write(out)
.head((List<List<String>>) data.get("header"))
- .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) // 鑷�傚簲鍒楀
- .registerWriteHandler(horizontalCellStyleStrategy)
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .registerWriteHandler(style)
.sheet("骞村害")
.doWrite((Collection<?>) data.get("data"));
+
} else {
- data = personalShiftService.exportToMonthExcel(time, userName, sysDeptId);
- // 璁剧疆鍗曞厓鏍兼牱寮�
- HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(StyleMonthUtils.getHeadStyle(), StyleMonthUtils.getContentStyle());
- EasyExcel.write(response.getOutputStream())
+ Map<Object, Object> data = personalShiftService.exportToMonthExcel(time, userName, sysDeptId);
+
+ HorizontalCellStyleStrategy style = new HorizontalCellStyleStrategy(
+ StyleMonthUtils.getHeadStyle(),
+ StyleMonthUtils.getContentStyle()
+ );
+
+ EasyExcel.write(out)
.head((List<List<String>>) data.get("header"))
- .registerWriteHandler(horizontalCellStyleStrategy)
+ .registerWriteHandler(style)
.sheet("鏈堝害")
.doWrite((Collection<?>) data.get("data"));
}
+
+ out.flush();
}
--
Gitblit v1.9.3