From b2b628979e529ac6afb87a0d0fdee6b00a2565a6 Mon Sep 17 00:00:00 2001 From: gjh <1421wake> Date: Wed, 23 Apr 2025 14:16:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=BD=93=E6=9C=88=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=B7=B2=E7=BB=8F=E8=AF=84=E4=BC=B0=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EvaluationInfoController.java | 14 ++++++++++++++ .../dromara/platform/domain/EvaluationInfo.java | 2 ++ .../platform/service/IEvaluationInfoService.java | 10 ++++++++++ .../service/impl/EvaluationInfoServiceImpl.java | 9 +++++++++ 4 files changed, 35 insertions(+) diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/EvaluationInfoController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/EvaluationInfoController.java index eff00bd..2fd3779 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/EvaluationInfoController.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/EvaluationInfoController.java @@ -1,12 +1,15 @@ package org.dromara.platform.controller; +import java.util.Date; import java.util.List; import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import org.apache.ibatis.annotations.Param; import org.dromara.platform.domain.dto.EvaluationDto; +import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -119,4 +122,15 @@ public class EvaluationInfoController extends BaseController { evaluationInfoService.addBySelect(dto); return R.ok("创建成功!"); } + + + + @SaCheckPermission("platform:evaluationInfo:isScoreExits") + @GetMapping("/isScoreExits") + public R isScoreExits(EvaluationInfoBo bo) { + Date checkTime = bo.getCheckTime(); + String ioCompany = bo.getIoCompany(); + Boolean flag = evaluationInfoService.isScoreExits(ioCompany,checkTime); + return R.ok(flag); + } } diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/EvaluationInfo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/EvaluationInfo.java index 82b3833..bd5742c 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/EvaluationInfo.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/EvaluationInfo.java @@ -5,6 +5,7 @@ import org.dromara.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serial; import java.util.Date; @@ -48,6 +49,7 @@ public class EvaluationInfo extends TenantEntity { * 考核时间 */ @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM") private Date checkTime; /** diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IEvaluationInfoService.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IEvaluationInfoService.java index fed5ca3..5c9208d 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IEvaluationInfoService.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IEvaluationInfoService.java @@ -7,6 +7,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; import java.util.Collection; +import java.util.Date; import java.util.List; /** @@ -70,4 +71,13 @@ public interface IEvaluationInfoService { void addBySelect(EvaluationDto dto); TableDataInfo queryPageListForScore(EvaluationInfoBo bo, PageQuery pageQuery); + + + /** + * 判断运维单位当月是否已评分 + * @param ioCompany + * @param checkTime + * @return + */ + Boolean isScoreExits(String ioCompany, Date checkTime); } diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/EvaluationInfoServiceImpl.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/EvaluationInfoServiceImpl.java index ffc8828..34feae1 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/EvaluationInfoServiceImpl.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/EvaluationInfoServiceImpl.java @@ -1,6 +1,7 @@ package org.dromara.platform.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; import jakarta.annotation.Resource; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; @@ -206,6 +207,14 @@ public class EvaluationInfoServiceImpl implements IEvaluationInfoService { return TableDataInfo.build(result); } + @Override + public Boolean isScoreExits(String ioCompany, Date checkTime) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(EvaluationInfo::getIoCompany, ioCompany); + queryWrapper.eq(EvaluationInfo::getCheckTime, checkTime); + return baseMapper.selectCount(queryWrapper) < 1; + } + private LambdaQueryWrapper buildQueryWrapperForScore(EvaluationInfoBo bo) { Map params = bo.getParams();