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

---
 src/main/java/org/springblade/modules/train/mapper/TrainMapper.java                        |   43 ++
 src/main/java/org/springblade/modules/examination/mapper/ExaminationMapper.xml             |   26 +
 src/main/java/org/springblade/modules/examination/mapper/ExaminationMapper.java            |   43 ++
 src/main/java/org/springblade/modules/examination/service/impl/ExaminationServiceImpl.java |   49 ++
 src/main/java/org/springblade/modules/examination/vo/ExaminationVO.java                    |   36 ++
 src/main/java/org/springblade/modules/shareholder/service/IShareholderService.java         |    5 
 src/main/java/org/springblade/modules/train/service/impl/TrainServiceImpl.java             |   49 ++
 src/main/java/org/springblade/modules/train/vo/TrainVO.java                                |   36 ++
 src/main/java/org/springblade/modules/train/entity/Train.java                              |  101 +++++
 src/main/java/org/springblade/modules/examination/service/IExaminationService.java         |   44 ++
 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml                         |    4 
 src/main/java/org/springblade/modules/examination/dto/ExaminationDTO.java                  |   34 ++
 src/main/java/org/springblade/modules/shareholder/mapper/ShareholderMapper.xml             |    6 
 src/main/java/org/springblade/modules/system/entity/User.java                              |    1 
 src/main/java/org/springblade/modules/shareholder/service/impl/ShareholderServiceImpl.java |    8 
 src/main/java/org/springblade/modules/examination/entity/Examination.java                  |   80 ++++
 src/main/java/org/springblade/modules/train/dto/TrainDTO.java                              |   34 ++
 src/main/java/org/springblade/modules/performance/entity/Performance.java                  |    1 
 src/main/java/org/springblade/modules/train/controller/TrainController.java                |  136 ++++++++
 src/main/java/org/springblade/modules/shareholder/mapper/ShareholderMapper.java            |    3 
 src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java    |   11 
 src/main/java/org/springblade/modules/train/service/ITrainService.java                     |   44 ++
 src/main/java/org/springblade/modules/examination/controller/ExaminationController.java    |  136 ++++++++
 src/main/java/org/springblade/modules/performance/mapper/PerformanceMapper.xml             |    1 
 src/main/java/org/springblade/modules/train/mapper/TrainMapper.xml                         |   31 +
 25 files changed, 960 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/examination/controller/ExaminationController.java b/src/main/java/org/springblade/modules/examination/controller/ExaminationController.java
