杰生重构

hx-common/common-client-util/src/main/java/com/fjhx/utils/UserClientUtil.java

@@ -62,6 +62,16 @@ public class UserClientUtil {
     }
 
     /**
+     * 赋值用户名称
+     */
+    public static void setUserName(List<Map<String, Object>> mapList, String getUserIdStr, String setUserNameStr) {
+        Map<Long, String> userNameMap = UserClientUtil.getUserNameMap(mapList, item -> item.get(getUserIdStr));
+        for (Map<String, Object> item : mapList) {
+            item.put(setUserNameStr, userNameMap.get(Convert.toLong(item.get(getUserIdStr))));
+        }
+    }
+
+    /**
      * 通过用户id获取用户、岗位、部门名称
      */
     public static Map<Long, Map<String, Object>> getNameByUserId(List<Long> userIdList) {

hx-common/service-flow/src/main/java/com/fjhx/service/example/impl/ExampleInfoServiceImpl.java

@@ -104,10 +104,8 @@ public class ExampleInfoServiceImpl extends ServiceImpl<ExampleInfoMapper, Examp
         List<Map<String, Object>> records = waitingProcessingPage.getRecords();
 
         if (records.size() > 0) {
-            Map<Long, String> userNameMap = UserClientUtil.getUserNameMap(records, item -> (Long) item.get("createUser"));
-            for (Map<String, Object> record : records) {
-                record.put("userName", userNameMap.get((Long) record.get("createUser")));
-            }
+            // 赋值用户名称
+            UserClientUtil.setUserName(records, "createUser", "userName");
         }
 
         return waitingProcessingPage;

hx-service/basics/src/main/java/com/fjhx/service/impl/StockExServiceImpl.java

@@ -41,9 +41,8 @@ public class StockExServiceImpl implements StockExService {
             return inOutPage;
         }
 
-        // 赋值操作人
-        Map<Long, String> createUser = UserClientUtil.getUserNameMap(records, item -> (Long) item.get("createUser"));
-        records.forEach(item -> item.put("createUser", createUser.get((Long) item.get("createUser"))));
+        // 赋值操作人名称
+        UserClientUtil.setUserName(records, "createUser", "createUser");
 
         return inOutPage;
     }

hx-service/storage-restructure/src/main/java/com/fjhx/service/contract/impl/ContractDetailsServiceImpl.java

@@ -203,10 +203,8 @@ public class ContractDetailsServiceImpl extends ServiceImpl<ContractDetailsMappe
             return page;
         }
 
-        Map<Long, String> userNameMap = UserClientUtil.getUserNameMap(records, item -> Convert.toLong(item.get("operUserId")));
-        for (Map<String, Object> record : records) {
-            record.put("operUserName", userNameMap.get(Convert.toLong(record.get("operUserId"))));
-        }
+        // 赋值用户名称
+        UserClientUtil.setUserName(records,"operUserId","operUserName");
 
         return page;
     }

hx-service/storage-restructure/src/main/java/com/fjhx/service/quality/impl/QualityTestingServiceImpl.java

@@ -340,13 +340,8 @@ public class QualityTestingServiceImpl extends ServiceImpl<QualityTestingMapper,
             return page;
         }
 
-        Map<Long, String> userMap = UserClientUtil.getUserNameMap(records,
-                item -> Convert.toLong(item.get("checkUserId")));
-
-
-        for (Map<String, Object> record : records) {
-            record.put("checkUserName", userMap.get(Convert.toLong(record.get("checkUserId"))));
-        }
+        // 赋值用户名称
+        UserClientUtil.setUserName(records, "checkUserId", "checkUserName");
 
         return page;
     }

hx-service/storage-restructure/src/main/java/com/fjhx/service/water/impl/WaterBackServiceImpl.java

@@ -90,12 +90,8 @@ public class WaterBackServiceImpl extends ServiceImpl<WaterBackMapper, WaterBack
         List<Map<String, Object>> list = listMaps(Wrappers.<WaterBack>lambdaQuery()
                 .eq(WaterBack::getStatus, StatusConstant.NO));
 
