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/shareholder/controller/ShareholderController.java |   33 ++++++++++++++++++++++++++-------
 1 files changed, 26 insertions(+), 7 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 0b4f9aa..0638a6c 100644
--- a/src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java
+++ b/src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java
@@ -22,16 +22,19 @@
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
+import org.springblade.common.utils.DesensitizedUtil;
 import org.springblade.common.utils.arg;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
 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;
@@ -47,6 +50,7 @@
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 保安公司主要出资人信息
@@ -101,12 +105,20 @@
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入shareholder")
-	public R save(@Valid @RequestBody Shareholder shareholder) throws Exception {
-		boolean save = shareholderService.save(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()));
+		}
+		if (null!=shareholder1.getCell() && !shareholder1.getCell().equals("")){
+			shareholder1.setCell(DesensitizedUtil.desensitizedPhoneNumber(shareholder1.getCell()));
+		}
+		boolean save = shareholderService.save(shareholder1);
 		if (shareholder.getCapitaltime() == null) {
 			String s1 =
 				"insert into sys_shareholder(id,shareholder,shareholdingratio,capital,cardid,cell,creditCode,dept_id) " +
-					"values(" + "'" + shareholder.getId() + "'" + "," +
+					"values(" + "'" + shareholder1.getId() + "'" + "," +
 					"'" + shareholder.getShareholder() + "'" + "," +
 					"'" + shareholder.getShareholdingratio() + "'" + "," +
 					"'" + shareholder.getCapital() + "'" + "," +
@@ -119,7 +131,7 @@
 		} else {
 			String s1 =
 				"insert into sys_shareholder(id,shareholder,shareholdingratio,capital,capitalTime,cardid,cell,creditCode,dept_id) " +
-					"values(" + "'" + shareholder.getId() + "'" + "," +
+					"values(" + "'" + shareholder1.getId() + "'" + "," +
 					"'" + shareholder.getShareholder() + "'" + "," +
 					"'" + shareholder.getShareholdingratio() + "'" + "," +
 					"'" + shareholder.getCapital() + "'" + "," +
@@ -140,8 +152,16 @@
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入shareholder")
-	public R update(@Valid @RequestBody Shareholder shareholder) throws Exception {
-		boolean b = shareholderService.updateById(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()));
+		}
+		if (null!=shareholder1.getCell() && !shareholder1.getCell().equals("")){
+			shareholder1.setCell(DesensitizedUtil.desensitizedPhoneNumber(shareholder1.getCell()));
+		}
+		boolean b = shareholderService.updateById(shareholder1);
 		if (shareholder.getCapitaltime() == null) {
 			//内网同步
 			String s1 = "update sys_shareholder set shareholder = " + "'" + shareholder.getShareholder() + "'" +
@@ -193,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