From 5c6b5da756cd1b97443a6436c67a363a013bb4b6 Mon Sep 17 00:00:00 2001 From: chen <1251790704@qq.com> Date: Sun, 20 Dec 2020 11:19:29 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DgGuaranteeLetterAssignUserController.java | 2 +- .../financial/guarantee/controller/DgLoanNoticeController.java | 2 +- .../controller/DgPaymentConfirmationConsiderController.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeLetterAssignUserController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeLetterAssignUserController.java index 58c4031a..23acd8ec 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeLetterAssignUserController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeLetterAssignUserController.java @@ -78,7 +78,7 @@ public class DgGuaranteeLetterAssignUserController { @RequestBody GuaranteeLetterUpdateStatusRequest guaranteeLetterUpdateStatusRequest) { //如果为驳回操作且无审核意见，抛出异常 if (StatusCode.SP_REJECT.equals(guaranteeLetterUpdateStatusRequest.getStatus()) && guaranteeLetterUpdateStatusRequest.getAuditOpinion().length()==0){ - ExceptionCast.cast(HrmsCode.EMPTY_OPINION); + return ResponseResult.FAIL(44444,"请填写审核意见！"); } boolean result = guaranteeLetterAssignUserService.updateGuaranteeLetterStatus(guaranteeLetterUpdateStatusRequest); return result ? ResponseResult.SUCCESS("确认成功！"):ResponseResult.FAIL(40005,"确认失败！"); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanNoticeController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanNoticeController.java index 41c982bf..65b18fc3 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanNoticeController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanNoticeController.java @@ -72,7 +72,7 @@ public class DgLoanNoticeController { @RequestBody LoanNoticeUpdateRequest loanNoticeUpdateRequest) { //如果为驳回操作且无审核意见，抛出异常 if (StatusCode.SP_REJECT.equals(loanNoticeUpdateRequest.getStatus()) && loanNoticeUpdateRequest.getAuditOpinion().length()==0){ - ExceptionCast.cast(HrmsCode.EMPTY_OPINION); + return ResponseResult.FAIL(44444,"请填写审核意见！"); } boolean result = loanNoticeService.updateLoanNotice(loanNoticeUpdateRequest); return result ? ResponseResult.SUCCESS("更新成功！"):ResponseResult.FAIL(40005,"更新失败！"); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgPaymentConfirmationConsiderController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgPaymentConfirmationConsiderController.java index 5ceb9ae3..5fb6b6ba 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgPaymentConfirmationConsiderController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgPaymentConfirmationConsiderController.java @@ -63,7 +63,7 @@ public class DgPaymentConfirmationConsiderController { @RequestBody PaymentConfirmationUpdateRequest paymentConfirmationUpdateRequest) { //如果为驳回操作且无审核意见，抛出异常 if (StatusCode.SP_REJECT.equals(paymentConfirmationUpdateRequest.getStatus()) && paymentConfirmationUpdateRequest.getAuditOpinion().length()==0){ - ExceptionCast.cast(HrmsCode.EMPTY_OPINION); + return ResponseResult.FAIL(44444,"请填写审核意见！"); } boolean result = paymentConfirmationConsiderService.updatePaymentConfirmation(paymentConfirmationUpdateRequest); return result ? ResponseResult.SUCCESS("更新成功！"):ResponseResult.FAIL(40005,"更新失败！"); From 2bc4f402e15dcc871921b149cb873f2d48fdce55 Mon Sep 17 00:00:00 2001 From: river <1376754470@qq.com> Date: Sun, 20 Dec 2020 11:21:16 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=B3=BB=E7=BB=9F=E5=89=8D=E5=8F=B0=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=BB=8F=E7=90=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crms/service/impl/CustomerWorkbenchServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerWorkbenchServiceImpl.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerWorkbenchServiceImpl.java index 21d1d9a1..4e33f0c4 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerWorkbenchServiceImpl.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerWorkbenchServiceImpl.java @@ -289,8 +289,8 @@ public class CustomerWorkbenchServiceImpl extends ServiceImpl Date: Sun, 20 Dec 2020 15:53:15 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dq-financial-crms/pom.xml | 5 +++++ dq-financial-hrms/pom.xml | 6 +++++- dq-framework-utils/pom.xml | 5 ----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dq-financial-crms/pom.xml b/dq-financial-crms/pom.xml index 4b6eac05..8a846c97 100644 --- a/dq-financial-crms/pom.xml +++ b/dq-financial-crms/pom.xml @@ -40,6 +40,11 @@ org.springframework.boot spring-boot-starter-web + + org.apache.poi + ooxml-schemas + 1.0 + org.springframework.cloud spring-cloud-starter-openfeign diff --git a/dq-financial-hrms/pom.xml b/dq-financial-hrms/pom.xml index c01409a1..b06a34fd 100644 --- a/dq-financial-hrms/pom.xml +++ b/dq-financial-hrms/pom.xml @@ -34,7 +34,11 @@ org.springframework.cloud spring-cloud-starter-openfeign - + + org.apache.poi + ooxml-schemas + 1.0 +