更改

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeDetailsVo.java

@@ -63,6 +63,9 @@ public class ScmSpecialrebatedistributeDetailsVo implements Vo {
     @ApiModelProperty("申请人")
     private String createByName;
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @ApiModelProperty("创建日期")
+    private Date createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     @ApiModelProperty("办结日期")
     private Date finishTime; // 办结日期
     @ApiModelProperty("创建人sid")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeFeignFallback.java

@@ -26,10 +26,7 @@
 package com.yxt.anrui.scm.api.scmspecialrebatedistribute;
 
 import com.yxt.anrui.scm.api.flow.FlowTaskVo;
-import com.yxt.anrui.scm.api.scmspecialrebatedistribute.flow.GetNodeQuery;
-import com.yxt.anrui.scm.api.scmspecialrebatedistribute.flow.GetNodeVo;
-import com.yxt.anrui.scm.api.scmspecialrebatedistribute.flow.ScmSpecialRebatedistributeCompleteDto;
-import com.yxt.anrui.scm.api.scmspecialrebatedistribute.flow.SubmitScmSpecialRebatedistributeDto;
+import com.yxt.anrui.scm.api.scmspecialrebatedistribute.flow.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -114,4 +111,14 @@ public class ScmSpecialrebatedistributeFeignFallback implements ScmSpecialrebate
 	public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
 		return null;
 	}
+
+	@Override
+	public ResultBean delegate(ScmScmSpecialRebatedistributeDelegateQuery delegateQuery) {
+		return null;
+	}
+
+	@Override
+	public ResultBean assignTask(ScmScmSpecialRebatedistributeDelegateQuery delegateQuery) {
+		return null;
+	}
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatedistribute/AppSpecialrebatedistributeFeign.java

@@ -33,8 +33,8 @@ public interface AppSpecialrebatedistributeFeign {
     public ResultBean<AppSpecialrebatedistributeDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
 
     @ApiOperation("根据专项返利sid查询选择的分配车辆信息")
-    @PostMapping("/getVehBySpecialRebateSid")
-    public ResultBean<List<AppSpecialRebateDisGetVehVo>> getVehBySpecialRebateSid(@RequestParam("specialRebateSid") String specialRebateSid);
+    @GetMapping("/getVehBySpecialRebateSid")
+    public ResultBean<List<AppSpecialRebateDisGetVehVo>> getVehBySpecialRebateSid(@RequestParam("sid") String sid);
 
     /**********************************************流程********************************************/
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatedistribute/AppSpecialrebatedistributedetailDetailsVo.java

@@ -75,4 +75,6 @@ public class AppSpecialrebatedistributedetailDetailsVo implements Vo {
     private BigDecimal uploadMoney;
     @ApiModelProperty("单车分配金额")
     private String unitSetAllocationMoney;
+    @ApiModelProperty("专项返利sid")
+    private String specialRebateSid;
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/specialrebatedistribute/AppSpecialrebatedistributeRest.java

@@ -49,8 +49,8 @@ public class AppSpecialrebatedistributeRest implements AppSpecialrebatedistribut
     }
 
     @Override
-    public ResultBean<List<AppSpecialRebateDisGetVehVo>> getVehBySpecialRebateSid(String specialRebateSid) {
-        return appSpecialrebatedistributeService.getVehBySpecialRebateSid(specialRebateSid);
+    public ResultBean<List<AppSpecialRebateDisGetVehVo>> getVehBySpecialRebateSid(String sid) {
+        return appSpecialrebatedistributeService.getVehBySpecialRebateSid(sid);
     }
 
     @Override

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/specialrebatedistribute/AppSpecialrebatedistributeService.java

@@ -75,15 +75,18 @@ public class AppSpecialrebatedistributeService {
         appSpecialrebatedistributeDetailsVo.setProcInsId(data.getProcInstId());
         BeanUtil.copyProperties(data,appSpecialrebatedistributeDetailsVo);
         List<AppSpecialrebatedistributedetailDetailsVo> scmSpecialrebatedistributedetails = appSpecialrebatedistributeDetailsVo.getScmSpecialrebatedistributedetails();
+        for (AppSpecialrebatedistributedetailDetailsVo scmSpecialrebatedistributedetail : scmSpecialrebatedistributedetails) {
+            scmSpecialrebatedistributedetail.setSid(scmSpecialrebatedistributedetail.getSpecialRebateSid());
+        }
         appSpecialrebatedistributeDetailsVo.setUploadMoneyTotal(scmSpecialrebatedistributedetails.stream().map(AppSpecialrebatedistributedetailDetailsVo::getUploadMoney).reduce(BigDecimal.ZERO,BigDecimal::add));
         appSpecialrebatedistributeDetailsVo.setEstimateRebateTotal(scmSpecialrebatedistributedetails.stream().map(AppSpecialrebatedistributedetailDetailsVo::getEstimateRebate).reduce(BigDecimal.ZERO,BigDecimal::add));
         return rb.success().setData(appSpecialrebatedistributeDetailsVo);
     }
 
-    public ResultBean<List<AppSpecialRebateDisGetVehVo>> getVehBySpecialRebateSid(String specialRebateSid) {
+    public ResultBean<List<AppSpecialRebateDisGetVehVo>> getVehBySpecialRebateSid(String sid) {
         ResultBean rb = ResultBean.fireFail();
         List<AppSpecialRebateDisGetVehVo> appSpecialRebateDisGetVehVos = new ArrayList<>();
-        List<BaseSpecialRebateDisGetVehVo> data = baseVehicleFeign.getVehBySpecialRebateSid(specialRebateSid).getData();
+        List<BaseSpecialRebateDisGetVehVo> data = baseVehicleFeign.getVehBySpecialRebateSid(sid).getData();
         for (BaseSpecialRebateDisGetVehVo datum : data) {
             AppSpecialRebateDisGetVehVo appSpecialRebateDisGetVehVo = new AppSpecialRebateDisGetVehVo();
             BeanUtil.copyProperties(datum,appSpecialRebateDisGetVehVo);