|
@@ -459,44 +459,47 @@ 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);
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ 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);
|
|
|
+
|
|
|
+ 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();
|
|
|
}
|
|
|
|
|
@@ -720,10 +723,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);
|
|
|
+ waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);*/
|
|
|
List<LoanApplicationFj> fjUrl = reviewComments.getFjUrl();
|
|
|
if (fjUrl != null && fjUrl.size() > 0) {
|
|
|
StringBuilder type = new StringBuilder();
|
|
@@ -812,8 +815,16 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
waitRemindList.add(waitRemindManager);
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
waitRemindMapper.batchWaitRemind(waitRemindList);
|
|
|
|
|
|
+ WaitRemind waitRemindIsRead = new WaitRemind();
|
|
|
+ waitRemindIsRead.setLoanApplicationId(loanApplicationId);
|
|
|
+ waitRemindIsRead.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
|
|
|
+ waitRemindIsRead.setRemindType(ONE);
|
|
|
+
|
|
|
+ waitRemindMapper.updateWaitRemindIsRead(waitRemindIsRead);
|
|
|
+
|
|
|
|
|
|
|
|
|
userIdList.add(loanApplication.getaUserId());
|
|
@@ -866,7 +877,12 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
}
|
|
|
}
|
|
|
waitRemindMapper.batchWaitRemind(waitRemindList);
|
|
|
-
|
|
|
+
|
|
|
+ WaitRemind waitRemindIsRead = new WaitRemind();
|
|
|
+ waitRemindIsRead.setLoanApplicationId(loanApplicationId);
|
|
|
+ waitRemindIsRead.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
|
|
|
+ waitRemindIsRead.setRemindType(ONE);
|
|
|
+ waitRemindMapper.updateWaitRemindIsRead(waitRemindIsRead);
|
|
|
|
|
|
|
|
|
userIdList.add(loanApplication.getaUserId());
|
|
@@ -999,7 +1015,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
loanApplication.setAuditSchedule(String.valueOf(Integer.parseInt(auditSchedule) + 1));
|
|
|
loanApplication.setAuditType(ONE);
|
|
|
|
|
|
- if (auditSchedule.equals(FOR)){
|
|
|
+ if (auditSchedule.equals(FOR)) {
|
|
|
|
|
|
WaitRemind waitRemindf = new WaitRemind();
|
|
|
waitRemindf.setLoanApplicationId(loanApplicationId);
|
|
@@ -1050,6 +1066,12 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
if (waitRemindList.size() > 0) {
|
|
|
waitRemindMapper.batchWaitRemind(waitRemindList);
|
|
|
|
|
|
+
|
|
|
+ WaitRemind waitRemindIsRead = new WaitRemind();
|
|
|
+ waitRemindIsRead.setLoanApplicationId(loanApplicationId);
|
|
|
+ waitRemindIsRead.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
|
|
|
+ waitRemindIsRead.setRemindType(String.valueOf(Integer.parseInt(waitRemindList.get(0).getRemindType()) - 1));
|
|
|
+ waitRemindMapper.updateWaitRemindIsRead(waitRemindIsRead);
|
|
|
|
|
|
List<SysUser> sysUsers = sysUserService.selectUserListByIdList(userIdList);
|
|
|
if (sysUsers != null && sysUsers.size() > 0) {
|
|
@@ -1171,37 +1193,47 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
return AjaxResult.error("当前项目状态异常,不允许上会");
|
|
|
}
|
|
|
int rows = loanApplicationMapper.updateLoanApplication(loanApplication);
|
|
|
-
|
|
|
+
|
|
|
WaitRemind waitRemindDelete = new WaitRemind();
|
|
|
waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
|
|
|
|
|
|
- waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);
|
|
|
+ waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);*/
|
|
|
|
|
|
- WaitRemind waitRemindManager = new WaitRemind();
|
|
|
- waitRemindManager.setLoanApplicationId(loanApplication.getLoanApplicationId());
|
|
|
- waitRemindManager.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
|
|
|
- waitRemindManager.setRemindTitle("有一条【" + loanApplication.getEnterpriseName() + "】的上会审核信息");
|
|
|
- waitRemindManager.setRemindTime(DateUtils.getNowDate());
|
|
|
- waitRemindManager.setRemindType(SEV);
|
|
|
- waitRemindManager.setReadUserId(loanApplication.getaUserId().toString());
|
|
|
- String result = "通过";
|
|
|
- if (TWO.equals(reviewSchedule)) {
|
|
|
- result = "不通过";
|
|
|
- }
|
|
|
- waitRemindManager.setRemindContent(loanApplication.getEnterpriseName() + "的上会审核信息申请" + result);
|
|
|
- waitRemindManager.setReadUserId(String.valueOf(loanApplication.getaUserId()));
|
|
|
- waitRemindMapper.insertWaitRemind(waitRemindManager);
|
|
|
-
|
|
|
-
|
|
|
- SysUser user = sysUserService.selectUserById(loanApplication.getaUserId());
|
|
|
- if (StringUtils.isNotEmpty(user.getJgId())) {
|
|
|
- String notificationTitle = "消息通知";
|
|
|
- String msgTitle = "上会审核信息";
|
|
|
- String msgContent = loanApplication.getEnterpriseName() + "的上会审核信息申请" + result;
|
|
|
- String jPushVO = "";
|
|
|
- JPushToolUtil.sendToRegistrationId(notificationTitle, msgTitle, msgContent, jPushVO, user.getJgId());
|
|
|
+ if (rows > 0) {
|
|
|
+
|
|
|
+ WaitRemind waitRemindIsRead = new WaitRemind();
|
|
|
+ waitRemindIsRead.setLoanApplicationId(loanApplication.getLoanApplicationId());
|
|
|
+ waitRemindIsRead.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
|
|
|
+ waitRemindIsRead.setRemindType(SEV);
|
|
|
+ waitRemindMapper.updateWaitRemindIsRead(waitRemindIsRead);
|
|
|
+
|
|
|
+ WaitRemind waitRemindManager = new WaitRemind();
|
|
|
+ waitRemindManager.setLoanApplicationId(loanApplication.getLoanApplicationId());
|
|
|
+ waitRemindManager.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
|
|
|
+ waitRemindManager.setRemindTitle("有一条【" + loanApplication.getEnterpriseName() + "】的上会审核信息");
|
|
|
+ waitRemindManager.setRemindTime(DateUtils.getNowDate());
|
|
|
+ waitRemindManager.setRemindType(SEV);
|
|
|
+ waitRemindManager.setReadUserId(loanApplication.getaUserId().toString());
|
|
|
+ String result = "通过";
|
|
|
+ if (TWO.equals(reviewSchedule)) {
|
|
|
+ result = "不通过";
|
|
|
+ }
|
|
|
+ waitRemindManager.setRemindContent(loanApplication.getEnterpriseName() + "的上会审核信息申请" + result);
|
|
|
+ waitRemindManager.setReadUserId(String.valueOf(loanApplication.getaUserId()));
|
|
|
+ waitRemindMapper.insertWaitRemind(waitRemindManager);
|
|
|
+
|
|
|
+ waitRemindIsRead.setRemindType(SIX);
|
|
|
+ waitRemindMapper.updateWaitRemindIsRead(waitRemindIsRead);
|
|
|
+
|
|
|
+ SysUser user = sysUserService.selectUserById(loanApplication.getaUserId());
|
|
|
+ if (StringUtils.isNotEmpty(user.getJgId())) {
|
|
|
+ String notificationTitle = "消息通知";
|
|
|
+ String msgTitle = "上会审核信息";
|
|
|
+ String msgContent = loanApplication.getEnterpriseName() + "的上会审核信息申请" + result;
|
|
|
+ String jPushVO = "";
|
|
|
+ JPushToolUtil.sendToRegistrationId(notificationTitle, msgTitle, msgContent, jPushVO, user.getJgId());
|
|
|
+ }
|
|
|
}
|
|
|
-
|
|
|
return rows > 0 ? AjaxResult.success() : AjaxResult.error();
|
|
|
}
|
|
|
|
|
@@ -1246,10 +1278,10 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
application.setAuditSchedule(TEN);
|
|
|
}
|
|
|
loanApplicationMapper.updateLoanApplication(application);
|
|
|
-
|
|
|
+
|
|
|
WaitRemind waitRemindDelete = new WaitRemind();
|
|
|
waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
|
|
|
- waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);
|
|
|
+ waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);*/
|
|
|
|
|
|
WaitRemind waitRemind = new WaitRemind();
|
|
|
waitRemind.setLoanApplicationId(loanApplication.getLoanApplicationId());
|
|
@@ -1280,7 +1312,12 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
}
|
|
|
}
|
|
|
waitRemindMapper.batchWaitRemind(waitRemindList);
|
|
|
-
|
|
|
+
|
|
|
+ WaitRemind waitRemindIsRead = new WaitRemind();
|
|
|
+ waitRemindIsRead.setLoanApplicationId(loanApplication.getLoanApplicationId());
|
|
|
+ waitRemindIsRead.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
|
|
|
+ waitRemindIsRead.setRemindType(String.valueOf(Integer.parseInt(application.getAuditSchedule()) - 1));
|
|
|
+ waitRemindMapper.updateWaitRemindIsRead(waitRemindIsRead);
|
|
|
|
|
|
userIdList.add(loanApplication.getaUserId());
|
|
|
List<SysUser> sysUsers = sysUserService.selectUserListByIdList(userIdList);
|
|
@@ -1336,10 +1373,11 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
if (Integer.parseInt(loanSchedule) < 2 || Integer.parseInt(auditSchedule) < 1 || Integer.parseInt(loanApplicationType) != 2) {
|
|
|
return AjaxResult.error("当前项目不可撤销");
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
WaitRemind waitRemindDelete = new WaitRemind();
|
|
|
waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
|
|
|
- waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);
|
|
|
+ waitRemindDelete.setRemindType(auditSchedule);
|
|
|
+ waitRemindMapper.deleteWaitRemindByLoanApplicationIdAndIsRead(waitRemindDelete);
|
|
|
if (Integer.parseInt(loanSchedule) > 7) {
|
|
|
|
|
|
loanApplication.setLoanSchedule(String.valueOf(Integer.parseInt(loanSchedule) - 1));
|
|
@@ -1423,7 +1461,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
waitRemindList.add(waitRemind);
|
|
|
userIdList.add(loanApplicationOld.getaUserId());
|
|
|
|
|
|
- if (loanApplication.getAuditSchedule().equals(FIV)){
|
|
|
+ if (loanApplication.getAuditSchedule().equals(FIV)) {
|
|
|
WaitRemind waitRemindf = new WaitRemind();
|
|
|
waitRemindf.setLoanApplicationId(loanApplicationId);
|
|
|
waitRemindf.setLoanApplicationNumber(loanApplicationNumber);
|
|
@@ -1455,21 +1493,28 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
}
|
|
|
loanApplicationMapper.updateLoanApplication2(loanApplication);
|
|
|
|
|
|
-
|
|
|
- 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);
|
|
|
+ if (waitRemindList.size() > 0){
|
|
|
+
|
|
|
+ waitRemindMapper.batchWaitRemind(waitRemindList);
|
|
|
+
|
|
|
+ WaitRemind waitRemindIsRead = new WaitRemind();
|
|
|
+ waitRemindIsRead.setLoanApplicationId(loanApplication.getLoanApplicationId());
|
|
|
+ waitRemindIsRead.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
|
|
|
+ waitRemindIsRead.setRemindType(String.valueOf(Integer.parseInt(waitRemindList.get(0).getRemindType()) - 1));
|
|
|
+ waitRemindMapper.updateWaitRemindIsRead(waitRemindIsRead);
|
|
|
+
|
|
|
+ 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);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1668,10 +1713,10 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
reviewComments.setAuditTime(DateUtils.getNowDate());
|
|
|
reviewComments.setCreateBy(SecurityUtils.getUsername());
|
|
|
reviewCommentsMapper.insertReviewComments(reviewComments);
|
|
|
-
|
|
|
+
|
|
|
WaitRemind waitRemindDelete = new WaitRemind();
|
|
|
waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
|
|
|
- waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);
|
|
|
+ waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);*/
|
|
|
return AjaxResult.success();
|
|
|
}
|
|
|
|
|
@@ -1683,10 +1728,10 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
*/
|
|
|
@Override
|
|
|
public AjaxResult zanHuan(LoanApplication loanApplication) {
|
|
|
-
|
|
|
+
|
|
|
WaitRemind waitRemindDelete = new WaitRemind();
|
|
|
waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
|
|
|
- waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);
|
|
|
+ waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);*/
|
|
|
WaitRemind waitRemind = new WaitRemind();
|
|
|
waitRemind.setLoanApplicationId(loanApplication.getLoanApplicationId());
|
|
|
waitRemind.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
|
|
@@ -1715,6 +1760,12 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
waitRemindRole.setRemindContent(loanApplication.getRemark());
|
|
|
waitRemindMapper.insertWaitRemind(waitRemindRole);
|
|
|
}
|
|
|
+
|
|
|
+ WaitRemind waitRemindIsRead = new WaitRemind();
|
|
|
+ waitRemindIsRead.setLoanApplicationId(loanApplication.getLoanApplicationId());
|
|
|
+ waitRemindIsRead.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
|
|
|
+ waitRemindIsRead.setRemindType(EIG);
|
|
|
+ waitRemindMapper.updateWaitRemindIsRead(waitRemindIsRead);
|
|
|
|
|
|
|
|
|
List<Long> userIdList = sysUserRoles.stream().map(SysUserRole::getUserId).collect(Collectors.toList());
|
|
@@ -2215,7 +2266,38 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
case "15":
|
|
|
|
|
|
|
|
|
- SysUserConference sysUserConference = new SysUserConference();
|
|
|
+
|
|
|
+
|
|
|
+ LoanApplication aplication = new LoanApplication();
|
|
|
+ aplication.setReviewTime(loanApplication.getReviewTime());
|
|
|
+ List<LoanApplication> loanApplicationList = loanApplicationMapper.selectLoanApplicationList(aplication);
|
|
|
+
|
|
|
+ StringBuilder sbxmname = new StringBuilder();
|
|
|
+ int num = 1;
|
|
|
+ for (LoanApplication application : loanApplicationList) {
|
|
|
+ if(sbxmname.length()>0){
|
|
|
+ sbxmname.append("、").append(application.getEnterpriseName());
|
|
|
+ }else{
|
|
|
+ sbxmname.append(application.getEnterpriseName());
|
|
|
+ }
|
|
|
+ SysUserConference sysUserConference = new SysUserConference();
|
|
|
+ sysUserConference.setLoanApplicationId(application.getLoanApplicationId());
|
|
|
+ sysUserConference.setConferenceTime(application.getReviewTime());
|
|
|
+ List<SysUserConference> sysUserConferences = sysUserConferenceMapper.selectSysUserConferenceList(sysUserConference);
|
|
|
+
|
|
|
+
|
|
|
+ StringBuilder sb = new StringBuilder();
|
|
|
+ sb.append(application.getEnterpriseName()).append("的评委是:");
|
|
|
+ for (SysUserConference userConference1 : sysUserConferences) {
|
|
|
+ sb.append(" ").append(userConference1.getRealName());
|
|
|
+ }
|
|
|
+ params.put("user"+num, sb.toString());
|
|
|
+ num++;
|
|
|
+ }
|
|
|
+
|
|
|
+ params.put("enterpriseName", sbxmname.toString());
|
|
|
+
|
|
|
+
|
|
|
sysUserConference.setLoanApplicationId(loanApplication.getLoanApplicationId());
|
|
|
sysUserConference.setConferenceTime(loanApplication.getReviewTime());
|
|
|
List<SysUserConference> sysUserConferences = sysUserConferenceMapper.selectSysUserConferenceList(sysUserConference);
|
|
@@ -2228,13 +2310,13 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
|
|
|
sb.append(userConference1.getRealName());
|
|
|
}
|
|
|
|
|
|
- }
|
|
|
+ }*/
|
|
|
|
|
|
params.put("time", loanApplication.getReviewTime());
|
|
|
|
|
|
- params.put("enterpriseName", loanApplication.getEnterpriseName());
|
|
|
+
|
|
|
|
|
|
- params.put("user", sb.toString());
|
|
|
+
|
|
|
|
|
|
templatePath = templatePath + "/mb/评审会通知.docx";
|
|
|
fileDir = fileDir + "/mb/temporarily/" + loanApplicationNumber;
|