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

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

@@ -7,5 +7,5 @@ import java.util.Date;
 
 public interface SysUserTrackMapper extends BaseMapper<SysUserTrack> {
 
-    Date getLastTime(String userId);
+    SysUserTrack getLastTime(String userId);
 }

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

@@ -6,10 +6,28 @@ import java.util.Date;
 
 @Data
 public class SysUserTrack {
+    /**
+     * id
+     */
     private Integer id;
+    /**
+     * 用户id
+     */
     private String userId;
+    /**
+     * 用户状态 0,"离司",1,"正常",2,"入司待审核",3,"入司审核驳回",4,"离司待审核",5,"离司审核驳回"
+     */
     private Integer status;
+    /**
+     * 审核人
+     */
     private String approveBy;
+    /**
+     * 审核时间
+     */
     private Date approveTime;
+    /**
+     * 审核信息
+     */
     private String approveMess;
 }

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

@@ -47,6 +47,9 @@ public class SysUserTeamInfoDto {
     @ApiModelProperty(value = "审核时间")
     private Date approveTime;
 
+    @ApiModelProperty(value = "审核人")
+    private String approveBy;
+
     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/service/SysUserTrackService.java

@@ -6,5 +6,5 @@ import com.ydtech.modules.admin.model.SysUserTrack;
 import java.util.Date;
 
 public interface SysUserTrackService extends IService<SysUserTrack> {
-    Date getLastTime(String userId);
+    SysUserTrack getLastTime(String userId);
 }

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

@@ -7,6 +7,7 @@ import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.model.SysDept;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.SysUserInfo;
+import com.ydtech.modules.admin.model.SysUserTrack;
 import com.ydtech.modules.admin.model.dto.SysUserTeamDto;
 import com.ydtech.modules.admin.model.dto.SysUserTeamInfoDto;
 import com.ydtech.modules.admin.model.vo.AppCustomerManagementQueryVo;
@@ -74,7 +75,9 @@ 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));
+        SysUserTrack sysUserTrack = sysUserTrackService.getLastTime(userId);
+        sysUserTeamInfoDto.setApproveTime(sysUserTrack.getApproveTime());
+        sysUserTeamInfoDto.setApproveBy(sysUserTrack.getApproveBy());
         return HttpResult.ok(sysUserTeamInfoDto);
     }
 }

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

@@ -683,6 +683,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Transactional
     public HttpResult updateUserInfo(String userId, SysUser2Vo sysUserVo) {
         SysUser sysUser = sysUserVo.getSysUser();
+        int beStatus = sysUser.getStatus();
         //如果审核驳回则 重新修改为 审核状态
         if(sysUserVo.getSysUser().getStatus() == UserWorkStatus.UWS_3.getCode()){
             sysUserVo.getSysUser().setStatus(UserWorkStatus.UWS_2.getCode());
@@ -751,14 +752,16 @@ 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);
-
+        if (UserWorkStatus.UWS_5.getCode() == beStatus ||
+                UserWorkStatus.UWS_3.getCode() == beStatus) {
+            //添加轨迹
+            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("修改成功");
     }
 

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

@@ -11,7 +11,7 @@ import java.util.Date;
 @Service
 public class SysUserTrackServiceImpl extends ServiceImpl<SysUserTrackMapper, SysUserTrack> implements SysUserTrackService {
     @Override
-    public Date getLastTime(String userId) {
+    public SysUserTrack getLastTime(String userId) {
         return baseMapper.getLastTime(userId);
     }
 }

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

@@ -15,7 +15,7 @@
     </insert>
 
     <select id="getLastTime" resultMap="sysUserTrackMap">
-        select  approve_time from sys_user_track
+        select  approve_by,approve_time from sys_user_track
         where user_id = #{userId} order by approve_time desc limit 1
     </select>
 </mapper>