1.修改更新集团项目成员

src/main/java/com/galaxis/manatee/entity/chuanyun/data/object/ChuanyunGroupProjectDetailDO.java

@@ -22,6 +22,12 @@ import java.time.LocalDateTime;
 @Entity(name = "CHUANYUN_GROUP_PROJECT_DETAIL")
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class ChuanyunGroupProjectDetailDO extends BasicSubDO{
+
+    /**
+     * 表名
+     */
+    public static final String SCHEMA_CODE ="D001789Fd992bf8fbe114c9babe0f98cf676f8a2";
+
     /**
      * 项目组织名称
      */
@@ -36,7 +42,7 @@ public class ChuanyunGroupProjectDetailDO extends BasicSubDO{
     /**
      * 项目分类
      */
-    @JsonProperty("F0000026")
+    @JsonProperty("F0000037")
     private String type;
 
     /**

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

@@ -113,10 +113,7 @@ public class ChuanyunBasicDataScheduledTask {
         var start=0;
         var totalCount=0L;
         var flag=true;
-        var projectCode = new String[]{"6bdcdc7d-4740-46e3-abb0-a209d2811f8c","8d748588-7aa0-44cb-ab0a-918af45f4094","bb096f83-6cea-4ddf-81f1-611910425101",
-                "11ce2006-0ea5-443e-b5b7-d8b14a7f96d4","1668df14-df5a-4439-b979-80608e96d540","4af60648-9229-11ea-8ae9-7cd30ab711fe","5882eeaa-cb72-4a5a-9eb6-c42deea37c84","11ce2006-0ea5-443e-b5b7-d8b14a7f96d4"};
-        StringBuilder builder = new StringBuilder();
-        List<String> memberlist = new ArrayList<>();
+
         while (flag){
             try {
                 //从氚云查询数据
@@ -160,7 +157,8 @@ public class ChuanyunBasicDataScheduledTask {
                     }
                     //将项目组成员projectMember替换为主键
                     if (chuanyunGroupProjectDO.getProjectMemberlist()!= null) {
-
+                        var memberlist = new ArrayList<>();
+                        var builder = new StringBuilder();
                         for (ChuanyunObject chuanyunObject: chuanyunGroupProjectDO.getProjectMemberObject()) {
                             builder.append(chuanyunObject.getObjectId()+";");
                             memberlist.add(chuanyunObject.getObjectId());
@@ -169,28 +167,22 @@ public class ChuanyunBasicDataScheduledTask {
                         //替换为主键后更新氚云数据表来增加权限
                         chuanyunGroupProjectDO.setProjectMemberlist(memberlist.toArray(new String[memberlist.size()]));
                     }
-                    //如果项目组成员为空，则自动为项目添加所有EBG成员作为项目组成员
+//                    //如果项目组成员为空，则自动为项目添加所有EBG成员作为项目组成员
 //                    if ("EBG".equals(chuanyunGroupProjectDO.getBusinessGroup())&&chuanyunGroupProjectDO.getProjectMemberlist().length==0&&
 //                            ("实施".equals(chuanyunGroupProjectDO.getProjectType())||"维保".equals(chuanyunGroupProjectDO.getProjectType())||
 //                                    "研发二开".equals(chuanyunGroupProjectDO.getProjectType())||"售后".equals(chuanyunGroupProjectDO.getProjectType()))) {
-//
+//                        List<String> projectmember = new ArrayList<>();
 //                        for (ChuanyunUserCompanyDO chuanyunUserCompanyDO : chuanyunUserCompanyDao.findAll()) {
 //                            if (chuanyunCompanyDao.findByObjectId(chuanyunUserCompanyDO.getCompanyId()).getBusinessGroup().equals("EBG")) {
 //                                builder.append(chuanyunUserCompanyDO.getUserId()+";");
-//                                memberlist.add(chuanyunUserCompanyDO.getUserId());
+//                                projectmember.add(chuanyunUserCompanyDO.getUserId());
 //                            }
 //                        }
 //                        chuanyunGroupProjectDO.setProjectMember(builder.toString());
-//                        chuanyunGroupProjectDO.setProjectMemberlist(memberlist.toArray(new String[memberlist.size()]));
+//                        chuanyunGroupProjectDO.setProjectMemberlist(projectmember.toArray(new String[projectmember.size()]));
 //                        log.info("成员已更新");
 //                    }
 
-                    //如果项目为pmo建设、电气组建设、项目实施组建设则更新成员为空
-                    if (Arrays.asList(projectCode).contains(chuanyunGroupProjectDO.getObjectId())) {
-                        List<String> list = new ArrayList<>();
-                        chuanyunGroupProjectDO.setProjectMemberlist(list.toArray(new String[list.size()]));
-                        chuanyunGroupProjectDO.setProjectMember("");
-                    }
                     //通过更新集团项目中的EBG项目经理、IBG项目经理
                     //TODO 测试结束后需要扩大范围到所有项目
                     GroupProjectUpdateDTO groupProjectUpdateDTO=new GroupProjectUpdateDTO();