From 8e99321db3dfeedaf910c7a7c7f5afde60caafb7 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 06 May 2022 15:21:08 +0800
Subject: [PATCH] 枪支，派遣单位，考试成绩保存，成绩审查，主要管理人员，出资人，用户导入，新增，许可证信息等信息修改变动
---
src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java b/src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java
index f99e66c..0638a6c 100644
--- a/src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java
+++ b/src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java
@@ -29,10 +29,12 @@
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.Func;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.information.excel.InforExcel;
import org.springblade.modules.information.excel.InforImporter;
+import org.springblade.modules.licence.entity.LicencePaper;
import org.springblade.modules.member.excel.memberExcel;
import org.springblade.modules.shareholder.entity.Shareholder;
import org.springblade.modules.shareholder.excel.shareExcel;
@@ -48,6 +50,7 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
/**
* 保安公司主要出资人信息
@@ -102,8 +105,8 @@
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入shareholder")
- public R save(@Valid @RequestBody Shareholder shareholder) throws Exception {
- Shareholder shareholder1 = shareholder;
+ public R save(@Valid @RequestBody Shareholder shareholder){
+ Shareholder shareholder1 = Objects.requireNonNull(BeanUtil.copy(shareholder, Shareholder.class));
//脱敏处理
if (null!=shareholder1.getCardid() && !shareholder1.getCardid().equals("")){
shareholder1.setCardid(DesensitizedUtil.desensitizedIdNumberBy4(shareholder1.getCardid()));
@@ -149,8 +152,8 @@
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入shareholder")
- public R update(@Valid @RequestBody Shareholder shareholder) throws Exception {
- Shareholder shareholder1 = shareholder;
+ public R update(@Valid @RequestBody Shareholder shareholder){
+ Shareholder shareholder1 = Objects.requireNonNull(BeanUtil.copy(shareholder, Shareholder.class));
//脱敏处理
if (null!=shareholder1.getCardid() && !shareholder1.getCardid().equals("")){
shareholder1.setCardid(DesensitizedUtil.desensitizedIdNumberBy4(shareholder1.getCardid()));
@@ -210,7 +213,6 @@
List<Long> list = Func.toLongList(ids);
list.forEach(id -> {
String s1 = "delete from sys_shareholder where id = " + "'" + id + "'";
- //FtpUtil.sqlFileUpload(s1);
myAsyncService.FTP(s1);
});
return R.status(shareholderService.removeByIds(Func.toLongList(ids)));
--
Gitblit v1.9.3