From f84d9e69907cb678150eaa6393fd74cf042fcca4 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:39:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDeviceCalendarController.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDeviceCalendarController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDeviceCalendarController.java
index 6e02946..f0d7903 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDeviceCalendarController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDeviceCalendarController.java
@@ -82,9 +82,9 @@
return Result.error("璇烽�夋嫨鏈夋晥鍙傛暟锛�");
}
boolean result = mdcDeviceCalendarService.saveCalendar(calendarVo);
- if(result){
+ if (result) {
return Result.OK("淇濆瓨鎴愬姛");
- }else{
+ } else {
return Result.error("鏈�夋嫨鐝锛�");
}
}
@@ -113,30 +113,30 @@
@ApiOperation(value = "璁惧宸ヤ綔鏃ュ巻琛�-閫氳繃id鍒犻櫎", notes = "璁惧宸ヤ綔鏃ュ巻琛�-閫氳繃id鍒犻櫎")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+ Date date = new Date();
MdcDeviceCalendar mdcDeviceCalendar = mdcDeviceCalendarService.getById(id);
- String todayDay = DateUtils.format(new Date(), DateUtils.STRDATE);
+ String todayDay = DateUtils.format(date, DateUtils.STRDATE);
String effectiveDate = mdcDeviceCalendar.getEffectiveDate();
MdcSystemParameters mdcSystemParameters = mdcSystemParametersService.getOne(new LambdaQueryWrapper<MdcSystemParameters>().eq(MdcSystemParameters::getCode, "equip_log_statis_time"));
- boolean b = Integer.parseInt(todayDay) > Integer.parseInt(effectiveDate);
if (mdcSystemParameters != null) {
String time = mdcSystemParameters.getValue();
- Date keyDate = DateUtils.setTimeForDay(new Date(), time);
+ Date keyDate = DateUtils.setTimeForDay(date, time);
// 20230920 20230910 20230922
if (Integer.parseInt(todayDay) <= Integer.parseInt(effectiveDate)) {
mdcDeviceCalendarService.removeById(id);
return Result.OK("鍒犻櫎鎴愬姛!");
- } else if (b && keyDate.before(new Date())) {
+ } else if ((Integer.parseInt(todayDay) - Integer.parseInt(effectiveDate)) == 1 && keyDate.after(date)) {
mdcDeviceCalendarService.removeById(id);
return Result.OK("鍒犻櫎鎴愬姛!");
}
} else {
- if (b) {
- return Result.error("鍒犻櫎澶辫触!");
+ if (Integer.parseInt(todayDay) > Integer.parseInt(effectiveDate)) {
+ return Result.error("鍒犻櫎澶辫触!姝ら厤缃凡浣滀负璁惧鍩虹鏁版嵁璁＄畻鏁堢巼锛�");
}
mdcDeviceCalendarService.removeById(id);
return Result.OK("鍒犻櫎鎴愬姛!");
}
- return Result.error("鍒犻櫎澶辫触!");
+ return Result.error("鍒犻櫎澶辫触!姝ら厤缃凡浣滀负璁惧鍩虹鏁版嵁璁＄畻鏁堢巼锛�");
}
/**
--
Gitblit v1.9.3