派遣，考试，工作汇报修改

Administrator

2021-12-04 f7115db7eb622bcd2dd4ec62ce6f2b380a46bc08

 src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java

@@ -80,6 +80,16 @@
   }

   /**
    * 自定义分页数据
    * @param page 分页条件
    * @return
    */
   @Override
   public IPage<ExamScoreVO> scorePage(IPage<ExamScoreVO> page,String deptid,String jurisdiction,String realName) {
      return page.setRecords(baseMapper.scorePage(page,deptid,jurisdiction,realName));
   }

   /**
    * 详情
    * @param examScore 考试成绩信息对象
    */
@@ -198,7 +208,7 @@
            examScore.setAllGrade(Math.round(theoryGrade / 2));
         }
         if (age>50) {
            examScore.setAllGrade(Integer.parseInt(String.valueOf(Math.round(theoryGrade*0.3))));
            examScore.setAllGrade(Integer.parseInt(String.valueOf(Math.round(theoryGrade*0.5))));
         }
         //设置状态
         if (theoryGrade>=60){
@@ -260,7 +270,8 @@
                        } else {
                           //格式化
                           DecimalFormat decimalFormat = new DecimalFormat("00000");
                           result = pre + (decimalFormat.format(count++));
                           count++;
                           result = pre + (decimalFormat.format(count));
                        }
                        user.setSecuritynumber(result);
                        //发证日期
@@ -268,16 +279,15 @@
                        //修改为持证保安
                        user.setHold("1");
                        //分配保安角色
                        Role role = new Role();
                        role.setRoleAlias("保安");
                        Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
                        user.setRoleId(oneRole.getId().toString());
//                        Role role = new Role();
//                        role.setRoleAlias("保安");
//                        Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
//                        user.setRoleId(oneRole.getId().toString());
                        //更新保安数据
                        userService.updateById(user);

                        String s1 =
                           "update blade_user set role_id = " + "'" +  user.getRoleId() + "'" +
                              ",hold = " + "'" + user.getHold() + "'" +
                           "update blade_user set hold = " + "'" +  user.getHold() + "'" +
                              ",securitynumber = " + "'" + user.getSecuritynumber() + "'" +
                              ",paper_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime()) + "'" +
                              " " +"where id = " + "'" + user.getId() + "'";
@@ -292,8 +302,8 @@
                     examScore.setAllGrade(Math.round((examScore.getTheoryGrade()+examScoreExcel.getLearnGrade())/2));
                  }
                  if (user.getAge()>50) {
                     examScore.setAllGrade(Integer.parseInt(String.valueOf(Math.round(examScore.getTheoryGrade()*0.3)))
                        + Integer.parseInt(String.valueOf(Math.round(examScoreExcel.getLearnGrade()*0.7))));
                     examScore.setAllGrade(Integer.parseInt(String.valueOf(Math.round(examScore.getTheoryGrade()*0.5)))
                        + Integer.parseInt(String.valueOf(Math.round(examScoreExcel.getLearnGrade()*0.5))));
                  }

                  //内网同步
@@ -312,7 +322,36 @@
   }

   @Override
   public List<Map<String, Object>> scoreStatistics() {
      return baseMapper.scoreStatistics();
   public List<Map<String, Object>> scoreStatistics(String deptid,String jurisdiction) {
      return baseMapper.scoreStatistics(deptid,jurisdiction);
   }
   @Override
   public List<Map<String, Object>> scoreStatisticssc(String deptid,String jurisdiction) {
      return baseMapper.scoreStatisticssc(deptid,jurisdiction);
   }

   /**
    * 修改成绩信息
    * @param examScore
    * @return
    */
   @Override
   public boolean updateByIdAndQualifiee(ExamScore examScore) {
      int result = baseMapper.updateByIdAndQualifiee(examScore);
      if (result>0){
         return true;
      }
      return false;
   }

   /**
    * 考试合格人数对比
    * @param deptid
    * @param jurisdiction
    * @return
    */
   @Override
   public List<Object> scoreStat(String deptid, String jurisdiction) {
      return baseMapper.scoreStat(deptid,jurisdiction);
   }
}