Merge branch '1.0' of codeup.aliyun.com:5ec7ea24405cdab50f3fd8f0/galaxis/manatee into 1.0

src/main/java/com/galaxis/manatee/controller/GetController.java

@@ -1,6 +1,7 @@
 package com.galaxis.manatee.controller;
 
 import com.galaxis.manatee.service.ChuanyunService;
+import com.galaxis.manatee.task.ChuanyunBasicDataScheduledTask;
 import com.galaxis.manatee.task.ChuanyunHumanResourceScheduledTask;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -16,10 +17,12 @@ import org.springframework.web.bind.annotation.RestController;
 public class GetController {
 
     private final ChuanyunHumanResourceScheduledTask chuanyunHumanResourceScheduledTask;
+    private final ChuanyunBasicDataScheduledTask chuanyunBasicDataScheduledTask;
     private final ChuanyunService chuanyunService;
 
-    public GetController(ChuanyunHumanResourceScheduledTask chuanyunHumanResourceScheduledTask, ChuanyunService chuanyunService) {
+    public GetController(ChuanyunHumanResourceScheduledTask chuanyunHumanResourceScheduledTask, ChuanyunBasicDataScheduledTask chuanyunBasicDataScheduledTask, ChuanyunService chuanyunService) {
         this.chuanyunHumanResourceScheduledTask = chuanyunHumanResourceScheduledTask;
+        this.chuanyunBasicDataScheduledTask = chuanyunBasicDataScheduledTask;
         this.chuanyunService = chuanyunService;
     }
 
@@ -49,4 +52,42 @@ public class GetController {
     public void getProjectMember() {
         chuanyunService.updateProjectMember();
     }
+
+    /**
+     * 手动更新人员-归属公司
+     */
+    @Async
+    @GetMapping("/test/getUserCompany")
+    public void getUserCompanyManually() {
+        chuanyunBasicDataScheduledTask.getUserCompanyManually();
+    }
+
+    /**
+     * 手动更新人员信息
+     */
+    @Async
+    @GetMapping("/test/getUserList")
+    public void getUserListManually() {
+        chuanyunBasicDataScheduledTask.getUserListManually();
+    }
+
+    /**
+     * 手动更新公司信息
+     */
+    @Async
+    @GetMapping("/test/getCompany")
+    public void getCompanyManually() {
+        chuanyunBasicDataScheduledTask.getCompanyManually();
+    }
+
+    /**
+     * 手动更新集团项目信息
+     */
+    @Async
+    @GetMapping("/test/getGroupProject")
+    public void getGroupProjectManually() {
+        chuanyunBasicDataScheduledTask.getGroupProjectManually();
+    }
+
+
 }

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

@@ -115,6 +115,24 @@ public class ChuanyunReimbursementDO extends BasicDO{
     private String reimburseUserCostCode;
 
     /**
+     * 打印项目号
+     */
+    @JsonProperty("F0000109")
+    private String printingProjectCode;
+
+    /**
+     * 打印项目类型
+     */
+    @JsonProperty("F0000110")
+    private String printingProjectType;
+
+    /**
+     * 打印项目名称
+     */
+    @JsonProperty("F0000108")
+    private String printingProjectName;
+
+    /**
      * 核销方式
      */
     @JsonProperty("F0000054")

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

@@ -52,6 +52,22 @@ public class ChuanyunBasicDataScheduledTask {
         this.chuanyunSpecialProcedureDao = chuanyunSpecialProcedureDao;
     }
 
+    public void getUserCompanyManually(){
+        this.getUserCompany();
+    }
+
+    public void getUserListManually(){
+        this.getUserList();
+    }
+
+
+    public void getCompanyManually(){
+        this.getCompany();
+    }
+
+    public void getGroupProjectManually(){
+        this.getGroupProject();
+    }
     /**
      * 定时将氚云中的数据保存到manatee
      */