From cf4ec31dbdf1bb1325140849167fd8b38b44adf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Mon, 6 Jan 2025 11:29:43 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=88=90=E6=9C=AC=E5=88=86=E6=9E=90):=20?=
 =?UTF-8?q?=E6=88=90=E6=9C=AC=E7=BB=B4=E6=8A=A4=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/query/WorkingTypeQuery.java          |  4 +--
 .../technology/service/CostConfigService.java | 29 ++++++++++++-------
 .../service/WorkingTypeService.java           |  4 +--
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/query/WorkingTypeQuery.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/query/WorkingTypeQuery.java
index b2e7ed11..43b91a60 100644
--- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/query/WorkingTypeQuery.java
+++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/query/WorkingTypeQuery.java
@@ -20,10 +20,10 @@ public class WorkingTypeQuery implements Serializable {
     @ApiModelProperty("名称")
     @NotBlank(message = "名称不能为空")
     @Length(max = 10, message = "名称不能超过10个字")
-    private String name;
+    private String workingTypeName;
 
     @ApiModelProperty("编号")
     @NotBlank(message = "编号不能为空")
     @Length(max = 10, message = "编号不能超过10个字")
-    private String code;
+    private String workingTypeCode;
 }
diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/CostConfigService.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/CostConfigService.java
index eb263a02..3117180a 100644
--- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/CostConfigService.java
+++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/CostConfigService.java
@@ -61,18 +61,27 @@ public class CostConfigService {
         manday.setHourlyWages(technologyConfigService.getHourlyWages());
         manday.setBenefit(technologyConfigService.getBenefit());
         vo.setManday(manday);
-        List<VirtualWorkingEntity> virtualWorkingEntities = virtualWorkingService.list();
-        if (CollectionUtil.isNotEmpty(virtualWorkingEntities)) {
-            List<VirtualWorkingItemVO> vos = Convert.toList(VirtualWorkingItemVO.class, virtualWorkingEntities);
-            List<WorkingTypeEntity> workingTypeEntities = workingTypeService.list();
-            vos.forEach(cvo -> {
-                WorkingTypeEntity wt = workingTypeEntities.stream().filter(w -> Objects.equals(w.getId(), cvo.getWorkingTypeId())).findFirst().orElse(null);
-                if (Objects.nonNull(wt)) {
-                    cvo.setWorkingTypeName(wt.getName());
-                    cvo.setWorkingTypeCode(wt.getCode());
+        List<VirtualWorkingItemVO> vos = new ArrayList<>();
+        vo.setVirtualWorking(vos);
+        List<WorkingTypeEntity> workingTypeEntities = workingTypeService.list();
+        if (CollectionUtil.isNotEmpty(workingTypeEntities)) {
+            List<VirtualWorkingEntity> virtualWorkingEntities = virtualWorkingService.list();
+            workingTypeEntities.forEach(wt -> {
+                VirtualWorkingEntity vw = virtualWorkingEntities.stream()
+                        .filter(v -> Objects.equals(v.getWorkingTypeId(), wt.getId()))
+                        .findFirst()
+                        .orElse(null);
+                VirtualWorkingItemVO itemVO;
+                if (Objects.isNull(vw)) {
+                    itemVO = new VirtualWorkingItemVO();
+                    itemVO.setWorkingTypeId(wt.getId());
+                } else {
+                    itemVO = Convert.convert(VirtualWorkingItemVO.class, vw);
                 }
+                itemVO.setWorkingTypeName(wt.getName());
+                itemVO.setWorkingTypeCode(wt.getCode());
+                vos.add(itemVO);
             });
-            vo.setVirtualWorking(vos);
         }
         return vo;
     }
diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/WorkingTypeService.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/WorkingTypeService.java
index a81907ab..32e7629e 100644
--- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/WorkingTypeService.java
+++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/WorkingTypeService.java
@@ -37,8 +37,8 @@ public class WorkingTypeService extends ServiceImpl<WorkingTypeMapper, WorkingTy
         list.forEach(l -> {
             if (Objects.isNull(l.getId()) || 0 == l.getId()) {
                 WorkingTypeEntity entity = new WorkingTypeEntity();
-                entity.setName(l.getName());
-                entity.setCode(l.getCode());
+                entity.setName(l.getWorkingTypeName());
+                entity.setCode(l.getWorkingTypeCode());
                 entity.setCreateBy(SessionUtil.getRealName());
                 entity.setCreateTime(LocalDateTime.now());
                 forAdd.add(entity);