费用申请的提交完善

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyFeign.java

@@ -67,7 +67,7 @@ public interface FinCostapplyFeign {
     @ApiOperation("新增或修改")
     @PostMapping("/save")
     @ResponseBody
-    public ResultBean save(@Valid @RequestBody FinCostapplyDto dto);
+    public ResultBean<String> save(@Valid @RequestBody FinCostapplyDto dto);
 
     @ApiOperation("根据sid删除记录")
     @DeleteMapping("/delBySids")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyFeignFallback.java

@@ -56,8 +56,9 @@ public class FinCostapplyFeignFallback implements FinCostapplyFeign {
 	}
 
 	@Override
-	public ResultBean save(FinCostapplyDto dto){
-		return ResultBean.fireFail().setMsg("接口anrui-fin/fincostapply/save无法访问");
+	public ResultBean<String> save(FinCostapplyDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-fin/fincostapply/save无法访问");
 	}
 
 	@Override

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyQuery.java

@@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * Project: anrui-fin(财务) <br/>
  * File: FinCostapplyQuery.java <br/>
@@ -57,6 +59,7 @@ public class FinCostapplyQuery implements Query {
     @ApiModelProperty("使用方式key,先预支/先垫付，先预支的需要生成财务待支付记录。先垫付的，等报销时，在生成待支付记录。")
     private String useTypeKey;
     @ApiModelProperty(value = "用户sid")
+    @NotBlank(message = "参数错误：userSid")
     private String userSid;
     @ApiModelProperty(value = "报销状态：2已报销，1未报销")
     private String state;

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyRest.java

@@ -69,9 +69,8 @@ public class FinCostapplyRest implements FinCostapplyFeign {
     }
 
     @Override
-    public ResultBean save(@RequestBody FinCostapplyDto dto) {
-        ResultBean rb = ResultBean.fireFail();
-        ResultBean resultBean = finCostapplyService.saveOrUpdateDto(dto);
+    public ResultBean<String> save(@RequestBody FinCostapplyDto dto) {
+        ResultBean<String> resultBean = finCostapplyService.saveOrUpdateDto(dto);
         return resultBean;
     }
 

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java

@@ -132,8 +132,8 @@ public class FinCostapplyService extends MybatisBaseService<FinCostapplyMapper,
         return p;
     }
 
-    public ResultBean saveOrUpdateDto(FinCostapplyDto dto) {
-        ResultBean rb = ResultBean.fireFail();
+    public ResultBean<String> saveOrUpdateDto(FinCostapplyDto dto) {
+        ResultBean<String> rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             //新增
@@ -159,6 +159,7 @@ public class FinCostapplyService extends MybatisBaseService<FinCostapplyMapper,
                 }
             }
             baseMapper.insert(finCostapply);
+            dtoSid = finCostapply.getSid();
         } else {
             FinCostapply finCostapply = fetchBySid(dtoSid);
             if (finCostapply == null) {
@@ -186,7 +187,7 @@ public class FinCostapplyService extends MybatisBaseService<FinCostapplyMapper,
             }
             baseMapper.updateById(finCostapply);
         }
-        return rb.success();
+        return rb.success().setData(dtoSid);
     }
 
     public String getApplyCode(FinCostapplyDto dto) {