-        Map<Long, String> userNameMap = UserClientUtil.getUserNameMap(list,
-                item -> Convert.toLong(item.get("createUser")));
-
-        for (Map<String, Object> map : list) {
-            map.put("createUserName", userNameMap.get(Convert.toLong(map.get("createUser"))));
-        }
+        // 赋值用户名称
+        UserClientUtil.setUserName(list, "createUser", "createUserName");
 
         return list;
     }
@@ -237,10 +233,8 @@ public class WaterBackServiceImpl extends ServiceImpl<WaterBackMapper, WaterBack
             return page;
         }
 
-        Map<Long, String> userNameMap = UserClientUtil.getUserNameMap(records, item -> item.get("createUser"));
-        for (Map<String, Object> record : records) {
-            record.put("createUserName", userNameMap.get(Convert.toLong(record.get("createUser"))));
-        }
+        // 赋值用户名称
+        UserClientUtil.setUserName(records, "createUser", "createUserName");
 
         return page;
     }

hx-service/storage-restructure/src/main/java/com/fjhx/service/water/impl/WaterDetailServiceImpl.java

@@ -66,11 +66,8 @@ public class WaterDetailServiceImpl extends ServiceImpl<WaterDetailMapper, Water
         Long applyPurchaseDetailsId = condition.getLong("applyPurchaseDetailsId");
         List<Map<String, Object>> list = baseMapper.getInQuantityByApplyPurchaseDetailsId(applyPurchaseDetailsId);
 
-        Map<Long, String> userMap = UserClientUtil.getUserNameMap(list, item -> Convert.toLong(item.get("operUserId")));
-
-        for (Map<String, Object> map : list) {
-            map.put("operUserName", userMap.get(Convert.toLong(map.get("operUserId"))));
-        }
+        // 赋值用户名称
+        UserClientUtil.setUserName(list, "operUserId", "operUserName");
 
         return list;
     }
@@ -82,10 +79,8 @@ public class WaterDetailServiceImpl extends ServiceImpl<WaterDetailMapper, Water
 
         List<Map<String, Object>> pickingList = baseMapper.getPickingList(wrapper);
         if (pickingList.size() > 0) {
-            Map<Long, String> userMap = UserClientUtil.getUserNameMap(pickingList, item -> Convert.toLong(item.get("userId")));
-            for (Map<String, Object> map : pickingList) {
-                map.put("userName", userMap.get(Convert.toLong(map.get("userId"))));
-            }
+            // 赋值用户名称
+            UserClientUtil.setUserName(pickingList, "userId", "userName");
         }
 
         HashMap<String, Object> result = new HashMap<>();
@@ -247,10 +242,9 @@ public class WaterDetailServiceImpl extends ServiceImpl<WaterDetailMapper, Water
         if (records.size() == 0) {
             return page;
         }
-        Map<Long, String> userMap = UserClientUtil.getUserNameMap(records, item -> Convert.toLong(item.get("operUserId")));
-        for (Map<String, Object> map : records) {
-            map.put("realName", userMap.get(Convert.toLong(map.get("operUserId"))));
-        }
+
+        // 赋值用户名称
+        UserClientUtil.setUserName(records, "operUserId", "realName");
 
         return page;
     }

hx-service/syringe-production/src/main/java/com/fjhx/service/tda/impl/TdaApplicationServiceImpl.java

@@ -1,6 +1,5 @@
 package com.fjhx.service.tda.impl;
 
-import cn.hutool.core.convert.Convert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -48,9 +47,8 @@ public class TdaApplicationServiceImpl extends ServiceImpl<TdaApplicationMapper,
         Page<Map<String, Object>> mapPage = pageMaps(condition, wrapper);
         List<Map<String, Object>> records = mapPage.getRecords();
 
-        Map<Long, String> createUser = UserClientUtil.getUserNameMap(records, item -> item.get("createUser"));
-        records.forEach(item -> item.put("createUserName", createUser.get(Convert.toLong(item.get("createUser")))));
-
+        // 赋值用户名称
+        UserClientUtil.setUserName(records, "createUser", "createUserName");
         return mapPage;
     }