From 29504e5001b4e7593dc114ebdb95db6122a67212 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 08 Jul 2021 17:00:57 +0800
Subject: [PATCH] 1.公司管理人

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml                         |    4 
 src/main/java/org/springblade/modules/experience/service/impl/ExperienceServiceImpl.java   |   49 ++++
 src/main/java/org/springblade/modules/shareholder/mapper/ShareholderMapper.xml             |    2 
 src/main/java/org/springblade/modules/member/controller/MemberController.java              |   10 +
 src/main/java/org/springblade/modules/experience/vo/ExperienceVO.java                      |   36 +++
 src/main/java/org/springblade/modules/experience/dto/ExperienceDTO.java                    |   34 +++
 src/main/java/org/springblade/modules/shareholder/service/impl/ShareholderServiceImpl.java |    5 
 src/main/java/org/springblade/modules/experience/mapper/ExperienceMapper.xml               |   29 ++
 src/main/java/org/springblade/modules/shareholder/service/IShareholderService.java         |    2 
 src/main/java/org/springblade/modules/experience/service/IExperienceService.java           |   44 ++++
 src/main/java/org/springblade/modules/member/service/IMemberService.java                   |    5 
 src/main/java/org/springblade/modules/member/service/impl/MemberServiceImpl.java           |    8 
 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java             |    5 
 src/main/java/org/springblade/modules/experience/controller/ExperienceController.java      |  136 +++++++++++++
 src/main/java/org/springblade/modules/experience/mapper/ExperienceMapper.java              |   43 ++++
 src/main/java/org/springblade/modules/member/entity/Member.java                            |    7 
 src/main/java/org/springblade/modules/shareholder/mapper/ShareholderMapper.java            |    2 
 src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java    |    9 
 src/main/java/org/springblade/modules/system/controller/UserController.java                |    8 
 src/main/java/org/springblade/modules/system/mapper/UserMapper.java                        |    2 
 src/main/java/org/springblade/modules/system/service/IUserService.java                     |    1 
 src/main/java/org/springblade/modules/experience/entity/Experience.java                    |  106 ++++++++++
 src/main/java/org/springblade/modules/member/mapper/MemberMapper.java                      |    3 
 src/main/java/org/springblade/modules/member/mapper/MemberMapper.xml                       |    8 
 24 files changed, 540 insertions(+), 18 deletions(-)

