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 | 86 ++++++++++++++++++++++++++++++------------
1 files changed, 61 insertions(+), 25 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 8e3e99c..74ce87c 100644
--- a/src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java
+++ b/src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java
@@ -38,6 +38,7 @@
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;
@@ -60,7 +61,7 @@
public class ShareholderController extends BladeController {
private final IShareholderService shareholderService;
-
+ private final MyAsyncService myAsyncService;
/**
* 详情
*/
@@ -102,17 +103,34 @@
@ApiOperation(value = "新增", notes = "传入shareholder")
public R save(@Valid @RequestBody Shareholder shareholder) throws Exception {
boolean save = shareholderService.save(shareholder);
- String s1 =
- "insert into sys_shareholder(id,shareholder,shareholdingratio,capital,capitalTime,cardid,cell,creditCode) " +
- "values(" + "'" + shareholder.getId() + "'" + "," +
- "'" + shareholder.getShareholder() + "'" + "," +
- "'" + shareholder.getShareholdingratio() + "'" + "," +
- "'" + shareholder.getCapital() + "'" + "," +
- "'" + new SimpleDateFormat("yyyy-MM-dd").format(shareholder.getCapitaltime()) + "'"+"," +
- "'" + shareholder.getCardid() + "'"+"," +
- "'" + shareholder.getCell() + "'"+"," +
- "'" + shareholder.getCreditcode() + "'" + ")";
- FtpUtil.sqlFileUpload(s1);
+ 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);
}
@@ -124,16 +142,32 @@
@ApiOperation(value = "修改", notes = "传入shareholder")
public R update(@Valid @RequestBody Shareholder shareholder) throws Exception {
boolean b = shareholderService.updateById(shareholder);
- //内网同步
- 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() + "'" +
- " " + "where id = " + "'" + shareholder.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ 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);
}
@@ -159,19 +193,21 @@
List<Long> list = Func.toLongList(ids);
list.forEach(id -> {
String s1 = "delete from sys_shareholder where id = " + "'" + id + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
});
return R.status(shareholderService.removeByIds(Func.toLongList(ids)));
}
/**
* 出资人信息
+ *
* @param shareholderVO
* @return
*/
@PostMapping("/selectShareholderInfo")
public R<IPage<ShareholderVO>> selectShareholderInfo(ShareholderVO shareholderVO, Query query) {
- IPage<ShareholderVO> pages=shareholderService.selectShareholderInfo(Condition.getPage(query), shareholderVO);
+ IPage<ShareholderVO> pages = shareholderService.selectShareholderInfo(Condition.getPage(query), shareholderVO);
return R.data(pages);
}
@@ -196,7 +232,7 @@
public void exportMember(HttpServletResponse response) {
List<shareExcel> list = new ArrayList<>();
shareExcel share = new shareExcel();
- share.setCreditcode("xx12351214112");
+ share.setDeptId("xxx保安服务有限公司");
share.setShareholder("张三");
share.setShareholdingratio("10");
share.setCardid("360***********0001");
--
Gitblit v1.9.3