From 37d6233d5ea7c8d6de144e8fe29e58134c5c35c6 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Mon, 6 Nov 2023 10:59:09 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8):=20=E6=96=87=E4=BB=B6=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsStandardizationController.java | 2 +- .../entity/LawsStandardizationPayment.java | 6 +- .../impl/LawsStandardizationServiceImpl.java | 79 +++++++++---------- 3 files changed, 43 insertions(+), 44 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java index 4fbc76a8..e59ba1e9 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java @@ -177,7 +177,7 @@ public class LawsStandardizationController extends JeroController delete(@RequestBody Map map) { if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ return Result.error("请选择数据!"); - } + } lawsStandardizationService.delete(map.get("id")); return Result.OK("删除成功!"); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationPayment.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationPayment.java index 9b9f5609..e9bbba1d 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationPayment.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationPayment.java @@ -40,9 +40,9 @@ public class LawsStandardizationPayment extends BaseEntity { @ApiModelProperty(value = "年份") @TableField(updateStrategy = FieldStrategy.IGNORED) private String year; - /**整改状态(1-待整改、2-整改中、3-审批中、4-已完成)*/ - @Excel(name = "整改状态(1-待整改、2-整改中、3-审批中、4-已完成)", width = 15) - @ApiModelProperty(value = "整改状态(1-待整改、2-整改中、3-审批中、4-已完成)") + /**整改状态*/ + @Excel(name = "整改状态", width = 15) + @ApiModelProperty(value = "整改状态") @TableField(updateStrategy = FieldStrategy.IGNORED) private String state; /**计划内*/ diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java index 54e5f43f..3764e3a6 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java @@ -19,10 +19,7 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; @@ -74,6 +71,9 @@ public class LawsStandardizationServiceImpl extends ServiceImpl standardizationPaymentList = standardizationVO.getStandardizationPayments(); List standardizationMeetingList = standardizationVO.getStandardizationMeetings(); + if (StringUtils.isBlank(lawsStandardization.getId())){ + lawsStandardization.setId(String.valueOf(SnowflakeUtils.snowflake())); + } // 基础信息 lawsStandardizationService.saveOrUpdate(lawsStandardization); @@ -140,50 +140,49 @@ public class LawsStandardizationServiceImpl extends ServiceImpl children = treeList.getChildren(); - // 查询父级信息 - LawsStandardization fatherDetail = getChildrenDetail(children, lawsStandardization.getPid()); - String name = getName(fatherDetail); - return (StringUtils.isNotBlank(name) ? name + "-" : "") + "会议资料"; - } - - private String getName(LawsStandardization lawsStandardization) { + // 拆开为list结构 + List list = new ArrayList<>(); StringBuilder stringBuilder = new StringBuilder(); - if (lawsStandardization.getLevel() < 2L){ - return stringBuilder.toString(); + treeToList(treeList, list); + // 获取一二级节点名称 + getNodeName(lawsStandardization, list, stringBuilder); + if (stringBuilder.length() > 0){ + stringBuilder.append("-"); } - if (lawsStandardization.getLevel().equals(3L)){ - // 工作组 - stringBuilder.append("-").append(lawsStandardization.getName()); - } - if (lawsStandardization.getLevel().equals(2L)){ - // 委员会 - stringBuilder.insert(0, lawsStandardization.getName()); - } - getName(lawsStandardizationService.getOne( - new LambdaQueryWrapper() - .eq(LawsStandardization::getId, lawsStandardization.getPid()))); - return stringBuilder.toString(); + return stringBuilder.append("会议资料").toString(); } - private LawsStandardization getChildrenDetail(List treeList, String pid) { - for (LawsStandardization tree : treeList) { - if (tree.getId().equals(pid)) { - return tree; + private void getNodeName(LawsStandardization lawsStandardization, List list, StringBuilder stringBuilder) { + Optional first = list.stream().filter(v -> v.getId().equals(lawsStandardization.getPid())).findFirst(); + first.ifPresent(v -> { + // 工作组 + if (first.get().getLevel().equals(2L)){ + stringBuilder.append(v.getName()); } - if (tree.getChildren() != null && !tree.getChildren().isEmpty()) { - getChildrenDetail(tree.getChildren(), pid); + // 委员会 + if (first.get().getLevel().equals(1L)){ + stringBuilder.insert(0, v.getName() + "-"); + } + getNodeName(v, list, stringBuilder); + }); + } + + private void treeToList(LawsStandardization treeList, List list) { + if (!Objects.isNull(treeList)){ + list.add(treeList); + if (!Objects.isNull(treeList.getChildren()) && !treeList.getChildren().isEmpty()) { + for (LawsStandardization tree : treeList.getChildren()) { + treeToList(tree, list); + } } } - return new LawsStandardization(); } /** - * 保存或更新法律法规标准化信息的支付信息 + * 保存或更新支付信息 * - * @param lawsStandardization 法律法规标准化信息对象 - * @param standardizationPaymentList 标准化支付信息列表 + * @param lawsStandardization 标准化活动对象 + * @param standardizationPaymentList 支付信息列表 */ private void saveOrUpdatePayment(LawsStandardization lawsStandardization, List standardizationPaymentList) { for (LawsStandardizationPayment lawsStandardizationPayment : standardizationPaymentList) { @@ -220,10 +219,10 @@ public class LawsStandardizationServiceImpl extends ServiceImpl standardizationGroupList) { for (LawsStandardizationGroup lawsStandardizationGroup : standardizationGroupList) {