1.修改集团项目

src/main/java/com/galaxis/manatee/task/ChuanyunBasicDataScheduledTask.java

@@ -17,6 +17,9 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
+import javax.persistence.CascadeType;
+import javax.persistence.FetchType;
+import javax.persistence.OneToMany;
 import javax.persistence.Transient;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -139,6 +142,18 @@ public class ChuanyunBasicDataScheduledTask {
                         chuanyunGroupProjectDO.setIsCreate(projectDO.getIsCreate());
                         chuanyunGroupProjectDao.delete(tmpGroupProjectDO.get());
                     });
+                    //新增项目组织信息
+//                    List<ChuanyunGroupProjectDetailDO> detaillist = new ArrayList<>();
+//                    for (ChuanyunCompanyDO chuanyunCompanyDO : chuanyunCompanyDao.findAll()) {
+//                        if (!chuanyunCompanyDO.getCompanyName().equals("浙江凯乐士无锡分公司")&&!chuanyunCompanyDO.getCompanyName().equals("GALAXIS Automation management GmbH")) {
+//                            ChuanyunGroupProjectDetailDO chuanyunGroupProjectDetailDO = new ChuanyunGroupProjectDetailDO();
+//                            chuanyunGroupProjectDetailDO.setCompanyName(chuanyunCompanyDO.getCompanyName());
+//                            chuanyunGroupProjectDetailDO.setType(chuanyunGroupProjectDO.getProjectType());
+//                            chuanyunGroupProjectDetailDO.setParentObjectId(chuanyunGroupProjectDO.getObjectId());
+//                            detaillist.add(chuanyunGroupProjectDetailDO);
+//                        }
+//                    }
+//                    chuanyunGroupProjectDO.setDetailList(detaillist);
                     //将projectManger和projectOwner替换为主键
                     if(!StringUtils.isEmpty(chuanyunGroupProjectDO.getProjectOwner())){
                         chuanyunGroupProjectDO.setProjectOwner(chuanyunGroupProjectDO.getProjectOwnerObject().getObjectId());
@@ -155,20 +170,20 @@ public class ChuanyunBasicDataScheduledTask {
                         chuanyunGroupProjectDO.setProjectMemberlist(memberlist.toArray(new String[memberlist.size()]));
                     }
                     //如果项目组成员为空，则自动为项目添加所有EBG成员作为项目组成员
-                    if ("EBG".equals(chuanyunGroupProjectDO.getBusinessGroup())&&chuanyunGroupProjectDO.getProjectMemberlist().length==0&&
-                            ("实施".equals(chuanyunGroupProjectDO.getProjectType())||"维保".equals(chuanyunGroupProjectDO.getProjectType())||
-                                    "研发二开".equals(chuanyunGroupProjectDO.getProjectType())||"售后".equals(chuanyunGroupProjectDO.getProjectType()))) {
-
-                        for (ChuanyunUserCompanyDO chuanyunUserCompanyDO : chuanyunUserCompanyDao.findAll()) {
-                            if (chuanyunCompanyDao.findByObjectId(chuanyunUserCompanyDO.getCompanyId()).getBusinessGroup().equals("EBG")) {
-                                builder.append(chuanyunUserCompanyDO.getUserId()+";");
-                                memberlist.add(chuanyunUserCompanyDO.getUserId());
-                            }
-                        }
-                        chuanyunGroupProjectDO.setProjectMember(builder.toString());
-                        chuanyunGroupProjectDO.setProjectMemberlist(memberlist.toArray(new String[memberlist.size()]));
-                        log.info("成员已更新");
-                    }
+//                    if ("EBG".equals(chuanyunGroupProjectDO.getBusinessGroup())&&chuanyunGroupProjectDO.getProjectMemberlist().length==0&&
+//                            ("实施".equals(chuanyunGroupProjectDO.getProjectType())||"维保".equals(chuanyunGroupProjectDO.getProjectType())||
+//                                    "研发二开".equals(chuanyunGroupProjectDO.getProjectType())||"售后".equals(chuanyunGroupProjectDO.getProjectType()))) {
+//
+//                        for (ChuanyunUserCompanyDO chuanyunUserCompanyDO : chuanyunUserCompanyDao.findAll()) {
+//                            if (chuanyunCompanyDao.findByObjectId(chuanyunUserCompanyDO.getCompanyId()).getBusinessGroup().equals("EBG")) {
+//                                builder.append(chuanyunUserCompanyDO.getUserId()+";");
+//                                memberlist.add(chuanyunUserCompanyDO.getUserId());
+//                            }
+//                        }
+//                        chuanyunGroupProjectDO.setProjectMember(builder.toString());
+//                        chuanyunGroupProjectDO.setProjectMemberlist(memberlist.toArray(new String[memberlist.size()]));
+//                        log.info("成员已更新");
+//                    }
 
                     //如果项目为pmo建设、电气组建设、项目实施组建设则更新成员为空
                     if (Arrays.asList(projectCode).contains(chuanyunGroupProjectDO.getObjectId())) {
@@ -472,6 +487,13 @@ public class ChuanyunBasicDataScheduledTask {
         @JsonProperty("F0000034")
         private String[] projectMemberlist;
 
+        /**
+         * 项目组织信息
+         */
+        @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true,fetch = FetchType.EAGER)
+        @JsonProperty("D001789Fd992bf8fbe114c9babe0f98cf676f8a2")
+        private List<ChuanyunGroupProjectDetailDO> detailList;
+
 
 
         public GroupProjectUpdateDTO() {
@@ -491,6 +513,9 @@ public class ChuanyunBasicDataScheduledTask {
                 if(null!=chuanyunGroupProjectDO.getProjectMemberlist()){
                     this.projectMemberlist=chuanyunGroupProjectDO.getProjectMemberlist();
                 }
+                if(null!=chuanyunGroupProjectDO.getDetailList()){
+                    this.detailList=chuanyunGroupProjectDO.getDetailList();
+                }
             }
         }
     }