diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyFeign.java index 60221e4b0a..c5ba24a583 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyFeign.java +++ b/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 save(@Valid @RequestBody FinCostapplyDto dto); @ApiOperation("根据sid删除记录") @DeleteMapping("/delBySids") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyFeignFallback.java index ae4d77a478..b1d1b2ecf6 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyFeignFallback.java +++ b/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 save(FinCostapplyDto dto){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-fin/fincostapply/save无法访问"); } @Override diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyQuery.java index ee96c6f5ee..c669c46dd4 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyQuery.java +++ b/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(财务)
* File: FinCostapplyQuery.java
@@ -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; diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyRest.java index 802f4a64ca..8d8f6972fb 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyRest.java +++ b/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 save(@RequestBody FinCostapplyDto dto) { + ResultBean resultBean = finCostapplyService.saveOrUpdateDto(dto); return resultBean; } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java index b8b5e0926a..81bd9fd873 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java +++ b/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 saveOrUpdateDto(FinCostapplyDto dto) { + ResultBean rb = ResultBean.fireFail(); String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { //新增 @@ -159,6 +159,7 @@ public class FinCostapplyService extends MybatisBaseService