diff --git a/src/main/java/org/springblade/modules/experience/controller/ExperienceController.java b/src/main/java/org/springblade/modules/experience/controller/ExperienceController.java
new file mode 100644
index 0000000..0cb565b
--- /dev/null
+++ b/src/main/java/org/springblade/modules/experience/controller/ExperienceController.java
@@ -0,0 +1,136 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.experience.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+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.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.modules.experience.entity.Experience;
+import org.springblade.modules.experience.vo.ExperienceVO;
+import org.springblade.modules.experience.service.IExperienceService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ *  控制器
+ *
+ * @author BladeX
+ * @since 2021-07-08
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/experience")
+@Api(value = "", tags = "接口")
+public class ExperienceController extends BladeController {
+
+	private final IExperienceService experienceService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入experience")
+	public R<Experience> detail(Experience experience) {
+		Experience detail = experienceService.getOne(Condition.getQueryWrapper(experience));
+		return R.data(detail);
+	}
+
+	/**
+	 * 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入experience")
+	public R<IPage<Experience>> list(Experience experience, Query query) {
+		IPage<Experience> pages = experienceService.page(Condition.getPage(query), Condition.getQueryWrapper(experience));
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入experience")
+	public R<IPage<ExperienceVO>> page(ExperienceVO experience, Query query) {
+		IPage<ExperienceVO> pages = experienceService.selectExperiencePage(Condition.getPage(query), experience);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入experience")
+	public R save(@Valid @RequestBody Experience experience) {
+		return R.status(experienceService.save(experience));
+	}
+
+	/**
+	 * 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入experience")
+	public R update(@Valid @RequestBody Experience experience) {
+		return R.status(experienceService.updateById(experience));
+	}
+
+	/**
+	 * 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入experience")
+	public R submit(@Valid @RequestBody Experience experience) {
+		return R.status(experienceService.saveOrUpdate(experience));
+	}
+
+
+	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(experienceService.removeByIds(Func.toLongList(ids)));
+	}
+
+	/**
+	 * 保安就业记录
+	 * @param cardid 身份证
+	 * @return
+	 */
+	@PostMapping("/selectExperienceInfo")
+	public R selectExperienceInfo(String cardid) {
+		return R.data(experienceService.selectExperienceInfo(cardid));
+	}
+
+
+}
diff --git a/src/main/java/org/springblade/modules/experience/dto/ExperienceDTO.java b/src/main/java/org/springblade/modules/experience/dto/ExperienceDTO.java
new file mode 100644
index 0000000..a22b53b
--- /dev/null
+++ b/src/main/java/org/springblade/modules/experience/dto/ExperienceDTO.java
@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.experience.dto;
+
+import org.springblade.modules.experience.entity.Experience;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2021-07-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ExperienceDTO extends Experience {
+	private static final long serialVersionUID = 1L;
+
+}
diff --git a/src/main/java/org/springblade/modules/experience/entity/Experience.java b/src/main/java/org/springblade/modules/experience/entity/Experience.java
new file mode 100644
index 0000000..aec6509
--- /dev/null
+++ b/src/main/java/org/springblade/modules/experience/entity/Experience.java
@@ -0,0 +1,106 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.experience.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 实体类
+ *
+ * @author BladeX
+ * @since 2021-07-08
+ */
+@Data
+@TableName("sys_experience")
+@ApiModel(value = "Experience对象", description = "Experience对象")
+public class Experience implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 姓名
+	 */
+	@ApiModelProperty(value = "姓名")
+	private String name;
+	/**
+	 * 岗位
+	 */
+	@ApiModelProperty(value = "岗位")
+	private String post;
+	/**
+	 * 部门
+	 */
+	@ApiModelProperty(value = "部门")
+	private String department;
+	/**
+	 * 岗位职责
+	 */
+	@ApiModelProperty(value = "岗位职责")
+	private String responsibilities;
+	/**
+	 * 入职时间
+	 */
+	@ApiModelProperty(value = "入职时间")
+	@TableField("entryTime")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date entrytime;
+	/**
+	 * 离职时间
+	 */
+	@ApiModelProperty(value = "离职时间")
+	@TableField("departureTime")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date departuretime;
+	/**
+	 * 离职原因
+	 */
+	@ApiModelProperty(value = "离职原因")
+	private String leaving;
+	/**
+	 * 身份证号
+	 */
+	@ApiModelProperty(value = "身份证号")
+	@TableField("cardId")
+	private String cardid;
+	/**
+	 * 公司名称
+	 */
+	@ApiModelProperty(value = "公司名称")
+	private String companyname;
+	@TableId(value = "id", type = IdType.AUTO)
+	private Integer id;
+
+
+}
diff --git a/src/main/java/org/springblade/modules/experience/mapper/ExperienceMapper.java b/src/main/java/org/springblade/modules/experience/mapper/ExperienceMapper.java
new file mode 100644
index 0000000..b397664
--- /dev/null
+++ b/src/main/java/org/springblade/modules/experience/mapper/ExperienceMapper.java
@@ -0,0 +1,43 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.experience.mapper;
+
+import org.springblade.modules.experience.entity.Experience;
+import org.springblade.modules.experience.vo.ExperienceVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+import java.util.Map;
+
+/**
+ *  Mapper 接口
+ *
+ * @author BladeX
+ * @since 2021-07-08
+ */
+public interface ExperienceMapper extends BaseMapper<Experience> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param experience
+	 * @return
+	 */
+	List<ExperienceVO> selectExperiencePage(IPage page, ExperienceVO experience);
+	List<Map<Object,String>> selectExperienceInfo(String cardid);
+}
diff --git a/src/main/java/org/springblade/modules/experience/mapper/ExperienceMapper.xml b/src/main/java/org/springblade/modules/experience/mapper/ExperienceMapper.xml
new file mode 100644
index 0000000..84f2e93
--- /dev/null
+++ b/src/main/java/org/springblade/modules/experience/mapper/ExperienceMapper.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.modules.experience.mapper.ExperienceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="experienceResultMap" type="org.springblade.modules.experience.entity.Experience">
+        <id column="id" property="id"/>
+        <result column="name" property="name"/>
+        <result column="post" property="post"/>
+        <result column="department" property="department"/>
+        <result column="responsibilities" property="responsibilities"/>
+        <result column="entryTime" property="entrytime"/>
+        <result column="departureTime" property="departuretime"/>
+        <result column="leaving" property="leaving"/>
+        <result column="cardId" property="cardid"/>
+        <result column="companyname" property="companyname"/>
+    </resultMap>
+
+
+    <select id="selectExperiencePage" resultMap="experienceResultMap">
+        select * from sys_experience where is_deleted = 0
+    </select>
+
+
+    <select id="selectExperienceInfo" resultType="java.util.HashMap">
+        select * from sys_experience where cardId=#{cardid}
+    </select>
+
+</mapper>
diff --git a/src/main/java/org/springblade/modules/experience/service/IExperienceService.java b/src/main/java/org/springblade/modules/experience/service/IExperienceService.java
new file mode 100644
index 0000000..44359fb
--- /dev/null
+++ b/src/main/java/org/springblade/modules/experience/service/IExperienceService.java
@@ -0,0 +1,44 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.experience.service;
+
+import org.springblade.modules.experience.entity.Experience;
+import org.springblade.modules.experience.vo.ExperienceVO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ *  服务类
+ *
+ * @author BladeX
+ * @since 2021-07-08
+ */
+public interface IExperienceService extends IService<Experience> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param experience
+	 * @return
+	 */
+	IPage<ExperienceVO> selectExperiencePage(IPage<ExperienceVO> page, ExperienceVO experience);
+	List<Map<Object,String>> selectExperienceInfo(String cardid);
+}
diff --git a/src/main/java/org/springblade/modules/experience/service/impl/ExperienceServiceImpl.java b/src/main/java/org/springblade/modules/experience/service/impl/ExperienceServiceImpl.java
new file mode 100644
index 0000000..5611994
--- /dev/null
+++ b/src/main/java/org/springblade/modules/experience/service/impl/ExperienceServiceImpl.java
@@ -0,0 +1,49 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.experience.service.impl;
+
+import org.springblade.modules.experience.entity.Experience;
+import org.springblade.modules.experience.vo.ExperienceVO;
+import org.springblade.modules.experience.mapper.ExperienceMapper;
+import org.springblade.modules.experience.service.IExperienceService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ *  服务实现类
+ *
+ * @author BladeX
+ * @since 2021-07-08
+ */
+@Service
+public class ExperienceServiceImpl extends ServiceImpl<ExperienceMapper, Experience> implements IExperienceService {
+
+	@Override
+	public IPage<ExperienceVO> selectExperiencePage(IPage<ExperienceVO> page, ExperienceVO experience) {
+		return page.setRecords(baseMapper.selectExperiencePage(page, experience));
+	}
+
+	@Override
+	public List<Map<Object, String>> selectExperienceInfo(String cardid) {
+		return baseMapper.selectExperienceInfo(cardid);
+	}
+
+}
diff --git a/src/main/java/org/springblade/modules/experience/vo/ExperienceVO.java b/src/main/java/org/springblade/modules/experience/vo/ExperienceVO.java
new file mode 100644
index 0000000..65887f9
--- /dev/null
+++ b/src/main/java/org/springblade/modules/experience/vo/ExperienceVO.java
@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.experience.vo;
+
+import org.springblade.modules.experience.entity.Experience;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 视图实体类
+ *
+ * @author BladeX
+ * @since 2021-07-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "ExperienceVO对象", description = "ExperienceVO对象")
+public class ExperienceVO extends Experience {
+	private static final long serialVersionUID = 1L;
+
+}
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 ab49cae..223818f 100644
--- a/src/main/java/org/springblade/modules/member/controller/MemberController.java
+++ b/src/main/java/org/springblade/modules/member/controller/MemberController.java
@@ -122,5 +122,15 @@
 		return R.status(memberService.removeByIds(Func.toLongList(ids)));
 	}
 
