From 8853292babb2ad94de4a3207966f1e83b767cd2d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sun, 17 Sep 2023 16:38:34 +0800
Subject: [PATCH] 新增流程节点进程查询接口
---
src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java | 126 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 116 insertions(+), 10 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 da0ea4f..74ce87c 100644
--- a/src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java
+++ b/src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java
@@ -24,19 +24,32 @@
import lombok.AllArgsConstructor;
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.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.member.excel.memberExcel;
import org.springblade.modules.shareholder.entity.Shareholder;
+import org.springblade.modules.shareholder.excel.shareExcel;
+import org.springblade.modules.shareholder.excel.shareImporter;
import org.springblade.modules.shareholder.service.IShareholderService;
import org.springblade.modules.shareholder.vo.ShareholderVO;
+import org.springblade.modules.system.service.MyAsyncService;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
/**
- * 控制器
+ * 保安公司主要出资人信息
*
* @author BladeX
* @since 2021-07-06
@@ -48,7 +61,7 @@
public class ShareholderController extends BladeController {
private final IShareholderService shareholderService;
-
+ private final MyAsyncService myAsyncService;
/**
* 详情
*/
@@ -89,9 +102,36 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入shareholder")
public R save(@Valid @RequestBody Shareholder shareholder) throws Exception {
- arg arg = new arg();
- arg.test01(arg.url+"/shareholder/save",shareholder);
- return R.status(shareholderService.save(shareholder));
+ boolean save = shareholderService.save(shareholder);
+ if (shareholder.getCapitaltime() == null) {
+ String s1 =
+ "insert into sys_shareholder(id,shareholder,shareholdingratio,capital,cardid,cell,creditCode,dept_id) " +
+ "values(" + "'" + shareholder.getId() + "'" + "," +
+ "'" + shareholder.getShareholder() + "'" + "," +
+ "'" + shareholder.getShareholdingratio() + "'" + "," +
+ "'" + shareholder.getCapital() + "'" + "," +
+ "'" + shareholder.getCardid() + "'" + "," +
+ "'" + shareholder.getCell() + "'" + "," +
+ "'" + shareholder.getCreditcode() + "'" + "," +
+ "'" + shareholder.getDeptId() + "'" + ")";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
+ } else {
+ String s1 =
+ "insert into sys_shareholder(id,shareholder,shareholdingratio,capital,capitalTime,cardid,cell,creditCode,dept_id) " +
+ "values(" + "'" + shareholder.getId() + "'" + "," +
+ "'" + shareholder.getShareholder() + "'" + "," +
+ "'" + shareholder.getShareholdingratio() + "'" + "," +
+ "'" + shareholder.getCapital() + "'" + "," +
+ "'" + new SimpleDateFormat("yyyy-MM-dd").format(shareholder.getCapitaltime()) + "'" + "," +
+ "'" + shareholder.getCardid() + "'" + "," +
+ "'" + shareholder.getCell() + "'" + "," +
+ "'" + shareholder.getCreditcode() + "'" + "," +
+ "'" + shareholder.getDeptId() + "'" + ")";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
+ }
+ return R.status(save);
}
/**
@@ -100,8 +140,35 @@
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入shareholder")
- public R update(@Valid @RequestBody Shareholder shareholder) {
- return R.status(shareholderService.updateById(shareholder));
+ public R update(@Valid @RequestBody Shareholder shareholder) throws Exception {
+ boolean b = shareholderService.updateById(shareholder);
+ if (shareholder.getCapitaltime() == null) {
+ //内网同步
+ String s1 = "update sys_shareholder set shareholder = " + "'" + shareholder.getShareholder() + "'" +
+ ",shareholdingratio = " + "'" + shareholder.getShareholdingratio() + "'" +
+ ",capital = " + "'" + shareholder.getCapital() + "'" +
+ ",cardid = " + "'" + shareholder.getCardid() + "'" +
+ ",cell = " + "'" + shareholder.getCell() + "'" +
+ ",creditCode = " + "'" + shareholder.getCreditcode() + "'" +
+ ",dept_id = " + "'" + shareholder.getDeptId() + "'" +
+ " " + "where id = " + "'" + shareholder.getId() + "'";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
+ } else {
+ //内网同步
+ String s1 = "update sys_shareholder set shareholder = " + "'" + shareholder.getShareholder() + "'" +
+ ",shareholdingratio = " + "'" + shareholder.getShareholdingratio() + "'" +
+ ",capital = " + "'" + shareholder.getCapital() + "'" +
+ ",capitalTime = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(shareholder.getCapitaltime()) + "'" +
+ ",cardid = " + "'" + shareholder.getCardid() + "'" +
+ ",cell = " + "'" + shareholder.getCell() + "'" +
+ ",creditCode = " + "'" + shareholder.getCreditcode() + "'" +
+ ",dept_id = " + "'" + shareholder.getDeptId() + "'" +
+ " " + "where id = " + "'" + shareholder.getId() + "'";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
+ }
+ return R.status(b);
}
/**
@@ -122,19 +189,58 @@
@ApiOperationSupport(order = 8)
@ApiOperation(value = "删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ //内网同步
+ List<Long> list = Func.toLongList(ids);
+ list.forEach(id -> {
+ String s1 = "delete from sys_shareholder where id = " + "'" + id + "'";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
+ });
return R.status(shareholderService.removeByIds(Func.toLongList(ids)));
}
/**
* 出资人信息
- * @param creditcode
+ *
+ * @param shareholderVO
* @return
*/
@PostMapping("/selectShareholderInfo")
- public R<IPage<ShareholderVO>> selectShareholderInfo(String creditcode, Query query) {
- IPage<ShareholderVO> pages=shareholderService.selectShareholderInfo(Condition.getPage(query), creditcode);
+ public R<IPage<ShareholderVO>> selectShareholderInfo(ShareholderVO shareholderVO, Query query) {
+ IPage<ShareholderVO> pages = shareholderService.selectShareholderInfo(Condition.getPage(query), shareholderVO);
return R.data(pages);
}
+ /**
+ * 导入投资人信息
+ */
+ @PostMapping("import-share")
+ @ApiOperationSupport(order = 12)
+ @ApiOperation(value = "导入投资人", notes = "传入excel")
+ public R importUser(MultipartFile file, Integer isCovered) {
+ shareImporter shareImporter = new shareImporter(shareholderService, false);
+ ExcelUtil.save(file, shareImporter, shareExcel.class);
+ return R.success("操作成功");
+ }
+
+
+ /**
+ * 导出模板
+ */
+ @GetMapping("export-template")
+ @ApiOperation(value = "导出模板")
+ public void exportMember(HttpServletResponse response) {
+ List<shareExcel> list = new ArrayList<>();
+ shareExcel share = new shareExcel();
+ share.setDeptId("xxx保安服务有限公司");
+ share.setShareholder("张三");
+ share.setShareholdingratio("10");
+ share.setCardid("360***********0001");
+ share.setCell("131********");
+ share.setCapital("50");
+ share.setCapitaltime("2020/01/01");
+ list.add(share);
+ ExcelUtil.export(response, "出资人数据导入模板", "出资人导入数据表", list, shareExcel.class);
+ }
}
--
Gitblit v1.9.3