..

backend/src/main/java/com/budwk/app/module/activity/controller/ActScoreEnterController.java

@@ -25,7 +25,10 @@ import org.nutz.mvc.annotation.Ok;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 /**
  * @author zhf
@@ -49,28 +52,6 @@ public class ActScoreEnterController {
     public void index() {
     }
 
-    @At()
-    @SaCheckPermission("activity.scoreEnter")
-    public Result getActivityOptions(Integer year) {
-        return Result.success(activityService.dao().query(Activity.class, Cnd.NEW().andEX("YEAR(startTime)", "=", year)));
-    }
-
-    @At()
-    @SaCheckPermission("activity.scoreEnter")
-    public Result pageData(ActScoreEnterPageForm pageForm) {
-        Sql sql = Sqls.create("""
-                SELECT
-                  t1.*
-                FROM
-                  `activity_item` t1
-                WHERE t1.activityId=@id
-                ORDER BY t1.sort asc
-                """).setParam("id", pageForm.getActivityId());
-
-        return Result.success(activityService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql));
-    }
-
-
     @At("/list-activity")
     @SaCheckPermission("activity.scoreEnter")
     @ApiOperation(value = "获取活动列表", nickname = "/list-activity", httpMethod = "GET")
@@ -91,7 +72,6 @@ public class ActScoreEnterController {
     public Result listGroup(Long activityId) {
         List<ActGroup> groupList = activityService.dao().query(ActGroup.class, Cnd.where(ActGroup::getActivityId, "=", activityId));
         return Result.success(groupList);
-
     }
 
     /**
@@ -110,7 +90,7 @@ public class ActScoreEnterController {
 
     @At("/list-item-score/?")
     @SaCheckPermission("activity.scoreEnter")
-    @ApiOperation(value = "获取项目列表", nickname = "/list-item-score", httpMethod = "GET")
+    @ApiOperation(value = "获取队伍项目成绩", nickname = "/list-item-score", httpMethod = "GET")
     public Result listItemScore(Long activityId) {
         List<ActItemGroupScore> scoreList = dao.query(ActItemGroupScore.class, Cnd.where(ActItemGroupScore::getActivityId, "=", activityId));
         return Result.success(scoreList);
@@ -119,7 +99,7 @@ public class ActScoreEnterController {
     @At("/save-score")
     @SaCheckPermission("activity.scoreEnter")
     @Aop(TransAop.READ_COMMITTED)
-    @ApiOperation(value = "保存成绩", nickname = "/list-activity", httpMethod = "POST")
+    @ApiOperation(value = "保存成绩", nickname = "/save-score", httpMethod = "POST")
     public Result saveScore(ActItemScoreVo actItemScoreVo) {
         List<ActivityItem> itemList = dao.query(ActivityItem.class, Cnd.where(ActivityItem::getActivityId, "=", actItemScoreVo.getActivityId()));
 //        dao.clear(ActItemGroupScore.class, Cnd.where(ActItemGroupScore::getActivityId, "=", actItemScoreVo.getActivityId()));
@@ -144,8 +124,17 @@ public class ActScoreEnterController {
                 activityItemScores.add(score);
             });
         });
-
         dao.update(activityItemScores);
+
+        // 更新队伍得分及排名
+        List<ActGroup> groups = dao.query(ActGroup.class, Cnd.where(ActGroup::getActivityId, "=", actItemScoreVo.getActivityId()));
+        for (ActGroup group : groups) {
+            List<ActItemGroupScore> groupScores = activityItemScores.stream().filter(item -> item.getGroupId().equals(group.getId())).collect(Collectors.toList());
+            groupScores.stream().map(v -> v.getScore()).reduce(BigDecimal::add).ifPresent(group::setTotalScore);
+        }
+        groups.sort(Comparator.comparing(ActGroup::getTotalScore).reversed());
+        IntStream.range(0, groups.size()).forEach(i -> groups.get(i).setTotalRank(i + 1));
+        dao.update(groups, "totalScore|totalRank");
         return Result.success();
     }
 

backend/src/main/resources/views/platform/activity/scoreEnter/index.html

@@ -182,20 +182,19 @@ layout("/layouts/platform_1.html"){
             cellClick(row, column) {
             },
             // 保存成绩
-            saveScore() {
+            async saveScore() {
                 const formData = {
                     activityId: this.pageForm.activityId,
                     data: JSON.stringify(this.tableData)
                 }
-                $.post("/platform/activity/scoreEnter/save-score", formData).then(async res => {
+                const {code,data,msg} = await $.post("/platform/activity/scoreEnter/save-score", formData)
-                    if (res.code === 0) {
+                if (code === 0) {
                     await this.listItemScore()
                     this.buildTableData()
                     this.$message.success("保存成功")
-                    } else {
+                }else{
-                        this.$message.error(res.msg)
+                    this.$message.error(msg)
                 }
-                })
                 console.log(this.tableData)
             }
         },

frontend/src/pages/activity/scan-sign/index.vue

@@ -1,5 +1,6 @@
 <template>
   <view class="page-container">
+    <template v-if="actOptions && actOptions.length > 0">
       <t-dropdown-menu class="top-dropdown">
         <t-dropdown-item :options="actOptions" :value="selectActId" @change="getSignInfo"/>
       </t-dropdown-menu>
@@ -51,10 +52,10 @@
                     <uni-icons type="calendar" size="14" color="#666666"/>
                     <text>签到时间：{{ signInfo.signInTime }}</text>
                   </view>
-<!--                <view class="detail-item">-->
+                  <!--                <view class="detail-item">-->
-<!--                  <uni-icons type="location" size="14" color="#666666"/>-->
+                  <!--                  <uni-icons type="location" size="14" color="#666666"/>-->
-<!--                  <text>签到地点：{{ signInfo.location }}</text>-->
+                  <!--                  <text>签到地点：{{ signInfo.location }}</text>-->
-<!--                </view>-->
+                  <!--                </view>-->
                 </view>
               </view>
             </template>
@@ -68,7 +69,6 @@
           </view>
         </view>
       </view>
-
       <div class="bg-decoration">
         <svg class="wave" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1440 320">
           <path fill="#f45a5a" fill-opacity="0.1" d="M0,160L48,154.7C96,149,192,139,288,144C384,149,480,171,576,176C672,181,768,171,864,154.7C960,139,1056,117,1152,128C1248,139,1344,181,1392,202.7L1440,224L1440,0L1392,0C1344,0,1248,0,1152,0C1056,0,960,0,864,0C768,0,672,0,576,0C480,0,384,0,288,0C192,0,96,0,48,0L0,0Z"></path>
@@ -91,6 +91,18 @@
           <circle fill="#f45a5a" fill-opacity="0.2" cx="90" cy="50" r="3" />
         </svg>
       </div>
+    </template>
+
+    <view style="flex: 1;display: flex;justify-content: center;align-items: center">
+      <t-empty v-if="actOptions && actOptions.length === 0"
+               image="/static/img/empty.png"
+               description="报名活动后才能扫码签到"
+               style="flex: 1">
+        <template #action>
+          <t-button theme="primary" shape="round" size="large" @click="navigateToSignUp">去报名列表看看</t-button>
+        </template>
+      </t-empty>
+    </view>
   </view>
 
   <ScanQRCode
@@ -205,6 +217,13 @@ async function signIn() {
   }
 }
 
+// 去报名列表
+function navigateToSignUp(){
+  uni.redirectTo({
+    url: '/pages/activity/list/index'
+  })
+}
+
 </script>
 
 <style scoped lang="less">

frontend/src/pages/activity/team-form/index.vue

@@ -1,9 +1,9 @@
 <template>
   <view class="page-container">
+    <template v-if="actOptions && actOptions.length>0">
       <t-dropdown-menu class="top-dropdown">
         <t-dropdown-item :options="actOptions" :value="selectActId"/>
       </t-dropdown-menu>
-
       <view class="content-container">
         <view class="page-header">
           <text class="page-title">团队报名</text>
@@ -31,13 +31,20 @@
                 <t-icon name="chevron-right" color="#999"/>
               </view>
             </view>
-<!--          <view v-if="registrationStatus.get(project.id)?.length" class="project-card__checkmark">
+            <!--          <view v-if="registrationStatus.get(project.id)?.length" class="project-card__checkmark">
                         <t-icon name="check" color="#52c41a"/>
                       </view>-->
           </view>
         </view>
       </view>
-
+    </template>
+    <view v-else style="flex: 1;display: flex;justify-content: center;align-items: center">
+      <t-empty v-if="actOptions && actOptions.length === 0"
+               image="/static/img/empty.png"
+               description="您没有任何团队信息，无法进行项目报名"
+               style="flex: 1">
+      </t-empty>
+    </view>
     <t-popup v-model:visible="showMemberPicker" placement="bottom" destroy-on-close>
       <view class="member-picker">
         <view class="picker-header">

frontend/src/pages/activity/team/index.vue

@@ -42,7 +42,8 @@
 
         <!-- 项目报名按钮 -->
         <div class="action-section">
-          <t-button block theme="danger" size="large" class="register-btn" @click="goToEventRegistration" :disabled="!team.teamIsLeader">
+          <t-button block theme="danger" size="large" class="register-btn" @click="goToEventRegistration"
+                    :disabled="!team.teamIsLeader">
             <div v-if="team.teamIsLeader"> {{ team.isSelfLeader ? '参与项目报名' : '查看项目报名' }}</div>
             <div v-else>暂无队长无法报名</div>
           </t-button>
@@ -115,18 +116,12 @@
         </div>
       </div>
     </view>
-    <view v-else style="background-color: #FFFFFF">
+    <view v-else style="flex: 1;display: flex;justify-content: center;align-items: center">
-      <view>
+      <t-empty v-if="actOptions && actOptions.length === 0"
-        <t-result>
+               image="/static/img/empty.png"
-          <template #image>
+               description="您没有任何团队信息"
-            <t-image src="https://tdesign.gtimg.com/mobile/demos/result1.png" class="external-class-image"/>
+               style="flex: 1">
-          </template>
+      </t-empty>
-          <template #title>
-            <div>暂无团队</div>
-          </template>
-        </t-result>
-      </view>
-
     </view>
   </view>
   <t-dialog