报聘提醒辅导人审批问题修复2

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

@@ -407,8 +407,10 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
         //不是他
         //不是他
         boolean flag = this.isHasNextStep(loginPractitionerId, mobileNo, basicInfoId, nextStep);
         boolean flag = this.isHasNextStep(loginPractitionerId, mobileNo, basicInfoId, nextStep);
         if (!flag) {
         if (!flag) {
+            if ("1".equals(requestVO.getApprovingStatus())) {// 审批状态为"通过"
                 // 发送短信通知及公众号推送通知下一位审批人进行审批
                 // 发送短信通知及公众号推送通知下一位审批人进行审批
                 agmsHiringDalService.noticeNextStep(nextStep, basicInfoId);
                 agmsHiringDalService.noticeNextStep(nextStep, basicInfoId);
+            }
 
 
             responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
             responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
             return;
             return;

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerHiringServiceImpl.java

@@ -916,7 +916,7 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
             this.distributeToSubsystemOwner(hiringMemberShip);
             this.distributeToSubsystemOwner(hiringMemberShip);
 
 
             // 发短信及微信推送下一步审批人
             // 发短信及微信推送下一步审批人
-            String nextStepSeq = "2".equals(stepSeq) ? "3" : "1";
+            Integer nextStepSeq = "2".equals(stepSeq) ? 3 : 1;
             // 查询下一步审批
             // 查询下一步审批
             List<MdPractitionerHiringApproveSteps> approveStepsList = mdPractitionerHiringApproveStepsDalService.findAll();
             List<MdPractitionerHiringApproveSteps> approveStepsList = mdPractitionerHiringApproveStepsDalService.findAll();
             MdPractitionerHiringApproveSteps nextStep = null;
             MdPractitionerHiringApproveSteps nextStep = null;

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

@@ -260,7 +260,7 @@ public class AgmsHiringDALServiceImpl implements AgmsHiringDALService {
                     // 微信通知
                     // 微信通知
                     wechatService.sendTemplateMessage(sendTemplateRequest);
                     wechatService.sendTemplateMessage(sendTemplateRequest);
                 } else {
                 } else {
-                    logger.error("【》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》发送微信模板消息审批人");
+                    logger.error("【》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》发送微信模板消息审批人openId为空");
                     logger.error("【》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》" + practitionerInfo.getName());
                     logger.error("【》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》" + practitionerInfo.getName());
                 }
                 }
             }
             }
@@ -275,7 +275,8 @@ public class AgmsHiringDALServiceImpl implements AgmsHiringDALService {
             name = practitionerInfo.getName();
             name = practitionerInfo.getName();
             mobileNo = practitionerInfo.getMobileNo();
             mobileNo = practitionerInfo.getMobileNo();
             if (StringUtils.isNotBlank(mobileNo)) {
             if (StringUtils.isNotBlank(mobileNo)) {
-                mobileNo = "18353621360";
+                logger.error("【》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》电子报聘发送短信");
+                logger.error("【》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》" + name + ": " + mobileNo);
                 // 发短信
                 // 发短信
                 // ${name}，您好！${name2}(S3纵队S2体系S1分部的XX)经纪人已提交报聘审批，请至“赢家平台>我的团队-报聘审批”进行查看审批，谢谢！
                 // ${name}，您好！${name2}(S3纵队S2体系S1分部的XX)经纪人已提交报聘审批，请至“赢家平台>我的团队-报聘审批”进行查看审批，谢谢！
                 String templateCode = systemConfigService.getSingleConfigValue("ALI_SMS_HiringApproveNotice");
                 String templateCode = systemConfigService.getSingleConfigValue("ALI_SMS_HiringApproveNotice");