Merge remote-tracking branch 'origin/dev' into dev

bluejay

2025-04-09 06d2730553811243101503b96620407d68008f54

 aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanController.java

@@ -45,6 +45,21 @@
    public TableDataInfo list(ApsPartPlan apsPartPlan) {
//        startPage();
        List<ApsPartPlan> list = apsPartPlanService.selectApsPartPlanList(apsPartPlan);
        List<SysDictData> suspendedDic = DictUtils.getDictCache("aps_is_suspended");
        List<SysDictData> businessTypeDic = DictUtils.getDictCache("aps_business_type");
        List<SysDictData> documentStatusDic = DictUtils.getDictCache("aps_document_status");
        List<SysDictData> accountDic = DictUtils.getDictCache("aps_account");
        list.parallelStream().forEach(plan->{
             documentStatusDic.stream().filter(x -> x.getDictValue().equals( plan.getDocumentStatus().trim()))
                     .findFirst().ifPresent(sysDictData -> plan.setDocumentStatus(sysDictData.getDictLabel()));
             accountDic.stream().filter(x -> x.getDictValue().equals( plan.getAccount().trim()))
                     .findFirst().ifPresent(sysDictData -> plan.setAccount(sysDictData.getDictLabel()));
             businessTypeDic.stream().filter(x -> x.getDictValue().equals(plan.getBusinessType().trim()))
                     .findFirst().ifPresent(sysDictData -> plan.setBusinessType(sysDictData.getDictLabel()));
             suspendedDic.stream().filter(x -> x.getDictValue().equals( plan.getIsSuspended()))
                     .findFirst().ifPresent(sysDictData -> plan.setIsSuspended(sysDictData.getDictLabel()));
        });

        return getDataTable(list);
    }