sun15684712291/sdwu_dw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

接口名称改进

Browse Source
This commit is contained in:
sunyg
2025-09-23 10:11:05 +08:00
parent 0fa07d8907
commit 31304b4630
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ruoyi-dw/src/main/java/com/ruoyi/dw/controller/XyCheckController.java
View File

@@ -59,7 +59,7 @@ public class XyCheckController extends BaseController {
* 修改考核状态 * 修改考核状态
* @return * @return
*/ */
@PutMapping("/status") @PutMapping("/dwStatus")
public AjaxResult updateStatus(@RequestBody DataCheckStatus checkStatus) { public AjaxResult updateStatus(@RequestBody DataCheckStatus checkStatus) {
Calendar startTime = Calendar.getInstance(); Calendar startTime = Calendar.getInstance();
startTime.setTime(checkStatus.getBeginDate()); startTime.setTime(checkStatus.getBeginDate());
@@ -85,7 +85,7 @@ public class XyCheckController extends BaseController {
* 修改考核状态 * 修改考核状态
* @return * @return
*/ */
@PutMapping("/dwStatus") @PutMapping("/cjStatus")
public AjaxResult updateDwStatus(@RequestBody DataCheckStatus checkStatus) { public AjaxResult updateDwStatus(@RequestBody DataCheckStatus checkStatus) {
Calendar startTime = Calendar.getInstance(); Calendar startTime = Calendar.getInstance();
startTime.setTime(checkStatus.getBeginDate()); startTime.setTime(checkStatus.getBeginDate());
@@ -193,24 +193,18 @@ public class XyCheckController extends BaseController {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
// 把周几转成 Java 的 DayOfWeek // 把周几转成 Java 的 DayOfWeek
DayOfWeek targetDay = DayOfWeek.of(weekDay); DayOfWeek targetDay = DayOfWeek.of(weekDay);
LocalTime targetTime = LocalTime.parse(timeStr); LocalTime targetTime = LocalTime.parse(timeStr);
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
// 找到最近一次目标星期+时间（可能是本周，也可能是上周） // 找到最近一次目标星期+时间（可能是本周，也可能是上周）
LocalDate targetDate = now.toLocalDate() LocalDate targetDate = now.toLocalDate()
.with(TemporalAdjusters.previousOrSame(targetDay)); .with(TemporalAdjusters.previousOrSame(targetDay));
LocalDateTime startDateTime = LocalDateTime.of(targetDate, targetTime); LocalDateTime startDateTime = LocalDateTime.of(targetDate, targetTime);
// 如果今天就是目标日但时间还没到，就回退一周 // 如果今天就是目标日但时间还没到，就回退一周
if (now.isBefore(startDateTime)) { if (now.isBefore(startDateTime)) {
startDateTime = startDateTime.minusWeeks(1); startDateTime = startDateTime.minusWeeks(1);
} }
// 结束时间是起始时间 + 1 周 // 结束时间是起始时间 + 1 周
LocalDateTime endDateTime = startDateTime.plusWeeks(1); LocalDateTime endDateTime = startDateTime.plusWeeks(1);
return new String[]{formatter.format(startDateTime.minusWeeks(1)), formatter.format(endDateTime.minusWeeks(1))}; return new String[]{formatter.format(startDateTime.minusWeeks(1)), formatter.format(endDateTime.minusWeeks(1))};
} }