|
@@ -7,6 +7,7 @@ import com.huyi.service.base.service.*;
|
|
|
import com.huyi.service.common.financeLog.FinanceLog;
|
|
import com.huyi.service.common.financeLog.FinanceLog;
|
|
|
import com.huyi.service.common.flowable.service.ApprovalService;
|
|
import com.huyi.service.common.flowable.service.ApprovalService;
|
|
|
import com.huyi.service.credit.service.OwnCreditService;
|
|
import com.huyi.service.credit.service.OwnCreditService;
|
|
|
|
|
+import com.huyi.service.util.FlowableService;
|
|
|
import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
|
|
import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
|
|
|
import com.tianhu.common.core.domain.R;
|
|
import com.tianhu.common.core.domain.R;
|
|
|
import com.tianhu.common.core.utils.AmtUtil;
|
|
import com.tianhu.common.core.utils.AmtUtil;
|
|
@@ -24,7 +25,6 @@ import com.tianhu.system.api.model.LoginUser;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
-
|
|
|
|
|
import java.lang.reflect.InvocationTargetException;
|
|
import java.lang.reflect.InvocationTargetException;
|
|
|
import java.text.SimpleDateFormat;
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.util.*;
|
|
import java.util.*;
|
|
@@ -145,13 +145,13 @@ public class OwnCreditController extends BaseController {
|
|
|
map.put("receiveCompany", receiveCompany);
|
|
map.put("receiveCompany", receiveCompany);
|
|
|
//融资产品
|
|
//融资产品
|
|
|
map.put("zfpName",zfpName);
|
|
map.put("zfpName",zfpName);
|
|
|
|
|
+ //签收日期
|
|
|
|
|
+ map.put("startTime",zfiSignDate.get("zfiSignDate[0]"));
|
|
|
|
|
+ map.put("endTime",zfiSignDate.get("zfiSignDate[1]"));
|
|
|
//利率
|
|
//利率
|
|
|
if(CommonUtil.isNotEmpty(zfiRate)){
|
|
if(CommonUtil.isNotEmpty(zfiRate)){
|
|
|
map.put("zfiRate",CommonUtil.objToBigDecimal(zfiRate));
|
|
map.put("zfiRate",CommonUtil.objToBigDecimal(zfiRate));
|
|
|
}
|
|
}
|
|
|
- //签收日期
|
|
|
|
|
- map.put("startTime",zfiSignDate.get("zfiSignDate[0]"));
|
|
|
|
|
- map.put("endTime",zfiSignDate.get("zfiSignDate[1]"));
|
|
|
|
|
//承诺还款日
|
|
//承诺还款日
|
|
|
map.put("zfiExpireDateStart",zfiExpireDate.get("zfiExpireDate[0]"));
|
|
map.put("zfiExpireDateStart",zfiExpireDate.get("zfiExpireDate[0]"));
|
|
|
map.put("zfiExpireDateEnd",zfiExpireDate.get("zfiExpireDate[1]"));
|
|
map.put("zfiExpireDateEnd",zfiExpireDate.get("zfiExpireDate[1]"));
|
|
@@ -550,8 +550,66 @@ public class OwnCreditController extends BaseController {
|
|
|
inf.setZfiAmount(zfiAmount);
|
|
inf.setZfiAmount(zfiAmount);
|
|
|
//原签发金额
|
|
//原签发金额
|
|
|
inf.setZfiOldAmount(zfiAmount);
|
|
inf.setZfiOldAmount(zfiAmount);
|
|
|
|
|
+ //获取当前融信的平台审批状态
|
|
|
|
|
+ String zfiPlatformStatus = CommonUtil.objToString(map.get("zfiPlatformStatus"));
|
|
|
|
|
+ //获取融信类型
|
|
|
|
|
+ String zfiCreateType = CommonUtil.objToString(map.get("zfiCreateType"));
|
|
|
|
|
+ //获取核心审批状态
|
|
|
|
|
+ String zfiCoreStatus = CommonUtil.objToString(map.get("zfiCoreStatus"));
|
|
|
|
|
+ //获取融资方审批状态
|
|
|
|
|
+ String zfiSupplierStatus = CommonUtil.objToString(map.get("zfiSupplierStatus"));
|
|
|
|
|
+ //获取融信状态
|
|
|
|
|
+ String zfiStatus = CommonUtil.objToString(map.get("zfiStatus"));
|
|
|
|
|
+ //平台拒绝
|
|
|
|
|
+ if("02".equals(zfiPlatformStatus)){
|
|
|
|
|
+ //置空得自写sql,set03的话会在页面展示暂存,所以set04
|
|
|
|
|
+ inf.setZfiPlatformStatus("04");
|
|
|
|
|
+ }
|
|
|
//修改数据
|
|
//修改数据
|
|
|
financeInfService.updateById(inf);
|
|
financeInfService.updateById(inf);
|
|
|
|
|
+ //核心开立
|
|
|
|
|
+ if("1".equals(zfiCreateType)){
|
|
|
|
|
+ //核心拒绝
|
|
|
|
|
+ if("02".equals(zfiCoreStatus)){
|
|
|
|
|
+ //调用核心开立审批
|
|
|
|
|
+ approvalService.coreApproval(map);
|
|
|
|
|
+ }
|
|
|
|
|
+ //融资方审批拒绝或者平台审批拒绝
|
|
|
|
|
+ if("02".equals(zfiSupplierStatus) || "02".equals(zfiPlatformStatus)){
|
|
|
|
|
+ //调用补充资料审批
|
|
|
|
|
+ approvalService.addInformationApproval(map);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ //融资申请
|
|
|
|
|
+ if("0".equals(zfiCreateType)){
|
|
|
|
|
+ //(融资方审批拒绝或者平台审批拒绝)并且融信状态不等于待签收
|
|
|
|
|
+ if(("02".equals(zfiSupplierStatus) || "02".equals(zfiPlatformStatus)) && !"01".equals(zfiStatus)){
|
|
|
|
|
+ //调用融资申请审批
|
|
|
|
|
+ approvalService.financeApplyApproval(map);
|
|
|
|
|
+ }
|
|
|
|
|
+ //核心拒绝
|
|
|
|
|
+ if("02".equals(zfiCoreStatus)){
|
|
|
|
|
+ //调用确权审批
|
|
|
|
|
+ approvalService.coreConfirmationApproval(map);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ //融资开立
|
|
|
|
|
+ if("2".equals(zfiCreateType)){
|
|
|
|
|
+ //融资方审批拒绝或者平台审批拒绝
|
|
|
|
|
+ if("02".equals(zfiSupplierStatus) || "02".equals(zfiPlatformStatus)){
|
|
|
|
|
+ //调用融信开立审批
|
|
|
|
|
+ approvalService.financeOpenApproval(map);
|
|
|
|
|
+ }
|
|
|
|
|
+ //核心拒绝
|
|
|
|
|
+ if("02".equals(zfiCoreStatus)){
|
|
|
|
|
+ //调用确权审批
|
|
|
|
|
+ approvalService.coreConfirmationApproval(map);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
return AjaxResult.success();
|
|
return AjaxResult.success();
|
|
|
}
|
|
}
|
|
|
|
|
|