From 048ac3dc5e9959821bf2d9a4f0435d7858556bdc Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 17 Dec 2021 16:44:36 +0800
Subject: [PATCH] 1. 保安证打印修改 2. 保安证查询修改 3. 考试成绩查询修改
---
src/main/java/org/springblade/modules/accreditation/controller/AccreditationRecordsController.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 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 358c126..32b4d63 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);
}
@@ -338,8 +364,10 @@
if (list.size()<=7){
HSSFRow row = sheet.createRow(0);
row.setHeight((short) 1980);
+
HSSFRow row1 = sheet.createRow(1);
row1.setHeight((short) 300);
+
for (int i = 0; i < list.size(); i++) {
ExportSecurityPaperExcelVO checkWorkVo = list.get(i);
row1.createCell(i).setCellValue(checkWorkVo.getName());
--
Gitblit v1.9.3