From d3397094c217c642d68313ca6b9996e6a133b362 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 31 Dec 2021 11:41:47 +0800
Subject: [PATCH] 1. 保安员导入去除是否持证 2. 考试成绩统计查询新增查询接口 3. 新增保安员证导入接口 4. 上岗证导出修改为导出即修改制证状态
---
src/main/java/org/springblade/modules/accreditation/controller/AccreditationRecordsController.java | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/accreditation/controller/AccreditationRecordsController.java b/src/main/java/org/springblade/modules/accreditation/controller/AccreditationRecordsController.java
index 3eb7b09..dc1f539 100644
--- a/src/main/java/org/springblade/modules/accreditation/controller/AccreditationRecordsController.java
+++ b/src/main/java/org/springblade/modules/accreditation/controller/AccreditationRecordsController.java
@@ -70,13 +70,39 @@
}
/**
- * 新增
+ * 新增（补证）
* @param accreditationRecords 制证记录信息对象
*/
@PostMapping("/save")
@ApiOperation(value = "新增", notes = "传入accreditationRecords")
public R save(@RequestBody AccreditationRecords accreditationRecords){
- return R.data(accreditationRecordsService.save(accreditationRecords));
+ accreditationRecords.setCreateTime(new Date());
+ accreditationRecords.setStatus(1);
+ accreditationRecords.setAuditStatus(1);
+ boolean save = accreditationRecordsService.save(accreditationRecords);
+
+ //修改用户信息
+ User user = new User();
+ user.setId(accreditationRecords.getUserId());
+ user.setUpdateTime(new Date());
+ //修改为未制证状态
+ user.setUserType(7);
+ userService.updateById(user);
+ //内网同步
+ //内网新增
+ String s = "insert into sys_accreditation_records(id,user_id,create_time,create_user,status,type,audit_status) " +
+ "values(" + "'" + accreditationRecords.getId() + "'" + ","
+ + "'" + accreditationRecords.getUserId() + "'" + ","
+ + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(accreditationRecords.getCreateTime()) + "'" + ","
+ + "'" + accreditationRecords.getCreateUser() +"'" + ","
+ + "'" + accreditationRecords.getStatus() +"'" + ","
+ + "'" + accreditationRecords.getType() +"'" + ","
+ +"'" + accreditationRecords.getAuditStatus() + "'" + ");" +
+ "update blade_user set user_type = " + "'" + user.getUserType() + "'" +
+ ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'" +
+ " " + "where id = " + "'" + user.getId() + "'";
+ FtpUtil.sqlFileUpload(s);
+ return R.data(save);
}
@@ -86,9 +112,17 @@
* @param accreditationRecords 制证记录信息对象
*/
@PostMapping("/securityApply")
- @ApiOperation(value = "新增", notes = "传入accreditationRecords")
public R securityApply(@RequestBody AccreditationRecordsVo accreditationRecords){
return R.data(accreditationRecordsService.securityApply(accreditationRecords));
+ }
+
+ /**
+ * 批量修改为已制证
+ * @param accreditationRecords 制证记录信息对象
+ */
+ @PostMapping("/batchAccreditation")
+ public R batchAccreditation(@RequestBody AccreditationRecordsVo accreditationRecords){
+ return R.data(accreditationRecordsService.batchAccreditation(accreditationRecords));
}
@@ -239,7 +273,7 @@
}
/**
- * 导出保安员证信息
+ * 导出保安员证信息（上岗证）
*/
@GetMapping("export-security-paper")
public void exportSecurityPaper(AccreditationRecordsVo accreditationRecords, HttpServletResponse response) throws IOException {
--
Gitblit v1.9.3