diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java index 50b1b71c0c..fe356b8054 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java @@ -88,7 +88,7 @@ public interface FinCollectionConfirmationFeign { @ApiOperation("收款申请撤回") @PostMapping("/recallConfirm") - ResultBean recallConfirm(@RequestParam("sid") String sid); + ResultBean recallConfirm(@RequestParam("sid") String sid,@RequestParam("userSid")String userSid); @ApiOperation("出纳驳回") @PostMapping("/cashierReject") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java index 682696d786..e6b93c075e 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java @@ -84,7 +84,7 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf } @Override - public ResultBean recallConfirm(String sid) { + public ResultBean recallConfirm(String sid,String userSid) { return null; } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java index f95e8f5a6b..48258f2ef3 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java @@ -107,8 +107,8 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF } @Override - public ResultBean recallConfirm(String sid) { - return finCollectionConfirmationService.recallConfirm(sid); + public ResultBean recallConfirm(String sid,String userSid) { + return finCollectionConfirmationService.recallConfirm(sid,userSid); } @Override diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 9646f4a041..498fb78705 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -4174,21 +4174,24 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, 1); finSelectedReceivablesDetailedVos.stream().forEach(v -> { String selectSid = v.getSid(); FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(selectSid); finSelectedReceivablesDetailed.setAuditDate(DateUtil.today()); - finSelectedReceivablesDetailed.setAuditState(0); + finSelectedReceivablesDetailed.setAuditState(4); finSelectedReceivablesDetailedService.updateById(finSelectedReceivablesDetailed); //应收未收将款项加回来 FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid()); @@ -4196,7 +4199,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService