1.新增项目物料成本

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

@@ -0,0 +1,11 @@
+package com.galaxis.manatee.dao;
+
+import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunProjectDO;
+import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunPurCostDO;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+
+@Repository
+public interface ChuanyunPurCostDao extends JpaRepository<ChuanyunPurCostDO,String> {
+}

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

@@ -0,0 +1,41 @@
+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;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.math.BigDecimal;
+
+@Slf4j
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Entity(name = "CHUANYUN_PROJECT_CASHFLOW")
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class ChuanyunProjectCashFlowDO extends BasicDO{
+
+    /**
+     * 表名
+     */
+    public static final String SCHEMA_CODE ="D001789270cab743bc748eab875f5651f3a7107";
+
+    @JsonProperty("F0000001")
+    private String projectcode;
+
+    /**
+     * 收款金额
+     */
+    @JsonProperty("F0000002")
+    private BigDecimal income;
+
+    /**
+     * 付款金额
+     */
+    @JsonProperty("F0000003")
+    private BigDecimal outcome;
+}

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

@@ -0,0 +1,44 @@
+package com.galaxis.manatee.entity.chuanyun.data.object;
+
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.galaxis.manatee.entity.chuanyun.data.object.BasicDO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.math.BigDecimal;
+
+@Slf4j
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Entity(name = "CHUANYUN_PURCOST")
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class ChuanyunPurCostDO extends BasicDO {
+
+    /**
+     * 表名
+     */
+    public static final String SCHEMA_CODE ="D001789bdc0b713e29b4fb0afd543bc4da68154";
+
+
+    @JsonProperty("F0000001")
+    private String projectcode;
+
+    /**
+     * 采购成本
+     */
+    @JsonProperty("F0000002")
+    private BigDecimal purcost;
+
+    /**
+     * 领料成本
+     */
+    @JsonProperty("F0000003")
+    private BigDecimal issuedcost;
+
+}

src/main/java/com/galaxis/manatee/entity/chuanyun/dto/ChuanyunProjectCashFlowDTO.java

@@ -0,0 +1,27 @@
+package com.galaxis.manatee.entity.chuanyun.dto;
+
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.galaxis.manatee.entity.chuanyun.data.object.BasicDO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.persistence.Entity;
+import java.math.BigDecimal;
+
+@Data
+public class ChuanyunProjectCashFlowDTO {
+
+    private String projectcode;
+
+    /**
+     * 收款金额
+     */
+    private BigDecimal income;
+
+    /**
+     * 付款金额
+     */
+    private BigDecimal outcome;
+}

src/main/java/com/galaxis/manatee/entity/chuanyun/dto/ChuanyunPurCostDTO.java

@@ -0,0 +1,31 @@
+package com.galaxis.manatee.entity.chuanyun.dto;
+
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.galaxis.manatee.entity.chuanyun.data.object.BasicDO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.persistence.Entity;
+import java.math.BigDecimal;
+
+
+@Data
+public class ChuanyunPurCostDTO {
+
+
+
+    private String projectcode;
+
+    /**
+     * 采购成本
+     */
+    private BigDecimal purcost;
+
+    /**
+     * 领料成本
+     */
+    private BigDecimal issuedcost;
+
+}

src/main/java/com/galaxis/manatee/manager/ClawFeign.java

@@ -1,7 +1,11 @@
 package com.galaxis.manatee.manager;
 
 import com.galaxis.capsule.dto.*;
+import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunProjectCashFlowDO;
+import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunPurCostDO;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunReimbursementDO;
+import com.galaxis.manatee.entity.chuanyun.dto.ChuanyunProjectCashFlowDTO;
+import com.galaxis.manatee.entity.chuanyun.dto.ChuanyunPurCostDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -35,6 +39,23 @@ public interface ClawFeign {
     PageDTO<ChuanyunProjectDTO> findChuanyunProjectPageable(@RequestParam Map<String,String> map);
 
     /**
+     * 查询项目材料成本
+     * @param map
+     * @return
+     */
+    @GetMapping("/cashflow/findAllByParameters")
+    PageDTO<ChuanyunProjectCashFlowDTO> findChuanyunProjectCashFlow(@RequestParam Map<String,String> map);
+
+    /**
+     * 查询项目收付款
+     * @param map
+     * @return
+     */
+    @GetMapping("/purcost/findAllByParameters")
+    PageDTO<ChuanyunPurCostDTO> findChuanyunPurCost(@RequestParam Map<String,String> map);
+
+
+    /**
      * 测试
      * @param chuanyunProjectDTO    保存DTO数据
      * @return  请求结果

src/main/java/com/galaxis/manatee/webservice/CountryEndpoint.java

@@ -69,7 +69,7 @@ public class CountryEndpoint {
 		chuanyunBasicDataScheduledTask.getCompanyManually();
 		chuanyunBasicDataScheduledTask.getCostCollectionManually();
 		chuanyunBasicDataScheduledTask.getReimbursementItemsManually();
-		chuanyunBasicDataScheduledTask.getGroupProjectManually();
+		chuanyunBasicDataScheduledTask.getGroupProjectForSynchronizationManually();
 		log.info("数据同步成功");
 		invokeResponse.setResponse("{}");
 		return invokeResponse;