From c8541699bf8864f1cb084fee1f8d225d90f2ac52 Mon Sep 17 00:00:00 2001 From: niujiyi <18272501226@163.com> Date: Fri, 15 May 2026 14:47:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF-=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B7=AF=E5=BE=84=EF=BC=8C=E8=B7=9F=E6=96=B0?= =?UTF-8?q?=E8=AF=84=E4=BB=B7=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/enterprise/AppEnforcementCarouselBannerController.java | 2 +- .../app/enterprise/AppEnforcementLawCheckPlanController.java | 2 +- .../app/enterprise/AppEnforcementLawNoticeController.java | 2 +- .../enterprise/AppEnforcementLawNoticeFeedbackController.java | 2 +- .../app/enterprise/AppEnterpriseEvaluateController.java | 2 +- .../controller/app/enterprise/AppMessageViewLogController.java | 2 +- .../controller/app/enterprise/AppNoticeInfoController.java | 2 +- .../controller/app/enterprise/AppTodoItemController.java | 2 +- .../app/enterprise/EnforcementEducationServicesController.java | 2 +- .../service/impl/EnterpriseEvaluateServiceImpl.java | 2 ++ .../mapper/enforcementcode/EnforcementRegistrationMapper.xml | 2 +- 11 files changed, 12 insertions(+), 10 deletions(-) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnforcementCarouselBannerController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnforcementCarouselBannerController.java index 38d6e78d..ee3ac8de 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnforcementCarouselBannerController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnforcementCarouselBannerController.java @@ -32,7 +32,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/app/enterprise/carouselBanner") +@RequestMapping("/app-ent/enterprise/carouselBanner") public class AppEnforcementCarouselBannerController extends BaseController { private final IEnforcementCarouselBannerService enforcementCarouselBannerService; diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnforcementLawCheckPlanController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnforcementLawCheckPlanController.java index db5d77ea..486fb6c9 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnforcementLawCheckPlanController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnforcementLawCheckPlanController.java @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/app/enterprise/lawCheckPlan") +@RequestMapping("/app-ent/enterprise/lawCheckPlan") public class AppEnforcementLawCheckPlanController extends BaseController { private final IEnforcementLawCheckPlanService enforcementLawCheckPlanService; diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnforcementLawNoticeController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnforcementLawNoticeController.java index c571d308..456191c0 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnforcementLawNoticeController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnforcementLawNoticeController.java @@ -33,7 +33,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/app/enterprise/lawNotice") +@RequestMapping("/app-ent/enterprise/lawNotice") public class AppEnforcementLawNoticeController extends BaseController { private final IEnforcementLawNoticeService enforcementLawNoticeService; diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnforcementLawNoticeFeedbackController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnforcementLawNoticeFeedbackController.java index 1a41df6a..c61ff333 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnforcementLawNoticeFeedbackController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnforcementLawNoticeFeedbackController.java @@ -32,7 +32,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/app/enforcementcode/lawNoticeFeedback") +@RequestMapping("/app-ent/enforcementcode/lawNoticeFeedback") public class AppEnforcementLawNoticeFeedbackController extends BaseController { private final IEnforcementLawNoticeFeedbackService enforcementLawNoticeFeedbackService; diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseEvaluateController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseEvaluateController.java index 29ff97f7..70c9032d 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseEvaluateController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseEvaluateController.java @@ -34,7 +34,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/app/enterprise/evaluate") +@RequestMapping("/app-ent/enterprise/evaluate") public class AppEnterpriseEvaluateController extends BaseController { private final IEnterpriseEvaluateService enterpriseEvaluateService; diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppMessageViewLogController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppMessageViewLogController.java index 8feb4dee..a9c6a2b3 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppMessageViewLogController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppMessageViewLogController.java @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/app/enterprise/messageViewLog") +@RequestMapping("/app-ent/enterprise/messageViewLog") public class AppMessageViewLogController extends BaseController { private final ISysMessageViewLogService sysMessageViewLogService; diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppNoticeInfoController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppNoticeInfoController.java index ed7863e6..63f7ebd7 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppNoticeInfoController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppNoticeInfoController.java @@ -32,7 +32,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/app/enterprise/noticeInfo") +@RequestMapping("/app-ent/enterprise/noticeInfo") public class AppNoticeInfoController extends BaseController { private final ISysNoticeInfoService sysNoticeInfoService; diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppTodoItemController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppTodoItemController.java index d66521ef..fb4234cb 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppTodoItemController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppTodoItemController.java @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/app/enterprise/todoitem") +@RequestMapping("/app-ent/enterprise/todoitem") public class AppTodoItemController extends BaseController { private final ITodoItemService todoItemService; diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/EnforcementEducationServicesController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/EnforcementEducationServicesController.java index 27cdb24f..19a570e1 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/EnforcementEducationServicesController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/EnforcementEducationServicesController.java @@ -27,7 +27,7 @@ import org.springframework.web.bind.annotation.RestController; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/app/enforcementcode/educationServices") +@RequestMapping("/app-ent/enforcementcode/educationServices") public class EnforcementEducationServicesController extends BaseController { private final IEnforcementEducationServicesService enforcementEducationServicesService; diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseEvaluateServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseEvaluateServiceImpl.java index d7c6ea6d..bfc06900 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseEvaluateServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseEvaluateServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.zdxt.enforcementcode.domain.EnforcementRegistration; import com.zdxt.enforcementcode.domain.vo.enterprise.AppEnforcementRegistrationVo; import com.zdxt.enforcementcode.mapper.enterprise.AppEnforcementRegistrationMapper; +import org.dromara.common.core.utils.DateUtils; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -122,6 +123,7 @@ public class EnterpriseEvaluateServiceImpl implements IEnterpriseEvaluateService LambdaUpdateWrapper lqw = new LambdaUpdateWrapper<>(); lqw.eq(EnforcementRegistration::getId, bo.getEnforcementId()); lqw.set(EnforcementRegistration::getHasEvaluate, bo.getHasEvaluate()); + lqw.set(EnforcementRegistration::getUpdateTime, DateUtils.getNowDate()); flag= appEnforcementRegistrationMapper.update(lqw)>0; if (flag) { bo.setId(add.getId()); diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml index 5403bfd8..6287163a 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml @@ -106,7 +106,7 @@ AND is_delete = 0 - ORDER BY id DESC + ORDER BY update_time DESC