2024-05-31

src/main/java/com/spring/modules/change/controller/ChangeManagementController.java

@@ -385,7 +385,7 @@ public class ChangeManagementController {
     @PostMapping(value="/getNodeAuthority")
     @ResponseBody
     public R getNodeAuthority(@RequestBody ChangeRequestVo data) {
-        Map<String, Object> map = changeManagementService.getNodeAuthority(data);
+        Map<String, List<RequestNodeAuthorityEntity>> map = changeManagementService.getNodeAuthority(data);
         return R.ok().put("rows", map);
     }
 

src/main/java/com/spring/modules/change/service/ChangeManagementService.java

@@ -67,7 +67,7 @@ public interface ChangeManagementService {
 
     void submitChange(ChangeRequestVo data);
 
-    Map<String, Object> getNodeAuthority(ChangeRequestVo data);
+    Map<String, List<RequestNodeAuthorityEntity>> getNodeAuthority(ChangeRequestVo data);
 
     void issueChange2(ChangeRequestVo data);
 

src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java

@@ -16,6 +16,7 @@ import com.spring.modules.base.data.PlmPropertiesItemData;
 import com.spring.modules.base.data.PlmPropertiesModelHeaderData;
 import com.spring.modules.base.service.BaseService;
 import com.spring.modules.base.service.TransNoControlService;
+import com.spring.modules.base.utils.CommonUtils;
 import com.spring.modules.base.utils.HttpClientUtil;
 import com.spring.modules.base.utils.ResponseData;
 import com.spring.modules.change.entity.*;
@@ -2057,8 +2058,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
      * @return
      */
     @Override
-    public Map<String, Object> getNodeAuthority(ChangeRequestVo data) {
-        HashMap<String, Object> map = new HashMap<>();
+    public Map<String, List<RequestNodeAuthorityEntity>> getNodeAuthority(ChangeRequestVo data) {
         // 查询节点信息
         List<PlmRequestDetailEntity> requestNodeList = changeManagementMapper.getNodeInformation(data.getSite(), data.getMenuId(), data.getStepId());
         if (requestNodeList.isEmpty()) {
@@ -2066,27 +2066,12 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
         }
         // 根据节点获得节点权限
         List<RequestNodeAuthorityEntity> nodeAuthorityList = changeManagementMapper.getNodeAuthority(requestNodeList.get(0));
-
-        if ("108002".equals(data.getMenuId())) {
-            List<RequestNodeAuthorityEntity> plmChangeRequest = nodeAuthorityList.stream().filter(a -> "plm_change_request".equals(a.getTableId())).collect(Collectors.toList());
-            List<RequestNodeAuthorityEntity> plmChangeRequestDetail = nodeAuthorityList.stream().filter(a -> "plm_change_request_detail".equals(a.getTableId())).collect(Collectors.toList());
-            List<RequestNodeAuthorityEntity> plmChangeCostImpact = nodeAuthorityList.stream().filter(a -> "plm_change_cost_impact".equals(a.getTableId())).collect(Collectors.toList());
-            List<RequestNodeAuthorityEntity> plmChangeExecutionInfo = nodeAuthorityList.stream().filter(a -> "plm_change_execution_info".equals(a.getTableId())).collect(Collectors.toList());
-            List<RequestNodeAuthorityEntity> plmChangeCountersignatureItem = nodeAuthorityList.stream().filter(a -> "plm_change_countersignature_item".equals(a.getTableId())).collect(Collectors.toList());
-            List<RequestNodeAuthorityEntity> plmChangeFAItem = nodeAuthorityList.stream().filter(a -> "plm_change_FA_item".equals(a.getTableId())).collect(Collectors.toList());
-            List<RequestNodeAuthorityEntity> plmChangeItem = nodeAuthorityList.stream().filter(a -> "plm_change_item".equals(a.getTableId())).collect(Collectors.toList());
-            map.put("plmChangeRequest", plmChangeRequest);
-            map.put("plmChangeRequestDetail", plmChangeRequestDetail);
-            map.put("plmChangeCostImpact", plmChangeCostImpact);
-            map.put("plmChangeExecutionInfo", plmChangeExecutionInfo);
-            map.put("plmChangeCountersignatureItem", plmChangeCountersignatureItem);
-            map.put("plmChangeFAItem", plmChangeFAItem);
-            map.put("plmChangeItem", plmChangeItem);
-        } else if ("102001".equals(data.getMenuId())) {
-            List<RequestNodeAuthorityEntity> plmQuotationInformation = nodeAuthorityList.stream().filter(a -> "plm_quotation_information".equals(a.getTableId())).collect(Collectors.toList());
-            map.put("plmQuotationInformation", plmQuotationInformation);
-        }
-        return map;
+        nodeAuthorityList = nodeAuthorityList.stream().map(item ->{
+            item.setFieldId(CommonUtils.underScoreToCamel(item.getFieldId()));
+            return item;
+        }).collect(Collectors.toList());
+        Map<String, List<RequestNodeAuthorityEntity>> collect = nodeAuthorityList.stream().collect(Collectors.groupingBy(RequestNodeAuthorityEntity::getTableId));
+        return collect;
     }