Merge remote-tracking branch 'origin/main'

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/TongfenCompinfo/mapper/TongfenCompinfoMapper.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.demo.TongfenCompinfo.mapper;
 
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 import org.jeecg.modules.demo.TongfenCompinfo.entity.TongfenCompinfo;
@@ -23,5 +24,5 @@ public interface TongfenCompinfoMapper extends BaseMapper<TongfenCompinfo> {
     String geturl(String enrollCode);
 
     @Update("UPDATE  score_persion SET score=#{score} where enroll_code =#{ccode}")
-    Integer updateScore(String score, String ccode);
+    Integer updateScore(@Param("score") String score, @Param("ccode") String ccode);
 }

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/abilityEvaluation/controller/PersonalAbilityEvaluationCollectController.java

@@ -13,6 +13,8 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.demo.abilityEvaluation.entity.PersonalAbilityEvaluationCollect;
 import org.jeecg.modules.demo.abilityEvaluation.service.IPersonalAbilityEvaluationCollectService;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -35,6 +37,9 @@ public class PersonalAbilityEvaluationCollectController extends JeecgController<
     @Autowired
     private IPersonalAbilityEvaluationCollectService personalAbilityEvaluationCollectService;
 
+    @Autowired
+    private ISysUserService iSysUserService;
+
     /**
      * 分页列表查询
      *
@@ -76,7 +81,8 @@ public class PersonalAbilityEvaluationCollectController extends JeecgController<
                                                                          HttpServletRequest req) {
         QueryWrapper<PersonalAbilityEvaluationCollect> queryWrapper = QueryGenerator.initQueryWrapper(personalAbilityEvaluationCollect, req.getParameterMap());
         LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        queryWrapper.eq("work_on",user.getUsername());
+        SysUser user1 = iSysUserService.getById(user.getId());
+        queryWrapper.eq("work_on",user1.getWorkNo());
         Page<PersonalAbilityEvaluationCollect> page = new Page<PersonalAbilityEvaluationCollect>(pageNo, pageSize);
         IPage<PersonalAbilityEvaluationCollect> pageList = personalAbilityEvaluationCollectService.page(page, queryWrapper);
         return Result.OK(pageList);

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/controller/PersonalCompTotalScoreController.java

@@ -15,6 +15,8 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.demo.annualScore.entity.PersonalCompTotalScore;
 import org.jeecg.modules.demo.annualScore.service.IPersonalCompTotalScoreService;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -37,6 +39,9 @@ public class PersonalCompTotalScoreController extends JeecgController<PersonalCo
     @Autowired
     private IPersonalCompTotalScoreService personalCompTotalScoreService;
 
+    @Autowired
+    private ISysUserService iSysUserService;
+
     /**
      * 分页列表查询
      *
@@ -79,7 +84,8 @@ public class PersonalCompTotalScoreController extends JeecgController<PersonalCo
                                                                HttpServletRequest req) {
         QueryWrapper<PersonalCompTotalScore> queryWrapper = QueryGenerator.initQueryWrapper(personalCompTotalScore, req.getParameterMap());
         LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        queryWrapper.eq("work_on",user.getUsername());
+        SysUser user1 = iSysUserService.getById(user.getId());
+        queryWrapper.eq("work_on",user1.getWorkNo());
         Page<PersonalCompTotalScore> page = new Page<PersonalCompTotalScore>(pageNo, pageSize);
         IPage<PersonalCompTotalScore> pageList = personalCompTotalScoreService.page(page, queryWrapper);
         return Result.OK(pageList);

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/service/impl/DepartCompTotalScoreServiceImpl.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.demo.annualScore.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.modules.demo.annualScore.entity.DepartCompTotalScore;
 import org.jeecg.modules.demo.annualScore.entity.PersonalCompScore;
@@ -9,10 +10,10 @@ import org.jeecg.modules.demo.annualScore.service.IDepartCompTotalScoreService;
 import org.jeecg.modules.demo.annualScore.service.IPersonalCompScoreService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.util.ObjectUtils;
 
+import java.math.RoundingMode;
+import java.text.DecimalFormat;
 import java.util.Date;
 import java.util.List;
 
@@ -44,10 +45,14 @@ public class DepartCompTotalScoreServiceImpl extends ServiceImpl<DepartCompTotal
         );
 
         double totalScore = 0;
+        DecimalFormat decimalFormat = new DecimalFormat(totalScore + "");
+        decimalFormat.setMaximumFractionDigits(2); // 保留两位小数
+        decimalFormat.setRoundingMode(RoundingMode.HALF_UP); // 设置具体的进位机制
         if (!ObjectUtils.isEmpty(personalCompScoreList)) {
             totalScore = personalCompScoreList.stream().mapToDouble(PersonalCompScore::getScore).sum();
         }
-        departCompTotalScore.setScore(totalScore);
+        departCompTotalScore.setScore(new Double(decimalFormat.format(totalScore)));
+
 
         //id不为空，院系的某一年度已汇总过，重新汇算
         if (StringUtils.isNotEmpty(departCompTotalScore.getId())) {

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/controller/AwardPersionController.java

@@ -18,6 +18,7 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.config.JeecgBaseConfig;
+import org.jeecg.modules.demo.annual.service.IAnnualService;
 import org.jeecg.modules.demo.annualCompPoint.entity.AnnualCompPoint;
 import org.jeecg.modules.demo.annualCompPoint.service.IAnnualCompPointService;
 import org.jeecg.modules.demo.annualcomp.entity.AnnualComp;
@@ -96,6 +97,8 @@ public class AwardPersionController extends JeecgController<AwardPersion, IAward
 	 private ISysRoleService sysRoleService;
 	 @Autowired
 	 private ISysUserRoleService sysUserRoleService;
+	 @Autowired
+	 private IAnnualService annualService;
 
 	/**
 	 * 分页列表查询
@@ -536,10 +539,17 @@ public class AwardPersionController extends JeecgController<AwardPersion, IAward
 					QueryWrapper<TeamManagement> queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, request.getParameterMap());
 					queryWrappertm.eq("enroll_code",list.get(i).getEnrollCode());
 					List<TeamManagement> listtm = teamManagementService.list(queryWrappertm);
+					try {
+						list.get(i).setAnnualid(annualService.getannualthisid(list.get(i).getAnnualid()));
+					}catch (Exception e){
+						return Result.error("文件导入失败:第"+(i+1)+"行年度不存在");
+					}
+
 					try {
 					for (int l = 0 ; l < listtm.size() ; l++){
 						SysUser sysUser = sysUserService.getById(listtm.get(l).getUserId());
 						list.get(i).setStudentorg(sysDepartService.queryDepartsByUsername(sysUser.getUsername()).get(0).getId());
+
 						if(listaca.get(0).getFirstPrize().equals(list.get(i).getAwardname())){
 							list.get(i).setAwardsort(1);
 							list.get(i).setAwardid(listaca.get(0).getId());

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/comp/mapper/CompMapper.java

@@ -30,5 +30,5 @@ public interface CompMapper extends BaseMapper<Comp> {
     List<Comp> getAllCompByType(String compTypeId);
 
     @Update("UPDATE comp SET compweight = #{scoreold} WHERE id=#{id}")
-    void updatedatework(String id, int scoreold);
+    void updatedatework(@Param("id") String id, @Param("scoreold") int scoreold);
 }

jeecgboot-vue3-master/src/views/system/loginmini/MiniLogin.vue

@@ -112,13 +112,13 @@
                 </div>
               </div>
               <a-form @keyup.enter.native="loginHandleClick">
-               <!-- <div class="aui-flex aui-third-text">
+                <div class="aui-flex aui-third-text">
                   <div class="aui-flex-box aui-third-border">
                     <span>{{ t('sys.login.otherSignIn') }}</span>
                   </div>
-                </div>-->
-              <!--  <div class="aui-flex" :class="`${prefixCls}-sign-in-way`">
-                  <div class="aui-flex-box">
+                </div>
+                <div class="aui-flex" :class="`${prefixCls}-sign-in-way`">
+                  <!--<div class="aui-flex-box">
                     <div class="aui-third-login">
                       <a title="github" @click="onThirdLogin('github')"><GithubFilled /></a>
                     </div>
@@ -132,13 +132,13 @@
                     <div class="aui-third-login">
                       <a title="钉钉" @click="onThirdLogin('dingtalk')"><DingtalkCircleFilled /></a>
                     </div>
-                  </div>
+                  </div>-->
                   <div class="aui-flex-box">
                     <div class="aui-third-login">
                       <a title="微信" @click="onThirdLogin('wechat_open')"><WechatFilled /></a>
                     </div>
                   </div>
-                </div>-->
+                </div>
               </a-form>
             </div>
           </div>

jeecgboot-vue3-master/src/views/system/user/userYX.data.ts

@@ -21,7 +21,7 @@ export const columns: BasicColumn[] = [
     width: 120,
     customRender: render.renderAvatar,
   },
-  {
+/*  {
     title: '性别',
     dataIndex: 'sex',
     width: 80,
@@ -34,7 +34,7 @@ export const columns: BasicColumn[] = [
     title: '生日',
     dataIndex: 'birthday',
     width: 100,
-  },
+  },*/
   {
     title: '手机号',
     dataIndex: 'phone',

jeecgboot-vue3-master/src/views/system/user/userZJ.data.ts

@@ -20,7 +20,7 @@ export const columns: BasicColumn[] = [
     width: 120,
     customRender: render.renderAvatar,
   },
-  {
+  /*{
     title: '性别',
     dataIndex: 'sex',
     width: 80,
@@ -33,7 +33,7 @@ export const columns: BasicColumn[] = [
     title: '生日',
     dataIndex: 'birthday',
     width: 100,
-  },
+  },*/
   {
     title: '手机号',
     dataIndex: 'phone',

jeecgboot-vue3-master/src/views/system/userZJ/user.data.ts

@@ -20,7 +20,7 @@ export const columns: BasicColumn[] = [
     width: 120,
     customRender: render.renderAvatar,
   },
-  {
+  /*{
     title: '性别',
     dataIndex: 'sex',
     width: 80,
@@ -33,7 +33,7 @@ export const columns: BasicColumn[] = [
     title: '生日',
     dataIndex: 'birthday',
     width: 100,
-  },
+  },*/
   {
     title: '手机号',
     dataIndex: 'phone',

jeecgboot-vue3-master/src/views/system/userZJ/userZJ.data.ts

@@ -20,7 +20,7 @@ export const columns: BasicColumn[] = [
     width: 120,
     customRender: render.renderAvatar,
   },
-  {
+ /* {
     title: '性别',
     dataIndex: 'sex',
     width: 80,
@@ -33,7 +33,7 @@ export const columns: BasicColumn[] = [
     title: '生日',
     dataIndex: 'birthday',
     width: 100,
-  },
+  },*/
   {
     title: '手机号',
     dataIndex: 'phone',

jeecgboot-vue3-master/src/views/system/usercompexpert/user.data.ts

@@ -20,7 +20,7 @@ export const columns: BasicColumn[] = [
     width: 120,
     customRender: render.renderAvatar,
   },
-  {
+  /*{
     title: '性别',
     dataIndex: 'sex',
     width: 80,
@@ -33,7 +33,7 @@ export const columns: BasicColumn[] = [
     title: '生日',
     dataIndex: 'birthday',
     width: 100,
-  },
+  },*/
   {
     title: '手机号',
     dataIndex: 'phone',

jeecgboot-vue3-master/src/views/system/usercompexpert/userZJ.data.ts

@@ -20,7 +20,7 @@ export const columns: BasicColumn[] = [
     width: 120,
     customRender: render.renderAvatar,
   },
-  {
+  /*{
     title: '性别',
     dataIndex: 'sex',
     width: 80,
@@ -33,7 +33,7 @@ export const columns: BasicColumn[] = [
     title: '生日',
     dataIndex: 'birthday',
     width: 100,
-  },
+  },*/
   {
     title: '手机号',
     dataIndex: 'phone',

jeecgboot-vue3-master/src/views/system/userdep/userYX.data.ts

@@ -22,7 +22,7 @@ export const columns: BasicColumn[] = [
     width: 120,
     customRender: render.renderAvatar,
   },
-  {
+  /*{
     title: '性别',
     dataIndex: 'sex',
     width: 80,
@@ -35,7 +35,7 @@ export const columns: BasicColumn[] = [
     title: '生日',
     dataIndex: 'birthday',
     width: 100,
-  },
+  },*/
   {
     title: '手机号',
     dataIndex: 'phone',

jeecgboot-vue3-master/src/views/system/userdep/userZJ.data.ts

@@ -20,7 +20,7 @@ export const columns: BasicColumn[] = [
     width: 120,
     customRender: render.renderAvatar,
   },
-  {
+  /*{
     title: '性别',
     dataIndex: 'sex',
     width: 80,
@@ -33,7 +33,7 @@ export const columns: BasicColumn[] = [
     title: '生日',
     dataIndex: 'birthday',
     width: 100,
-  },
+  },*/
   {
     title: '手机号',
     dataIndex: 'phone',