修改

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

@@ -1260,7 +1260,6 @@ public class ProjectController {
                                 .setInchargerName(first.get().getName());
                     }
                     projectService.updateById(item);
-                    update++;
                     List<Participation> allParticipations = participationService.list(new QueryWrapper<Participation>().eq("project_id", item.getId()));
                     if(map.get("xmcygs")!=null&&!map.get("xmcygs").equals("")){
                         participationService.remove(new QueryWrapper<Participation>().eq("project_id",item.getId()));
@@ -1277,11 +1276,16 @@ public class ProjectController {
                     }
                     List<String> collect = allParticipations.stream().map(al -> al.getUserId()).distinct().collect(Collectors.toList());
                     List<String> collect1 = participationList.stream().map(pl -> pl.getUserId()).distinct().collect(Collectors.toList());
-
+                    System.out.println("之前的数据："+collect);
+                    System.out.println("之后的数据："+collect1);
                     if(collect.size()!=collect1.size()){
-                        sb.append("["+item.getProjectCode()+"/"+item.getProjectCode()+"]"+"\n");
+                        sb.append("["+item.getProjectName()+"/"+item.getProjectCode()+"]"+"\n");
+                        update++;
                     }else if(!collect.containsAll(collect1)){
-                        sb.append("["+item.getProjectCode()+"/"+item.getProjectCode()+"]"+"\n");
+                        sb.append("["+item.getProjectName()+"/"+item.getProjectCode()+"]"+"\n");
+                        update++;
+                    }else if(!item.getInchargerId().equals(first.get().getId())){
+                        update++;
                     }
                     if(participationList.size()>0){
                         participationService.saveBatch(participationList);

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/TimingTask.java

@@ -553,10 +553,10 @@ public class TimingTask {
         }
     }
     
-    @Scheduled(cron = "0 23 17 ? * *")
+    @Scheduled(cron = "0 15 3 ? * *")
     private void synFanWeiProjectDate() {
-//        if (isDev) return;
-//        if(!isPrivateDeploy) return;
+        if (isDev) return;
+        if(!isPrivateDeploy) return;
         List<TimeType> timeTypeList = timeTypeMapper.selectList(new QueryWrapper<TimeType>().eq("sync_fanwei", 1));
         List<Integer> compIds = timeTypeList.stream().map(TimeType::getCompanyId).collect(Collectors.toList());
         if(compIds.isEmpty()){
@@ -592,7 +592,6 @@ public class TimingTask {
                                     .setInchargerName(first.get().getName());
                         }
                         projectService.updateById(item);
-                        update++;
                         List<Participation> allParticipations = participationService.list(new QueryWrapper<Participation>().eq("project_id", item.getId()));
                         if(map.get("xmcygs")!=null&&!map.get("xmcygs").equals("")){
                             participationService.remove(new QueryWrapper<Participation>().eq("project_id",item.getId()));
@@ -609,11 +608,16 @@ public class TimingTask {
                         }
                         List<String> collect = allParticipations.stream().map(al -> al.getUserId()).distinct().collect(Collectors.toList());
                         List<String> collect1 = participationList.stream().map(pl -> pl.getUserId()).distinct().collect(Collectors.toList());
-
+                        System.out.println("之前的数据："+collect);
+                        System.out.println("之后的数据："+collect1);
                         if(collect.size()!=collect1.size()){
-                            sb.append("["+item.getProjectCode()+"/"+item.getProjectCode()+"]"+"\n");
+                            sb.append("["+item.getProjectName()+"/"+item.getProjectCode()+"]"+"\n");
+                            update++;
                         }else if(!collect.containsAll(collect1)){
-                            sb.append("["+item.getProjectCode()+"/"+item.getProjectCode()+"]"+"\n");
+                            sb.append("["+item.getProjectName()+"/"+item.getProjectCode()+"]"+"\n");
+                            update++;
+                        }else if(!item.getInchargerId().equals(first.get().getId())){
+                            update++;
                         }
                         if(participationList.size()>0){
                             participationService.saveBatch(participationList);