Merge remote-tracking branch 'origin/master'

dq-financial-crms/pom.xml

@@ -40,6 +40,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>ooxml-schemas</artifactId>
+            <version>1.0</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>

dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerWorkbenchServiceImpl.java

@@ -289,8 +289,8 @@ public class CustomerWorkbenchServiceImpl extends ServiceImpl<CustomerWorkbenchD
     @Transactional
     public Boolean insertCompany(CompanyCustomerRequest companyCustomerReq) {
 
-        //Long userId = Long.parseLong(this.getUserId());
-        //companyCustomerReq.setManager(userId); // 从redis获取当前登录用户
+//        Long userId = Long.parseLong(this.getUserId());
+//        companyCustomerReq.setManager(userId); // 从redis获取当前登录用户
         boolean result = customerService.insertCompany(companyCustomerReq);
         return result;
     }
@@ -301,8 +301,8 @@ public class CustomerWorkbenchServiceImpl extends ServiceImpl<CustomerWorkbenchD
     @Transactional
     public Boolean updateCompanyNew(CompanyCustomerRequest companyCustomerReq) {
 
-        //Long userId = Long.parseLong(this.getUserId());
-        //companyCustomerReq.setManager(userId);
+//        Long userId = Long.parseLong(this.getUserId());
+//        companyCustomerReq.setManager(userId);
         return customerService.updateCompanyNew(companyCustomerReq);
     }
 }

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,"确认失败！");

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,"更新失败！");

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,"更新失败！");

dq-financial-hrms/pom.xml

@@ -34,7 +34,11 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>ooxml-schemas</artifactId>
+            <version>1.0</version>
+        </dependency>
         <!--<dependency>
             <groupId>com.daqing.financial</groupId>
             <artifactId>dq-financial-hrms-auth</artifactId>

dq-framework-utils/pom.xml

@@ -52,11 +52,6 @@
             <artifactId>poi-ooxml-schemas</artifactId>
             <version>3.15</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>ooxml-schemas</artifactId>
-            <version>1.0</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-core</artifactId>