From 2685d5e8b7c872ba0f87e3e3aa5863e40f579d30 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 14 Sep 2023 17:27:05 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E5=A4=8D=E5=AE=A1?= =?UTF-8?q?=E8=AE=A1=E5=88=92-=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E5=80=BC=E5=88=87=E6=8D=A2=E4=B8=BA=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EnterpriseStandardInspectRectifyPlan.java | 2 ++ ...riseStandardInspectRectifyPlanServiceImpl.java | 15 --------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectRectifyPlan.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectRectifyPlan.java index bb08f26a..041bcbc9 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectRectifyPlan.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectRectifyPlan.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.util.Date; +import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -99,6 +100,7 @@ public class EnterpriseStandardInspectRectifyPlan implements Serializable { /** * 整改状态 */ + @Dict(dicCode = "inspect_rectify_status") @ApiModelProperty(value = "整改状态") private String rectifyStatus; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectRectifyPlanServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectRectifyPlanServiceImpl.java index c55fd2ec..e72674c4 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectRectifyPlanServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectRectifyPlanServiceImpl.java @@ -39,23 +39,8 @@ public class EnterpriseStandardInspectRectifyPlanServiceImpl extends ServiceImpl public IPage getRectifyPlan(String inspectId, Integer pageNo, Integer pageSize) { IPage page = new Page<>(pageNo, pageSize); esInspectRectifyPlanMapper.page(page, inspectId); - this.transInspectVo(page.getRecords()); return page; } - - // 转换列表中的状态值为中文 - private void transInspectVo(List list) { - if (list.isEmpty()) { - return; - } - List ynDictModelList = sysBaseAPI.getDictItems("inspect_rectify_status"); - list.forEach(e -> { - List collect = ynDictModelList.stream().filter(e1 -> e1.getValue().equals(e.getRectifyStatus())).collect(Collectors.toList()); - if (!collect.isEmpty()) { - e.setRectifyStatus(collect.get(0).getText()); - } - }); - } }