题目生成修改，考试成绩计算修改，用户新增接口修改

Administrator

2021-08-27 18464ca2adbfc5e4e0f4c111be78a29658d96e3d

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

@@ -34,6 +34,7 @@
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;

@@ -197,7 +198,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){
@@ -262,6 +263,8 @@
                           result = pre + (decimalFormat.format(count++));
                        }
                        user.setSecuritynumber(result);
                        //发证日期
                        user.setPaperTime(new Date());
                        //修改为持证保安
                        user.setHold("1");
                        //分配保安角色
@@ -276,6 +279,7 @@
                           "update blade_user set role_id = " + "'" +  user.getRoleId() + "'" +
                              ",hold = " + "'" + user.getHold() + "'" +
                              ",securitynumber = " + "'" + user.getSecuritynumber() + "'" +
                              ",paper_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime()) + "'" +
                              " " +"where id = " + "'" + user.getId() + "'";
                        FtpUtil.sqlFileUpload(s1);
                     }
@@ -288,8 +292,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))));
                  }

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

   @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);
   }
}