同分复评bug修复

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompIntface/controller/AnnconalCompController.java

@@ -4,10 +4,13 @@ import io.lettuce.core.ScriptOutputType;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.ArrayStack;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.demo.abilityEvaluation.entity.PersonalAbilityEvaluationCollect;
+import org.jeecg.modules.demo.annualCompIntface.entity.Bslist;
+import org.jeecg.modules.demo.annualCompIntface.entity.Grebscore;
 import org.jeecg.modules.demo.annualCompIntface.service.AnnconalCompService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -15,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -35,11 +39,39 @@ public class AnnconalCompController
         return Result.ok(result);
     }
 
-    @ApiOperation(value = "管理员首页", notes = "管理员首页")
+    @ApiOperation(value = "个人首页的12个个人能力", notes = "个人首页的12个个人能力")
     @GetMapping(value = "/studentindex")
     public Result studentindex(HttpServletRequest req) {
         List<PersonalAbilityEvaluationCollect> result = annconalCompService.studentindex();
         System.out.println(result);
         return Result.ok(result);
     }
+
+
+
+    @ApiOperation(value = "个人首页的个人总分", notes = "管理员个人总分")
+    @GetMapping(value = "/studentindexgzf")
+    public Result studentindexgzf(HttpServletRequest req) {
+        String result =annconalCompService.studentindexgzf();
+        List<Grebscore> grebscoreList =new ArrayList<>();
+        Grebscore ge = new Grebscore();
+        ge.setTitle("个人总分");
+        ge.setTotal(result);
+        grebscoreList.add(ge);
+        System.out.println(grebscoreList);
+        return Result.ok(grebscoreList);
+    }
+
+    @ApiOperation(value = "个人首页的个人总分", notes = "管理员个人总分")
+    @GetMapping(value = "/studentindexbs")
+    public Result studentindexbs(HttpServletRequest req) {
+        LoginUser user= (LoginUser)SecurityUtils.getSubject().getPrincipal();
+        String uid = user.getId();
+        List<Bslist> bslistList = new ArrayStack();
+        bslistList=annconalCompService.studentindexbs(uid);
+
+        return Result.ok(bslistList);
+    }
+
+
 }

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompIntface/service/AnnconalCompService.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.demo.annualCompIntface.service;
 
 import org.jeecg.modules.demo.abilityEvaluation.entity.PersonalAbilityEvaluationCollect;
+import org.jeecg.modules.demo.annualCompIntface.entity.Bslist;
 
 import java.util.List;
 import java.util.Map;
@@ -10,4 +11,8 @@ public interface AnnconalCompService {
 
 
     List<PersonalAbilityEvaluationCollect> studentindex();
+
+    String studentindexgzf();
+
+    List<Bslist> studentindexbs(String uid);
 }

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompIntface/service/AnnconalCompServiceImpl.java

@@ -9,23 +9,27 @@ import org.jeecg.modules.demo.abilityEvaluation.service.IPersonalAbilityEvaluati
 import org.jeecg.modules.demo.abilityEvaluation.service.IPersonalAbilityEvaluationService;
 import org.jeecg.modules.demo.annual.entity.Annual;
 import org.jeecg.modules.demo.annual.service.IAnnualService;
+import org.jeecg.modules.demo.annualCompIntface.entity.Bslist;
 import org.jeecg.modules.demo.annualCompPoint.entity.AnnualCompPoint;
 import org.jeecg.modules.demo.annualCompPoint.service.IAnnualCompPointService;
+import org.jeecg.modules.demo.annualScore.entity.PersonalCompTotalScore;
+import org.jeecg.modules.demo.annualScore.service.IPersonalCompTotalScoreService;
 import org.jeecg.modules.demo.annualcomp.entity.AnnualComp;
 import org.jeecg.modules.demo.annualcomp.service.IAnnualCompService;
 import org.jeecg.modules.demo.annualcompetitionprojectregistration.entity.AnnualCompetitionProjectRegistration;
+import org.jeecg.modules.demo.annualcompetitionprojectregistration.entity.TeamManagement;
 import org.jeecg.modules.demo.annualcompetitionprojectregistration.service.IAnnualCompetitionProjectRegistrationService;
+import org.jeecg.modules.demo.annualcompetitionprojectregistration.service.ITeamManagementService;
 import org.jeecg.modules.demo.awardpersion.entity.AwardPersion;
 import org.jeecg.modules.demo.comp.entity.Comp;
 import org.jeecg.modules.demo.comp.service.ICompService;
