fix 待办流程提醒

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/LoanApplicationServiceImpl.java

@@ -1271,7 +1271,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
      * @return
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public AjaxResult cx(LoanApplication loanApplication) {
 
         List<Long> userIdList = new ArrayList<>();
@@ -1289,6 +1289,10 @@ 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);
         if (Integer.parseInt(loanSchedule) > 7) {
             //撤销只返回贷款申请进度到上一步
             loanApplication.setLoanSchedule(String.valueOf(Integer.parseInt(loanSchedule) - 1));
@@ -1334,121 +1338,68 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 //进入待审核
                 loanApplication.setAuditType(ONE);
             }
-            String enterpriseName = loanApplicationOld.getEnterpriseName();
-            String loanApplicationNumber = loanApplicationOld.getLoanApplicationNumber();
-
-            //如果退到 A角色审核 B角色审核 还需要插入待办提醒
-            if (loanApplication.getAuditSchedule().equals(TWO)) {
-                //删除所有待办事项
-                WaitRemind waitRemindDelete = new WaitRemind();
-                waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
-                waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);
-                WaitRemind waitRemind = new WaitRemind();
-                waitRemind.setLoanApplicationId(loanApplicationId);
-                waitRemind.setLoanApplicationNumber(loanApplicationNumber);
-                waitRemind.setRemindTitle("您有一条【" + enterpriseName + "】的审核信息待办");
-                waitRemind.setRemindTime(DateUtils.getNowDate());
-                waitRemind.setRemindType(TWO);
-                //给A角色发送待办提醒
-                waitRemind.setReadUserId(loanApplicationOld.getaUserId().toString());
-                waitRemind.setRemindContent(enterpriseName + "有一条贷款申请需及时处理");
-                waitRemindList.add(waitRemind);
-
-                userIdList.add(loanApplicationOld.getaUserId());
-            }
-            if (loanApplication.getAuditSchedule().equals(THR)) {
-                //删除所有状态小于的待办事项
-                WaitRemind waitRemindDelete = new WaitRemind();
-                waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
-
-                waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);
-                WaitRemind waitRemind = new WaitRemind();
-                waitRemind.setLoanApplicationId(loanApplicationId);
-                waitRemind.setLoanApplicationNumber(loanApplicationNumber);
-                waitRemind.setRemindTitle("您有一条【" + enterpriseName + "】的审核信息待办");
-                waitRemind.setRemindTime(DateUtils.getNowDate());
-                waitRemind.setRemindType(THR);
-                //给B角色发送待办提醒
-                waitRemind.setReadUserId(loanApplicationOld.getbUserId().toString());
-                waitRemind.setRemindContent(enterpriseName + "有一条贷款申请需及时处理");
-                waitRemindList.add(waitRemind);
-
-                userIdList.add(loanApplicationOld.getbUserId());
-            }
         }
