From 045b55722b25ccc77d88671c5d6df309edb8a66d Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Tue, 22 Feb 2022 16:00:34 +0800
Subject: [PATCH] 1. 保安员新增异步推送数据至群访用户表 2. 会员标记接口新增,会员标记成功,则创建会员记录和会员题库记录(包含120道题目) 3. web 端考试开始,查询题目判断用户是否为会员,如果为会员则从会员题库获取当前人员的考试题目(从120道题中随机抽取60道)
---
src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java | 76 ++++++++++++++++++++++++++------------
1 files changed, 52 insertions(+), 24 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 a73975c..711d010 100644
--- a/src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java
+++ b/src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java
@@ -102,18 +102,32 @@
@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,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);
+ 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);
+ } 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);
+ }
return R.status(save);
}
@@ -125,17 +139,30 @@
@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() + "'" +
- ",dept_id = " + "'" + shareholder.getDeptId() + "'" +
- " " + "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);
+ } 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);
+ }
return R.status(b);
}
@@ -168,12 +195,13 @@
/**
* 出资人信息
+ *
* @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);
}
--
Gitblit v1.9.3