|
@@ -6,6 +6,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.constant.FileConstants;
|
|
import com.huyi.service.constant.FileConstants;
|
|
|
|
|
+import com.huyi.service.util.DocumentConstant;
|
|
|
import com.keao.tianhu.core.util.AmtUtil;
|
|
import com.keao.tianhu.core.util.AmtUtil;
|
|
|
import com.tianhu.common.core.utils.CommonUtil;
|
|
import com.tianhu.common.core.utils.CommonUtil;
|
|
|
import com.tianhu.common.core.utils.DateUtils;
|
|
import com.tianhu.common.core.utils.DateUtils;
|
|
@@ -84,7 +85,9 @@ public class CreditHandleController extends BaseController {
|
|
|
//融信文件关系服务类
|
|
//融信文件关系服务类
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private IZcFinanceFileRelService financeFileRelService;
|
|
private IZcFinanceFileRelService financeFileRelService;
|
|
|
-
|
|
|
|
|
|
|
+ //待办服务类
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private ISysNoticeService sysNoticeService;
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -246,6 +249,19 @@ public class CreditHandleController extends BaseController {
|
|
|
//调确权审批
|
|
//调确权审批
|
|
|
approvalService.coreConfirmationApproval(map);
|
|
approvalService.coreConfirmationApproval(map);
|
|
|
}
|
|
}
|
|
|
|
|
+ //待办更改为已办
|
|
|
|
|
+ LambdaQueryWrapper<SysNotice> noticeLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
|
|
+ //待办
|
|
|
|
|
+ noticeLambdaQueryWrapper.eq(SysNotice::getStatus,"0");
|
|
|
|
|
+ //融信编号
|
|
|
|
|
+ noticeLambdaQueryWrapper.eq(SysNotice::getTableId,zfiId);
|
|
|
|
|
+ //待确权
|
|
|
|
|
+ noticeLambdaQueryWrapper.eq(SysNotice::getWorkType,"02");
|
|
|
|
|
+ SysNotice notice = new SysNotice();
|
|
|
|
|
+ //已办
|
|
|
|
|
+ notice.setStatus("1");
|
|
|
|
|
+ sysNoticeService.update(notice,noticeLambdaQueryWrapper);
|
|
|
|
|
+
|
|
|
return AjaxResult.success();
|
|
return AjaxResult.success();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -386,6 +402,18 @@ public class CreditHandleController extends BaseController {
|
|
|
// 调用签收审批流
|
|
// 调用签收审批流
|
|
|
approvalService.addSignApproval(CommonUtil.entityToMap(finance));
|
|
approvalService.addSignApproval(CommonUtil.entityToMap(finance));
|
|
|
}
|
|
}
|
|
|
|
|
+ //待办更改为已办
|
|
|
|
|
+ LambdaQueryWrapper<SysNotice> noticeLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
|
|
+ //待办
|
|
|
|
|
+ noticeLambdaQueryWrapper.eq(SysNotice::getStatus,"0");
|
|
|
|
|
+ //融信编号
|
|
|
|
|
+ noticeLambdaQueryWrapper.eq(SysNotice::getTableId,zfiId);
|
|
|
|
|
+ //待签收
|
|
|
|
|
+ noticeLambdaQueryWrapper.eq(SysNotice::getWorkType,"04");
|
|
|
|
|
+ SysNotice notice = new SysNotice();
|
|
|
|
|
+ //已办
|
|
|
|
|
+ notice.setStatus("1");
|
|
|
|
|
+ sysNoticeService.update(notice,noticeLambdaQueryWrapper);
|
|
|
|
|
|
|
|
return AjaxResult.success();
|
|
return AjaxResult.success();
|
|
|
}
|
|
}
|
|
@@ -475,7 +503,18 @@ public class CreditHandleController extends BaseController {
|
|
|
} else if ("1".equals(zcFinanceInf.getZfiCreateType())) {
|
|
} else if ("1".equals(zcFinanceInf.getZfiCreateType())) {
|
|
|
financeLog.addFinanceLog(zfiId, "补充资料【拒绝】,融信失效", null, FinanceLog.STATUS_ONE);
|
|
financeLog.addFinanceLog(zfiId, "补充资料【拒绝】,融信失效", null, FinanceLog.STATUS_ONE);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+ //待办更改为已办
|
|
|
|
|
+ LambdaQueryWrapper<SysNotice> noticeLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
|
|
+ //待办
|
|
|
|
|
+ noticeLambdaQueryWrapper.eq(SysNotice::getStatus,"0");
|
|
|
|
|
+ //融信编号
|
|
|
|
|
+ noticeLambdaQueryWrapper.eq(SysNotice::getTableId,zfiId);
|
|
|
|
|
+ //待签收
|
|
|
|
|
+ noticeLambdaQueryWrapper.eq(SysNotice::getWorkType,"04");
|
|
|
|
|
+ SysNotice notice = new SysNotice();
|
|
|
|
|
+ //已办
|
|
|
|
|
+ notice.setStatus("1");
|
|
|
|
|
+ sysNoticeService.update(notice,noticeLambdaQueryWrapper);
|
|
|
return AjaxResult.success();
|
|
return AjaxResult.success();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -560,6 +599,18 @@ public class CreditHandleController extends BaseController {
|
|
|
//已失效
|
|
//已失效
|
|
|
financeInf.setZfiStatus("03");
|
|
financeInf.setZfiStatus("03");
|
|
|
financeInfService.updateById(financeInf);
|
|
financeInfService.updateById(financeInf);
|
|
|
|
|
+ //待办更改为已办
|
|
|
|
|
+ LambdaQueryWrapper<SysNotice> noticeLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
|
|
+ //待办
|
|
|
|
|
+ noticeLambdaQueryWrapper.eq(SysNotice::getStatus,"0");
|
|
|
|
|
+ //融信编号
|
|
|
|
|
+ noticeLambdaQueryWrapper.eq(SysNotice::getTableId,zfiId);
|
|
|
|
|
+ //待盖章
|
|
|
|
|
+ noticeLambdaQueryWrapper.eq(SysNotice::getWorkType,"03");
|
|
|
|
|
+ SysNotice notice = new SysNotice();
|
|
|
|
|
+ //已办
|
|
|
|
|
+ notice.setStatus("1");
|
|
|
|
|
+ sysNoticeService.update(notice,noticeLambdaQueryWrapper);
|
|
|
return AjaxResult.success();
|
|
return AjaxResult.success();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -778,33 +829,33 @@ public class CreditHandleController extends BaseController {
|
|
|
//往word中填充数据
|
|
//往word中填充数据
|
|
|
Map<String,Object> ps = new HashMap<>();
|
|
Map<String,Object> ps = new HashMap<>();
|
|
|
//开立方
|
|
//开立方
|
|
|
- ps.put("openName",openName);
|
|
|
|
|
|
|
+ ps.put(DocumentConstant.OPEN_NAME,openName);
|
|
|
//开立方社会统一代码
|
|
//开立方社会统一代码
|
|
|
- ps.put("openCode",openCode);
|
|
|
|
|
|
|
+ ps.put(DocumentConstant.OPEN_CODE,openCode);
|
|
|
//开立方银行
|
|
//开立方银行
|
|
|
- ps.put("openBank",openBank);
|
|
|
|
|
|
|
+ ps.put(DocumentConstant.OPEN_BANK,openBank);
|
|
|
//开立方账号
|
|
//开立方账号
|
|
|
- ps.put("openAccount",openAccount);
|
|
|
|
|
|
|
+ ps.put(DocumentConstant.OPEN_ACCOUNT,openAccount);
|
|
|
//接收方
|
|
//接收方
|
|
|
- ps.put("receiverName",receiverName);
|
|
|
|
|
|
|
+ ps.put(DocumentConstant.RECEIVER_NAME,receiverName);
|
|
|
//接收方社会统一代码
|
|
//接收方社会统一代码
|
|
|
- ps.put("receiverCode",receiverCode);
|
|
|
|
|
|
|
+ ps.put(DocumentConstant.RECEIVER_CODE,receiverCode);
|
|
|
//接收方银行
|
|
//接收方银行
|
|
|
- ps.put("receiverBank",receiverBank);
|
|
|
|
|
|
|
+ ps.put(DocumentConstant.RECEIVER_BANK,receiverBank);
|
|
|
//接收方账号
|
|
//接收方账号
|
|
|
- ps.put("receiverAccount",receiverAccount);
|
|
|
|
|
|
|
+ ps.put(DocumentConstant.RECEIVER_ACCOUNT,receiverAccount);
|
|
|
//小写金额
|
|
//小写金额
|
|
|
- ps.put("zfiAmount",AmtUtil.moneyFormat(zfiAmount));
|
|
|
|
|
|
|
+ ps.put(DocumentConstant.ZFI_AMOUNT,AmtUtil.moneyFormat(zfiAmount));
|
|
|
//大写金额
|
|
//大写金额
|
|
|
- ps.put("zfiAmountBig",zfiAmountBig);
|
|
|
|
|
|
|
+ ps.put(DocumentConstant.ZFI_AMOUNT_BIG,zfiAmountBig);
|
|
|
//起止日期
|
|
//起止日期
|
|
|
- ps.put("stopDate",stopDate);
|
|
|
|
|
|
|
+ ps.put(DocumentConstant.STOP_DATE,stopDate);
|
|
|
//当前日期
|
|
//当前日期
|
|
|
- ps.put("currecntDate",currecntDate);
|
|
|
|
|
|
|
+ ps.put(DocumentConstant.CURRECNT_DATE,currecntDate);
|
|
|
//还款编号
|
|
//还款编号
|
|
|
- ps.put("zfiPaymentNumber",zfiPaymentNumber);
|
|
|
|
|
|
|
+ ps.put(DocumentConstant.ZFI_PAYMENT_NUMBER,zfiPaymentNumber);
|
|
|
//承诺还款日
|
|
//承诺还款日
|
|
|
- ps.put("expireDate",expireDateA);
|
|
|
|
|
|
|
+ ps.put(DocumentConstant.EXPIRE_DATE,expireDateA);
|
|
|
//调用替换word中的变量
|
|
//调用替换word中的变量
|
|
|
WordUtil.wordTemplate(filePath,filePath,ps);
|
|
WordUtil.wordTemplate(filePath,filePath,ps);
|
|
|
//保存为PDF格式
|
|
//保存为PDF格式
|