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/member/controller/MemberController.java | 93 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 86 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/member/controller/MemberController.java b/src/main/java/org/springblade/modules/member/controller/MemberController.java
index 42d0dca..c78d2c5 100644
--- a/src/main/java/org/springblade/modules/member/controller/MemberController.java
+++ b/src/main/java/org/springblade/modules/member/controller/MemberController.java
@@ -24,16 +24,29 @@
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.equipage.excel.EquipageExcel;
import org.springblade.modules.member.entity.Member;
+import org.springblade.modules.member.excel.memberExcel;
+import org.springblade.modules.member.excel.memberImporter;
import org.springblade.modules.member.service.IMemberService;
import org.springblade.modules.member.vo.MemberVO;
+import org.springblade.modules.shareholder.excel.shareExcel;
+import org.springblade.modules.shareholder.excel.shareImporter;
+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;
/**
* 控制器
@@ -48,6 +61,7 @@
public class MemberController extends BladeController {
private final IMemberService memberService;
+ private final MyAsyncService myAsyncService;
/**
* 详情
@@ -89,8 +103,21 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入member")
public R save(@Valid @RequestBody Member member) throws Exception {
- //arg.test01(arg.url+"/member/save",member);
- return R.status(memberService.save(member));
+ boolean save = memberService.save(member);
+ if (save) {
+ String s1 =
+ "insert into sys_member(id,name,post,cardid,cell,creditCode,dept_id) " +
+ "values(" + "'" + member.getId() + "'" + "," +
+ "'" + member.getName() + "'" + "," +
+ "'" + member.getPost() + "'" + "," +
+ "'" + member.getCardid() + "'" + "," +
+ "'" + member.getCell() + "'" + "," +
+ "'" + member.getCreditcode() + "'" + "," +
+ "'" + member.getDeptId() + "'" + ")";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
+ }
+ return R.status(save);
}
/**
@@ -100,8 +127,20 @@
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入member")
public R update(@Valid @RequestBody Member member) throws Exception {
- //arg.test01(arg.url+"/member/update",member);
- return R.status(memberService.updateById(member));
+ boolean b = memberService.updateById(member);
+ if (b) {
+ String s1 = "update sys_member set name = " + "'" + member.getName() + "'" +
+ ",post = " + "'" + member.getPost() + "'" +
+ ",cardid = " + "'" + member.getCardid() + "'" +
+ ",cell = " + "'" + member.getCell() + "'" +
+ ",cardid = " + "'" + member.getCardid() + "'" +
+ ",creditCode = " + "'" + member.getCreditcode() + "'" +
+ ",dept_id = " + "'" + member.getDeptId() + "'" +
+ " " + "where id = " + "'" + member.getId() + "'";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
+ }
+ return R.status(b);
}
/**
@@ -122,18 +161,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_member where id = " + "'" + id + "'";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
+ });
return R.status(memberService.removeByIds(Func.toLongList(ids)));
}
/**
* 主要管理员信息
- * @param creditcode
+ * @param member
* @return
*/
@PostMapping("/selectMemberInfo")
- public R<IPage<MemberVO>> selectMemberInfo(String creditcode,Query query) {
- IPage<MemberVO> pages = memberService.selectMemberInfo(Condition.getPage(query), creditcode);
+ public R<IPage<MemberVO>> selectMemberInfo(Member member,Query query) {
+ IPage<MemberVO> pages = memberService.selectMemberInfo(Condition.getPage(query), member);
return R.data(pages);
}
+
+
+ /**
+ * 导入管理人信息
+ */
+ @PostMapping("import-member")
+ @ApiOperationSupport(order = 12)
+ @ApiOperation(value = "导入投资人", notes = "传入excel")
+ public R importUser(MultipartFile file, Integer isCovered) {
+ memberImporter memberImporter = new memberImporter(memberService, false);
+ ExcelUtil.save(file, memberImporter, memberExcel.class);
+ return R.success("操作成功");
+ }
+
+
+ /**
+ * 导出模板
+ */
+ @GetMapping("export-template")
+ @ApiOperation(value = "导出模板")
+ public void exportMember(HttpServletResponse response) {
+ List<memberExcel> list = new ArrayList<>();
+ memberExcel member = new memberExcel();
+ member.setDeptId("xxx保安服务有限公司");
+ member.setName("张三");
+ member.setPost("经理");
+ member.setCardid("360***********0001");
+ member.setCell("131********");
+ member.setRtime("2020/01/01");
+ list.add(member);
+ ExcelUtil.export(response, "主要管理人员数据导入模板", "主要管理人员导入数据表", list, memberExcel.class);
+ }
+
}
--
Gitblit v1.9.3