new file mode 100644
index 0000000..6b3e91a
--- /dev/null
+++ b/src/main/java/org/springblade/modules/examination/controller/ExaminationController.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.examination.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.examination.entity.Examination;
+import org.springblade.modules.examination.vo.ExaminationVO;
+import org.springblade.modules.examination.service.IExaminationService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ *  控制器
+ *
+ * @author BladeX
+ * @since 2021-07-08
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/examination")
+@Api(value = "", tags = "接口")
+public class ExaminationController extends BladeController {
+
+	private final IExaminationService examinationService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入examination")
+	public R<Examination> detail(Examination examination) {
+		Examination detail = examinationService.getOne(Condition.getQueryWrapper(examination));
+		return R.data(detail);
+	}
+
+	/**
+	 * 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入examination")
+	public R<IPage<Examination>> list(Examination examination, Query query) {
+		IPage<Examination> pages = examinationService.page(Condition.getPage(query), Condition.getQueryWrapper(examination));
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入examination")
+	public R<IPage<ExaminationVO>> page(ExaminationVO examination, Query query) {
+		IPage<ExaminationVO> pages = examinationService.selectExaminationPage(Condition.getPage(query), examination);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入examination")
+	public R save(@Valid @RequestBody Examination examination) {
+		return R.status(examinationService.save(examination));
+	}
+
+	/**
+	 * 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入examination")
+	public R update(@Valid @RequestBody Examination examination) {
+		return R.status(examinationService.updateById(examination));
+	}
+
+	/**
+	 * 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入examination")
+	public R submit(@Valid @RequestBody Examination examination) {
+		return R.status(examinationService.saveOrUpdate(examination));
+	}
+
+
+	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(examinationService.removeByIds(Func.toLongList(ids)));
+	}
+
+	/**
+	 * 成绩查询
+	 * @param cardid
+	 * @return
+	 */
+	@PostMapping("/selectExaminationInfo")
+	public R selectExaminationInfo(String cardid) {
+		return R.data(examinationService.selectExaminationInfo(cardid));
+	}
+
+
+}
diff --git a/src/main/java/org/springblade/modules/examination/dto/ExaminationDTO.java b/src/main/java/org/springblade/modules/examination/dto/ExaminationDTO.java
new file mode 100644
index 0000000..1ded16a
--- /dev/null
+++ b/src/main/java/org/springblade/modules/examination/dto/ExaminationDTO.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.examination.dto;
+
+import org.springblade.modules.examination.entity.Examination;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2021-07-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ExaminationDTO extends Examination {
+	private static final long serialVersionUID = 1L;
+
+}
diff --git a/src/main/java/org/springblade/modules/examination/entity/Examination.java b/src/main/java/org/springblade/modules/examination/entity/Examination.java
new file mode 100644
index 0000000..91e0a71
--- /dev/null
+++ b/src/main/java/org/springblade/modules/examination/entity/Examination.java
@@ -0,0 +1,80 @@
+/*
+ *      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.examination.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 实体类
+ *
+ * @author BladeX
+ * @since 2021-07-08
+ */
+@Data
+@TableName("sys_examination")
+@ApiModel(value = "Examination对象", description = "Examination对象")
+public class Examination implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* 姓名
+	*/
+		@ApiModelProperty(value = "姓名")
+		private String rname;
+	/**
+	* 考试开始时间
+	*/
+		@ApiModelProperty(value = "考试开始时间")
+		private String examinationbegintime;
+	/**
+	* 考试地点
+	*/
+		@ApiModelProperty(value = "考试地点")
+		private String examinationaddress;
+	/**
+	* 考试类别
+	*/
+		@ApiModelProperty(value = "考试类别")
+		private String examinationtype;
+	/**
+	* 考试成绩
+	*/
+		@ApiModelProperty(value = "考试成绩")
+		private String examinationc;
+	/**
+	* 身份证
+	*/
+		@ApiModelProperty(value = "身份证")
+		private String cardid;
+	/**
+	* 考试结束时间
+	*/
+		@ApiModelProperty(value = "考试结束时间")
+		private String examinationendtime;
+	private Integer id;
+
+	private String stat;
+
+
+}
diff --git a/src/main/java/org/springblade/modules/examination/mapper/ExaminationMapper.java b/src/main/java/org/springblade/modules/examination/mapper/ExaminationMapper.java
new file mode 100644
index 0000000..dbcaa1e
--- /dev/null
+++ b/src/main/java/org/springblade/modules/examination/mapper/ExaminationMapper.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.examination.mapper;
+
+import org.springblade.modules.examination.entity.Examination;
+import org.springblade.modules.examination.vo.ExaminationVO;
+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 ExaminationMapper extends BaseMapper<Examination> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param examination
+	 * @return
+	 */
+	List<ExaminationVO> selectExaminationPage(IPage page, ExaminationVO examination);
+	List<Map<Object,String>> selectExaminationInfo(String cardid);
+}
diff --git a/src/main/java/org/springblade/modules/examination/mapper/ExaminationMapper.xml b/src/main/java/org/springblade/modules/examination/mapper/ExaminationMapper.xml
new file mode 100644
index 0000000..d457b56
--- /dev/null
+++ b/src/main/java/org/springblade/modules/examination/mapper/ExaminationMapper.xml
@@ -0,0 +1,26 @@
+<?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.examination.mapper.ExaminationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="examinationResultMap" type="org.springblade.modules.examination.entity.Examination">
+        <id column="id" property="id"/>
+        <result column="rname" property="rname"/>
+        <result column="examinationbegintime" property="examinationbegintime"/>
+        <result column="examinationaddress" property="examinationaddress"/>
+        <result column="examinationtype" property="examinationtype"/>
+        <result column="examinationc" property="examinationc"/>
+        <result column="cardid" property="cardid"/>
+        <result column="examinationendtime" property="examinationendtime"/>
+        <result column="stat" property="stat"/>
+    </resultMap>
+
+
+    <select id="selectExaminationPage" resultMap="examinationResultMap">
+        select * from sys_examination where is_deleted = 0
+    </select>
+
+    <select id="selectExaminationInfo" resultType="java.util.HashMap">
+        select * from sys_examination where cardid=#{cardid}
+    </select>
+</mapper>
diff --git a/src/main/java/org/springblade/modules/examination/service/IExaminationService.java b/src/main/java/org/springblade/modules/examination/service/IExaminationService.java
new file mode 100644
index 0000000..7bcfcf9
--- /dev/null
+++ b/src/main/java/org/springblade/modules/examination/service/IExaminationService.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.examination.service;
+
+import org.springblade.modules.examination.entity.Examination;
+import org.springblade.modules.examination.vo.ExaminationVO;
+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 IExaminationService extends IService<Examination> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param examination
+	 * @return
+	 */
+	IPage<ExaminationVO> selectExaminationPage(IPage<ExaminationVO> page, ExaminationVO examination);
+	List<Map<Object,String>> selectExaminationInfo(String cardid);
+}
diff --git a/src/main/java/org/springblade/modules/examination/service/impl/ExaminationServiceImpl.java b/src/main/java/org/springblade/modules/examination/service/impl/ExaminationServiceImpl.java
new file mode 100644
index 0000000..d63fd00
--- /dev/null
+++ b/src/main/java/org/springblade/modules/examination/service/impl/ExaminationServiceImpl.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.examination.service.impl;
+
+import org.springblade.modules.examination.entity.Examination;
+import org.springblade.modules.examination.vo.ExaminationVO;
+import org.springblade.modules.examination.mapper.ExaminationMapper;
+import org.springblade.modules.examination.service.IExaminationService;
+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 ExaminationServiceImpl extends ServiceImpl<ExaminationMapper, Examination> implements IExaminationService {
+
+	@Override
+	public IPage<ExaminationVO> selectExaminationPage(IPage<ExaminationVO> page, ExaminationVO examination) {
+		return page.setRecords(baseMapper.selectExaminationPage(page, examination));
+	}
+
+	@Override
+	public List<Map<Object, String>> selectExaminationInfo(String cardid) {
+		return baseMapper.selectExaminationInfo(cardid);
+	}
+
+}
diff --git a/src/main/java/org/springblade/modules/examination/vo/ExaminationVO.java b/src/main/java/org/springblade/modules/examination/vo/ExaminationVO.java
new file mode 100644
index 0000000..2cb301c
--- /dev/null
+++ b/src/main/java/org/springblade/modules/examination/vo/ExaminationVO.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.examination.vo;
+
+import org.springblade.modules.examination.entity.Examination;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 视图实体类
+ *
+ * @author BladeX
+ * @since 2021-07-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "ExaminationVO对象", description = "ExaminationVO对象")
+public class ExaminationVO extends Examination {
+	private static final long serialVersionUID = 1L;
+
+}
diff --git a/src/main/java/org/springblade/modules/performance/entity/Performance.java b/src/main/java/org/springblade/modules/performance/entity/Performance.java
index 67131ea..3e52ea7 100644
--- a/src/main/java/org/springblade/modules/performance/entity/Performance.java
+++ b/src/main/java/org/springblade/modules/performance/entity/Performance.java
@@ -82,6 +82,7 @@
 		@ApiModelProperty(value = "租户ID")
 		@TableField("tenantId")
 	private String tenantid;
