fegin接口参数添加注解

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/ExtIncomeContractController.java

@@ -2,18 +2,13 @@ package com.yonde.dcs.plan.core.controller;
 
 import org.springframework.stereotype.Controller;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.validation.annotation.Validated;
-import java.util.List;
 import com.yonde.dcs.plan.common.vo.ExtIncomeContractVO;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Autowired;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.*;
 import com.yonde.dcs.plan.core.service.ExtIncomeContractService;
 import com.yonde.dex.basedata.entity.api.ApiResult;
 import com.yonde.dcs.plan.core.controller.shadow.ExtIncomeContractControllerShadow;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Controller;
 
 /**
 * @description: ExtIncomeContract-Controller
@@ -46,6 +41,13 @@ public class ExtIncomeContractController<V extends ExtIncomeContractVO, S extend
         return ApiResult.ok(extIncomeContractService.calculateIncomeByYear(id,year));
     }
 
+    @ApiOperation(value = "重新计算收入到款", notes = "重新计算收入到款", httpMethod = "GET")
+    @GetMapping("/reCalculIncomeById")
+    public ApiResult reCalculIncomeById(@RequestParam("id") Long id){
+        return ApiResult.ok(extIncomeContractService.reCalculIncomeById(id));
+    }
+
+
 }
 
 

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/ExtPlanController.java

@@ -103,6 +103,12 @@ public class ExtPlanController<V extends ExtPlanVO, S extends ExtPlanService<V>>
         extPlanService.searchFileType(fileType,doc);
     }
 
+    @ApiOperation(value = "生成计划分发记录对象方法", notes = "生成计划分发记录对象方法", httpMethod = "post")
+    @GetMapping(value = "/generatePlanDistributeRecord")
+    public void generatePlanDistributeRecord(@RequestBody ExtPlanVO extPlanVO){
+        extPlanService.generatePlanDistributeRecord(extPlanVO);
+    }
+
 }
 
 

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/ExtIncomeContractService.java

@@ -39,6 +39,6 @@ public interface ExtIncomeContractService<V extends ExtIncomeContractVO> extends
      *
      * @param id
      */
-    void reCalculIncomeById(Long id);
+    String reCalculIncomeById(Long id);
 
 }

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/impl/ExtIncomeContractServiceImpl.java

@@ -179,9 +179,10 @@ public class ExtIncomeContractServiceImpl<V extends ExtIncomeContractVO> impleme
      * @param id
      */
     @Override
-    public void reCalculIncomeById(Long id) {
+    public String reCalculIncomeById(Long id) {
         ExtIncomeContractVO extIncomeContractVO = this.findRecursionExtIncomeContractVO(id);
         this.calculateIncomeByYear(id, null, extIncomeContractVO);
+        return "ok";
     }
 
 

dcs-plan-feign/src/main/java/com/yonde/dcs/plan/feign/ExtDistributeRecordServiceFeign.java

@@ -52,6 +52,6 @@ public interface ExtDistributeRecordServiceFeign<V extends ExtDistributeRecordVO
 
     @ApiOperation("生成计划分发记录对象方法")
     @GetMapping("/generatePlanDistributeRecord")
-    void generatePlanDistributeRecord(ExtPlanVO extPlanVO);
+    void generatePlanDistributeRecord(@RequestBody ExtPlanVO extPlanVO);
 
 }

dcs-plan-feign/src/main/java/com/yonde/dcs/plan/feign/ExtIncomeContractServiceFeign.java

@@ -21,15 +21,15 @@ public interface ExtIncomeContractServiceFeign<V extends ExtIncomeContractVO> ex
 
     @ApiOperation(value = "合同收入计算", notes = "合同收入计算", httpMethod = "GET")
     @GetMapping("/calculateIncome/{id}")
-    ExtIncomeContractVO calculateIncome(@PathVariable Long id);
+    ExtIncomeContractVO calculateIncome(@PathVariable("id") Long id);
 
     @ApiOperation(value = "xxx年到款计算", notes = "xxx年到款计算", httpMethod = "GET")
     @GetMapping("/calculateIncome")
-    ExtIncomeContractVO calculateIncomeByYear(@RequestParam Long id, String year);
+    ExtIncomeContractVO calculateIncomeByYear(@RequestParam("id") Long id, @RequestParam("year") String year);
 
 
     @ApiOperation(value = "重新计算收入到款", notes = "重新计算收入到款", httpMethod = "GET")
     @GetMapping("/reCalculIncomeById")
-    void reCalculIncomeById(Long id);
+    String reCalculIncomeById(@RequestParam("id") Long id);
 
 }

dcs-plan-feign/src/main/java/com/yonde/dcs/plan/feign/ExtPlanServiceFeign.java

@@ -48,7 +48,7 @@ public interface ExtPlanServiceFeign<V extends ExtPlanVO> extends ExtPlanService
      */
     @ApiOperation("计划驱动编制任务")
     @GetMapping(value = "/changeState")
-    void extChangeState(@RequestParam String state, @RequestParam List<Long> ids);
+    void extChangeState(@RequestParam("state") String state, @RequestParam("ids") List<Long> ids);
 
     /**
      * 校验计划答复状态
@@ -58,7 +58,7 @@ public interface ExtPlanServiceFeign<V extends ExtPlanVO> extends ExtPlanService
      */
     @ApiOperation("校验计划答复状态")
     @GetMapping(value = "/checkReplayState")
-    String checkReplayState(@RequestParam Long id) ;
+    String checkReplayState(@RequestParam("id") Long id) ;
 
 
     /**

dcs-plan-feign/src/main/java/com/yonde/dcs/plan/feign/ExtSpendingContractServiceFeign.java

@@ -20,6 +20,6 @@ public interface ExtSpendingContractServiceFeign<V extends ExtSpendingContractVO
 
     @ApiOperation(value = "支出合同金额计算", notes = "支出合同金额计算", httpMethod = "GET")
     @GetMapping("/calculateSpending/{id}")
-    ExtSpendingContractVO calculateSpending(@PathVariable Long id);
+    ExtSpendingContractVO calculateSpending(@PathVariable("id") Long id);
 
 }