SAI台账列表查询和导出优化

master/src/main/java/com/ruoyi/project/production/controller/TSaiApplyController.java

@@ -253,10 +253,10 @@ public class TSaiApplyController extends BaseController
     public AjaxResult export(SaiApplyQueryVO tSaiApply)
     {
         List<SysUser> userList = userService.selectUserList(new SysUser());
-        Map<String, String> nameMap = new HashMap<String, String>();
+        Map<Long, String> nameMap = new HashMap<Long, String>();
         Map<Long, String> staffIdMap = new HashMap<Long, String>();
         for (SysUser sysUser : userList) {
-            nameMap.put(sysUser.getStaffId(), sysUser.getNickName());
+            nameMap.put(sysUser.getUserId(), sysUser.getNickName());
             staffIdMap.put(sysUser.getUserId(), sysUser.getStaffId());
         }
 
@@ -309,7 +309,7 @@ public class TSaiApplyController extends BaseController
                     for (int i = 0; i < split.length; i++) {
                         if (split[i] != null && !"null".equals(split[i])) {
 //                            inspectorName += userService.selectUserById(Long.parseLong(split[i])).getNickName();
-                            inspectorName += nameMap.get(split[i]);
+                            inspectorName += nameMap.get(Long.parseLong(split[i]));
                             if (i < split.length - 1) {
                                 inspectorName += ",";
                             }
@@ -318,7 +318,7 @@ public class TSaiApplyController extends BaseController
                     vo.setInspectors(inspectorName);
                 } else {
 //                    vo.setInspectors(userService.selectUserById(Long.parseLong(inspectors)).getNickName());
-                    vo.setInspectors(nameMap.get(inspectors));
+                    vo.setInspectors(nameMap.get(Long.parseLong(inspectors)));
                 }
             }
             vo.setValidateDate(entity.getActualFinishDate());

master/src/main/java/com/ruoyi/project/production/service/impl/TSaiApplyServiceImpl.java

@@ -80,9 +80,9 @@ public class TSaiApplyServiceImpl implements ITSaiApplyService
     public List<TSaiApply> selectTSaiApplyList(SaiApplyQueryVO tSaiApply)
     {
         List<SysUser> userList = userService.selectUserList(new SysUser());
-        Map<String, String> nameMap = new HashMap<String, String>();
+        Map<Long, String> nameMap = new HashMap<Long, String>();
         for (SysUser sysUser : userList) {
-            nameMap.put(sysUser.getStaffId(), sysUser.getNickName());
+            nameMap.put(sysUser.getUserId(), sysUser.getNickName());
         }
 
         List<TSaiApply> tSaiApplies = tSaiApplyMapper.selectTSaiApplyList(tSaiApply);