From 37ae76ee922eb2b0837c8cd0dd24574d97e5a591 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 11 Sep 2023 15:38:55 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=BE=E7=BD=AE=E4=BC=98=E8=B4=A8?= =?UTF-8?q?=E6=A0=87=E5=87=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../laws/common/constant/ResultCommon.java | 2 ++ ...rpriseStandardReviewMeetingController.java | 20 ++++++++++++++++++- .../entity/EnterpriseStandardPlan.java | 4 ++++ ...EnterpriseStandardReviewMeetingRecord.java | 4 ---- .../xml/EnterpriseStandardPlanMapper.xml | 3 ++- ...priseStandardReviewMeetingRecordMapper.xml | 6 +++--- ...iseStandardReviewMeetingRecordService.java | 6 ++++++ ...tandardReviewMeetingRecordServiceImpl.java | 15 ++++++++++++-- .../main/resources/i18n/messages.properties | 3 ++- .../resources/i18n/messages_en.properties | 3 ++- .../resources/i18n/messages_zh.properties | 5 +++-- 11 files changed, 56 insertions(+), 15 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java index e7b69330..07199fc0 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java @@ -13,4 +13,6 @@ public class ResultCommon { public static final String ERROR = "message.error"; // 操作失败 + public static final String RMR_SET_QUALITY_OVER_TEN = "es.rmr.setQuality.overTen"; // 请最多选择10条 + } 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 6346779e..19aecb4e 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 @@ -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.EnterpriseStandardReviewMeetingRecord; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardRmrEvaluateDetail; import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; @@ -17,7 +19,6 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.Arrays; import java.util.List; -import java.util.List; import java.util.Map; @@ -63,4 +64,21 @@ public class EnterpriseStandardReviewMeetingController extends JeroController> resultMap = esReviewMeetingService.evaluateDetail(id); return Result.OK(resultMap); } + + /** + * 分页列表查询 + * + * @return + */ + @AutoLog(value = "企标评审会-设置优质标准") + @ApiOperation(value="企标评审会-设置优质标准", notes="企标评审会-设置优质标准") + @GetMapping(value = "/setQualityStandards") + public Result setQualityStandards(@RequestParam String standardNos) { + List standardNoList = Arrays.asList(standardNos.split(",")); + if (standardNoList.size() > 10) { + return Result.error(MessageUtils.getMessage(ResultCommon.RMR_SET_QUALITY_OVER_TEN)); + } + esReviewMeetingService.setQualityStandards(standardNoList); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); + } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlan.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlan.java index 592c0546..b2318e16 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlan.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlan.java @@ -183,4 +183,8 @@ public class EnterpriseStandardPlan implements Serializable { @ApiModelProperty(value = "附件") private String attachement; + + /**是否为优质标准*/ + @ApiModelProperty(value = "是否为优质标准") + private String qualityFlag; } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardReviewMeetingRecord.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardReviewMeetingRecord.java index 6d42582f..e4927bad 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardReviewMeetingRecord.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardReviewMeetingRecord.java @@ -71,8 +71,4 @@ public class EnterpriseStandardReviewMeetingRecord implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "评审日期") private Date reviewDate; - - /**是否为优质标准*/ - @ApiModelProperty(value = "是否为优质标准") - private String qualityFlag; } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml index 22203722..fde2ae12 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml @@ -55,6 +55,7 @@ + @@ -74,6 +75,6 @@ review_date,approval_date,release_date, change_status,project_background,similar_na_standards_analysis, similar_en_standards_analysis,standard_leading_necessity,project_expected_effects, - remarks,attachement + remarks,attachement,qualityFlag diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml index 945842d3..c6ee38ba 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml @@ -14,7 +14,6 @@ -