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