|
@@ -271,7 +271,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
* @return 结果
|
|
|
*/
|
|
|
@Override
|
|
|
- @Transactional
|
|
|
+ @Transactional(rollbackFor = Exception.class)
|
|
|
public int insertLoanApplication(LoanApplication loanApplication) {
|
|
|
if (loanApplicationMapper.selectLoanApplicationList(loanApplication).size() > 0) {
|
|
|
return 0;
|
|
@@ -326,6 +326,45 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
loanSchedule.setLoanScheduleScore(0L);
|
|
|
loanSchedule.setLoanScheduleTime(DateUtils.getNowDate());
|
|
|
loanScheduleMapper.insertLoanSchedule(loanSchedule);
|
|
|
+
|
|
|
+
|
|
|
+ List<SysUserRole> sysUserRoles = sysUserRoleMapper.selectRoleListNoDataScope();
|
|
|
+ List<Long> userIdList = new ArrayList<>();
|
|
|
+
|
|
|
+ List<WaitRemind> waitRemindList = new ArrayList<>();
|
|
|
+ if (sysUserRoles != null && sysUserRoles.size() > 0) {
|
|
|
+ userIdList = sysUserRoles.stream().map(SysUserRole::getUserId).collect(Collectors.toList());
|
|
|
+ for (SysUserRole sysUserRole : sysUserRoles) {
|
|
|
+ WaitRemind waitRemindManager = new WaitRemind();
|
|
|
+ waitRemindManager.setLoanApplicationId(loanApplication.getLoanApplicationId());
|
|
|
+ waitRemindManager.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
|
|
|
+ waitRemindManager.setRemindTitle("有一条【" + loanApplication.getEnterpriseName() + "】贷款申请需及时处理");
|
|
|
+ waitRemindManager.setRemindTime(DateUtils.getNowDate());
|
|
|
+ waitRemindManager.setRemindType(ONE);
|
|
|
+ waitRemindManager.setRemindContent(loanApplication.getEnterpriseName() + "有一条贷款申请进需及时处理");
|
|
|
+
|
|
|
+ waitRemindManager.setReadUserId(sysUserRole.getUserId().toString());
|
|
|
+ waitRemindList.add(waitRemindManager);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if (waitRemindList.size() > 0) {
|
|
|
+ waitRemindMapper.batchWaitRemind(waitRemindList);
|
|
|
+
|
|
|
+ List<SysUser> sysUsers = sysUserService.selectUserListByIdList(userIdList);
|
|
|
+ if (sysUsers != null && sysUsers.size() > 0) {
|
|
|
+ String notificationTitle = "消息通知";
|
|
|
+ String msgTitle = "审核信息";
|
|
|
+ String msgContent = loanApplication.getEnterpriseName() + "的审核信息申请通过进入到下一阶段";
|
|
|
+ String jPushVO = "";
|
|
|
+ List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
|
|
|
+ listS.removeAll(Collections.singleton(null));
|
|
|
+ if (listS != null && listS.size() > 0) {
|
|
|
+ String[] registrationId = listS.toArray(new String[listS.size()]);
|
|
|
+ JPushToolUtil.sendToRegistrationId(notificationTitle, msgTitle, msgContent, jPushVO, registrationId);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
return i;
|
|
|
}
|
|
|
|
|
@@ -418,6 +457,44 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
guaranteeInfoFjMapper.deleteGuaranteeInfoFjByGuaranteeInfoIds(guaranteeInfoIdList);
|
|
|
}
|
|
|
int rows = loanApplicationMapper.updateLoanApplication(loanApplication);
|
|
|
+
|
|
|
+ List<SysUserRole> sysUserRoles = sysUserRoleMapper.selectRoleListNoDataScope();
|
|
|
+ List<Long> userIdList = new ArrayList<>();
|
|
|
+
|
|
|
+ List<WaitRemind> waitRemindList = new ArrayList<>();
|
|
|
+ if (sysUserRoles != null && sysUserRoles.size() > 0) {
|
|
|
+ userIdList = sysUserRoles.stream().map(SysUserRole::getUserId).collect(Collectors.toList());
|
|
|
+ for (SysUserRole sysUserRole : sysUserRoles) {
|
|
|
+ WaitRemind waitRemindManager = new WaitRemind();
|
|
|
+ waitRemindManager.setLoanApplicationId(loanApplication.getLoanApplicationId());
|
|
|
+ waitRemindManager.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
|
|
|
+ waitRemindManager.setRemindTitle("有一条【" + loanApplication.getEnterpriseName() + "】贷款申请需及时处理");
|
|
|
+ waitRemindManager.setRemindTime(DateUtils.getNowDate());
|
|
|
+ waitRemindManager.setRemindType(ONE);
|
|
|
+ waitRemindManager.setRemindContent(loanApplication.getEnterpriseName() + "有一条贷款申请需及时处理");
|
|
|
+
|
|
|
+ waitRemindManager.setReadUserId(sysUserRole.getUserId().toString());
|
|
|
+ waitRemindList.add(waitRemindManager);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if (waitRemindList.size() > 0) {
|
|
|
+ waitRemindMapper.batchWaitRemind(waitRemindList);
|
|
|
+
|
|
|
+ List<SysUser> sysUsers = sysUserService.selectUserListByIdList(userIdList);
|
|
|
+ if (sysUsers != null && sysUsers.size() > 0) {
|
|
|
+ String notificationTitle = "消息通知";
|
|
|
+ String msgTitle = "审核信息";
|
|
|
+ String msgContent = loanApplication.getEnterpriseName() + "的审核信息申请通过进入到下一阶段";
|
|
|
+ String jPushVO = "";
|
|
|
+ List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
|
|
|
+ listS.removeAll(Collections.singleton(null));
|
|
|
+ if (listS != null && listS.size() > 0) {
|
|
|
+ String[] registrationId = listS.toArray(new String[listS.size()]);
|
|
|
+ JPushToolUtil.sendToRegistrationId(notificationTitle, msgTitle, msgContent, jPushVO, registrationId);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
return rows > 0 ? AjaxResult.success() : AjaxResult.error();
|
|
|
}
|
|
|
|
|
@@ -641,6 +718,10 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
if (Integer.parseInt(auditSchedule) <= Integer.parseInt(auditScheduleOld) && !Objects.equals(auditTypeOld, ONE)) {
|
|
|
return AjaxResult.error("当前进度已审核,请勿重复审核");
|
|
|
}
|
|
|
+
|
|
|
+ WaitRemind waitRemindDelete = new WaitRemind();
|
|
|
+ waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
|
|
|
+ waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);
|
|
|
List<LoanApplicationFj> fjUrl = reviewComments.getFjUrl();
|
|
|
if (fjUrl != null && fjUrl.size() > 0) {
|
|
|
StringBuilder type = new StringBuilder();
|
|
@@ -695,16 +776,13 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
}
|
|
|
waitRemindMapper.batchWaitRemind(waitRemindList);*/
|
|
|
return AjaxResult.success();
|
|
|
-
|
|
|
+
|
|
|
} else if (THR.equals(auditType) && auditSchedule.equals(TWO)) {
|
|
|
loanApplication.setLoanSchedule(THR);
|
|
|
loanApplication.setAuditType(FOR);
|
|
|
loanApplication.setLoanApplicationType(TWO);
|
|
|
loanApplicationMapper.updateLoanApplication(loanApplication);
|
|
|
-
|
|
|
- WaitRemind waitRemindDelete = new WaitRemind();
|
|
|
- waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
|
|
|
- waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);
|
|
|
+
|
|
|
|
|
|
WaitRemind waitRemind = new WaitRemind();
|
|
|
waitRemind.setLoanApplicationId(loanApplicationId);
|
|
@@ -719,11 +797,6 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
if (sysUserRoles != null && sysUserRoles.size() > 0) {
|
|
|
userIdList = sysUserRoles.stream().map(SysUserRole::getUserId).collect(Collectors.toList());
|
|
|
for (SysUserRole sysUserRole : sysUserRoles) {
|
|
|
-
|
|
|
- waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
|
|
|
- waitRemindDelete.setReadUserId(sysUserRole.getUserId().toString());
|
|
|
- waitRemindDelete.setRemindType(TWO);
|
|
|
- waitRemindMapper.deleteWaitRemindByLoanApplicationId(waitRemindDelete);
|
|
|
|
|
|
WaitRemind waitRemindManager = new WaitRemind();
|
|
|
waitRemindManager.setLoanApplicationId(loanApplicationId);
|
|
@@ -762,10 +835,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
|
|
|
loanApplication.setAuditType(FOR);
|
|
|
loanApplicationMapper.updateLoanApplication(loanApplication);
|
|
|
-
|
|
|
- WaitRemind waitRemindDelete = new WaitRemind();
|
|
|
- waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
|
|
|
- waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);
|
|
|
+
|
|
|
|
|
|
WaitRemind waitRemind = new WaitRemind();
|
|
|
waitRemind.setLoanApplicationId(loanApplicationId);
|
|
@@ -816,7 +886,6 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
|
|
|
if (TWO.equals(auditType)) {
|
|
|
|
|
|
- WaitRemind waitRemindDelete = new WaitRemind();
|
|
|
List<Long> userIdList = new ArrayList<>();
|
|
|
|
|
|
WaitRemind waitRemind = new WaitRemind();
|
|
@@ -826,9 +895,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
waitRemind.setRemindTime(DateUtils.getNowDate());
|
|
|
waitRemind.setRemindType(TWO);
|
|
|
if (auditSchedule.equals(ONE)) {
|
|
|
-
|
|
|
- waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
|
|
|
- waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);
|
|
|
+
|
|
|
loanApplication.setLoanSchedule(String.valueOf(Integer.parseInt(loanScheduleOld) + 1));
|
|
|
loanApplication.setAuditSchedule(String.valueOf(Integer.parseInt(auditSchedule) + 1));
|
|
|
loanApplication.setAuditType(ONE);
|
|
@@ -873,12 +940,6 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
loanApplication.setAuditSchedule(String.valueOf(Integer.parseInt(auditSchedule) + 1));
|
|
|
loanApplication.setAuditType(ONE);
|
|
|
if (auditSchedule.equals(TWO)) {
|
|
|
-
|
|
|
-
|
|
|
- waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
|
|
|
- waitRemindDelete.setReadUserId(loanApplication.getaUserId().toString());
|
|
|
- waitRemindDelete.setRemindType(TWO);
|
|
|
- waitRemindMapper.deleteWaitRemindByLoanApplicationId(waitRemindDelete);
|
|
|
|
|
|
waitRemind.setReadUserId(loanApplication.getbUserId().toString());
|
|
|
waitRemind.setRemindContent(enterpriseName + "有一条贷款申请需及时处理");
|
|
@@ -889,11 +950,6 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
userIdList = sysUserRoles.stream().map(SysUserRole::getUserId).collect(Collectors.toList());
|
|
|
|
|
|
for (SysUserRole sysUserRole : sysUserRoles) {
|
|
|
-
|
|
|
- waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
|
|
|
- waitRemindDelete.setReadUserId(sysUserRole.getUserId().toString());
|
|
|
- waitRemindDelete.setRemindType(TWO);
|
|
|
- waitRemindMapper.deleteWaitRemindByLoanApplicationId(waitRemindDelete);
|
|
|
|
|
|
WaitRemind waitRemindManager = new WaitRemind();
|
|
|
waitRemindManager.setLoanApplicationId(loanApplicationId);
|
|
@@ -909,14 +965,8 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
}
|
|
|
}
|
|
|
userIdList.add(loanApplication.getbUserId());
|
|
|
- }
|
|
|
- if (auditSchedule.equals(THR)) {
|
|
|
-
|
|
|
+ } else if (auditSchedule.equals(THR)) {
|
|
|
|
|
|
- waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
|
|
|
- waitRemindDelete.setReadUserId(loanApplication.getbUserId().toString());
|
|
|
- waitRemindDelete.setRemindType(THR);
|
|
|
- waitRemindMapper.deleteWaitRemindByLoanApplicationId(waitRemindDelete);
|
|
|
|
|
|
waitRemind.setReadUserId(loanApplication.getfUserId().toString());
|
|
|
waitRemind.setRemindContent(enterpriseName + "有一条贷款申请需及时处理");
|
|
@@ -925,15 +975,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
if (sysUserRoles != null && sysUserRoles.size() > 0) {
|
|
|
|
|
|
userIdList = sysUserRoles.stream().map(SysUserRole::getUserId).collect(Collectors.toList());
|
|
|
-
|
|
|
-
|
|
|
for (SysUserRole sysUserRole : sysUserRoles) {
|
|
|
-
|
|
|
- waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
|
|
|
- waitRemindDelete.setReadUserId(sysUserRole.getUserId().toString());
|
|
|
- waitRemindDelete.setRemindType(THR);
|
|
|
- waitRemindMapper.deleteWaitRemindByLoanApplicationId(waitRemindDelete);
|
|
|
-
|
|
|
WaitRemind waitRemindManager = new WaitRemind();
|
|
|
waitRemindManager.setLoanApplicationId(loanApplicationId);
|
|
|
waitRemindManager.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
|
|
@@ -949,17 +991,26 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
}
|
|
|
userIdList.add(loanApplication.getfUserId());
|
|
|
}
|
|
|
-
|
|
|
} else {
|
|
|
+
|
|
|
loanApplication.setLoanSchedule(String.valueOf(Integer.parseInt(loanScheduleOld) + 1));
|
|
|
loanApplication.setAuditSchedule(String.valueOf(Integer.parseInt(auditSchedule) + 1));
|
|
|
loanApplication.setAuditType(ONE);
|
|
|
-
|
|
|
|
|
|
- waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
|
|
|
- waitRemindDelete.setReadUserId(loanApplication.getaUserId().toString());
|
|
|
- waitRemindDelete.setRemindType(auditSchedule);
|
|
|
- waitRemindMapper.deleteWaitRemindByLoanApplicationId(waitRemindDelete);
|
|
|
+ if (auditSchedule.equals(FOR)){
|
|
|
+
|
|
|
+ WaitRemind waitRemindf = new WaitRemind();
|
|
|
+ waitRemindf.setLoanApplicationId(loanApplicationId);
|
|
|
+ waitRemindf.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
|
|
|
+ waitRemindf.setRemindTitle("您有一条【" + enterpriseName + "】的审核信息通过");
|
|
|
+ waitRemindf.setRemindTime(DateUtils.getNowDate());
|
|
|
+
|
|
|
+ waitRemindf.setReadUserId(loanApplication.getfUserId().toString());
|
|
|
+ waitRemindf.setRemindContent(enterpriseName + "有一条贷款申请需及时处理");
|
|
|
+ waitRemindf.setRemindType(FIV);
|
|
|
+ waitRemindList.add(waitRemindf);
|
|
|
+ userIdList.add(loanApplication.getfUserId());
|
|
|
+ }
|
|
|
|
|
|
waitRemind.setRemindType(loanApplication.getAuditSchedule());
|
|
|
waitRemind.setReadUserId(loanApplication.getaUserId().toString());
|
|
@@ -970,11 +1021,6 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
userIdList = sysUserRoles.stream().map(SysUserRole::getUserId).collect(Collectors.toList());
|
|
|
|
|
|
for (SysUserRole sysUserRole : sysUserRoles) {
|
|
|
-
|
|
|
- waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
|
|
|
- waitRemindDelete.setReadUserId(sysUserRole.getUserId().toString());
|
|
|
- waitRemindDelete.setRemindType(auditSchedule);
|
|
|
- waitRemindMapper.deleteWaitRemindByLoanApplicationId(waitRemindDelete);
|
|
|
WaitRemind waitRemindManager = new WaitRemind();
|
|
|
waitRemindManager.setLoanApplicationId(loanApplicationId);
|
|
|
waitRemindManager.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
|
|
@@ -1126,10 +1172,8 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
|
|
|
WaitRemind waitRemindDelete = new WaitRemind();
|
|
|
waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
|
|
|
- waitRemindDelete.setReadUserId(loanApplication.getaUserId().toString());
|
|
|
- waitRemindDelete.setRemindType(SEV);
|
|
|
-
|
|
|
- waitRemindMapper.deleteWaitRemindByLoanApplicationIdAndRemindType(waitRemindDelete);
|
|
|
+
|
|
|
+ waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);
|
|
|
|
|
|
WaitRemind waitRemindManager = new WaitRemind();
|
|
|
waitRemindManager.setLoanApplicationId(loanApplication.getLoanApplicationId());
|
|
@@ -1189,9 +1233,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
|
|
|
WaitRemind waitRemindDelete = new WaitRemind();
|
|
|
waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
|
|
|
- waitRemindDelete.setReadUserId(loanApplication.getaUserId().toString());
|
|
|
- waitRemindDelete.setRemindType(application.getAuditSchedule());
|
|
|
- waitRemindMapper.deleteWaitRemindByLoanApplicationIdAndRemindType(waitRemindDelete);
|
|
|
+ waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);
|
|
|
|
|
|
|
|
|
|
|
@@ -1211,13 +1253,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
|
|
|
userIdList = sysUserRoles.stream().map(SysUserRole::getUserId).collect(Collectors.toList());
|
|
|
|
|
|
-
|
|
|
for (SysUserRole sysUserRole : sysUserRoles) {
|
|
|
-
|
|
|
- waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
|
|
|
- waitRemindDelete.setReadUserId(sysUserRole.getUserId().toString());
|
|
|
- waitRemindDelete.setRemindType(application.getAuditSchedule());
|
|
|
- waitRemindMapper.deleteWaitRemindByLoanApplicationIdAndRemindType(waitRemindDelete);
|
|
|
|
|
|
WaitRemind waitRemindManager = new WaitRemind();
|
|
|
waitRemindManager.setLoanApplicationId(loanApplication.getLoanApplicationId());
|
|
@@ -1342,43 +1378,49 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
|
|
|
String enterpriseName = loanApplicationOld.getEnterpriseName();
|
|
|
String loanApplicationNumber = loanApplicationOld.getLoanApplicationNumber();
|
|
|
-
|
|
|
+ WaitRemind waitRemind = new WaitRemind();
|
|
|
+ waitRemind.setLoanApplicationId(loanApplicationId);
|
|
|
+ waitRemind.setLoanApplicationNumber(loanApplicationNumber);
|
|
|
+ waitRemind.setRemindTitle("您有一条【" + enterpriseName + "】的审核信息待办");
|
|
|
+ waitRemind.setRemindContent(enterpriseName + "有一条贷款申请需及时处理");
|
|
|
+ waitRemind.setRemindTime(DateUtils.getNowDate());
|
|
|
+
|
|
|
if (loanApplication.getAuditSchedule().equals(TWO)) {
|
|
|
- WaitRemind waitRemind = new WaitRemind();
|
|
|
- waitRemind.setLoanApplicationId(loanApplicationId);
|
|
|
- waitRemind.setLoanApplicationNumber(loanApplicationNumber);
|
|
|
- waitRemind.setRemindTitle("您有一条【" + enterpriseName + "】的审核信息待办");
|
|
|
- waitRemind.setRemindTime(DateUtils.getNowDate());
|
|
|
waitRemind.setRemindType(TWO);
|
|
|
|
|
|
waitRemind.setReadUserId(loanApplicationOld.getaUserId().toString());
|
|
|
- waitRemind.setRemindContent(enterpriseName + "有一条贷款申请需及时处理");
|
|
|
waitRemindList.add(waitRemind);
|
|
|
userIdList.add(loanApplicationOld.getaUserId());
|
|
|
} else if (loanApplication.getAuditSchedule().equals(THR)) {
|
|
|
- WaitRemind waitRemind = new WaitRemind();
|
|
|
- waitRemind.setLoanApplicationId(loanApplicationId);
|
|
|
- waitRemind.setLoanApplicationNumber(loanApplicationNumber);
|
|
|
- waitRemind.setRemindTitle("您有一条【" + enterpriseName + "】的审核信息待办");
|
|
|
- waitRemind.setRemindTime(DateUtils.getNowDate());
|
|
|
waitRemind.setRemindType(THR);
|
|
|
|
|
|
waitRemind.setReadUserId(loanApplicationOld.getbUserId().toString());
|
|
|
- waitRemind.setRemindContent(enterpriseName + "有一条贷款申请需及时处理");
|
|
|
waitRemindList.add(waitRemind);
|
|
|
userIdList.add(loanApplicationOld.getbUserId());
|
|
|
+ } else if (loanApplication.getAuditSchedule().equals(FOR)) {
|
|
|
+ waitRemind.setRemindType(FOR);
|
|
|
+
|
|
|
+ waitRemind.setReadUserId(loanApplicationOld.getfUserId().toString());
|
|
|
+ waitRemindList.add(waitRemind);
|
|
|
+ userIdList.add(loanApplicationOld.getfUserId());
|
|
|
} else {
|
|
|
- WaitRemind waitRemind = new WaitRemind();
|
|
|
- waitRemind.setLoanApplicationId(loanApplicationId);
|
|
|
- waitRemind.setLoanApplicationNumber(loanApplicationNumber);
|
|
|
- waitRemind.setRemindTitle("您有一条【" + enterpriseName + "】的审核信息待办");
|
|
|
- waitRemind.setRemindTime(DateUtils.getNowDate());
|
|
|
waitRemind.setRemindType(loanApplication.getAuditSchedule());
|
|
|
|
|
|
waitRemind.setReadUserId(loanApplicationOld.getaUserId().toString());
|
|
|
- waitRemind.setRemindContent(enterpriseName + "有一条贷款申请需及时处理");
|
|
|
waitRemindList.add(waitRemind);
|
|
|
userIdList.add(loanApplicationOld.getaUserId());
|
|
|
+
|
|
|
+ if (loanApplication.getAuditSchedule().equals(FIV)){
|
|
|
+ WaitRemind waitRemindf = new WaitRemind();
|
|
|
+ waitRemindf.setLoanApplicationId(loanApplicationId);
|
|
|
+ waitRemindf.setLoanApplicationNumber(loanApplicationNumber);
|
|
|
+ waitRemindf.setRemindTitle("您有一条【" + enterpriseName + "】的审核信息待办");
|
|
|
+ waitRemindf.setRemindContent(enterpriseName + "有一条贷款申请需及时处理");
|
|
|
+ waitRemindf.setRemindTime(DateUtils.getNowDate());
|
|
|
+ waitRemindf.setReadUserId(loanApplicationOld.getfUserId().toString());
|
|
|
+ waitRemindList.add(waitRemindf);
|
|
|
+ userIdList.add(loanApplicationOld.getfUserId());
|
|
|
+ }
|
|
|
}
|
|
|
loanApplicationMapper.updateLoanApplication2(loanApplication);
|
|
|
|
|
@@ -1598,7 +1640,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
|
|
|
WaitRemind waitRemindDelete = new WaitRemind();
|
|
|
waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
|
|
|
- waitRemindMapper.deleteWaitRemindByLoanApplicationId(waitRemindDelete);
|
|
|
+ waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);
|
|
|
return AjaxResult.success();
|
|
|
}
|
|
|
|
|
@@ -1613,9 +1655,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
|
|
|
WaitRemind waitRemindDelete = new WaitRemind();
|
|
|
waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
|
|
|
- waitRemindDelete.setReadUserId(loanApplication.getaUserId().toString());
|
|
|
- waitRemindDelete.setRemindType(FIF);
|
|
|
- waitRemindMapper.deleteWaitRemindByLoanApplicationIdAndRemindType(waitRemindDelete);
|
|
|
+ waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);
|
|
|
WaitRemind waitRemind = new WaitRemind();
|
|
|
waitRemind.setLoanApplicationId(loanApplication.getLoanApplicationId());
|
|
|
waitRemind.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
|
|
@@ -1631,11 +1671,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
List<SysUserRole> sysUserRoles = sysUserRoleMapper.selectRoleListNoDataScope();
|
|
|
if (sysUserRoles != null && sysUserRoles.size() > 0) {
|
|
|
for (SysUserRole sysUserRole : sysUserRoles) {
|
|
|
-
|
|
|
- waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
|
|
|
- waitRemindDelete.setReadUserId(sysUserRole.getUserId().toString());
|
|
|
- waitRemindDelete.setRemindType(FIF);
|
|
|
- waitRemindMapper.deleteWaitRemindByLoanApplicationId(waitRemindDelete);
|
|
|
+
|
|
|
WaitRemind waitRemindRole = new WaitRemind();
|
|
|
waitRemindRole.setLoanApplicationId(loanApplication.getLoanApplicationId());
|
|
|
waitRemindRole.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
|