From 0d99d26f39e055ee17fdbf2c5cbd1daf695c4310 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 13 Sep 2021 21:28:42 +0800
Subject: [PATCH] 报名新增,报名查询,报名清册,培训报名,培训报名查询修改

---
 src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java |   38 +++++++++++++++++++++++++++++++++++---
 1 files changed, 35 insertions(+), 3 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 35ce7c5..20d7f6e 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
@@ -115,6 +115,25 @@
 		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);
+	}
+
 	/**
 	 * 修改总成绩
 	 *
@@ -135,14 +154,15 @@
 					//去生成保安证编号
 					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);
 					//发证日期
@@ -314,4 +334,16 @@
 		cjhz.put("sccj",sccj);
 		return R.data(cjhz);
 	}
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param query     page,size
+	 */
+	@GetMapping("/score-page")
+	public R<IPage<ExamScoreVO>> scorePage(Query query, String deptid, String jurisdiction) {
+		IPage<ExamScoreVO> pages = examScoreService.scorePage(Condition.getPage(query),deptid,jurisdiction);
+		return R.data(pages);
+	}
+
 }

--
Gitblit v1.9.3