Merge branch 'test-cyr' of sxzgd/java-insagent-pc into test

src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -92,6 +92,8 @@ public class SysUserController extends BaseController {
 
     private final MessageSecretaryService messageSecretaryService;
 
+    private final SysUserTrackService sysUserTrackService;
+
 
     //    @PreAuthorize("hasAuthority('sys:user:delete')")
     @ApiOperation(value = "逻辑删除")
@@ -462,6 +464,12 @@ public class SysUserController extends BaseController {
         }else if(sysUser.getStatus() == UserWorkStatus.UWS_4.getCode()){
             sysUser.setStatus(UserWorkStatus.UWS_0.getCode());
         }
+        SysUserTrack sysUserTrack = new SysUserTrack();
+        sysUserTrack.setUserId(userId);
+        sysUserTrack.setApproveBy(getUserName());
+        sysUserTrack.setStatus(sysUser.getStatus());
+        sysUserTrack.setApproveTime(new Date());
+        sysUserTrackService.save(sysUserTrack);
         return HttpResult.ok(sysUserService.updateById(sysUser));
 
 
@@ -483,7 +491,13 @@ public class SysUserController extends BaseController {
             sysUser.setStatus(UserWorkStatus.UWS_5.getCode());
         }
         sysUser.setApprovalOpinion(reason);
-
+        SysUserTrack sysUserTrack = new SysUserTrack();
+        sysUserTrack.setUserId(userId);
+        sysUserTrack.setApproveBy(getUserName());
+        sysUserTrack.setStatus(sysUser.getStatus());
+        sysUserTrack.setApproveMess(reason);
+        sysUserTrack.setApproveTime(new Date());
+        sysUserTrackService.save(sysUserTrack);
         return HttpResult.ok(sysUserService.updateById(sysUser));
 
     }

src/main/java/com/ydtech/modules/admin/dao/SysUserTrackMapper.java

@@ -0,0 +1,11 @@
+package com.ydtech.modules.admin.dao;
+
+import com.ydtech.modules.admin.model.SysUserTrack;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.Date;
+
+public interface SysUserTrackMapper extends BaseMapper<SysUserTrack> {
+
+    Date getLastTime(String userId);
+}

src/main/java/com/ydtech/modules/admin/model/SysUserTrack.java

@@ -0,0 +1,15 @@
+package com.ydtech.modules.admin.model;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SysUserTrack {
+    private Integer id;
+    private String userId;
+    private Integer status;
+    private String approveBy;
+    private Date approveTime;
+    private String approveMess;
+}

src/main/java/com/ydtech/modules/admin/model/dto/SysUserTeamInfoDto.java

