电子报聘回退优化9

yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsHiringServiceImpl.java

@@ -616,7 +616,10 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
             approveName = "报聘人";
             approveName = "报聘人";
         }
         }
 
 
-        // 1.查询审批记录
+        // 1.获取通知人员列表
+        ArrayList<Map<String, String>> list = new ArrayList<>();
+
+        // 2.查询审批记录
         List<AclPractitionerHiringApproveRecords> recordsList = aclPractitionerHiringApproveRecordsDalService.queryListByBasicInfoId(basicInfoId);
         List<AclPractitionerHiringApproveRecords> recordsList = aclPractitionerHiringApproveRecordsDalService.queryListByBasicInfoId(basicInfoId);
         // 2.1 如果有审批记录，筛选需要提醒的审批经纪人id
         // 2.1 如果有审批记录，筛选需要提醒的审批经纪人id
         List<Long> practitionerIds = recordsList.stream()
         List<Long> practitionerIds = recordsList.stream()
@@ -627,8 +630,6 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
 
 
         if (CollectionUtils.isNotEmpty(practitionerIds)) {
         if (CollectionUtils.isNotEmpty(practitionerIds)) {
             List<PractitionerInfo> practitionerList = aclPractitionerDalService.findPractitionerInfoByIdList(practitionerIds);
             List<PractitionerInfo> practitionerList = aclPractitionerDalService.findPractitionerInfoByIdList(practitionerIds);
-
-            ArrayList<Map<String, String>> list = new ArrayList<>();
             for (PractitionerInfo practitionerInfo : practitionerList) {
             for (PractitionerInfo practitionerInfo : practitionerList) {
                 Map<String, String> map = new HashMap<>();
                 Map<String, String> map = new HashMap<>();
                 map.put("name", practitionerInfo.getName());
                 map.put("name", practitionerInfo.getName());
@@ -637,22 +638,20 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
 
 
                 list.add(map);
                 list.add(map);
             }
             }
-            // 回退提醒发消息(短信和微信推送)
-            this.approveRollBackNoticeSendMsg(approveName, rejectNote, list, basicInfoId);
         }
         }
-
-        // 2.2 如果没有审批记录，说明是从辅导人第一步直接退回到报聘人，则只要提醒报聘人
-        if (CollectionUtils.isEmpty(practitionerIds) && Integer.valueOf("0").equals(stepSeqStart)) {
+        // 2.2 如果退回到报聘人，还要提醒报聘人
+        if (Integer.valueOf("0").equals(stepSeqStart)) {
             AclPractitionerHiringBasicInfo basicInfo = aclPractitionerHiringBasicInfoDalService.findById(basicInfoId);
             AclPractitionerHiringBasicInfo basicInfo = aclPractitionerHiringBasicInfoDalService.findById(basicInfoId);
             AclCustomer customer = aclCustomerDalService.findByMobileNo(basicInfo.getMobileNo());
             AclCustomer customer = aclCustomerDalService.findByMobileNo(basicInfo.getMobileNo());
             Map<String, String> map = new HashMap<>();
             Map<String, String> map = new HashMap<>();
             map.put("name", basicInfo.getName());
             map.put("name", basicInfo.getName());
             map.put("mobileNo", basicInfo.getMobileNo());
             map.put("mobileNo", basicInfo.getMobileNo());
             map.put("ydWechatOpenid", customer == null ? null : customer.getYdWechatOpenid());
             map.put("ydWechatOpenid", customer == null ? null : customer.getYdWechatOpenid());
-            map.put("approveName", approveName);
-            ArrayList<Map<String, String>> list = new ArrayList<>();
+
             list.add(map);
             list.add(map);
-            // 回退提醒发消息(短信和微信推送)
+        }
+        // 3.回退提醒发消息(短信和微信推送)
+        if (CollectionUtils.isNotEmpty(list)) {
             this.approveRollBackNoticeSendMsg(approveName, rejectNote, list, basicInfoId);
             this.approveRollBackNoticeSendMsg(approveName, rejectNote, list, basicInfoId);
         }
         }
     }
     }