Merge branch 'saff_update_feature' into dev

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppShareholderDetailChangeRecordDTO.java

+package com.github.wxiaoqi.security.admin.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+@Data
+public class AppShareholderDetailChangeRecordDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 主键id
+     */
+    private Integer id;
+
+    /**
+     * 股东手机号
+     */
+    private String phone;
+
+    /**
+     * 股东名称
+     */
+    private String userName;
+
+    /**
+     * 公司ID
+     */
+    private Integer CompanyId;
+
+    /**
+     * 公司名称
+     */
+    private String CompanyName;
+
+    /**
+     * 操作人名称
+     */
+    private Integer operatorId;
+
+    /**
+     * 入股时间
+     */
+    private Timestamp relTime;
+
+    /**
+     * 股东id
+     */
+    private Integer userId;
+
+    /**
+     * 操作指令
+     */
+    private Integer changeState;
+
+
+    /**
+     * 0:入股 1：退股
+     */
+    private Integer isQuit;
+
+
+}

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppShareholderDetailDTO.java

@@ -61,5 +61,12 @@ public class AppShareholderDetailDTO {
     @ApiModelProperty("股东身份ID")
     private  Integer positionId;
 
+    /**
+     * 操作指令
+     * 1：信息修改
+     * 2：股权变动
+     */
+    private  Integer changeState;
+
 
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppShareholderDetail.java

@@ -7,11 +7,14 @@ import javax.persistence.Column;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Table;
+import java.io.Serializable;
 import java.util.Date;
 
 @Table(name = "app_shareholder_detail")
 @Data
-public class AppShareholderDetail {
+public class AppShareholderDetail implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     @Id
     @GeneratedValue(generator = "JDBC")//此处加上注解
     private Integer id;
@@ -55,4 +58,7 @@ public class AppShareholderDetail {
     @Column(name = "position_id")
     private Integer positionId;
 
+
+    private String companyIdArray;
+
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppShareholderDetailChangeRecord.java

+package com.github.wxiaoqi.security.admin.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.sql.Timestamp;
+import java.util.Date;
+
+@Data
+@Table(name = "app_shareholder_detail_change_record")
+public class AppShareholderDetailChangeRecord implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(generator = "JDBC")//此处加上注解
+    private Integer id;
+
+    @ApiModelProperty("用户id")
+    @Column(name = "user_id")
+    private Integer userId;
+
+    @ApiModelProperty("公司名称")
+    @Column(name = "company_name")
+    private String companyName;
+
+    @ApiModelProperty("公司ID")
+    @Column(name = "company_id")
+    private Integer companyId;
+
+    @ApiModelProperty("用户手机号")
+    @Column(name = "phone")
+    private String phone;
+
+    @ApiModelProperty("股东名称")
+    @Column(name = "name")
+    private String name;
+
+    @ApiModelProperty("持股状态 0：持股中 1：已退股")
+    @Column(name = "is_quit")
+    private Integer isQuit;
+
+    @ApiModelProperty("创建时间")
+    @Column(name = "crt_time")
+    private Long crtTime;
+
+    @ApiModelProperty("实际入股时间时间")
+    @Column(name = "rel_time")
+    private Date relTime;
+
+    @ApiModelProperty("操作人")
+    @Column(name = "operator_id")
+    private Integer operatorId;
+
+}

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/AppShareholderDetailVo.java

@@ -53,4 +53,6 @@ public class AppShareholderDetailVo {
 
     @ApiModelProperty("股东身份名称")
     private List<String> companyList;
+
+    private  String companyIdArray;
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppShareholderDetailChangeRecordBiz.java

+package com.github.wxiaoqi.security.admin.biz;
+
+import com.github.wxiaoqi.security.admin.dto.AppShareholderDetailChangeRecordDTO;
+import com.github.wxiaoqi.security.admin.dto.AppShareholderDetailDTO;
+import com.github.wxiaoqi.security.admin.entity.AppShareholderDetail;
+import com.github.wxiaoqi.security.admin.entity.AppShareholderDetailChangeRecord;
+import com.github.wxiaoqi.security.admin.mapper.AppShareholderDetailChangeRecordMapper;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import org.apache.commons.beanutils.BeanUtils;
+import tk.mybatis.mapper.entity.Example;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.List;
+
+@Slf4j
+@Transactional
+@Service("appShareholderDetailChangeRecordBiz")
+public class AppShareholderDetailChangeRecordBiz extends BaseBiz<AppShareholderDetailChangeRecordMapper, AppShareholderDetailChangeRecord> {
+    /**
+     * 股东变变更记录插入
+     */
+    public void addAppShareholderDetailChangeRecord(AppShareholderDetail appShareholderDetail, Integer operatorId, Integer changeState) {
+        AppShareholderDetailChangeRecord appShareholderDetailChangeRecord = new AppShareholderDetailChangeRecord();
+        appShareholderDetailChangeRecord.setRelTime(appShareholderDetail.getRelTime());
+        appShareholderDetailChangeRecord.setName(appShareholderDetail.getName());
+        appShareholderDetailChangeRecord.setPhone(appShareholderDetail.getPhone());
+        appShareholderDetailChangeRecord.setCompanyId(appShareholderDetail.getCompanyId());
+        appShareholderDetailChangeRecord.setCompanyName(appShareholderDetail.getCompanyName());
+        appShareholderDetailChangeRecord.setOperatorId(operatorId);
+        appShareholderDetailChangeRecord.setIsQuit(changeState);
+        appShareholderDetailChangeRecord.setUserId(appShareholderDetail.getId());
+        appShareholderDetailChangeRecord.setCrtTime(System.currentTimeMillis());
+        mapper.insertSelective(appShareholderDetailChangeRecord);
+    }
+
+    /**
+     * 查询员工信息变更记录表
+     */
+    public List<AppShareholderDetailChangeRecord> findShareholderChangeRecord(AppShareholderDetail appShareholderDetail) {
+        Example example = new Example(AppShareholderDetailChangeRecord.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("userId", appShareholderDetail.getId());
+        if (appShareholderDetail.getPhone() != null) {
+            criteria.andEqualTo("phone", appShareholderDetail.getPhone());
+        }
+        List<AppShareholderDetailChangeRecord > list = mapper.selectByExample(example);
+        return list;
+    }
+}

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppShareholderDetailChangeRecordMapper.java

+package com.github.wxiaoqi.security.admin.mapper;
+
+import com.github.wxiaoqi.security.admin.entity.AppShareholderDetailChangeRecord;
+import tk.mybatis.mapper.common.Mapper;
+
+public interface AppShareholderDetailChangeRecordMapper extends Mapper<AppShareholderDetailChangeRecord> {
+}

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/AppShareholderDetailController.java

 package com.github.wxiaoqi.security.admin.rest.admin;
 
 import com.github.wxiaoqi.security.admin.biz.AppShareholderDetailBiz;
+import com.github.wxiaoqi.security.admin.biz.AppShareholderDetailChangeRecordBiz;
 import com.github.wxiaoqi.security.admin.dto.AppShareholderDetailDTO;
 import com.github.wxiaoqi.security.admin.dto.AppShareholderDetailFindDTO;
+import com.github.wxiaoqi.security.admin.entity.AppShareholderDetail;
 import com.github.wxiaoqi.security.admin.vo.AppShareholderDetailVo;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
@@ -35,18 +37,22 @@ public class AppShareholderDetailController {
     @Autowired
     private AppShareholderDetailBiz appShareholderDetailBiz;
 
+    @Autowired
+    private AppShareholderDetailChangeRecordBiz appShareholderDetailChangeRecordBiz;
+
     @ApiOperation("批量导入股东")
     @PostMapping("/export")
     public ObjectRestResponse importAppShareholder(@RequestPart("file") MultipartFile appShareholderExcel, HttpServletRequest request) {
         try {
             IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
+            Integer operatorId = Integer.valueOf(infoFromToken.getId());
             List<String[]> appShareholderData = ExcelImport.getExcelData(appShareholderExcel);
             if (appShareholderData.size() < 1) {
                 return ObjectRestResponse.createFailedResult(1001, "导入不能没数据！！！");
             }
 //            appShareholderData.remove(0);
             try {
-                int effectSize = appShareholderDetailBiz.importShareholder(appShareholderData);
+                int effectSize = appShareholderDetailBiz.importShareholder(appShareholderData, operatorId);
                 return ObjectRestResponse.succ(effectSize);
             } catch (BaseException ex) {
                 return ObjectRestResponse.createDefaultFail();
@@ -67,9 +73,8 @@ public class AppShareholderDetailController {
     }
 
 
-
     /**
-     * 新增或编辑身份信息
+     * 新增股东信息
      *
      * @return
      */
@@ -77,13 +82,38 @@ public class AppShareholderDetailController {
     public ObjectRestResponse<Void> addUserPostion(@RequestBody AppShareholderDetailDTO appShareholderDetailDTO, HttpServletRequest request) {
         try {
             IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
-            Integer updUserId = Integer.valueOf(infoFromToken.getId());
-            return appShareholderDetailBiz.add(appShareholderDetailDTO, updUserId);
+            Integer operatorId = Integer.valueOf(infoFromToken.getId());
+            return appShareholderDetailBiz.add(appShareholderDetailDTO, operatorId);
         } catch (Exception e) {
             log.error("新增失败【{}】", e);
             throw new BaseException("新增失败");
         }
     }
 
+    /**
+     * 股东身份信息变更
+     *
+     * @return
+     */
+    @PostMapping("/updUserPostion")
+    public ObjectRestResponse<Void> updUserPostion(@RequestBody AppShareholderDetailDTO appShareholderDetailDTO, HttpServletRequest request) {
+        try {
+            IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
+            Integer operatorId = Integer.valueOf(infoFromToken.getId());
+            return appShareholderDetailBiz.updSharehoder(appShareholderDetailDTO, operatorId);
+        } catch (Exception e) {
+            log.error("修改失败【{}】", e);
+            throw new BaseException("修改失败");
+        }
+    }
+
+    /**
+     * 查询股東信息变更记录表
+     */
+    @GetMapping("/findShareholderChangeRecord")
+    public ObjectRestResponse findShareholderChangeRecord(AppShareholderDetail appShareholderDetail) {
+        return ObjectRestResponse.succ(appShareholderDetailChangeRecordBiz.findShareholderChangeRecord(appShareholderDetail));
+    }
+
 
 }

ace-modules/ace-admin/src/main/resources/mapper/AppShareholderDetailChangeRecord.xml

+<?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="com.github.wxiaoqi.security.admin.mapper.AppShareholderDetailChangeRecordMapper">
+    <resultMap id="appShareholderDetailMap" type="com.github.wxiaoqi.security.admin.entity.AppShareholderDetailChangeRecord">
+        <result property="id" column="id"/>
+        <result property="companyName" column="company_name"/>
+        <result property="userId" column="user_id"/>
+        <result property="phone" column="phone"/>
+        <result property="companyId" column="company_id"/>
+        <result property="name" column="name"/>
+        <result property="crtTime" column="crt_time"/>
+        <result property="isQuit" column="is_quit"/>
+        <result property="relTime" column="rel_time"/>
+    </resultMap>
+
+
+
+</mapper>

ace-modules/ace-admin/src/main/resources/mapper/AppShareholderDetailMapper.xml

@@ -28,27 +28,30 @@
             </otherwise>
         </choose>
     </select>
-
-    <select id="findPage" resultType="com.github.wxiaoqi.security.admin.entity.AppShareholderDetail">
+    <select id="findPage" resultMap="detail">
 
         select * from (
         select max(id) as id,max(name) as `name`,max(is_quit) as `isQuit`,max(position_id) as `positionId`,phone as
-        `phone`,group_concat(company_name) as `companyName`,max(company_id) as `companyId` from app_shareholder_detail
+        `phone`,group_concat(company_name) as `companyName`,group_concat(company_id) as `companyIdArray` from
+        app_shareholder_detail
         where is_quit=0 and
         position_id=1 group by phone
         union ALL
         select max(id) as id,max(name) as `name`,max(is_quit) as `isQuit`,max(position_id) as `positionId`,phone as
-        `phone`,group_concat(company_name) as `companyName` ,max(company_id) as `companyId`from app_shareholder_detail
+        `phone`,group_concat(company_name) as `companyName` ,group_concat(company_id) as `companyIdArray` from
+        app_shareholder_detail
         where is_quit=0 and
         position_id=2 group by phone
         union ALL
         select max(id) as id,max(name) as `name`,max(is_quit) as `isQuit`,max(position_id) as `positionId`,phone as
-        `phone`,group_concat(company_name) as `companyName` ,max(company_id) as `companyId`from app_shareholder_detail
+        `phone`,group_concat(company_name) as `companyName` ,group_concat(company_id) as `companyIdArray`from
+        app_shareholder_detail
         where is_quit=1 and position_id
         =1 group by phone
         union all
         select max(id) as id,max(name) as `name`,max(is_quit) as `isQuit`,max(position_id) as `positionId`,phone as
-        `phone`,group_concat(company_name) as `companyName` ,max(company_id) as `companyId`from app_shareholder_detail
+        `phone`,group_concat(company_name) as `companyName` ,group_concat(company_id) as `companyIdArray`from
+        app_shareholder_detail
         where is_quit=1 and position_id
         =2 group by phone
         ) a
@@ -66,4 +69,18 @@
             and a.companyId=#{companyId}
         </if>
     </select>
+
+    <resultMap id="detail" type="com.github.wxiaoqi.security.admin.entity.AppShareholderDetail">
+        <result property="id" column="id"/>
+        <result property="companyName" column="companyName"/>
+        <result property="userId" column="user_id"/>
+        <result property="phone" column="phone"/>
+        <result property="companyId" column="company_id"/>
+        <result property="name" column="name"/>
+        <result property="crtTime" column="crt_time"/>
+        <result property="isQuit" column="is_quit"/>
+        <result property="updTime" column="upd_time"/>
+        <result property="positionId" column="positionId"/>
+        <result property="companyIdArray" column="companyIdArray"/>
+    </resultMap>
 </mapper>
\ No newline at end of file