+	/**
+	 * 主要管理员信息
+	 * @param creditcode
+	 * @return
+	 */
+	@PostMapping("/selectMemberInfo")
+	public R<IPage<MemberVO>> selectMemberInfo(String creditcode,Query query) {
+		IPage<MemberVO> pages = memberService.selectMemberInfo(Condition.getPage(query), creditcode);
+		return R.data(pages);
+	}
 
 }
diff --git a/src/main/java/org/springblade/modules/member/entity/Member.java b/src/main/java/org/springblade/modules/member/entity/Member.java
index f3faa1c..27084c1 100644
--- a/src/main/java/org/springblade/modules/member/entity/Member.java
+++ b/src/main/java/org/springblade/modules/member/entity/Member.java
@@ -65,13 +65,8 @@
 	* 持股比例
 	*/
 		@ApiModelProperty(value = "持股比例")
-	private String share;
+	private String shareholdingratio;
 
-	/**
-	 * 租户ID
-	 */
-	@ApiModelProperty(value = "租户ID")
-	private String tenantid;
 	/**
 	 * 统一社会信用代码
 	 */
diff --git a/src/main/java/org/springblade/modules/member/mapper/MemberMapper.java b/src/main/java/org/springblade/modules/member/mapper/MemberMapper.java
index 6ab9fe1..7e5e892 100644
--- a/src/main/java/org/springblade/modules/member/mapper/MemberMapper.java
+++ b/src/main/java/org/springblade/modules/member/mapper/MemberMapper.java
@@ -21,6 +21,7 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.util.List;
+import java.util.Map;
 
 /**
  *  Mapper 接口
@@ -38,5 +39,5 @@
 	 * @return
 	 */
 	List<MemberVO> selectMemberPage(IPage page, MemberVO member);
