From 79841a6a5ecd713a9f02d23552619cbba1c991ad Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 06 三月 2026 17:42:40 +0800
Subject: [PATCH] fix:班次页面问题修复
---
performance-server/src/main/java/com/ruoyi/performance/controller/PerformanceShiftController.java | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/performance-server/src/main/java/com/ruoyi/performance/controller/PerformanceShiftController.java b/performance-server/src/main/java/com/ruoyi/performance/controller/PerformanceShiftController.java
index ecdabdb..ab52560 100644
--- a/performance-server/src/main/java/com/ruoyi/performance/controller/PerformanceShiftController.java
+++ b/performance-server/src/main/java/com/ruoyi/performance/controller/PerformanceShiftController.java
@@ -3,6 +3,7 @@
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.common.core.domain.entity.SysDictData;
@@ -55,6 +56,18 @@
@Resource
private UserService userService;
+ @ApiOperation(value = "缂栬緫鎵规敞鍐呭")
+ @PostMapping("editAnnotationText")
+ public Result<?> editAnnotationText(@RequestBody PerformanceShift performanceShift){
+ return Result.success(performanceShiftService.editAnnotationText(performanceShift));
+ }
+
+ @ApiOperation(value = "鍒犻櫎鎵规敞鍐呭")
+ @DeleteMapping("delAnnotationText/{id}")
+ public Result<?> delAnnotationText(@PathVariable("id") Integer id){
+ return Result.success(performanceShiftService.update(Wrappers.<PerformanceShift>lambdaUpdate().set(PerformanceShift::getAnnotationText,null).eq(PerformanceShift::getId,id)));
+ }
+
@ApiOperation(value = "鎺掔彮")
@PostMapping("add")
public Result<?> performanceShiftAdd(@RequestBody PerformanceShiftAddDto performanceShiftAddDto) {
@@ -62,20 +75,20 @@
return Result.success();
}
- @ApiOperation(value = "鏈堜唤鍒嗛〉鏌ヨ")
- @PostMapping("page")
- public Result<?> performanceShiftPage(Integer size, Integer current, String time, String userName, String laboratory) {
- return Result.success(performanceShiftService.performanceShiftPage(new Page<>(current, size), time, userName, laboratory));
+ @ApiOperation(value = "鏈堝害鐝鏌ヨ")
+ @GetMapping("page")
+ public Result<?> performanceShiftPage(String time, String userName, String laboratory) {
+ return Result.success(performanceShiftService.performanceShift(time, userName, laboratory));
}
- @ApiOperation(value = "骞翠唤鍒嗛〉鏌ヨ")
- @PostMapping("pageYear")
- public Result<?> performanceShiftPageYear(Integer size, Integer current, String time, String userName, String laboratory) {
- return Result.success(performanceShiftService.performanceShiftPageYear(new Page<>(current, size), time, userName, laboratory));
+ @ApiOperation(value = "骞村害鐝鏌ヨ")
+ @GetMapping("pageYear")
+ public Result<?> performanceShiftPageYear(String time, String userName, String laboratory) {
+ return Result.success(performanceShiftService.performanceShiftPageYear(time, userName, laboratory));
}
@ApiOperation(value = "鐝鐘舵�佷慨鏀�")
- @PutMapping("update")
+ @PostMapping("update")
public Result<?> performanceShiftUpdate(@RequestBody PerformanceShift performanceShift) {
performanceShiftService.performanceShiftUpdate(performanceShift);
return Result.success();
@@ -114,7 +127,6 @@
@ApiOperation(value = "涓存椂鎺ュ彛-娣诲姞7鏈堜唤8鏈堜唤鐨勬暟鎹�")
@GetMapping("temporaryInterface")
public void temporaryInterface() {
- System.out.println("寮�濮嬬粰姣忎釜浜鸿繘琛屾帓鐝�,榛樿鏃╃彮======start");
// TODO 缁欐瘡涓汉閮借繘琛屾帓鐝�(榛樿鏃╃彮)
PerformanceShiftAddDto performanceShiftAddDto = new PerformanceShiftAddDto();
//鐝--鏃�(鏌ヨ瀛楀吀)
@@ -140,13 +152,11 @@
endOfWeek = startOfWeek.plusDays(6);
LocalDateTime startDateTime = LocalDateTime.of(startOfWeek, LocalTime.MIDNIGHT);
LocalDateTime endDateTime = LocalDateTime.of(endOfWeek, LocalTime.MIDNIGHT);
- System.out.println("Week starts on " + startDateTime + " and ends on " + endDateTime);
performanceShiftAddDto.setStartWeek(startDateTime);
performanceShiftAddDto.setEndWeek(endDateTime);
performanceShiftService.performanceShiftAdd(performanceShiftAddDto);
startOfWeek = startOfWeek.plusWeeks(1);
}
- System.out.println("鎺掔彮缁撴潫======end");
}
}
--
Gitblit v1.9.3