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

fhKeeper/formulahousekeeper/management-platform-mld/src/main/resources/mapper/ProjectMapper.xml

@@ -3076,7 +3076,7 @@
             </foreach>
         </if>
         and daily.`allocate_date` BETWEEN #{startDate} AND #{endDate}
-        GROUP BY t.id, daily.`user_id`
+        GROUP BY t.id, daily.`user_id` order by userId
         <if test="start!=null and size !=null">
             limit #{start},#{size}
         </if>

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TaskGroupController.java

@@ -470,7 +470,7 @@ public class TaskGroupController {
             filterProjectName.add("公共项目号");
             filterProjectName.add("品质检验项目号");
             filterProjectName.add("请假");
-            if(!filterProjectName.contains(project.getProjectName())){
+            if(!filterProjectName.contains(project.getProjectName())&&!project.getProjectCode().startsWith("HH-RD")){
                 //检查生产订单和销售订单
                 DateTimeFormatter df=DateTimeFormatter.ofPattern("yyyy-MM-dd");
                 String projectCode = project.getProjectCode();

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

@@ -13535,7 +13535,16 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         List<String> collect = dataList.stream().map(Project::getProjectCode).distinct().collect(Collectors.toList());
                         List<String> existIds = projectMapper.getExistIds(collect, honghuCompId);
                         if(!org.springframework.util.CollectionUtils.isEmpty(existIds)){
-                            toUpdateList.addAll(dataList.stream().filter(t -> existIds.contains(t.getProjectCode())).collect(Collectors.toList()));
+                            List<Project> existProjects = projectMapper.selectList(new LambdaQueryWrapper<Project>().in(Project::getProjectCode, existIds));
+                            dataList.forEach(i->{
+                                if(existIds.contains(i.getProjectCode())){
+                                    Project project = existProjects.stream().filter(t -> t.getProjectCode().equals(i.getProjectCode())).findFirst().orElse(null);
+                                    if(project!=null){
+                                        i.setId(project.getId());
+                                        toUpdateList.add(i);
+                                    }
+                                }
+                            });
                             toAddList.addAll(dataList.stream().filter(t -> !existIds.contains(t.getProjectCode())).collect(Collectors.toList()));
                         }else{
                             toAddList.addAll(dataList);