Merge remote-tracking branch 'origin/master'

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java

@@ -423,9 +423,14 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
         }else{
             deptName = "资产部分管领导";
         }
+        String remark = Arrays.toString(approvalAssetsRequest.getRemark());//补充调查原因
+        String otherRemark = approvalAssetsRequest.getOtherRemark();//其他原因
+        String reason = remark+otherRemark;
+        String loanMoney = approvalAssetsRequest.getAmount().toString();//金额
+        String loanTerm = approvalAssetsRequest.getTerm();//期限
         //同时往审核流程进程表新增一条记录
         String account = dgApplyAmountInfoController.getAccount();
-        AuditProcessUtil.save(assetsInvestigation.getBusinessId(),account,deptName,approvalAssetsRequest.getApplyContent(),3,"","","");
+        AuditProcessUtil.save(assetsInvestigation.getBusinessId(),account,deptName,approvalAssetsRequest.getApplyContent(),3,reason,loanMoney,loanTerm);
 
         return 1;
     }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java

@@ -506,9 +506,14 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
         } else {
             deptName = "担保部分管领导";
         }
+        String remark = Arrays.toString(approvalGuaranteeRequest.getRemark());//补充调查原因
+        String otherRemark = approvalGuaranteeRequest.getOtherRemark();//其他原因
+        String reason = remark+otherRemark;
+        String loanMoney = approvalGuaranteeRequest.getAmount().toString();//金额
+        String loanTerm = approvalGuaranteeRequest.getTerm();//期限
         //同时往审核流程进程表新增一条记录
         String account = dgApplyAmountInfoController.getAccount();
-        AuditProcessUtil.save(guaranteeUser.getBusinessId(), account, deptName, approvalGuaranteeRequest.getApplyContent(), 2,"","","");
+        AuditProcessUtil.save(guaranteeUser.getBusinessId(), account, deptName, approvalGuaranteeRequest.getApplyContent(), 2,reason,loanMoney,loanTerm);
 
         return 1;
     }