From f50da3afc73bc458640677c198bb7c99de5b2fe5 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期一, 09 三月 2026 17:33:45 +0800
Subject: [PATCH] fix(mybatis): 修正createUser和updateUser填充值类型空值处理
---
src/main/java/com/ruoyi/staff/controller/PersonalShiftController.java | 98 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 98 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/controller/PersonalShiftController.java b/src/main/java/com/ruoyi/staff/controller/PersonalShiftController.java
new file mode 100644
index 0000000..85ff013
--- /dev/null
+++ b/src/main/java/com/ruoyi/staff/controller/PersonalShiftController.java
@@ -0,0 +1,98 @@
+package com.ruoyi.staff.controller;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
+import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.staff.dto.PerformanceShiftAddDto;
+import com.ruoyi.staff.pojo.PersonalAttendanceLocationConfig;
+import com.ruoyi.staff.pojo.PersonalShift;
+import com.ruoyi.staff.service.PersonalAttendanceLocationConfigService;
+import com.ruoyi.staff.service.PersonalShiftService;
+import com.ruoyi.staff.utils.StyleMonthUtils;
+import com.ruoyi.staff.utils.StyleYearUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotNull;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-05 03:52:19
+ */
+@RestController
+@RequestMapping("/personalShift")
+@Api(tags = "浜哄憳鎺掔彮")
+public class PersonalShiftController {
+
+ @Autowired
+ private PersonalShiftService personalShiftService;
+
+ @ApiOperation("浜哄憳鎺掔彮")
+ @PostMapping("/add")
+ public R add(@RequestBody PerformanceShiftAddDto performanceShiftAddDto){
+ return R.ok(personalShiftService.performanceShiftAdd(performanceShiftAddDto));
+ }
+
+ @ApiOperation(value = "鏈堜唤鍒嗛〉鏌ヨ")
+ @GetMapping("page")
+ public R performanceShiftPage(Integer size, Integer current, String time, String userName, Integer sysDeptId) {
+ return R.ok(personalShiftService.performanceShiftPage(new Page<>(current, size), time, userName, sysDeptId));
+ }
+
+ @ApiOperation(value = "骞翠唤鍒嗛〉鏌ヨ")
+ @GetMapping("pageYear")
+ public R performanceShiftPageYear(Integer size, Integer current, String time, String userName, Integer sysDeptId) {
+ return R.ok(personalShiftService.performanceShiftPageYear(new Page<>(current, size), time, userName, sysDeptId));
+ }
+
+ @ApiOperation(value = "鐝鐘舵�佷慨鏀�")
+ @PostMapping("update")
+ public R performanceShiftUpdate(@RequestBody PersonalShift personalShift) {
+ personalShiftService.performanceShiftUpdate(personalShift);
+ return R.ok();
+ }
+
+ @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;
+ response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+ response.setHeader("requestType","excel");
+ response.setHeader("Access-Control-Expose-Headers", "requestType");
+ if (!isMonth) {
+ data = personalShiftService.exportToYearExcel(time, userName, sysDeptId);
+ // 璁剧疆鍗曞厓鏍兼牱寮�
+ HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(StyleYearUtils.getHeadStyle(), StyleYearUtils.getContentStyle());
+ // 淇濆瓨鍒扮涓�涓猻heet涓�
+ EasyExcel.write(response.getOutputStream())
+ .head((List<List<String>>) data.get("header"))
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) // 鑷�傚簲鍒楀
+ .registerWriteHandler(horizontalCellStyleStrategy)
+ .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())
+ .head((List<List<String>>) data.get("header"))
+ .registerWriteHandler(horizontalCellStyleStrategy)
+ .sheet("鏈堝害")
+ .doWrite((Collection<?>) data.get("data"));
+ }
+ }
+
+
+}
--
Gitblit v1.9.3