diff --git a/src/main/java/com/xydl/cac/entity/Zsb.java b/src/main/java/com/xydl/cac/entity/Zsb.java index 0859a62..61d8d4d 100644 --- a/src/main/java/com/xydl/cac/entity/Zsb.java +++ b/src/main/java/com/xydl/cac/entity/Zsb.java @@ -212,4 +212,8 @@ public class Zsb { @Transient private String jgName; + @ApiModelProperty("类型名称") + @Transient + private String lxName; + } \ No newline at end of file diff --git a/src/main/java/com/xydl/cac/service/impl/ZsbServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/ZsbServiceImpl.java index 148034c..496c170 100644 --- a/src/main/java/com/xydl/cac/service/impl/ZsbServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/ZsbServiceImpl.java @@ -33,6 +33,7 @@ public class ZsbServiceImpl implements ZsbService { if (jgid == null) { List result = repository.findAll(); this.fillJgBdzName(result); + this.fillLxName(result); return result; } else { List result = repository.findByJgid(jgid); @@ -42,6 +43,7 @@ public class ZsbServiceImpl implements ZsbService { zsb.setJgName(jg.getMc()); zsb.setBdzName(jg.getBdzName()); } + this.fillLxName(result); } return result; } @@ -62,6 +64,20 @@ public class ZsbServiceImpl implements ZsbService { } } + private void fillLxName(List list) { + List lxList = lxRepository.findAll(); + if (!CollectionUtils.isEmpty(list) && !CollectionUtils.isEmpty(lxList)) { + for (Zsb zsb : list) { + for (Lx lx : lxList) { + if (lx.getId().equals(zsb.getLxid())) { + zsb.setLxName(lx.getMc()); + break; + } + } + } + } + } + @Override public Zsb add(Zsb item) throws Exception { item.setId(null); @@ -100,6 +116,10 @@ public class ZsbServiceImpl implements ZsbService { Jg jg = jgService.detail(zsb.getJgid()); zsb.setBdzName(jg.getBdzName()); zsb.setJgName(jg.getMc()); + Optional optionalLx = lxRepository.findById(zsb.getLxid()); + if (optionalLx.isPresent()) { + zsb.setLxName(optionalLx.get().getMc()); + } return zsb; } }