Merge remote-tracking branch 'origin/main'

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("评分开始时间应在上传作品结束时间之后");

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/topic/controller/TopicController.java

@@ -283,7 +283,7 @@ public class TopicController extends JeecgController<Topic, ITopicService> {
             }
         }
         QueryWrapper<Topic> queryWrapper= new QueryWrapper<>();
-        queryWrapper.eq("number",topic.getNumber());
+        queryWrapper.eq("annual_compid",topic.getAnnualCompid()).eq("number",topic.getNumber());
         Topic one = topicService.getOne(queryWrapper);
         if (!Objects.equals(one.getId(), topic.getId())){
             return Result.error("编码重复");

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"

jeecgboot-vue3-master/src/views/annualCompPoint/student/AnnualCompPointList.vue

@@ -228,12 +228,12 @@
     //     onClick: handleSubmitandApply.bind(null, record),
     //   });
     // }
-/*    if (record.requireUploadWorks === 'Y') {
+    if (record.requireUploadWorks === 'Y') {
       actions.unshift({
         label: '作品管理',
         onClick: workManage.bind(null, record),
       });
-    }*/
+    }
     /*if (record.requireTopic === 'Y' && record.annualCompState === '2') {
       actions.unshift({
         label: '选题',