维修工单查询详情添加代办人

module_cmms/src/main/java/org/jeecg/modules/cmmsRepair/service/impl/CmmsRepairServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.subject.Subject;
+import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.modules.cmmsOrderNode.entity.CmmsOrderNode;
@@ -17,6 +18,7 @@ import org.jeecg.modules.cmmsRepair.mapper.CmmsRepairMapper;
 import org.jeecg.modules.cmmsRepair.service.ICmmsRepairService;
 import org.jeecg.modules.sysUploadFile.entity.SysUploadFile;
 import org.jeecg.modules.sysUploadFile.service.ISysUploadFileService;
+import org.jeecg.modules.system.service.impl.SysBaseApiImpl;
 import org.jeecg.modules.util.AutoCodeUtil;
 import org.jeecg.modules.util.UserConstants;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,6 +51,9 @@ public class CmmsRepairServiceImpl extends ServiceImpl<CmmsRepairMapper, CmmsRep
     @Autowired
     @SuppressWarnings("all")
     private ISysUploadFileService fileService;
+    @Autowired
+    @SuppressWarnings("all")
+    private ISysBaseAPI sysBaseAPI;
 
 
 
@@ -112,7 +117,12 @@ public class CmmsRepairServiceImpl extends ServiceImpl<CmmsRepairMapper, CmmsRep
             cmmsRepairVo.setPriority(obj.getPriority());
             cmmsRepairVo.setFaultdate(obj.getFaultdate());
             cmmsRepairVo.setFaultdesc(obj.getFaultdesc());
-            cmmsRepairVo.setRepairuser(obj.getRepairuser());
+            if(ObjectUtil.isNotNull(obj.getRepairuser())){
+                LoginUser user = sysBaseAPI.getUserById(obj.getRepairuser());
+                cmmsRepairVo.setRepairuser(user.getRealname());
+            }else {
+                cmmsRepairVo.setRepairstatus("");
+            }
             cmmsRepairVo.setRepairdate(obj.getRepairdate());
             cmmsRepairVo.setFeedback(obj.getFeedback());
             cmmsRepairVo.setResult(obj.getResult());