lyhzzz 1 vuosi sitten
vanhempi
commit
c2d2de8b34

+ 6 - 0
src/main/java/com/fdkankan/manage/controller/RtkInfoController.java

@@ -1,6 +1,7 @@
 package com.fdkankan.manage.controller;
 
 
+import cn.dev33.satoken.stp.StpUtil;
 import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.entity.AgentAudit;
 import com.fdkankan.manage.entity.RtkInfo;
@@ -33,6 +34,11 @@ public class RtkInfoController {
 
     @PostMapping("/saveOrEdit")
     public ResultData saveOrEdit(@RequestBody RtkInfo rtkInfo){
+        if(rtkInfo.getId() == null){
+            rtkInfo.setCreateUserId(Long.valueOf((String)StpUtil.getLoginId()));
+        }else {
+            rtkInfo.setUpdateUserId(Long.valueOf((String)StpUtil.getLoginId()));
+        }
         rtkInfoService.saveOrEdit(rtkInfo);
         return ResultData.ok();
     }

+ 13 - 0
src/main/java/com/fdkankan/manage/entity/RtkInfo.java

@@ -92,5 +92,18 @@ public class RtkInfo implements Serializable {
     @TableField("update_time")
     private Date updateTime;
 
+    @TableField("create_user_id")
+    private Long createUserId;
+
+    @TableField(exist = false)
+    private String createUserName;
+    @TableField(exist = false)
+    private String createNickName;
+
+    @TableField("update_user_id")
+    private Long updateUserId;
+
+    @TableField(exist = false)
+    private String updateUserName;
 
 }

+ 22 - 0
src/main/java/com/fdkankan/manage/service/impl/RtkInfoServiceImpl.java

@@ -6,14 +6,23 @@ import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.entity.AgentAudit;
 import com.fdkankan.manage.entity.RtkInfo;
+import com.fdkankan.manage.entity.SysUser;
 import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.manage.mapper.IRtkInfoMapper;
 import com.fdkankan.manage.service.IRtkInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.manage.service.ISysUserService;
 import com.fdkankan.manage.vo.request.RtkInfoParam;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 /**
  * <p>
  *  服务实现类
@@ -25,6 +34,10 @@ import org.springframework.stereotype.Service;
 @Service
 public class RtkInfoServiceImpl extends ServiceImpl<IRtkInfoMapper, RtkInfo> implements IRtkInfoService {
 
+
+    @Autowired
+    ISysUserService sysUserService;
+
     @Override
     public RtkInfo getByRtkSnCode(String rtkSnCode) {
         LambdaQueryWrapper<RtkInfo> wrapper = new LambdaQueryWrapper<>();
@@ -50,6 +63,15 @@ public class RtkInfoServiceImpl extends ServiceImpl<IRtkInfoMapper, RtkInfo> imp
         wrapper.orderByDesc(RtkInfo::getCreateTime);
         wrapper.orderByDesc(RtkInfo::getId);
         Page<RtkInfo> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
+        Set<Long> createUserIds = page.getRecords().stream().map(RtkInfo::getCreateUserId).collect(Collectors.toSet());
+        HashMap<Long, SysUser> byIds = sysUserService.getByIds(createUserIds);
+        for (RtkInfo record : page.getRecords()) {
+            SysUser sysUser = byIds.get(record.getCreateUserId());
+            if(sysUser != null){
+                record.setCreateUserName(sysUser.getUserName());
+                record.setCreateNickName(sysUser.getNickName());
+            }
+        }
         return PageInfo.PageInfo(page);
     }