Browse Source

1.修改专项处理分摊规则

WoNiu 5 years ago
parent
commit
145a00921a

+ 0 - 2
src/main/java/com/galaxis/manatee/controller/GetController.java

@@ -51,6 +51,4 @@ public class GetController {
         chuanyunService.updateProjectMember();
         chuanyunService.updateProjectMember();
         return "开始更新项目组成员";
         return "开始更新项目组成员";
     }
     }
-
-
 }
 }

+ 31 - 0
src/main/java/com/galaxis/manatee/entity/chuanyun/data/object/ChuanyunSpecialProcedureDO.java

@@ -37,4 +37,35 @@ public class ChuanyunSpecialProcedureDO extends BasicSubDO{
      */
      */
     @JsonProperty("F0000023")
     @JsonProperty("F0000023")
     private String costCenterId;
     private String costCenterId;
+
+    /**
+     * 成本中心编码
+     */
+    @JsonProperty("F0000024")
+    private String centerCode;
+
+    /**
+     * 成本中心名称
+     */
+    @JsonProperty("F0000025")
+    private String centerName;
+
+
+    /**
+     * 项目号
+     */
+    @JsonProperty("F0000011")
+    private String projectCode;
+
+    /**
+     * 项目类别
+     */
+    @JsonProperty("F0000026")
+    private String projectType;
+
+    /**
+     * 项目名称
+     */
+    @JsonProperty("F0000012")
+    private String projectName;
 }
 }

+ 9 - 20
src/main/java/com/galaxis/manatee/task/ChuanyunBasicDataScheduledTask.java

@@ -545,20 +545,12 @@ public class ChuanyunBasicDataScheduledTask {
         @JsonProperty("F0000011")
         @JsonProperty("F0000011")
         private String ebgProjectManager;
         private String ebgProjectManager;
 
 
-//        /**
-//         * 项目组成员(前端传数据用)
-//         */
-//        @JsonProperty("F0000034")
-//        private String[] projectMemberList;
+        /**
+         * 外部项目名称
+         */
+        @JsonProperty(value="F0000038")
+        private String outProjectName;
 
 
-//        /**
-//         * 项目组织信息
-//         * TODO 这个DTO是用于更新氚云数据的,不需要使用@OneToMany注解吧?使用目的是啥
-//         */
-//        @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true,fetch = FetchType.EAGER)
-//        @JsonProperty("D001789Fd992bf8fbe114c9babe0f98cf676f8a2")
-////        @JsonProperty("D001789Fvspc68z01idftf5nqt66pkuc0")
-//        private List<ChuanyunGroupProjectDetailDO> detailList;
 
 
         public GroupProjectUpdateDTO() {
         public GroupProjectUpdateDTO() {
         }
         }
@@ -574,13 +566,10 @@ public class ChuanyunBasicDataScheduledTask {
                 if(null!=chuanyunGroupProjectDO.getEbgProjectManagerObject()){
                 if(null!=chuanyunGroupProjectDO.getEbgProjectManagerObject()){
                     this.ebgProjectManager=chuanyunGroupProjectDO.getEbgProjectManagerObject().getObjectId();
                     this.ebgProjectManager=chuanyunGroupProjectDO.getEbgProjectManagerObject().getObjectId();
                 }
                 }
-                //TODO 更新项目经理时更新项目组织信息会是这两个业务流程耦合,不方便后续维护需要考虑单独一个DTO作为更新项目组织信息的对象
-//                if(null!=chuanyunGroupProjectDO.getProjectMemberList()){
-//                    this.projectMemberList =chuanyunGroupProjectDO.getProjectMemberList();
-//                }
-//                if(null!=chuanyunGroupProjectDO.getDetailList()){
-//                    this.detailList=chuanyunGroupProjectDO.getDetailList();
-//                }
+                if(null!=chuanyunGroupProjectDO.getOutProjectName()){
+                    this.outProjectName=chuanyunGroupProjectDO.getOutProjectName();
+                }
+
             }
             }
         }
         }
     }
     }