From f901fe8371f3cc22fdb65109d7ffaea77d31e533 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 11 Sep 2023 18:04:02 +0800 Subject: [PATCH] =?UTF-8?q?ci:=20=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=80=BC=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EnterpriseStandardDeclareController.java | 5 +++-- .../controller/EnterpriseStandardInspectController.java | 7 +++---- .../EnterpriseStandardRecheckPlanController.java | 7 +++---- .../EnterpriseStandardReviewMeetingController.java | 4 ++-- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardDeclareController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardDeclareController.java index 9926f587..2246d670 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardDeclareController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardDeclareController.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; +import com.jero.common.util.MessageUtils; +import com.jero.modules.laws.common.constant.ResultCommon; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardDeclare; import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardDeclareVo; @@ -14,7 +16,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; /** @@ -44,6 +45,6 @@ public class EnterpriseStandardDeclareController extends JeroController pageList= esDeclareService.queryPageList(esDeclare, pageNo, pageSize); - return Result.OK(pageList); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK), pageList); } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java index a2ca6ddb..6adf5978 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java @@ -4,12 +4,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardDeclare; +import com.jero.common.util.MessageUtils; +import com.jero.modules.laws.common.constant.ResultCommon; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspect; import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; -import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardDeclareVo; import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardInspectVo; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardDeclareService; import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -49,6 +48,6 @@ public class EnterpriseStandardInspectController extends JeroController pageList= esInspectService.queryPageList(esInspect, pageNo, pageSize); - return Result.OK(pageList); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK), pageList); } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardRecheckPlanController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardRecheckPlanController.java index 27ffe9ec..afcbcbf0 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardRecheckPlanController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardRecheckPlanController.java @@ -4,12 +4,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardDeclare; +import com.jero.common.util.MessageUtils; +import com.jero.modules.laws.common.constant.ResultCommon; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardRecheckPlan; import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; -import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardDeclareVo; import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardRecheckPlanVo; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardDeclareService; import com.jero.modules.laws.enterprise.service.EnterpriseStandardRecheckPlanService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -49,6 +48,6 @@ public class EnterpriseStandardRecheckPlanController extends JeroController pageList= recheckPlanService.queryPageList(esDeclare, pageNo, pageSize); - return Result.OK(pageList); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK), pageList); } } \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardReviewMeetingController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardReviewMeetingController.java index 19aecb4e..bda4dfb5 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardReviewMeetingController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardReviewMeetingController.java @@ -49,7 +49,7 @@ public class EnterpriseStandardReviewMeetingController extends JeroController pageList = esReviewMeetingService.queryPageList(esReviewMeeting, pageNo, pageSize); - return Result.OK(pageList); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK), pageList); } /** @@ -62,7 +62,7 @@ public class EnterpriseStandardReviewMeetingController extends JeroController evaluateDetail(@PathVariable("id") String id) { Map> resultMap = esReviewMeetingService.evaluateDetail(id); - return Result.OK(resultMap); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK), resultMap); } /**