@@ -44,6 +44,9 @@ public class SysUserTeamInfoDto {
     @ApiModelProperty("注册时间")
     private Date createTime;
 
+    @ApiModelProperty(value = "审核时间")
+    private Date approveTime;
+
     public SysUserTeamInfoDto(SysUser sysUser, SysDept sysDept, SysDept  organization, SysUserInfo sysUserInfo) {
         this.organization = organization.getName();
         this.deptId = sysDept.getId();

src/main/java/com/ydtech/modules/admin/model/vo/SysUserBaseVO.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
@@ -63,4 +64,10 @@ public class SysUserBaseVO {
     @ApiModelProperty(value = "报价单颜色")
     private String themeColour;
 
+
+    @ApiModelProperty(value = "提交时间")
+    private Date submitTime;
+
+    @ApiModelProperty(value = "审核时间")
+    private Date approveTime;
 }

src/main/java/com/ydtech/modules/admin/service/SysUserTrackService.java

@@ -0,0 +1,10 @@
+package com.ydtech.modules.admin.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ydtech.modules.admin.model.SysUserTrack;
+
+import java.util.Date;
+
+public interface SysUserTrackService extends IService<SysUserTrack> {
+    Date getLastTime(String userId);
+}

src/main/java/com/ydtech/modules/admin/service/impl/AppCustomerManagementImpl.java

@@ -10,10 +10,7 @@ import com.ydtech.modules.admin.model.SysUserInfo;
 import com.ydtech.modules.admin.model.dto.SysUserTeamDto;
 import com.ydtech.modules.admin.model.dto.SysUserTeamInfoDto;
 import com.ydtech.modules.admin.model.vo.AppCustomerManagementQueryVo;
-import com.ydtech.modules.admin.service.AppCustomerManagementService;
-import com.ydtech.modules.admin.service.SysDeptService;
-import com.ydtech.modules.admin.service.SysUserInfoService;
-import com.ydtech.modules.admin.service.SysUserService;
+import com.ydtech.modules.admin.service.*;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.service.EsmUserReferrerService;
 import com.ydtech.modules.order.entity.BasePageResult;
@@ -36,6 +33,8 @@ public class AppCustomerManagementImpl implements AppCustomerManagementService {
 
     private final SysUserInfoService sysUserInfoService;
 
+    private final SysUserTrackService sysUserTrackService;
+
 
     @Override
     public HttpResult<BasePageResult<SysUserTeamDto>> authenticationQuery(AppCustomerManagementQueryVo managementQueryVo) {
@@ -75,6 +74,7 @@ public class AppCustomerManagementImpl implements AppCustomerManagementService {
         SysDept organization = sysDeptService.getById(dept.getParentId());
         SysUserInfo sysUserInfo = sysUserInfoService.getById(userId);
         SysUserTeamInfoDto sysUserTeamInfoDto = new SysUserTeamInfoDto(sysUser, dept, organization, sysUserInfo);
+        sysUserTeamInfoDto.setApproveTime(sysUserTrackService.getLastTime(userId));
         return HttpResult.ok(sysUserTeamInfoDto);
     }
 }

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ydtech.modules.admin.service.impl;
 
+import cn.dev33.satoken.stp.StpUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -79,6 +80,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Autowired
     private SysUserIsDialService sysUserIsDialService;
 
+    @Autowired
+    private SysUserTrackService sysUserTrackService;
+
     @Override
     public IPage<SysUserBaseVO> findUserList(PageDto<SysUserDto> pageDto) {
         PageVo<SysUserBaseVO> pageVo = new PageVo();
@@ -632,6 +636,13 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         List<EsmUserImageVo> esmUserImageVo = sysUserVo.getEsmUserImageVo();
         List<EsmUserImage> esmUserImages = esmUserImageVo.stream().map(x -> new EsmUserImage(x, userId)).collect(Collectors.toList());
         esmUserImageService.saveBatch(esmUserImages);
+        //添加轨迹
+        SysUserTrack sysUserTrack = new SysUserTrack();
+        sysUserTrack.setUserId(sysUser.getId());
+        sysUserTrack.setApproveBy(StpUtil.getLoginId().toString());
+        sysUserTrack.setStatus(sysUser.getStatus());
+        sysUserTrack.setApproveTime(new Date());
+        sysUserTrackService.save(sysUserTrack);
 
         return HttpResult.ok("新增成功");
     }
@@ -740,6 +751,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         List<EsmUserImage> esmUserImages = esmUserImageVo.stream().map(x -> new EsmUserImage(x, userId)).collect(Collectors.toList());
         esmUserImageService.saveBatch(esmUserImages);
 
+        //添加轨迹
+        SysUserTrack sysUserTrack = new SysUserTrack();
+        sysUserTrack.setUserId(sysUser.getId());
+        sysUserTrack.setApproveBy(StpUtil.getLoginId().toString());
+        sysUserTrack.setStatus(sysUserVo.getSysUser().getStatus());
+        sysUserTrack.setApproveTime(new Date());
+        sysUserTrackService.save(sysUserTrack);
+
         return HttpResult.ok("修改成功");
     }
 
@@ -1497,6 +1516,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         esmUserImageVo.setType(InsuranceImageEnum.LZ_01.getCode());
         EsmUserImage esmUserImage = new EsmUserImage(esmUserImageVo,sysUserVO.getSysUser().getId());
         esmUserImageService.save(esmUserImage);
+
+        //添加轨迹
+        SysUserTrack sysUserTrack = new SysUserTrack();
+        sysUserTrack.setUserId(byId.getId());
+        sysUserTrack.setApproveBy(StpUtil.getLoginId().toString());
+        sysUserTrack.setStatus(byId.getStatus());
+        sysUserTrack.setApproveTime(new Date());
+        sysUserTrackService.save(sysUserTrack);
         return true;
     }
 

src/main/java/com/ydtech/modules/admin/service/impl/SysUserTrackServiceImpl.java

@@ -0,0 +1,17 @@
+package com.ydtech.modules.admin.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.modules.admin.dao.SysUserTrackMapper;
+import com.ydtech.modules.admin.model.SysUserTrack;
+import com.ydtech.modules.admin.service.SysUserTrackService;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+@Service
+public class SysUserTrackServiceImpl extends ServiceImpl<SysUserTrackMapper, SysUserTrack> implements SysUserTrackService {
+    @Override
+    public Date getLastTime(String userId) {
+        return baseMapper.getLastTime(userId);
+    }
+}

src/main/resources/mapper/modules/admin/SysUserMapper.xml

@@ -87,13 +87,17 @@
         psd.id as pDeptId,
         psd.name as pDeptName,
         t4.id as roleId,
-        t4.name as roleName
+        t4.name as roleName,
+        su.create_time as submitTime,
+        sut.approveTime as approveTime
         from sys_user su
         left join sys_dept sd on su.dept_id=sd.id
         left join sys_dept psd on sd.parent_id=psd.id
         left join sys_user_info info on info.id=su.id
         left join sys_user_role t3 on su.id=t3.user_id
         left join sys_role t4 on t3.role_id=t4.id
+        left join (select user_id,MAX(approve_time) approveTime
+        from sys_user_track group by user_id ) sut on sut.user_id = su.id
         where 1=1
         AND sd.id <> ''
         <if test='user !=null  '>
@@ -132,7 +136,9 @@
         t4.name as roleName,
         sd.management_source,
         psd.id as pDeptId,
-        psd.name as pDeptName
+        psd.name as pDeptName,
+        su.create_time as submitTime,
+        sut.approveTime as approveTime
         FROM
         sys_user su
         LEFT JOIN sys_user_info info ON info.id = su.id
@@ -140,6 +146,8 @@
         left join sys_dept psd on psd.id = sd.parent_id
         LEFT JOIN sys_user_role t3 ON su.id = t3.user_id
         LEFT JOIN sys_role t4 ON t3.role_id = t4.id
+        left join (select user_id,MAX(approve_time) approveTime
+        from sys_user_track group by user_id ) sut on sut.user_id = su.id
         AND sd.del_flag = '0'
         WHERE
         1=1
@@ -238,7 +246,9 @@
         t4.name as roleName,
         sd.management_source,
         psd.id as pDeptId,
-        psd.name as pDeptName
+        psd.name as pDeptName,
+        su.create_time as submitTime,
+        sut.approveTime as approveTime
         FROM
         sys_user su
         LEFT JOIN sys_user_info info ON info.id = su.id
@@ -246,6 +256,8 @@
         left join sys_dept psd on psd.id = sd.parent_id
         LEFT JOIN sys_user_role t3 ON su.id = t3.user_id
         LEFT JOIN sys_role t4 ON t3.role_id = t4.id
+        left join (select user_id,MAX(approve_time) approveTime
+        from sys_user_track group by user_id ) sut on sut.user_id = su.id
         AND sd.del_flag = '0'
         WHERE
         1=1

src/main/resources/mapper/modules/admin/SysUserTrackMapper.xml

@@ -0,0 +1,21 @@
+<?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.ydtech.modules.admin.dao.SysUserTrackMapper">
+    <resultMap id="sysUserTrackMap" type="com.ydtech.modules.admin.model.SysUserTrack">
+        <id column="id" property="id" javaType="java.lang.Integer"/>
+        <result column="user_id" property="userId" javaType="java.lang.String"/>
+        <result column="status" property="status" javaType="java.lang.Integer"/>
+        <result column="approve_by" property="approveBy" javaType="java.lang.String"/>
+        <result column="approve_time" property="approveTime" javaType="java.util.Date"/>
+        <result column="approve_mess" property="approveMess" javaType="java.lang.String"/>
+    </resultMap>
+    <insert id="insert">
+        insert into sys_user_track (user_id,status,approve_by,approve_time,approve_mess)
+        values (#{userId},#{status},#{approveBy}, #{approveTime},#{approveMess})
+    </insert>
+
+    <select id="getLastTime" resultMap="sysUserTrackMap">
+        select  approve_time from sys_user_track
+        where user_id = #{userId} order by approve_time desc limit 1
+    </select>
+</mapper>