-
+	List<MemberVO> selectMemberInfo(IPage page,String creditcode);
 }
diff --git a/src/main/java/org/springblade/modules/member/mapper/MemberMapper.xml b/src/main/java/org/springblade/modules/member/mapper/MemberMapper.xml
index 3fcc6a7..4d4172f 100644
--- a/src/main/java/org/springblade/modules/member/mapper/MemberMapper.xml
+++ b/src/main/java/org/springblade/modules/member/mapper/MemberMapper.xml
@@ -9,8 +9,8 @@
         <result column="post" property="post"/>
         <result column="cardid" property="cardid"/>
         <result column="cell" property="cell"/>
-        <result column="share" property="share"/>
-        <result column="tenantid" property="tenantid"/>
+        <result column="shareholdingratio" property="shareholdingratio"/>
+        <result column="creditCode" property="creditcode"/>
     </resultMap>
 
 
@@ -18,4 +18,8 @@
         select * from sys_member where is_deleted = 0
     </select>
 
+    <select id="selectMemberInfo" resultMap="memberResultMap">
+        select * from sys_member where creditCode=#{creditcode}
+    </select>
+
 </mapper>
diff --git a/src/main/java/org/springblade/modules/member/service/IMemberService.java b/src/main/java/org/springblade/modules/member/service/IMemberService.java
index 382ee31..d1b53e3 100644
--- a/src/main/java/org/springblade/modules/member/service/IMemberService.java
+++ b/src/main/java/org/springblade/modules/member/service/IMemberService.java
@@ -21,6 +21,9 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  *  服务类
  *
@@ -37,5 +40,5 @@
 	 * @return
 	 */
 	IPage<MemberVO> selectMemberPage(IPage<MemberVO> page, MemberVO member);
-
+	IPage<MemberVO> selectMemberInfo(IPage<MemberVO> page,String creditcode);
 }
diff --git a/src/main/java/org/springblade/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/org/springblade/modules/member/service/impl/MemberServiceImpl.java
index cf4a19a..de0e749 100644
--- a/src/main/java/org/springblade/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/org/springblade/modules/member/service/impl/MemberServiceImpl.java
@@ -24,6 +24,9 @@
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  *  服务实现类
  *
@@ -38,4 +41,9 @@
 		return page.setRecords(baseMapper.selectMemberPage(page, member));
 	}
 
+	@Override
+	public IPage<MemberVO> selectMemberInfo(IPage<MemberVO> page,String creditcode) {
+		return page.setRecords(baseMapper.selectMemberInfo(page,creditcode));
+	}
+
 }
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 af7ac32..2681fa5 100644
--- a/src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java
+++ b/src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java
@@ -34,6 +34,9 @@
 import org.springblade.modules.shareholder.service.IShareholderService;
 import org.springblade.core.boot.ctrl.BladeController;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  *  控制器
  *
@@ -122,15 +125,15 @@
 		return R.status(shareholderService.removeByIds(Func.toLongList(ids)));
 	}
 
-
 	/**
 	 * 出资人信息
 	 * @param creditcode
 	 * @return
 	 */
 	@PostMapping("/selectShareholderInfo")
-	public R selectShareholderInfo(String creditcode) {
-		return R.data(shareholderService.selectShareholderInfo(creditcode));
+	public R<IPage<ShareholderVO>> selectShareholderInfo(String creditcode, Query query) {
+		IPage<ShareholderVO> pages=shareholderService.selectShareholderInfo(Condition.getPage(query), creditcode);
+		return R.data(pages);
 	}
 
 
diff --git a/src/main/java/org/springblade/modules/shareholder/mapper/ShareholderMapper.java b/src/main/java/org/springblade/modules/shareholder/mapper/ShareholderMapper.java
index 8884144..3f3abfc 100644
--- a/src/main/java/org/springblade/modules/shareholder/mapper/ShareholderMapper.java
+++ b/src/main/java/org/springblade/modules/shareholder/mapper/ShareholderMapper.java
@@ -39,5 +39,5 @@
 	 * @return
 	 */
 	List<ShareholderVO> selectShareholderPage(IPage page, ShareholderVO shareholder);
-	List<Map<Object,String>> selectShareholderInfo(String creditcode);
+	List<ShareholderVO> selectShareholderInfo(IPage page,String creditcode);
 }
