From e5bf0d08d05f5c58224fe28cdf743a1bae88e3f0 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期四, 30 十一月 2023 16:48:55 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java index 94ec885..962e0e9 100644 --- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java +++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java @@ -420,25 +420,33 @@ start = now.minusMonths(3); } Page<BaseCase> baseCasePage = baseCaseMapper.selectBaseCasePage(page, number, communityId, categories, start, end, site, state, streetId); - if (Objects.isNull(baseCasePage) && CollUtil.isNotEmpty(baseCasePage.getRecords())) { + if (!Objects.isNull(baseCasePage) && CollUtil.isNotEmpty(baseCasePage.getRecords())) { List<BaseCase> records = baseCasePage.getRecords(); //TODO:灏嗙姸鎬乻tate鏀逛负鐘舵�佸悕stateName records.stream().forEach(baseCase -> { Integer stateInt = baseCase.getState(); if (stateInt == 0) { - baseCase.setStateName("璇姤"); + baseCase.setStateName("寰呭鐞�"); }else if(stateInt == 1){ - baseCase.setStateName("涓婃姤"); + baseCase.setStateName("鎶ヨ"); }else if(stateInt == 2){ - baseCase.setStateName("绔嬫"); + baseCase.setStateName("涓婃姤"); }else if(stateInt == 3){ - baseCase.setStateName("娲鹃仯"); + baseCase.setStateName("鍦ㄥ涔�"); }else if(stateInt == 4){ - baseCase.setStateName("澶勭疆"); + baseCase.setStateName("鏆備笉澶勭悊"); }else if(stateInt == 5){ - baseCase.setStateName("鏍告煡"); + baseCase.setStateName("绔嬫"); }else if(stateInt == 6 ){ + baseCase.setStateName("璋冨害"); + }else if(stateInt == 7 ){ + baseCase.setStateName("澶勭疆"); + }else if(stateInt == 8 ){ + baseCase.setStateName("鏍告煡"); + }else if(stateInt == 9 ){ baseCase.setStateName("缁撴"); + }else if(stateInt == 10 ){ + baseCase.setStateName("寰呬笂鎶�"); } }); Set<Long> caseIds = records.stream().map(BaseCase::getId).collect(Collectors.toSet()); -- Gitblit v1.8.0