From f7115db7eb622bcd2dd4ec62ce6f2b380a46bc08 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 04 Dec 2021 14:50:52 +0800
Subject: [PATCH] 派遣，考试，工作汇报修改
---
src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java | 184 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 164 insertions(+), 20 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
index abbff05..a3b6246 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
@@ -10,6 +10,7 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.exam.entity.ExamPaper;
import org.springblade.modules.exam.entity.ExamScore;
import org.springblade.modules.exam.excel.ExamScoreExcel;
@@ -18,15 +19,19 @@
import org.springblade.modules.exam.service.ExamScoreService;
import org.springblade.modules.exam.util.SecurityPaperUtil;
import org.springblade.modules.exam.vo.ExamScoreVO;
+import org.springblade.modules.system.entity.Role;
import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.service.IRoleService;
import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.system.vo.UserVO;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+
import javax.servlet.http.HttpServletResponse;
+import java.sql.Array;
import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
+import java.text.SimpleDateFormat;
+import java.util.*;
/**
* @author zhongrj
@@ -44,9 +49,12 @@
private final ExamPaperService examPaperService;
+ private final IRoleService roleService;
+
/**
* 自定义分页
- * @param query page,size
+ *
+ * @param query page,size
* @param examScore 考试成绩信息对象
*/
@GetMapping("/page")
@@ -66,27 +74,40 @@
/**
* 新增
+ *
* @param examScore 考试成绩信息对象
*/
@PostMapping("/save")
@ApiOperation(value = "新增", notes = "传入examScore")
public R save(@RequestBody ExamScore examScore) {
- return R.status(examScoreService.save(examScore));
+ boolean save = examScoreService.save(examScore);
+ //内网同步
+ Long sid = examScore.getId();
+ String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examScore.getExamTime());
+ String s = "insert into exam_score(id,exam_time) " +
+ "values(" + "'" + sid + "'" +
+ "," + "'" + format + "'" + ")";
+ FtpUtil.sqlFileUpload(s);
+ //返回
+ return R.status(save);
}
/**
* 保存考试成绩
+ *
* @param examScore 考试成绩信息对象
*/
@PostMapping("/saveExamScore")
public R saveExamScore(@RequestBody ExamScoreVO examScore) {
+
return R.status(examScoreService.saveExamScore(examScore));
}
/**
* 修改
+ *
* @param examScore 考试成绩信息对象
*/
@PostMapping("/update")
@@ -94,53 +115,104 @@
return R.status(examScoreService.updateById(examScore));
}
+
+ /**
+ * 缺考标记修改
+ *
+ * @param examScore 考试成绩信息对象
+ */
+ @PostMapping("/updateAbsent")
+ public R updateAbsent(@RequestBody ExamScore examScore) {
+ examScore.setQualified(3);
+ boolean status = examScoreService.updateByIdAndQualifiee(examScore);
+
+ //内网数据推送
+ String s1 =
+ "update exam_score set qualified = " + "'" + examScore.getQualified() + "'" +
+ " " + "where id = " + "'" + examScore.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
+ return R.status(status);
+ }
+
/**
* 修改总成绩
+ *
* @param examScore 考试成绩信息对象
*/
@PostMapping("/updateExamScore")
- public R updateExamScore(@RequestBody ExamScore examScore){
- if (null!=examScore.getLearnGrade() && null!=examScore.getTheoryGrade()){
+ public R updateExamScore(@RequestBody ExamScore examScore) {
+ if (null != examScore.getLearnGrade() && null != examScore.getTheoryGrade()) {
ExamScore examScore1 = examScoreService.getById(examScore.getId());
- if (examScore.getTheoryGrade()>=60 && examScore.getLearnGrade()>=60){
+ //查询当前保安信息
+ UserVO user = userService.getUserAgeById(Long.parseLong(examScore1.getUserId()));
+ if (examScore.getTheoryGrade() >= 60 && examScore.getLearnGrade() >= 60) {
//合格
examScore.setQualified(0);
//正式考试通过生成保安证编号
ExamPaper paper = examPaperService.getById(examScore.getExamId());
- if (paper.getExamType()==1) {
+ if (paper.getExamType() == 1) {
//去生成保安证编号
- //查询当前保安信息
- User user = userService.getById(examScore1.getUserId());
String pre = SecurityPaperUtil.getSecurityPaper();
//查询当前年份已有的保安证编号
- int count = userService.getSecurityPaperCount(pre);
+ int max = userService.getSecurityPaperCount(pre);
String result = null;
- if (count == 0) {
+ if (max == 0) {
result = pre + "00000";
} else {
//格式化
DecimalFormat decimalFormat = new DecimalFormat("00000");
- result = pre + (decimalFormat.format(count++));
+ max++;
+ result = pre + (decimalFormat.format(max));
}
user.setSecuritynumber(result);
+ //发证日期
+ user.setPaperTime(new Date());
+ //修改为持证保安
+ user.setHold("1");
+ //分配保安角色
+// 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 hold = " + "'" + user.getHold() + "'" +
+ ",securitynumber = " + "'" + user.getSecuritynumber() + "'" +
+ ",paper_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime()) + "'" +
+ " " + "where id = " + "'" + user.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
}
- }else {
+ } else {
//不合格
examScore.setQualified(1);
}
//总成绩
- examScore.setAllGrade(Math.round((examScore.getLearnGrade()+examScore1.getTheoryGrade())/2));
+ if (user.getAge() <= 50) {
+ examScore.setAllGrade(Math.round((examScore.getLearnGrade() + examScore1.getTheoryGrade()) / 2));
+ }
+ if (user.getAge() > 50) {
+ examScore.setAllGrade(Integer.parseInt(String.valueOf(Math.round(examScore1.getTheoryGrade() * 0.5)))
+ + Integer.parseInt(String.valueOf(Math.round(examScore1.getLearnGrade() * 0.5))));
+ }
}
- //内网修改
- //arg.test01(arg.url+"/examScore/update",examScore);
+ //内网同步
+ String s1 =
+ "update exam_score set learn_grade = " + "'" + examScore.getLearnGrade() + "'" +
+ ",all_grade = " + "'" + examScore.getAllGrade() + "'" +
+ ",qualified = " + "'" + examScore.getQualified() + "'" +
+ " " + "where id = " + "'" + examScore.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
+
+
//本地修改
return R.status(examScoreService.updateById(examScore));
}
/**
* 新增或修改
+ *
* @param examScore 考试成绩信息对象
*/
@PostMapping("/submit")
@@ -150,15 +222,24 @@
/**
* 删除
+ *
* @param ids 考试成绩信息ids 数组
*/
@PostMapping("/remove")
public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
+ List<String> list = Arrays.asList(ids.split(","));
+ list.forEach(id -> {
+ //内网同步
+ String s1 = "delete from exam_score where id = " + "'" + id + "'";
+ FtpUtil.sqlFileUpload(s1);
+ });
return R.status(examScoreService.removeByIds(Func.toLongList(ids)));
}
+
/**
* 详情
+ *
* @param examScore 考试成绩信息对象
*/
@GetMapping("/detail")
@@ -173,6 +254,7 @@
/**
* 详情
+ *
* @param examScore 考试成绩信息对象
*/
@GetMapping("/details")
@@ -186,6 +268,7 @@
/**
* 导入实操成绩
+ *
* @param isCovered 1 覆盖 0不覆盖
* @return
*/
@@ -212,7 +295,68 @@
*/
@GetMapping("score-statistics")
@ApiOperation(value = "分数统计")
- public R<List> scoreStatistics(HttpServletResponse response) {
- return R.data(examScoreService.scoreStatistics());
+ public R<Map> scoreStatistics(HttpServletResponse response, String deptid, String jurisdiction) {
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials", "true");
+ List<Map<String, Object>> a = examScoreService.scoreStatistics(deptid, jurisdiction);
+ List<Map<String, Object>> b = examScoreService.scoreStatisticssc(deptid, jurisdiction);
+
+ Map<String, List> cjhz = new HashMap<>();
+ List llcj = new ArrayList();
+ List sccj = new ArrayList();
+
+ for (int i = 0; i <= 100; i++) {
+ int xb1 = 0,xb2 = 0;
+
+ for (int j = 0; j < a.size(); j++) {
+ if (i == (int) a.get(j).get("fs")) {
+ llcj.add(a.get(j).get("count").toString());
+ xb1 = 1;
+ }
+ }
+
+ for (int j = 0; j < b.size(); j++) {
+ if (i == (int) b.get(j).get("fs")) {
+ sccj.add(b.get(j).get("count").toString());
+ xb2 = 1;
+ }
+ }
+
+ if (xb1 == 0){
+ llcj.add("0");
+ }
+ if (xb2 == 0){
+ sccj.add("0");
+ }
+ }
+ cjhz.put("llcj",llcj);
+ cjhz.put("sccj",sccj);
+ return R.data(cjhz);
}
+
+ /**
+ * 考试合格人数对比统计
+ */
+ @GetMapping("score-stat")
+ @ApiOperation(value = "分数统计")
+ public R scoreStat(HttpServletResponse response, String deptid, String jurisdiction) {
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials", "true");
+ List<Object> mapList = examScoreService.scoreStat(deptid, jurisdiction);
+ return R.data(mapList);
+ }
+
+ /**
+ * 自定义分页
+ *
+ * @param query page,size
+ */
+ @GetMapping("/score-page")
+ public R<IPage<ExamScoreVO>> scorePage(Query query, String deptid, String jurisdiction,String realName) {
+ IPage<ExamScoreVO> pages = examScoreService.scorePage(Condition.getPage(query),deptid,jurisdiction,realName);
+ return R.data(pages);
+ }
+
}
--
Gitblit v1.9.3