diff --git a/src/main/java/org/springblade/modules/shareholder/mapper/ShareholderMapper.xml b/src/main/java/org/springblade/modules/shareholder/mapper/ShareholderMapper.xml
index e961e78..6aecf9a 100644
--- a/src/main/java/org/springblade/modules/shareholder/mapper/ShareholderMapper.xml
+++ b/src/main/java/org/springblade/modules/shareholder/mapper/ShareholderMapper.xml
@@ -21,7 +21,7 @@
     </select>
 
 
-    <select id="selectShareholderInfo" resultType="java.util.HashMap">
+    <select id="selectShareholderInfo" resultMap="shareholderResultMap">
         select * from sys_shareholder where creditCode=#{creditcode}
     </select>
 
diff --git a/src/main/java/org/springblade/modules/shareholder/service/IShareholderService.java b/src/main/java/org/springblade/modules/shareholder/service/IShareholderService.java
index e95e80f..6996b3d 100644
--- a/src/main/java/org/springblade/modules/shareholder/service/IShareholderService.java
+++ b/src/main/java/org/springblade/modules/shareholder/service/IShareholderService.java
@@ -40,5 +40,5 @@
 	 * @return
 	 */
 	IPage<ShareholderVO> selectShareholderPage(IPage<ShareholderVO> page, ShareholderVO shareholder);
-	List<Map<Object,String>> selectShareholderInfo(String creditcode);
+	IPage<ShareholderVO> selectShareholderInfo(IPage<ShareholderVO> page, String creditcode);
 }
diff --git a/src/main/java/org/springblade/modules/shareholder/service/impl/ShareholderServiceImpl.java b/src/main/java/org/springblade/modules/shareholder/service/impl/ShareholderServiceImpl.java
index 0688448..07dcafe 100644
--- a/src/main/java/org/springblade/modules/shareholder/service/impl/ShareholderServiceImpl.java
+++ b/src/main/java/org/springblade/modules/shareholder/service/impl/ShareholderServiceImpl.java
@@ -42,8 +42,9 @@
 	}
 
 	@Override
-	public List<Map<Object, String>> selectShareholderInfo(String creditcode) {
-		return baseMapper.selectShareholderInfo(creditcode);
+	public IPage<ShareholderVO> selectShareholderInfo(IPage<ShareholderVO> page, String creditcode) {
+		return page.setRecords(baseMapper.selectShareholderInfo(page,creditcode));
 	}
 
+
 }
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 6251800..d34eb3b 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -313,4 +313,12 @@
 		return R.data(userService.selectUserSearch(user, query));
 	}
 
+
+	@GetMapping("/updateUser")
+	public R updateUser(String hold,String cardid) {
+		userService.updateUser(hold, cardid);
+		return R.success("吊销成功");
+	}
+
+
 }
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
index 3935273..669a635 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -61,4 +61,6 @@
 	 */
 	List<UserExcel> exportUser(@Param("ew") Wrapper<User> queryWrapper);
 
+	void updateUser(String hold,String cardid);
+
 }
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index d71448f..176114a 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -95,4 +95,8 @@
         SELECT id, tenant_id, user_type, account, name, real_name, email, phone, birthday, role_id, dept_id, post_id FROM blade_user ${ew.customSqlSegment}
     </select>
 
+    <update id="updateUser">
+        update blade_user set hold=#{hold} where cardid=#{cardid}
+    </update>
+
 </mapper>
diff --git a/src/main/java/org/springblade/modules/system/service/IUserService.java b/src/main/java/org/springblade/modules/system/service/IUserService.java
index 932d0a5..9658ea8 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -206,4 +206,5 @@
 	 * @return
 	 */
 	UserVO platformDetail(User user);
+	void updateUser(String hold,String cardid);
 }
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 3ab1c72..972d1e2 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -422,4 +422,9 @@
 		return userVO;
 	}
 
+	@Override
+	public void updateUser(String hold, String cardid) {
+		baseMapper.updateUser(hold, cardid);
+	}
+
 }

--
Gitblit v1.9.3