+	private String company;
 
 
 }
diff --git a/src/main/java/org/springblade/modules/performance/mapper/PerformanceMapper.xml b/src/main/java/org/springblade/modules/performance/mapper/PerformanceMapper.xml
index ce63ca4..49686cd 100644
--- a/src/main/java/org/springblade/modules/performance/mapper/PerformanceMapper.xml
+++ b/src/main/java/org/springblade/modules/performance/mapper/PerformanceMapper.xml
@@ -12,6 +12,7 @@
         <result column="score" property="score"/>
         <result column="time" property="time"/>
         <result column="tenantId" property="tenantid"/>
+        <result column="company" property="company"/>
     </resultMap>
 
 
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 615b737..af7ac32 100644
--- a/src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java
+++ b/src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java
@@ -123,4 +123,15 @@
 	}
 
 
+	/**
+	 * 出资人信息
+	 * @param creditcode
+	 * @return
+	 */
+	@PostMapping("/selectShareholderInfo")
+	public R selectShareholderInfo(String creditcode) {
+		return R.data(shareholderService.selectShareholderInfo(creditcode));
+	}
+
+
 }
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 d5b0446..8884144 100644
--- a/src/main/java/org/springblade/modules/shareholder/mapper/ShareholderMapper.java
+++ b/src/main/java/org/springblade/modules/shareholder/mapper/ShareholderMapper.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<ShareholderVO> selectShareholderPage(IPage page, ShareholderVO shareholder);
-
+	List<Map<Object,String>> selectShareholderInfo(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 be6b9fa..e961e78 100644
--- a/src/main/java/org/springblade/modules/shareholder/mapper/ShareholderMapper.xml
+++ b/src/main/java/org/springblade/modules/shareholder/mapper/ShareholderMapper.xml
@@ -12,6 +12,7 @@
         <result column="capitalTime" property="capitaltime"/>
         <result column="cardid" property="cardid"/>
         <result column="cell" property="cell"/>
+        <result column="creditCode" property="creditcode"/>
     </resultMap>
 
 
@@ -19,4 +20,9 @@
         select * from sys_shareholder
     </select>
 
+
+    <select id="selectShareholderInfo" resultType="java.util.HashMap">
+        select * from sys_shareholder where creditCode=#{creditcode}
+    </select>
+
 </mapper>
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 b9ada2b..e95e80f 100644
--- a/src/main/java/org/springblade/modules/shareholder/service/IShareholderService.java
+++ b/src/main/java/org/springblade/modules/shareholder/service/IShareholderService.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<ShareholderVO> selectShareholderPage(IPage<ShareholderVO> page, ShareholderVO shareholder);
-
+	List<Map<Object,String>> selectShareholderInfo(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 7a337b5..0688448 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
@@ -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.selectShareholderPage(page, shareholder));
 	}
 