-        loanApplicationMapper.updateLoanApplication2(loanApplication);
-
-
-        //给A角色发送待办提醒
-        //待办信息集合
-/*        //查询审核管理员用户id
-        List<SysUserRole> sysUserRoles = sysUserRoleMapper.selectRoleListNoDataScope();
-        if (ObjectUtils.isNotEmpty(loanApplication.getaUserId())) {
-
-            //删除所有状态小于的待办事项
-            WaitRemind waitRemindDelete = new WaitRemind();
-            waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
-            waitRemindDelete.setReadUserId(loanApplication.getaUserId().toString());
-            waitRemindDelete.setRemindType(loanSchedule);
-            waitRemindMapper.deleteWaitRemindByLoanApplicationId(waitRemindDelete);
 
+        String enterpriseName = loanApplicationOld.getEnterpriseName();
+        String loanApplicationNumber = loanApplicationOld.getLoanApplicationNumber();
+        //如果退到 A角色审核 B角色审核 还需要插入待办提醒
+        if (loanApplication.getAuditSchedule().equals(TWO)) {
             WaitRemind waitRemind = new WaitRemind();
-            waitRemind.setLoanApplicationId(loanApplication.getLoanApplicationId());
-            waitRemind.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
-            waitRemind.setRemindTitle("您有一条【" + loanApplication.getEnterpriseName() + "】的信息进行了撤销");
+            waitRemind.setLoanApplicationId(loanApplicationId);
+            waitRemind.setLoanApplicationNumber(loanApplicationNumber);
+            waitRemind.setRemindTitle("您有一条【" + enterpriseName + "】的审核信息待办");
             waitRemind.setRemindTime(DateUtils.getNowDate());
-            waitRemind.setRemindType(loanSchedule);
-            waitRemind.setReadUserId(loanApplication.getaUserId().toString());
-            waitRemind.setRemindContent(loanApplication.getEnterpriseName() + "的信息进行了撤销");
+            waitRemind.setRemindType(TWO);
+            //给A角色发送待办提醒
+            waitRemind.setReadUserId(loanApplicationOld.getaUserId().toString());
+            waitRemind.setRemindContent(enterpriseName + "有一条贷款申请需及时处理");
             waitRemindList.add(waitRemind);
-            if (sysUserRoles != null && sysUserRoles.size() > 0) {
-                //极光推送
-                List<Long> userIds = sysUserRoles.stream().map(SysUserRole::getUserId).collect(Collectors.toList());
-                userIdList.addAll(userIds);
-
-                for (SysUserRole sysUserRole : sysUserRoles) {
-
-                    //删除所有状态小于的待办事项
-
-                    waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
-                    waitRemindDelete.setReadUserId(sysUserRole.getUserId().toString());
-                    waitRemindDelete.setRemindType(loanSchedule);
-                    waitRemindMapper.deleteWaitRemindByLoanApplicationId(waitRemindDelete);
-
-                    WaitRemind waitRemindManager = new WaitRemind();
-                    waitRemindManager.setLoanApplicationId(loanApplication.getLoanApplicationId());
-                    waitRemindManager.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
-                    waitRemindManager.setRemindTitle("有一条【" + loanApplication.getEnterpriseName() + "】的信息进行了撤销");
-                    waitRemindManager.setRemindTime(DateUtils.getNowDate());
-                    waitRemindManager.setRemindType(loanSchedule);
-                    waitRemindManager.setRemindContent(loanApplication.getEnterpriseName() + "的信息进行了撤销");
-                    //给管理员发送待办提醒
-                    waitRemindManager.setReadUserId(sysUserRole.getUserId().toString());
-                    waitRemindList.add(waitRemindManager);
-                }
-            }
-            userIdList.add(loanApplication.getaUserId());
-        }*/
-
-        if (waitRemindList != null && waitRemindList.size() > 0) {
-            waitRemindMapper.batchWaitRemind(waitRemindList);
+            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);
+            //给B角色发送待办提醒
+            waitRemind.setReadUserId(loanApplicationOld.getbUserId().toString());
+            waitRemind.setRemindContent(enterpriseName + "有一条贷款申请需及时处理");
+            waitRemindList.add(waitRemind);
+            userIdList.add(loanApplicationOld.getbUserId());
+        } else {
+            WaitRemind waitRemind = new WaitRemind();
+            waitRemind.setLoanApplicationId(loanApplicationId);
+            waitRemind.setLoanApplicationNumber(loanApplicationNumber);
+            waitRemind.setRemindTitle("您有一条【" + enterpriseName + "】的审核信息待办");
+            waitRemind.setRemindTime(DateUtils.getNowDate());
+            waitRemind.setRemindType(loanApplication.getAuditSchedule());
+            //给A角色发送待办提醒
+            waitRemind.setReadUserId(loanApplicationOld.getaUserId().toString());
+            waitRemind.setRemindContent(enterpriseName + "有一条贷款申请需及时处理");
+            waitRemindList.add(waitRemind);
+            userIdList.add(loanApplicationOld.getaUserId());
+        }
+        loanApplicationMapper.updateLoanApplication2(loanApplication);
 
-            //发极光推送id
-            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);
-                }
+        //插入待办事项
+        waitRemindMapper.batchWaitRemind(waitRemindList);
+        //发极光推送id
+        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);
             }
         }
 
+
         //业务审核意见插入撤销
         ReviewComments reviewComments = new ReviewComments();
         reviewComments.setLoanApplicationId(loanApplication.getLoanApplicationId());
@@ -1861,7 +1812,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         LoanApplicationFj loanApplicationFjTzs = new LoanApplicationFj();
 
         // 创建一个列表，用来存储要填充到Excel中的数据
