diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDayWorkServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDayWorkServiceImpl.java index bec4dd6..9635072 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDayWorkServiceImpl.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDayWorkServiceImpl.java @@ -60,6 +60,9 @@ public class YysDayWorkServiceImpl extends ServiceImpl getList(YysDayWorkPagination yysDayWorkPagination) { return getTypeList(yysDayWorkPagination, yysDayWorkPagination.getDataType()); @@ -434,6 +437,8 @@ public class YysDayWorkServiceImpl extends ServiceImpl reportEntityList = yysProdReportService.list(); Map> prodMap = reportEntityList.stream().collect(Collectors.groupingBy(YysProdReportEntity::getWorkId)); //进行平均分配 + //查询班次 + Map classCollect = yysClassesService.list().stream().collect(Collectors.toMap(YysClassesEntity::getId, YysClassesEntity::getClassesName)); List result = Lists.newArrayList(); for (Map.Entry> entry : rootMap.entrySet()) { if (resultMap.containsKey(entry.getKey())) { @@ -441,6 +446,7 @@ public class YysDayWorkServiceImpl extends ServiceImpl collected = entry.getValue().stream().sorted(Comparator.comparing(YysDayWorkEntity::getSort)).collect(Collectors.toList()); for (YysDayWorkEntity dayWork : collected) { ConfirmResponse confirmResponse = BeanUtil.copyProperties(dayWork, ConfirmResponse.class); + confirmResponse.setClassName(classCollect.get(dayWork.getPost())); confirmResponse.setGroupName(yysGroupEntity.getGroupName()); if (prodMap.containsKey(dayWork.getId())) { confirmResponse.setProdReportList(prodMap.get(dayWork.getId())); diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaywork/ConfirmResponse.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaywork/ConfirmResponse.java index 3e9f78e..081eaf8 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaywork/ConfirmResponse.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaywork/ConfirmResponse.java @@ -48,6 +48,11 @@ public class ConfirmResponse { */ private String groupName; + /** + * 班次名称 + */ + private String className; + /** * 生产报工确认列表 */