From 6626e45334a1f9dba9dd8e59893df74be8e70960 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=AE=B6=E4=B8=9C?= <1654135867@qq.com>
Date: Tue, 12 Dec 2023 09:19:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=80=A7=E8=AF=AD=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AnnualCompPointServiceImpl.java            | 6 ++++++
 .../committee/components/AnnualCompPointForm.vue            | 3 +--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompPoint/service/impl/AnnualCompPointServiceImpl.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompPoint/service/impl/AnnualCompPointServiceImpl.java
index 764c1b46..76baae57 100644
--- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompPoint/service/impl/AnnualCompPointServiceImpl.java
+++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompPoint/service/impl/AnnualCompPointServiceImpl.java
@@ -203,6 +203,12 @@ public class AnnualCompPointServiceImpl extends ServiceImpl<AnnualCompPointMappe
             if (scoreStartTime >= scoreEndTime){
                 return Result.error("评分开始时间不能在评分结束时间之后");
             }
+/*----------------王家东添加-------------------------------开始-------------*/
+            if (annualCompPoint.getRequireTopic().equals("N")){
+                return Result.error("如果需要评分，则需要添加题目");
+            }
+/*----------------王家东添加-------------------------------结束-------------*/
+
             if (requireUploadWorks.equals("Y")){
                 if (scoreStartTime<updateEndTime){
                     return Result.error("评分开始时间应在上传作品结束时间之后");
diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/AnnualCompPointForm.vue b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/AnnualCompPointForm.vue
index 824ae4f1..36bf3995 100644
--- a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/AnnualCompPointForm.vue
+++ b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/AnnualCompPointForm.vue
@@ -186,9 +186,7 @@
             <j-switch v-model:value="formData.requireScore" :disabled="disabled"></j-switch>
           </a-form-item>
         </a-col>
-
         <a-col :span="9" v-if="formData.requireScore==='Y'">
-
           <a-form-item label="开始时间" v-bind="validateInfos.scoreStartTime" :labelCol="labelCol5"
                        :wrapperCol="wrapperCol5">
             <a-date-picker placeholder="请选择评分开始时间" v-model:value="formData.scoreStartTime" showTime
@@ -205,6 +203,7 @@
           </a-form-item>
         </a-col>
       </a-row>
+      <p style="color: red">如果需要评分，则需要添加开启选题</p>
       <a-row v-if="formData.annualCompState==='4'">
         <a-col :span="24">
           <a-form-item label="驳回原因" v-bind="validateInfos.introduce" :labelCol="labelCol1"