Merge branch 'main' of http://182.92.169.222:3000/zhc077/hnjd_comp

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/bigScreen/controller/CompSystemBigScreenController.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.modules.demo.abilityEvaluation.entity.PersonalAbilityEvaluation;
 import org.jeecg.modules.demo.bigScreen.service.CompSystemBigScreenService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +32,7 @@ public class CompSystemBigScreenController /*extends JeecgController*/ {
     @Autowired
     private CompSystemBigScreenService compSystemBigScreenService;
 
+    @AutoLog(value = "河南机电-比赛数据综合大屏")
     @ApiOperation(value = "河南机电-比赛数据综合展示", notes = "河南机电-比赛数据综合展示")
     @GetMapping(value = "/composite")
     public Result composite(HttpServletRequest req) {
@@ -38,6 +40,7 @@ public class CompSystemBigScreenController /*extends JeecgController*/ {
         return Result.ok(result);
     }
 
+    @AutoLog(value = "河南机电-部门大屏")
     @ApiOperation(value = "河南机电-部门比赛数据展示", notes = "河南机电-部门比赛数据展示")
     @GetMapping(value = "/depart")
     public Result bigScreen4Depart(String departId) {
@@ -45,6 +48,7 @@ public class CompSystemBigScreenController /*extends JeecgController*/ {
         return Result.ok(result);
     }
 
+    @AutoLog(value = "河南机电-单个比赛大屏")
     @ApiOperation(value = "河南机电-单个比赛数据展示", notes = "河南机电-单个比赛数据展示")
     @GetMapping(value = "/singleComp")
     public Result singleComp(String compId) {
@@ -52,6 +56,7 @@ public class CompSystemBigScreenController /*extends JeecgController*/ {
         return Result.ok(result);
     }
 
+    @AutoLog(value = "河南机电-学生个人能力大屏")
     @ApiOperation(value = "学生个人能力大屏", notes = "学生个人能力大屏")
     @GetMapping(value = "/student")
     public Result bigScreen4Student(String workNo) {
@@ -59,24 +64,28 @@ public class CompSystemBigScreenController /*extends JeecgController*/ {
         return Result.ok(result);
     }
 
+    @AutoLog(value = "院系-参赛大屏")
     @ApiOperation(value = "河南机电-院系参赛大屏数据", notes = "河南机电-院系参赛大屏数据")
     @GetMapping(value = "/canSai")
     public Result canSai() {
         return Result.ok(compSystemBigScreenService.canSai());
     }
 
+    @AutoLog(value = "院系-能力大屏")
     @ApiOperation(value = "河南机电-院系能力大屏数据", notes = "河南机电-院系能力大屏数据")
     @GetMapping(value = "/nengLi")
     public Result nengLi() {
         return Result.ok(compSystemBigScreenService.nengLi());
     }
 
+    @AutoLog(value = "院系-获奖大屏")
     @ApiOperation(value = "河南机电-院系获奖大屏数据", notes = "河南机电-院系获奖大屏数据")
     @GetMapping(value = "/huoJiang")
     public Result huoJiang() {
         return Result.ok(compSystemBigScreenService.huoJiang());
     }
 
+    @AutoLog(value = "院系-得分大屏")
     @ApiOperation(value = "河南机电-院系各比赛类型得分大屏数据", notes = "河南机电-院系各比赛类型得分大屏数据")
     @GetMapping(value = "/deFei")
     public Result deFei() {

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/bigScreen/service/CompSystemBigScreenServiceImpl.java

@@ -489,10 +489,11 @@ public class CompSystemBigScreenServiceImpl implements CompSystemBigScreenServic
 
             //比赛数
             last5YearDataVo.setCompCount(1);
-            AnnualCompPoint annualCompPoint = iAnnualCompPointService.getOne(new LambdaQueryWrapper<AnnualCompPoint>().eq(AnnualCompPoint::getAnnualCompId, ac.getId()));
+            List<AnnualCompPoint> annualCompPoints = iAnnualCompPointService.list(new LambdaQueryWrapper<AnnualCompPoint>().eq(AnnualCompPoint::getAnnualCompId, ac.getId()));
-            if (!ObjectUtils.isEmpty(annualCompPoint)) {
+            if (!ObjectUtils.isEmpty(annualCompPoints)) {
+                Set<String> pids = annualCompPoints.stream().map(e -> e.getId()).collect(Collectors.toSet());
                 long personCount4CompTemp = iAnnualCompetitionProjectRegistrationService.count(new LambdaQueryWrapper<AnnualCompetitionProjectRegistration>().
-                        eq(AnnualCompetitionProjectRegistration::getAnnualCompid, annualCompPoint.getId()));
+                        in(AnnualCompetitionProjectRegistration::getAnnualCompid, pids));
                 personCount4Comp.getAndUpdate(val -> val.add(new BigDecimal(personCount4CompTemp)));
                 last5YearDataVo.setPersonCount(personCount4Comp.get().intValue());
             }
@@ -667,6 +668,9 @@ public class CompSystemBigScreenServiceImpl implements CompSystemBigScreenServic
         List<Map<String, Object>> last4YearData = new LinkedList<>();
         List<Integer> years = DateUtils.getLastxYear(4);
         List<Annual> annualList = iAnnualService.list(new LambdaQueryWrapper<Annual>().in(Annual::getAnnualName, years).orderByAsc(Annual::getAnnualName));
+        DecimalFormat decimalFormat = new DecimalFormat();
+        decimalFormat.setMaximumFractionDigits(2); // 保留两位小数
+        decimalFormat.setRoundingMode(RoundingMode.HALF_UP); // 设置具体的进位机制
         annualList.forEach(annual -> {
             AtomicReference<BigDecimal> baseScore = new AtomicReference<>(BigDecimal.ZERO);
             Map<String, Object> yearData = new LinkedHashMap<>();
@@ -678,7 +682,7 @@ public class CompSystemBigScreenServiceImpl implements CompSystemBigScreenServic
                 double sum = compScoreList.stream().mapToDouble(PersonalCompScore::getScore).sum();
                 baseScore.getAndUpdate(val -> val.add(new BigDecimal(sum)));
             }
-            yearData.put("score", baseScore);
+            yearData.put("score", decimalFormat.format(baseScore.get()));
             last4YearData.add(yearData);
         });
         studentInfoMap.put("last4YearData", last4YearData);

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java

@@ -268,7 +268,13 @@ public class ExpertController extends JeecgController<Expert, IExpertService> {
 	    // 现在 Compid, CompName 和 Stat 包含了逗号分隔的值
 		model.setCompName(CompName);
 		model.setCompid(Compid);
-		model.setStat(Stat);
+		if(Stat.indexOf(",")==-1){
+			model.setStat(Stat);
+		}else{
+			Stat = Stat.substring(0,Stat.indexOf(","));
+			model.setStat(Stat);
+		}
+
 		return Result.OK(model);
 	}
 

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/homepage/controller/UserHomePageController.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.modules.demo.homepage.service.UserHomePageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -28,6 +29,7 @@ public class UserHomePageController {
     @Autowired
     private UserHomePageService homePageService;
 
+    @AutoLog(value = "学校首页")
     @ApiOperation(value = "河南机电-学校首页", notes = "河南机电-学校首页")
     @GetMapping(value = "/school")
     public Result school(HttpServletRequest req) {
@@ -35,6 +37,7 @@ public class UserHomePageController {
         return Result.ok(result);
     }
 
+    @AutoLog(value = "部门首页")
     @ApiOperation(value = "河南机电-部门首页", notes = "河南机电-部门首页")
     @GetMapping(value = "/depart")
     public Result depart(String orgCode) {
@@ -42,6 +45,7 @@ public class UserHomePageController {
         return Result.ok(result);
     }
 
+    @AutoLog(value = "学校管理员-分析报告")
     @ApiOperation(value = "河南机电-学校综合报告", notes = "河南机电-学校综合报告")
     @GetMapping(value = "/report4School")
     public Result report4School(HttpServletRequest req) {
@@ -49,6 +53,7 @@ public class UserHomePageController {
         return Result.ok(result);
     }
 
+    @AutoLog(value = "部门管理员-分析报告")
     @ApiOperation(value = "河南机电-部门综合报告", notes = "河南机电-部门综合报告")
     @GetMapping(value = "/report4Depart")
     public Result report4Depart(String orgCode) {

jeecgboot-vue3-master/src/views/comp/CompList.vue

@@ -17,14 +17,7 @@
           <template v-if="toggleSearchStatus">
             <a-col :lg="8">
               <a-form-item label="比赛类型" name="compTypeId">
-                <j-popup
+                <j-dict-select-tag placeholder="请选择比赛类型" v-model:value="queryParam.compTypeId" dictCode="comp_type,type_name,id"/>
-                  placeholder="请选择比赛类型"
-                  v-model:value="queryParam.compTypeId"
-                  code="comptype"
-                  :fieldConfig="[{ source: 'type_name', target: 'compTypeId' }]"
-                  :multi="true"
-                  :setFieldsValue="setFieldsValue"
-                />
               </a-form-item>
             </a-col>
           </template>

jeecgboot-vue3-master/src/views/comp/CompListRole.vue

@@ -17,14 +17,7 @@
           <template v-if="toggleSearchStatus">
             <a-col :lg="8">
               <a-form-item label="比赛类型" name="compTypeId">
-                <j-popup
+                <j-dict-select-tag placeholder="请选择比赛类型" v-model:value="queryParam.compTypeId" dictCode="comp_type,type_name,id"/>
-                  placeholder="请选择比赛类型"
-                  v-model:value="queryParam.compTypeId"
-                  code="comptype"
-                  :fieldConfig="[{ source: 'type_name', target: 'compTypeId' }]"
-                  :multi="true"
-                  :setFieldsValue="setFieldsValue"
-                />
               </a-form-item>
             </a-col>
           </template>

jeecgboot-vue3-master/src/views/comp/CompListST.vue

@@ -17,14 +17,7 @@
           <template v-if="toggleSearchStatus">
             <a-col :lg="8">
               <a-form-item label="比赛类型" name="compTypeId">
-                <j-popup
+                <j-dict-select-tag placeholder="请选择比赛类型" v-model:value="queryParam.compTypeId" dictCode="comp_type,type_name,id"/>
-                  placeholder="请选择比赛类型"
-                  v-model:value="queryParam.compTypeId"
-                  code="comptype"
-                  :fieldConfig="[{ source: 'type_name', target: 'compTypeId' }]"
-                  :multi="true"
-                  :setFieldsValue="setFieldsValue"
-                />
               </a-form-item>
             </a-col>
           </template>

jeecgboot-vue3-master/src/views/comp/CompListZJ.vue

@@ -17,14 +17,7 @@
           <template v-if="toggleSearchStatus">
             <a-col :lg="8">
               <a-form-item label="比赛类型" name="compTypeId">
-                <j-popup
+                <j-dict-select-tag placeholder="请选择比赛类型" v-model:value="queryParam.compTypeId" dictCode="comp_type,type_name,id"/>
-                  placeholder="请选择比赛类型"
-                  v-model:value="queryParam.compTypeId"
-                  code="comptype"
-                  :fieldConfig="[{ source: 'type_name', target: 'compTypeId' }]"
-                  :multi="true"
-                  :setFieldsValue="setFieldsValue"
-                />
               </a-form-item>
             </a-col>
           </template>

jeecgboot-vue3-master/src/views/depart/workbench/components/organizingCommittee/organizingCommittee.vue

@@ -39,7 +39,7 @@
             <div class="left"><span>参赛人数</span><span>个人赛人数</span><span>团队赛人数</span></div>
             <div class="right"><SvgIcon size="20" name="content" /></div>
           </div>
-          <div class="name"><span>20</span><span>10</span><span>10</span></div>
+          <div class="name"><span>{{ data.csNumber  }}</span><span>{{ data.grsNumber }}</span><span>{{ data.tdsNumber }}</span></div>
         </div>
     </div></a-col>
     <a-col :lg="12" :xxl="6"><div class="item">

jeecgboot-vue3-master/src/views/expgroup/ExpGroup.data.ts

@@ -10,7 +10,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'grouid_dictText'
   },
   {
-    title: '是否队长',
+    title: '是否组长',
     align: "center",
     dataIndex: 'islead',
     customRender:({text}) => {
@@ -39,7 +39,7 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    label: '是否队长',
+    label: '是否组长',
     field: 'islead',
     component: 'JSwitch',
     componentProps:{

jeecgboot-vue3-master/src/views/expgroup/ExpGroupList.vue

@@ -174,9 +174,9 @@
         }
       },
       {
-        label: '设为队长',
+        label: '设为组长',
         popConfirm: {
-          title: '是否设为队长',
+          title: '是否设为组长',
           confirm: szdz.bind(null, record),
         }
       },

jeecgboot-vue3-master/src/views/expgroup/components/ExpGroupForm.vue

@@ -8,7 +8,7 @@
           </a-form-item>
         </a-col>
         <a-col :span="24">
-          <a-form-item label="是否队长" v-bind="validateInfos.islead">
+          <a-form-item label="是否组长" v-bind="validateInfos.islead">
 	          <j-switch v-model:value="formData.islead"  :disabled="disabled"></j-switch>
           </a-form-item>
         </a-col>
@@ -31,7 +31,7 @@
   import { getValueType } from '/@/utils';
   import { saveOrUpdate } from '../ExpGroup.api';
   import { Form } from 'ant-design-vue';
-  
+
   const props = defineProps({
     formDisabled: { type: Boolean, default: false },
     formData: { type: Object, default: ()=>{} },
@@ -42,9 +42,9 @@
   const emit = defineEmits(['register', 'ok']);
   const formData = reactive<Record<string, any>>({
     id: '',
-    grouid: '',   
+    grouid: '',
-    islead: '',   
+    islead: '',
-    annCompGroupid: '',   
+    annCompGroupid: '',
   });
   const { createMessage } = useMessage();
   const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
@@ -67,7 +67,7 @@
     return props.formDisabled;
   });
 
-  
+
   /**
    * 新增
    */

jeecgboot-vue3-master/src/views/topic/TopicList5.vue

@@ -230,7 +230,7 @@ function handleEdit3(record: Recordable) {
   function getTableAction(record) {
     const actions =  [
       {
-        label: '评分标准',
+        label: '评分细则设置',
         onClick: handleEdit2.bind(null, record),
       },
 /*      {