From e6c928a673f45573ce9e1425df6f856e3c53de61 Mon Sep 17 00:00:00 2001
From: jiyufei <67400194@qq.com>
Date: Wed, 21 Aug 2024 09:59:00 +0800
Subject: [PATCH] =?UTF-8?q?feat():=E8=BF=94=E5=9B=9E=E7=8F=AD=E6=AC=A1?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/jnpf/service/impl/YysDayWorkServiceImpl.java  | 6 ++++++
 .../main/java/jnpf/model/yysdaywork/ConfirmResponse.java    | 5 +++++
 2 files changed, 11 insertions(+)

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<YysDayWorkMapper, YysDayW
     @Autowired
     private YysRequisitionReportService yysRequisitionReportService;
 
+    @Autowired
+    private YysClassesService yysClassesService;
+
     @Override
     public List<YysDayWorkEntity> getList(YysDayWorkPagination yysDayWorkPagination) {
         return getTypeList(yysDayWorkPagination, yysDayWorkPagination.getDataType());
@@ -434,6 +437,8 @@ public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayW
         List<YysProdReportEntity> reportEntityList = yysProdReportService.list();
         Map<String, List<YysProdReportEntity>> prodMap = reportEntityList.stream().collect(Collectors.groupingBy(YysProdReportEntity::getWorkId));
         //进行平均分配
+        //查询班次
+        Map<String, String> classCollect = yysClassesService.list().stream().collect(Collectors.toMap(YysClassesEntity::getId, YysClassesEntity::getClassesName));
         List<ConfirmResponse> result = Lists.newArrayList();
         for (Map.Entry<String, List<YysDayWorkEntity>> entry : rootMap.entrySet()) {
             if (resultMap.containsKey(entry.getKey())) {
@@ -441,6 +446,7 @@ public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayW
                 List<YysDayWorkEntity> 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;
+
     /**
      * 生产报工确认列表
      */