-        List<Map<String,String>> list = new ArrayList<>();
+        List<Map<String, String>> list = new ArrayList<>();
         switch (type) {
             case "1":
                 //params.put("enterpriseName", loanApplication.getEnterpriseName());
@@ -2029,7 +1980,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                     for (ShareholderFj fj : shareholderFjs) {
                         if (StringUtils.isNotEmpty(fj.getShareholderBusinessUrl())) {
                             String shareholderName = "";
-                            if(StringUtils.isNotEmpty(fj.getShareholderName()) && !StringUtils.equals("null",fj.getShareholderName())){
+                            if (StringUtils.isNotEmpty(fj.getShareholderName()) && !StringUtils.equals("null", fj.getShareholderName())) {
                                 shareholderName = fj.getShareholderName();
                             }
                             params.put("gsName", shareholderName);
@@ -2064,7 +2015,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 if (guaranteeInfos != null && guaranteeInfos.size() > 0) {
                     for (GuaranteeInfo info : guaranteeInfos) {
                         String guaranteeName = "";
-                        if(StringUtils.isNotEmpty(info.getGuaranteeName()) && !StringUtils.equals("null",info.getGuaranteeName()) ){
+                        if (StringUtils.isNotEmpty(info.getGuaranteeName()) && !StringUtils.equals("null", info.getGuaranteeName())) {
                             guaranteeName = info.getGuaranteeName();
                         }
                         params.put("gsName", guaranteeName);
@@ -2099,26 +2050,26 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 //公司住址
                 //公司住址
                 excelMap.put("address", "");
-                if(StringUtils.isNotEmpty(sysUserEnterprise.getEnterpriseAddress())){
+                if (StringUtils.isNotEmpty(sysUserEnterprise.getEnterpriseAddress())) {
                     excelMap.put("address", sysUserEnterprise.getEnterpriseAddress());
                 }
                 //家庭住址
                 excelMap.put("fraddress", "");
-                if(StringUtils.isNotEmpty(loanApplication.getCorporationAddress())){
+                if (StringUtils.isNotEmpty(loanApplication.getCorporationAddress())) {
                     excelMap.put("fraddress", loanApplication.getCorporationAddress());
                 }
                 //申请金额
                 excelMap.put("sqje", Double.toString(loanApplication.getApplicationAmount()));
                 //申请期限
                 excelMap.put("sqqx", "");
-                if(StringUtils.isNotEmpty(loanApplication.getUsagePeriod())){
+                if (StringUtils.isNotEmpty(loanApplication.getUsagePeriod())) {
                     excelMap.put("sqqx", loanApplication.getUsagePeriod());
                 }
                 //申请银行
                 excelMap.put("bank", loanApplication.getApplicationBank());
                 //还款方式
                 excelMap.put("hkfs", "");
-                if(StringUtils.isNotEmpty(loanApplication.getRepaymentSource())){
+                if (StringUtils.isNotEmpty(loanApplication.getRepaymentSource())) {
                     excelMap.put("hkfs", loanApplication.getRepaymentSource());
                 }
                 //参会日期
@@ -2269,7 +2220,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 excelMap.put("sqje", Double.toString(loanApplication.getActuallyAmount()));
                 //申请期限
                 excelMap.put("sqqx", "");
-                if(StringUtils.isNotEmpty(loanApplication.getUsagePeriod())){
+                if (StringUtils.isNotEmpty(loanApplication.getUsagePeriod())) {
                     excelMap.put("sqqx", loanApplication.getUsagePeriod());
                 }
                 //申请银行
@@ -2291,7 +2242,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 excelMap.put("sqje", Double.toString(loanApplication.getActuallyAmount()));
                 //申请期限
                 excelMap.put("sqqx", "");
-                if(StringUtils.isNotEmpty(loanApplication.getUsagePeriod())){
+                if (StringUtils.isNotEmpty(loanApplication.getUsagePeriod())) {
                     excelMap.put("sqqx", loanApplication.getUsagePeriod());
                 }
                 //申请银行
@@ -2342,45 +2293,45 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
 
                         //分支行
                         excelMap.put("fzh", (String) imgMap.get("dkdw"));
-                        System.out.println("111"+imgMap.get("dkdw"));
+                        System.out.println("111" + imgMap.get("dkdw"));
                         //总行
-                        excelMap.put("zh", (String)imgMap.get("zh"));
-                        System.out.println("222"+imgMap.get("zh"));
+                        excelMap.put("zh", (String) imgMap.get("zh"));
+                        System.out.println("222" + imgMap.get("zh"));
                         //起始日期
-                        excelMap.put("qsrq", (String)imgMap.get("qxr"));
-                        System.out.println("333"+imgMap.get("qxr"));
+                        excelMap.put("qsrq", (String) imgMap.get("qxr"));
+                        System.out.println("333" + imgMap.get("qxr"));
                         //到期日期
-                        excelMap.put("dqrq", (String)imgMap.get("dqr"));
-                        System.out.println("444"+imgMap.get("dqr"));
+                        excelMap.put("dqrq", (String) imgMap.get("dqr"));
+                        System.out.println("444" + imgMap.get("dqr"));
                         //贷款利率
-                        excelMap.put("dklv", (String)imgMap.get("dklv"));
-                        System.out.println("555"+imgMap.get("dklv"));
+                        excelMap.put("dklv", (String) imgMap.get("dklv"));
+                        System.out.println("555" + imgMap.get("dklv"));
                     }
                 }
 
                 //所属行业
-                if(StringUtils.isNotEmpty(loanApplication.getCategoryType())){
+                if (StringUtils.isNotEmpty(loanApplication.getCategoryType())) {
                     excelMap.put("sshy", loanApplication.getCategoryType());
                 }
                 //主债权金额
                 //查询最新的一条投票数据
                 userConference = sysUserConferenceMapper.selectSysUserConferenceNew(loanApplication.getLoanApplicationId());
-                if(StringUtils.isNotEmpty(userConference.getLineGuarantee())){
+                if (StringUtils.isNotEmpty(userConference.getLineGuarantee())) {
                     excelMap.put("zzqje", userConference.getLineGuarantee());
                 }
                 //债务人名称
                 excelMap.put("zwrmc", "");
-                if(StringUtils.isNotEmpty(loanApplication.getEnterpriseName())){
+                if (StringUtils.isNotEmpty(loanApplication.getEnterpriseName())) {
                     excelMap.put("zwrmc", loanApplication.getEnterpriseName());
                 }
                 //法定代表人姓名
                 excelMap.put("fddbrxm", "");
-                if(StringUtils.isNotEmpty(loanApplication.getCorporationName())){
+                if (StringUtils.isNotEmpty(loanApplication.getCorporationName())) {
                     excelMap.put("fddbrxm", loanApplication.getCorporationName());
                 }
                 //法定代表人证件号码
                 excelMap.put("fddbrzjhm", "");
-                if(StringUtils.isNotEmpty(loanApplication.getCorporationIdCard())){
+                if (StringUtils.isNotEmpty(loanApplication.getCorporationIdCard())) {
                     excelMap.put("fddbrzjhm", loanApplication.getCorporationIdCard());
                 }
                 //保证合同号
@@ -2394,21 +2345,21 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 loanApplicationFj.setLoanApplicationId(loanApplication.getLoanApplicationId());
                 loanApplicationFj.setType("qtfj");
                 List<LoanApplicationFj> applicationFjList = loanApplicationFjMapper.selectLoanApplicationFjList(loanApplicationFj);
-                if(applicationFjList!=null && applicationFjList.size()>0){
+                if (applicationFjList != null && applicationFjList.size() > 0) {
                     for (LoanApplicationFj applicationFj : applicationFjList) {
-                        if(applicationFj.getName().contains("保证合同")){
+                        if (applicationFj.getName().contains("保证合同")) {
                             //服务器路径
                             String urlOnline = applicationFj.getUrl() + loanApplicationFjTzs.getUrl().replace("/profile/upload", "");
                             String bzhth = IdCardUtil.accurateBasicCjpdf(urlOnline);
                             excelMap.put("bzhth", bzhth);
-                            System.out.println("666"+bzhth);
+                            System.out.println("666" + bzhth);
                         }
-                        if(applicationFj.getName().contains("流动资金贷款合同")){
+                        if (applicationFj.getName().contains("流动资金贷款合同")) {
                             //服务器路径
                             String urlOnline = applicationFj.getUrl() + loanApplicationFjTzs.getUrl().replace("/profile/upload", "");
                             String ldzjdkhth = IdCardUtil.accurateBasicCjpdf(urlOnline);
                             excelMap.put("ldzjdkhth", ldzjdkhth);
-                            System.out.println("777"+ldzjdkhth);
+                            System.out.println("777" + ldzjdkhth);
                         }
 
                     }