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

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

@@ -93,6 +93,12 @@ public class GetController {
         chuanyunBasicDataScheduledTask.getGroupProjectManually();
     }
 
+    @Async
+    @GetMapping("/test/getCostCollectionManually")
+    public void getCostCollectionManually() {
+        chuanyunBasicDataScheduledTask.getCostCollectionManually();
+    }
+
     /**
      * 获取人员费用归集
      * @return

src/main/java/com/galaxis/manatee/dao/ChuanyunReimbursementItemsDao.java

@@ -0,0 +1,10 @@
+package com.galaxis.manatee.dao;
+
+import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunCompanyDO;
+import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunReimbursementItemsDO;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ChuanyunReimbursementItemsDao extends GalaxisRepository<ChuanyunReimbursementItemsDO,String> {
+}

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

@@ -133,6 +133,12 @@ public class ChuanyunGroupProjectDO extends BasicDO {
     private String signCompany;
 
     /**
+     * 关联项目号
+     */
+    @JsonProperty("F0000040")
+    private String relationProjectCode;
+
+    /**
      * 客户编码
      * U9编码
      */

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

@@ -0,0 +1,63 @@
+package com.galaxis.manatee.entity.chuanyun.data.object;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.persistence.Entity;
+
+@Slf4j
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Entity(name = "CHUANYUN_REIMBURSEMENT_ITEMS")
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class ChuanyunReimbursementItemsDO extends BasicDO{
+    /**
+     * 表名
+     */
+    public static final String SCHEMA_CODE ="D0017897914a5b9d64c4db087e4f5748bfcd02c";
+
+    /**
+     * 姓名
+     */
+    @JsonProperty("F0000002")
+    private String employName;
+
+    /**
+     * 工号
+     */
+    @JsonProperty("F0000003")
+    private String employCode;
+
+    /**
+     * 是否替换报销
+     */
+    @JsonProperty("F0000005")
+    private String isReplace;
+
+    /**
+     * 调整项目号
+     */
+    @JsonProperty("F0000006")
+    private String adjustProjectCode;
+
+    /**
+     * 调整项目名称
+     */
+    @JsonProperty("F0000007")
+    private String adjustProjectName;
+
+    /**
+     * 调整项目类型
+     */
+    @JsonProperty("F0000008")
+    private String adjustProjectType;
+
+    /**
+     * 调整项目ID
+     */
+    @JsonProperty("F0000004")
+    private String adjustProjectId;
+}

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

@@ -206,6 +206,7 @@ public class ChuanyunHumanResourceScheduledTask {
      */
     @Scheduled(fixedDelay = 86400000L)
     private void getPayroll() {
+        chuanyunPayrollDao.deleteAll();
         var objectMapper = new ObjectMapper();
         var start = 0;
         var totalCount = 0L;