From 061aa702237dfabe98bdb29e721168e40f463dfe Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 30 Nov 2023 10:00:22 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=91=E8=9D=B6?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=BA=94=E6=94=B6=E5=8D=95=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=89=A9=E6=96=99=E7=BC=96=E7=A0=81=E7=89=A9=E6=96=99=E5=90=8D?= =?UTF-8?q?=E7=A7=B02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusSalesOrderLoancontractService.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java index b1a1dc4b41..0bb835652f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java @@ -31,6 +31,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrower; import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo; @@ -127,6 +129,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService createQueryWrapper(BusSalesOrderLoancontractQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -380,8 +384,11 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService Date: Thu, 30 Nov 2023 10:10:27 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=A1=E5=AE=A1=E7=BB=88=E5=AE=A1?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanCapitalCreditResultMapper.java | 6 +++--- .../LoanCapitalCreditResultService.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultMapper.java index 9129f368e8..0d5b50f951 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultMapper.java @@ -64,12 +64,12 @@ public interface LoanCapitalCreditResultMapper extends BaseMapper selectListVo(); - @Update("update loan_capital_credit_result set capCarefulDate = #{capCarefulDate},capCarefulResult = #{capCarefulResult},state = '2' where sid = #{dtoSid}") - void updateStateAndDateResult(@Param("dtoSid") String dtoSid, @Param("capCarefulDate") String capCarefulDate, @Param("capCarefulResult") String capCarefulResult); + @Update("update loan_capital_credit_result set capCarefulDate = #{capCarefulDate},capCarefulResult = #{capCarefulResult},isCompInvoic = #{isCompInvoic},state = '2' where sid = #{dtoSid}") + void updateStateAndDateResult(@Param("dtoSid") String dtoSid, @Param("capCarefulDate") String capCarefulDate, @Param("capCarefulResult") String capCarefulResult, @Param("isCompInvoic") String isCompInvoic); int setState(String loanConcatSid); - /* int setState2(String borrowerSid);*/ + /* int setState2(String borrowerSid);*/ int selectCoun(String loanConcatSid); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java index e4a5f40e1d..facea06a29 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java @@ -204,8 +204,8 @@ public class LoanCapitalCreditResultService extends MybatisBaseService Date: Thu, 30 Nov 2023 10:23:00 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/fin/biz/kingdee/otherreceivablebill/data_model.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_model.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_model.json index f9932f6d8e..f1a8471d51 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_model.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_model.json @@ -50,7 +50,7 @@ "FNOTAXAMOUNT": "0", "FTAXAMOUNT": "0", "FCancelStatus": "", - "FAR_OtherRemarks": "@KD_FAR_OtherRemarks", + "FAR_OtherRemarks": "", "FScanPoint": { "FNUMBER": "" }, From 8d475b62d4a296e6ef8cd11e9f0a7cc3e80ed55a Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 30 Nov 2023 10:59:50 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BB=B7=E5=80=BC=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E5=A4=87=E6=A1=88=E6=8E=A8=E9=80=81=E5=BC=80=E7=A5=A8=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=98=AF=E5=90=A6=E9=A2=86=E7=A5=A8=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=9D=A5=E6=BA=90=E4=B8=BA=E5=8D=95=E7=8B=AC?= =?UTF-8?q?=E5=BC=80=E7=A5=A8=E7=9A=84=E5=8C=BA=E5=88=86=E6=AD=A3=E5=B8=B8?= =?UTF-8?q?=E5=BC=80=E7=A5=A8=E5=92=8C=E6=AC=A0=E6=AC=BE=E5=BC=80=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusValcustFilingService.java | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java index 81f78a32d5..be2172f69f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java @@ -616,7 +616,11 @@ public class BusValcustFilingService extends MybatisBaseService Date: Thu, 30 Nov 2023 11:17:29 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=A1=E5=AE=A1=E7=BB=88=E5=AE=A1?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E5=90=8E=E9=87=8D=E6=8E=A8=E8=B4=A2=E5=8A=A1?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanCapitalCreditResultFeign.java | 5 +++ .../LoanCapitalCreditResultFeignFallback.java | 5 +++ .../LoanNoGuaranteeCreditReviewFallback.java | 5 +++ .../LoanNoGuaranteeCreditReviewFeign.java | 3 ++ .../LoanCapitalCreditResultRest.java | 5 +++ .../LoanCapitalCreditResultService.java | 24 ++++++++++++++ .../LoanNoGuaranteeCreditReviewRest.java | 5 +++ .../LoanNoGuaranteeCreditReviewService.java | 32 +++++++++++++++++++ 8 files changed, 84 insertions(+) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultFeign.java index 428428ece0..394e61aa73 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultFeign.java @@ -85,4 +85,9 @@ public interface LoanCapitalCreditResultFeign { @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation("重推财务") + @PostMapping("/rePush") + public ResultBean rePush(@RequestParam("sid") String sid); + } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultFeignFallback.java index 986cd36042..d5697dbec9 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultFeignFallback.java @@ -79,4 +79,9 @@ public class LoanCapitalCreditResultFeignFallback implements LoanCapitalCreditRe ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-riskcenter/loancapitalcreditresult/fetchDetailsBySid无法访问"); } + + @Override + public ResultBean rePush(String sid) { + return null; + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFallback.java index 217393d825..dccfa1112f 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFallback.java @@ -22,4 +22,9 @@ public class LoanNoGuaranteeCreditReviewFallback implements LoanNoGuaranteeCredi public ResultBean saveReviewInfo(LoanNoGuaranteeCreditReviewDto dto) { return null; } + + @Override + public ResultBean rePush(String salesOrderSid) { + return null; + } } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFeign.java index 3ecbc54974..f14f6c936f 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFeign.java @@ -37,5 +37,8 @@ public interface LoanNoGuaranteeCreditReviewFeign { @PostMapping("/saveReviewInfo") public ResultBean saveReviewInfo(@RequestBody LoanNoGuaranteeCreditReviewDto dto); + @ApiOperation("重推财务") + @PostMapping("/rePush") + public ResultBean rePush(@RequestParam("salesOrderSid") String salesOrderSid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultRest.java index 594461ec73..d9ac242f43 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultRest.java @@ -100,4 +100,9 @@ public class LoanCapitalCreditResultRest implements LoanCapitalCreditResultFeign LoanCapitalCreditResultDetailsVo vo = loanCapitalCreditResultService.fetchDetailsVoBySid(sid); return rb.success().setData(vo); } + + @Override + public ResultBean rePush(String sid) { + return loanCapitalCreditResultService.rePush(sid); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java index facea06a29..00eb0ca65b 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java @@ -369,4 +369,28 @@ public class LoanCapitalCreditResultService extends MybatisBaseService saveReviewInfo(LoanNoGuaranteeCreditReviewDto dto) { return loanNoGuaranteeCreditReviewService.saveReviewInfo(dto); } + + @Override + public ResultBean rePush(String salesOrderSid) { + return loanNoGuaranteeCreditReviewService.rePush(salesOrderSid); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java index e53e9f332c..d2b87ef47c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java @@ -273,4 +273,36 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService