diff --git a/suimangCApi/src/main/java/com/iformall/controller/VoiceMouldController.java b/suimangCApi/src/main/java/com/iformall/controller/VoiceMouldController.java index eb74ee0..899da15 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/VoiceMouldController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/VoiceMouldController.java @@ -27,6 +27,8 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + @RestController @RequestMapping("/api/voiceMould") @@ -64,7 +66,16 @@ public class VoiceMouldController extends BaseController { public ResultData findById(Long id) { logger.debug("[" + getIpAddr() + "] MouldPatchController::findById"); VoiceMould voiceMould = voiceMouldService.getDetailById(id); - + if(voiceMould.getParentId() == 0l && voiceMould.getCountSub() > 0){ + VoiceMould voiceQ = new VoiceMould(); + voiceQ.setParentId(voiceMould.getId()); + voiceQ.setStatus(EnumaMouldPatchStatus.put_on.getCode()); + voiceQ.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); + List sublist = voiceMouldService.getClist(voiceQ); + if(sublist != null && !sublist.isEmpty()){ + voiceMould.setSubVoiceMould(sublist); + } + } return new ResultData(voiceMould); } @@ -96,6 +107,7 @@ public class VoiceMouldController extends BaseController { } VoiceMould voiceMould = new VoiceMould(); + voiceMould.setParentId(0l); voiceMould.setSex(sex); voiceMould.setSendType(EnumMouldSendType.auto.getCode()); voiceMould.setStatus(EnumaMouldPatchStatus.put_on.getCode()); diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceMould.java b/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceMould.java index 8bd264a..4ca51d3 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceMould.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceMould.java @@ -43,6 +43,8 @@ public class VoiceMould extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="查询-结束时间",name="endDate") private Date endDate; + private List subVoiceMould; + @io.swagger.annotations.ApiModelProperty(value="",name="parentId") private Long parentId; @io.swagger.annotations.ApiModelProperty(value="",name="countSub") diff --git a/suimangService/src/main/java/com/iformall/service/sm/VoiceMouldService.java b/suimangService/src/main/java/com/iformall/service/sm/VoiceMouldService.java index 3d3273e..7fd5045 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/VoiceMouldService.java +++ b/suimangService/src/main/java/com/iformall/service/sm/VoiceMouldService.java @@ -5,8 +5,12 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.sm.MouldPatch; import com.iformall.domain.po.sm.VoiceMould; +import java.util.List; + public interface VoiceMouldService { + List getClist(VoiceMould record); + /** * 根据实体查询分页列表 * diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceMouldServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceMouldServiceImpl.java index e519f2d..a24a297 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceMouldServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/VoiceMouldServiceImpl.java @@ -37,6 +37,11 @@ public class VoiceMouldServiceImpl implements VoiceMouldService { MouldPatchSignService mouldPatchSignService; + @Override + public List getClist(VoiceMould record) { + return voiceMouldMapper.findCList(record); + } + @Override public PageInfo listAsPage(VoiceMould record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> voiceMouldMapper.findList(record));