+import org.jeecg.modules.demo.scorepersion.entity.ScorePersion;
+import org.jeecg.modules.demo.scorepersion.service.IScorePersionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
-import java.util.Calendar;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -33,6 +37,9 @@ public class AnnconalCompServiceImpl  implements AnnconalCompService{
     @Autowired
     private ICompService compService;
 
+    @Autowired
+    private ITeamManagementService teamManagementService;
+
     @Autowired
     private IAnnualCompService annualCompService;
 
@@ -47,6 +54,13 @@ public class AnnconalCompServiceImpl  implements AnnconalCompService{
 
     @Autowired
     private IPersonalAbilityEvaluationCollectService personalAbilityEvaluationService;
+    @Autowired
+    private IPersonalCompTotalScoreService personalCompTotalScoreService;
+
+    @Autowired
+    private IScorePersionService scorePersionService;
+
+
 
 
     @Override
@@ -126,4 +140,35 @@ public class AnnconalCompServiceImpl  implements AnnconalCompService{
         return personalAbilityEvaluations;
     }
 
+    @Override
+    public String studentindexgzf() {
+        LoginUser user= (LoginUser)SecurityUtils.getSubject().getPrincipal();
+        String username=user.getUsername();
+        PersonalCompTotalScore personalAbilityEvaluations =personalCompTotalScoreService.getOne(new LambdaQueryWrapper<PersonalCompTotalScore>()
+                .eq(PersonalCompTotalScore::getWorkOn, "2340330327")
+                .last("limit 1"));
+
+        return personalAbilityEvaluations.getScore().toString();
+    }
+
+    @Override
+    public List<Bslist> studentindexbs(String uid) {
+        LoginUser user= (LoginUser)SecurityUtils.getSubject().getPrincipal();
+        List<TeamManagement> teamManagementList= teamManagementService.list(new LambdaQueryWrapper<TeamManagement>().in(TeamManagement::getUserId, "1726412010178629633"));
+        List<String> englist =teamManagementList.stream().map(TeamManagement::getEnrollCode).collect(Collectors.toList());
+        List<ScorePersion> scorePersionList =scorePersionService.list(new LambdaQueryWrapper<ScorePersion>().in(ScorePersion::getEnrollCode, englist));
+        List<Bslist> bslistList = new ArrayList<>();
+        for (int i=0;i< scorePersionList.size();i++){
+            Bslist bs = new Bslist();
+            bs.setUserid(user.getRealname());
+            bs.setScore(scorePersionList.get(i).getScore());
+            bs.setEnrollCode(scorePersionList.get(i).getEnrollCode());
+            bs.setAnnualid(annualService.getById(scorePersionList.get(i).getAnnualid()).getAnnualName());
+            bs.setAnnualCompid(annualCompService.getById(scorePersionList.get(i).getAnnualCompid()).getName());
+            bs.setAnnualCompP(annualCompPointService.getById(scorePersionList.get(i).getAnnualCompP()).getObjName());
+            bslistList.add(bs);
+        }
+        return bslistList;
+    }
+
 }

jeecgboot-vue3-master/src/views/dashboard/Analysis/data.js

@@ -95,7 +95,7 @@ export const bdcCardList = [
 ];
 export const table = {
     dataSource: [
-        { reBizCode: '1', type: '转移登记', acceptBy: '张三', acceptDate: '2019-01-22', curNode: '任务分派', flowRate: 60 },
+        { reBizCode: '1', type: '转移登记', acceptBy: '张三11', acceptDate: '2019-01-22', curNode: '任务分派', flowRate: 60 },
         { reBizCode: '2', type: '抵押登记', acceptBy: '李四', acceptDate: '2019-01-23', curNode: '领导审核', flowRate: 30 },
         { reBizCode: '3', type: '转移登记', acceptBy: '王武', acceptDate: '2019-01-25', curNode: '任务处理', flowRate: 20 },
         { reBizCode: '4', type: '转移登记', acceptBy: '赵楼', acceptDate: '2019-11-22', curNode: '部门审核', flowRate: 80 },
@@ -109,36 +109,41 @@ export const table = {
     ],
     columns: [
         {
-            title: '业务号',
+            title: '年度',
             align: 'center',
-            dataIndex: 'reBizCode',
+            dataIndex: 'annualid',
         },
         {
-            title: '业务类型',
+            title: '年度比赛',
             align: 'center',
-            dataIndex: 'type',
+            dataIndex: 'annualCompid',
         },
         {
-            title: '受理人',
+            title: '年度比赛项目',
             align: 'center',
-            dataIndex: 'acceptBy',
+            dataIndex: 'annualCompP',
         },
         {
-            title: '受理时间',
+            title: '报名编号',
             align: 'center',
-            dataIndex: 'acceptDate',
+            dataIndex: 'enrollCode',
         },
         {
-            title: '当前节点',
+            title: '成绩',
             align: 'center',
-            dataIndex: 'curNode',
+            dataIndex: 'score',
         },
-        {
+      {
+        title: '排名',
+        align: 'center',
+        dataIndex: 'sort',
+      },
+/*        {
             title: '办理时长',
             align: 'center',
             dataIndex: 'flowRate',
             slots: { customRender: 'flowRate' },
-        },
+        },*/
     ],
     ipagination: {
         current: 1,

jeecgboot-vue3-master/src/views/dashboard/Analysis/data.ts

@@ -108,7 +108,7 @@ export const bdcCardList: GrowCardItem[] = [
 
 export const table = {
   dataSource: [
-    { reBizCode: '1', type: '转移登记', acceptBy: '张三', acceptDate: '2019-01-22', curNode: '任务分派', flowRate: 60 },
+    { reBizCode: '1', type: '转移登记', acceptBy: '张三11', acceptDate: '2019-01-22', curNode: '任务分派', flowRate: 60 },
     { reBizCode: '2', type: '抵押登记', acceptBy: '李四', acceptDate: '2019-01-23', curNode: '领导审核', flowRate: 30 },
     { reBizCode: '3', type: '转移登记', acceptBy: '王武', acceptDate: '2019-01-25', curNode: '任务处理', flowRate: 20 },
     { reBizCode: '4', type: '转移登记', acceptBy: '赵楼', acceptDate: '2019-11-22', curNode: '部门审核', flowRate: 80 },

jeecgboot-vue3-master/src/views/dashboard/Analysis/homePage/IndexBdc.vue

@@ -6,7 +6,7 @@
       <a-col :span="24">
         <a-card :loading="loading" :class="{ 'anty-list-cust': true }" :bordered="false">
           <a-tabs v-model:activeKey="indexBottomTab" size="large" :tab-bar-style="{ marginBottom: '24px', paddingLeft: '16px' }">
-            <template #rightExtra>
+<!--            <template #rightExtra>
               <div class="extra-wrapper">
                 <a-radio-group v-model:value="indexRegisterType" @change="changeRegisterType">
                   <a-radio-button value="个人">个人</a-radio-button>
@@ -14,7 +14,7 @@
                   <a-radio-button value="">所有</a-radio-button>
                 </a-radio-group>
               </div>
-            </template>
+            </template>-->
 
             <a-tab-pane tab="参加的比赛项目" key="1">
               <a-table
@@ -42,39 +42,53 @@
   </div>
 </template>
 <script lang="ts" setup>
+
   import { ref, unref } from 'vue';
   import { Progress } from 'ant-design-vue';
   import ChartGroupCard from '../components/ChartGroupCard.vue';
   import BdcTabCard from '../components/BdcTabCard.vue';
   import { table, table1 } from '../data';
+  import {defHttp} from "/@/utils/http/axios";
 
   const loading = ref(true);
-
   setTimeout(() => {
     loading.value = false;
   }, 500);
 
   const indexBottomTab = ref('1');
   const indexRegisterType = ref('转移登记');
-  const dataSource = ref([]);
   const dataSource1 = ref([]);
   const ipagination = ref(table.ipagination);
   const ipagination1 = ref(table1.ipagination);
+  const ruleBaseURL = '/admin/inde/';
+  const url = ruleBaseURL + 'studentindexbs';
+  const dataSource =ref([]);
+  const getOrderNum = () => {
+    defHttp.get({ url }, { isTransformResponse: false }).then((res) => {
+      // 执行成功，获取返回的值，并赋到页面上
+      if (res.success) {
+        dataSource.value =res.result;
+        console.log(res.result)
+
+      }
+    });
+  };
 
-  function changeRegisterType(e) {
+
+/*  function changeRegisterType(e) {
     indexRegisterType.value = e.target.value;
     if (unref(indexBottomTab) == '1') {
-      loadDataSource();
+    /!*  loadDataSource();*!/
     } else {
       loadDataSource1();
     }
-  }
+  }*/
 
-  function tableChange(pagination) {
+/*  function tableChange(pagination) {
     ipagination.value.current = pagination.current;
     ipagination.value.pageSize = pagination.pageSize;
     loadDataSource();
-  }
+  }*/
 
   function tableChange1(pagination) {
     ipagination1.value.current = pagination.current;
@@ -105,6 +119,7 @@
     }
   }
 
+/*
   function loadDataSource() {
     dataSource.value = table.dataSource.filter((item) => {
       if (!unref(indexRegisterType)) {
@@ -113,6 +128,7 @@
       return item.type == unref(indexRegisterType);
     });
   }
+*/
 
   function loadDataSource1() {
     dataSource1.value = table1.dataSource.filter((item) => {
@@ -122,8 +138,8 @@
       return item.type == unref(indexRegisterType);
     });
   }
-
-  loadDataSource();
+  getOrderNum();
+  /*loadDataSource();*/
   loadDataSource1();
 </script>
 

jeecgboot-vue3-master/src/views/dashboard/Analysis/index1.vue

@@ -102,18 +102,6 @@
             </a-col>
             <a-col :span="4">
               <div class="colorDiv">
-<!--                <div class="color">
-                  <div class="green"></div>
-                  <p>指标一</p>
-                </div>
-                <div class="color">
-                  <div class="red"></div>
-                  <p>指标二</p>
-                </div>
-                <div class="color">
-                  <div class="yellow"></div>
-                  <p>指标三</p>
-                </div>-->
               </div>
             </a-col>
           </a-row>