From 8b375fe00a241b3a769b82fe3dac8d1c9dce8a02 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 16 Jun 2022 14:36:07 +0800
Subject: [PATCH] 模拟考试修改
---
src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java
index 22d774f..0eb1e35 100644
--- a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java
+++ b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java
@@ -29,6 +29,7 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.FTP.FtpUtil;
@@ -42,6 +43,7 @@
import org.springblade.modules.dispatcher.vo.DispatcherVO;
import org.springblade.modules.exam.excel.ExamScoreExcel;
import org.springblade.modules.exam.excel.ExamScoreImporter;
+import org.springblade.modules.securitypaper.entity.SecurityPaper;
import org.springblade.modules.system.service.MyAsyncService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -53,6 +55,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
* 控制器
@@ -133,45 +136,45 @@
@PostMapping("/submit")
public R submit(@Valid @RequestBody DispatcherUnit dispatcherUnit) {
boolean status = false;
+ //内网
+ DispatcherUnit dispatcherUnit1 = Objects.requireNonNull(BeanUtil.copy(dispatcherUnit, DispatcherUnit.class));
+ //脱敏处理
+ if (null!=dispatcherUnit.getLinkman()) {
+ dispatcherUnit1.setLinkman(DesensitizedUtil.desensitizedName(dispatcherUnit.getLinkman()));
+ }
+ if (null!=dispatcherUnit.getPhone()) {
+ dispatcherUnit1.setPhone(DesensitizedUtil.desensitizedPhoneNumber(dispatcherUnit.getPhone()));
+ }
+ dispatcherUnit1.setSecurityLinkman(DesensitizedUtil.desensitizedName(dispatcherUnit.getSecurityLinkman()));
+ dispatcherUnit1.setCell(DesensitizedUtil.desensitizedPhoneNumber(dispatcherUnit.getCell()));
if (null == dispatcherUnit.getId()) {
dispatcherUnit.setCreateTime(new Date());
- //内网
- DispatcherUnit dispatcherUnit1 = dispatcherUnit;
- //脱敏处理
- if (null!=dispatcherUnit.getLinkman()) {
- dispatcherUnit1.setLinkman(DesensitizedUtil.desensitizedName(dispatcherUnit.getLinkman()));
- }
- if (null!=dispatcherUnit.getPhone()) {
- dispatcherUnit1.setPhone(DesensitizedUtil.desensitizedPhoneNumber(dispatcherUnit.getPhone()));
- }
- dispatcherUnit1.setSecurityLinkman(DesensitizedUtil.desensitizedName(dispatcherUnit.getSecurityLinkman()));
- dispatcherUnit1.setCell(DesensitizedUtil.desensitizedPhoneNumber(dispatcherUnit.getCell()));
//新增
- status = dispatcherUnitService.save(dispatcherUnit);
+ status = dispatcherUnitService.save(dispatcherUnit1);
if (status) {
//数据同步
String s1 =
"insert into sys_dispatcher_unit(id,name,dept_id,linkman,phone,jurisdiction,create_time,start_time,end_time," +
"serve_type,security_linkman,cell,num) " +
- "values(" + "'" + dispatcherUnit.getId() + "'" + "," +
+ "values(" + "'" + dispatcherUnit1.getId() + "'" + "," +
"'" + dispatcherUnit.getName() + "'" + "," +
"'" + dispatcherUnit.getDeptId() + "'" + "," +
- "'" + dispatcherUnit1.getLinkman() + "'" + "," +
- "'" + dispatcherUnit1.getPhone() + "'" + "," +
+ "'" + dispatcherUnit.getLinkman() + "'" + "," +
+ "'" + dispatcherUnit.getPhone() + "'" + "," +
"'" + dispatcherUnit.getJurisdiction() + "'" + "," +
"'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(dispatcherUnit.getCreateTime()) + "'" + "," +
"'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcherUnit.getStartTime()) + "'" + "," +
"'" + new SimpleDateFormat("yyyy-MM-dd").format(dispatcherUnit.getEndTime()) + "'" + "," +
"'" + dispatcherUnit.getServeType() + "'" + "," +
- "'" + dispatcherUnit1.getSecurityLinkman() + "'" + "," +
- "'" + dispatcherUnit1.getCell() + "'" + "," +
+ "'" + dispatcherUnit.getSecurityLinkman() + "'" + "," +
+ "'" + dispatcherUnit.getCell() + "'" + "," +
"'" + dispatcherUnit.getNum() + "'" + ")";
//FtpUtil.sqlFileUpload(s1);
myAsyncService.FTP(s1);
}
} else {
//修改
- status = dispatcherUnitService.updateById(dispatcherUnit);
+ status = dispatcherUnitService.updateById(dispatcherUnit1);
//派遣记录修改合同时间
Long id = dispatcherUnit.getId();
@@ -219,7 +222,6 @@
list.forEach(id -> {
//内网同步
String s1 = "delete from sys_dispatcher_unit where id = " + "'" + id + "'";
- //FtpUtil.sqlFileUpload(s1);
myAsyncService.FTP(s1);
});
return R.status(dispatcherUnitService.removeByIds(Func.toLongList(ids)));
--
Gitblit v1.9.3