Merge branch 'master' of http://47.100.37.243:10191/quyueting/manHourHousekeeper

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/FinanceServiceImpl.java

@@ -2368,6 +2368,7 @@ public class FinanceServiceImpl extends ServiceImpl<FinanceMapper, Finance> impl
             for (Map<String, Object> map : projectTimeList) {
                 Integer projectId = ((Long) map.get("projectId")).intValue();
                 String curProject = (String) map.get("project");
+                String curProjectCode = (String) map.get("projectCode");
                 String creatorId = (String) map.get("creatorId");
                 Optional<Finance> first = finances.stream().filter(f -> f.getUserId().equals(creatorId)).findFirst();
                 Double workingTime = (Double)map.get("workingTime");
@@ -2435,6 +2436,7 @@ public class FinanceServiceImpl extends ServiceImpl<FinanceMapper, Finance> impl
                         pList.add(item);
                         item.projectId = projectId;
                         item.project = curProject;
+                        item.projectCode = curProjectCode;
                         item.workingTime = workingTime;
                         item.cost = cost;
                         item.salary = salary;