+	@Override
+	public List<Map<Object, String>> selectShareholderInfo(String creditcode) {
+		return baseMapper.selectShareholderInfo(creditcode);
+	}
+
 }
diff --git a/src/main/java/org/springblade/modules/system/entity/User.java b/src/main/java/org/springblade/modules/system/entity/User.java
index 68c0b5b..91911cb 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -147,6 +147,7 @@
 	 */
 	@ApiModelProperty(value = "入职时间")
 	private String rtime;
+	private String hold;
 
 
 }
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 f7d9843..d71448f 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -36,6 +36,7 @@
         <result column="address" property="address"/>
         <result column="registered" property="registered"/>
         <result column="rtime" property="rtime"/>
+        <result column="hold" property="hold"/>
     </resultMap>
 
     <select id="selectUserPage" resultMap="userResultMap">
@@ -62,6 +63,9 @@
         <if test="user.status!=null and user.status != ''">
             and status = #{user.status}
         </if>
+        <if test="user.hold!=null and user.hold != ''">
+            and hold = #{user.hold}
+        </if>
         <if test="deptIdList!=null and deptIdList.size>0">
             and id in (
                 SELECT
diff --git a/src/main/java/org/springblade/modules/train/controller/TrainController.java b/src/main/java/org/springblade/modules/train/controller/TrainController.java
new file mode 100644
index 0000000..7486380
--- /dev/null
+++ b/src/main/java/org/springblade/modules/train/controller/TrainController.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.train.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.train.entity.Train;
+import org.springblade.modules.train.vo.TrainVO;
+import org.springblade.modules.train.service.ITrainService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ *  控制器
+ *
+ * @author BladeX
+ * @since 2021-07-08
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/train")
+@Api(value = "", tags = "接口")
+public class TrainController extends BladeController {
+
+	private final ITrainService trainService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入train")
+	public R<Train> detail(Train train) {
+		Train detail = trainService.getOne(Condition.getQueryWrapper(train));
+		return R.data(detail);
+	}
+
+	/**
+	 * 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入train")
+	public R<IPage<Train>> list(Train train, Query query) {
+		IPage<Train> pages = trainService.page(Condition.getPage(query), Condition.getQueryWrapper(train));
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入train")
+	public R<IPage<TrainVO>> page(TrainVO train, Query query) {
+		IPage<TrainVO> pages = trainService.selectTrainPage(Condition.getPage(query), train);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入train")
+	public R save(@Valid @RequestBody Train train) {
+		return R.status(trainService.save(train));
+	}
+
+	/**
+	 * 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入train")
+	public R update(@Valid @RequestBody Train train) {
+		return R.status(trainService.updateById(train));
+	}
+
+	/**
+	 * 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入train")
+	public R submit(@Valid @RequestBody Train train) {
+		return R.status(trainService.saveOrUpdate(train));
+	}
+
+
+	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(trainService.removeByIds(Func.toLongList(ids)));
+	}
+
+	/**
+	 * 培训查询
+	 * @param cardid
+	 * @return
+	 */
+	@PostMapping("/selectTrainInfo")
+	public R selectTrainInfo(String cardid) {
+		return R.data(trainService.selectTrainInfo(cardid));
+	}
+
+
+}
diff --git a/src/main/java/org/springblade/modules/train/dto/TrainDTO.java b/src/main/java/org/springblade/modules/train/dto/TrainDTO.java
new file mode 100644
index 0000000..685a5b6
--- /dev/null
+++ b/src/main/java/org/springblade/modules/train/dto/TrainDTO.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.train.dto;
+
+import org.springblade.modules.train.entity.Train;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2021-07-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TrainDTO extends Train {
+	private static final long serialVersionUID = 1L;
+
+}
diff --git a/src/main/java/org/springblade/modules/train/entity/Train.java b/src/main/java/org/springblade/modules/train/entity/Train.java
new file mode 100644
index 0000000..fd2c5db
--- /dev/null
+++ b/src/main/java/org/springblade/modules/train/entity/Train.java
@@ -0,0 +1,101 @@
+/*
+ *      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.train.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 实体类
+ *
+ * @author BladeX
+ * @since 2021-07-08
+ */
+@Data
+@TableName("sys_train")
+@ApiModel(value = "Train对象", description = "Train对象")
+public class Train implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* 姓名
+	*/
+		@ApiModelProperty(value = "姓名")
+		private String rname;
+	/**
+	* 年龄
+	*/
+		@ApiModelProperty(value = "年龄")
+		private Integer age;
+	/**
+	* 性别
+	*/
+		@ApiModelProperty(value = "性别")
+		private String sex;
+	/**
+	* 民族
+	*/
+		@ApiModelProperty(value = "民族")
+		private String nation;
+	/**
+	* 政治面貌
+	*/
+		@ApiModelProperty(value = "政治面貌")
+		private String countenance;
+	/**
+	* 学历
+	*/
+		@ApiModelProperty(value = "学历")
+		private String education;
+	/**
+	* 身份证
+	*/
+		@ApiModelProperty(value = "身份证")
+		private String cardid;
+	/**
+	* 培训机构
+	*/
+		@ApiModelProperty(value = "培训机构")
+		private String train;
+	/**
+	* 培训时间
+	*/
+		@ApiModelProperty(value = "培训时间")
+		private LocalDateTime traintime;
+	/**
+	* 培训地点
+	*/
+		@ApiModelProperty(value = "培训地点")
+		private String trainaddrss;
+	/**
+	* 培训内容
+	*/
+		@ApiModelProperty(value = "培训内容")
+		private String traincontent;
+	@TableId(value = "id", type = IdType.AUTO)
+	private Integer id;
+
+
+}
diff --git a/src/main/java/org/springblade/modules/train/mapper/TrainMapper.java b/src/main/java/org/springblade/modules/train/mapper/TrainMapper.java
new file mode 100644
index 0000000..692f290
--- /dev/null
+++ b/src/main/java/org/springblade/modules/train/mapper/TrainMapper.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.train.mapper;
+
+import org.springblade.modules.train.entity.Train;
+import org.springblade.modules.train.vo.TrainVO;
+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 TrainMapper extends BaseMapper<Train> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param train
+	 * @return
+	 */
+	List<TrainVO> selectTrainPage(IPage page, TrainVO train);
+	List<Map<Object,String>> selectTrainInfo(String cardid);
+}
diff --git a/src/main/java/org/springblade/modules/train/mapper/TrainMapper.xml b/src/main/java/org/springblade/modules/train/mapper/TrainMapper.xml
new file mode 100644
index 0000000..1b8344a
--- /dev/null
+++ b/src/main/java/org/springblade/modules/train/mapper/TrainMapper.xml
@@ -0,0 +1,31 @@
+<?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.train.mapper.TrainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="trainResultMap" type="org.springblade.modules.train.entity.Train">
+        <id column="id" property="id"/>
+        <result column="rname" property="rname"/>
+        <result column="age" property="age"/>
+        <result column="sex" property="sex"/>
+        <result column="nation" property="nation"/>
+        <result column="countenance" property="countenance"/>
+        <result column="education" property="education"/>
+        <result column="cardid" property="cardid"/>
+        <result column="train" property="train"/>
+        <result column="traintime" property="traintime"/>
+        <result column="trainaddrss" property="trainaddrss"/>
+        <result column="traincontent" property="traincontent"/>
+    </resultMap>
+
+
+    <select id="selectTrainPage" resultMap="trainResultMap">
+        select * from sys_train where is_deleted = 0
+    </select>
+
+
+    <select id="selectTrainInfo" resultType="java.util.HashMap">
+        select * from sys_train where cardid=#{cardid}
+    </select>
+
+</mapper>
diff --git a/src/main/java/org/springblade/modules/train/service/ITrainService.java b/src/main/java/org/springblade/modules/train/service/ITrainService.java
new file mode 100644
index 0000000..c62bb28
--- /dev/null
+++ b/src/main/java/org/springblade/modules/train/service/ITrainService.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.train.service;
+
+import org.springblade.modules.train.entity.Train;
+import org.springblade.modules.train.vo.TrainVO;
+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 ITrainService extends IService<Train> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param train
+	 * @return
+	 */
+	IPage<TrainVO> selectTrainPage(IPage<TrainVO> page, TrainVO train);
+	List<Map<Object,String>> selectTrainInfo(String cardid);
+}
diff --git a/src/main/java/org/springblade/modules/train/service/impl/TrainServiceImpl.java b/src/main/java/org/springblade/modules/train/service/impl/TrainServiceImpl.java
new file mode 100644
index 0000000..3317e39
--- /dev/null
+++ b/src/main/java/org/springblade/modules/train/service/impl/TrainServiceImpl.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.train.service.impl;
+
+import org.springblade.modules.train.entity.Train;
+import org.springblade.modules.train.vo.TrainVO;
+import org.springblade.modules.train.mapper.TrainMapper;
+import org.springblade.modules.train.service.ITrainService;
+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 TrainServiceImpl extends ServiceImpl<TrainMapper, Train> implements ITrainService {
+
+	@Override
+	public IPage<TrainVO> selectTrainPage(IPage<TrainVO> page, TrainVO train) {
+		return page.setRecords(baseMapper.selectTrainPage(page, train));
+	}
+
+	@Override
+	public List<Map<Object, String>> selectTrainInfo(String cardid) {
+		return baseMapper.selectTrainInfo(cardid);
+	}
+
+}
diff --git a/src/main/java/org/springblade/modules/train/vo/TrainVO.java b/src/main/java/org/springblade/modules/train/vo/TrainVO.java
new file mode 100644
index 0000000..0d0bd00
--- /dev/null
+++ b/src/main/java/org/springblade/modules/train/vo/TrainVO.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.train.vo;
+
+import org.springblade.modules.train.entity.Train;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 视图实体类
+ *
+ * @author BladeX
+ * @since 2021-07-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "TrainVO对象", description = "TrainVO对象")
+public class TrainVO extends Train {
+	private static final long serialVersionUID = 1L;
+
+}

--
Gitblit v1.9.3