Bläddra i källkod

餐补卡号调整

wangqiang 1 år sedan
förälder
incheckning
0c7c83e87a

+ 2 - 1
jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentKeyCardService.java

@@ -59,6 +59,7 @@ public class EnrollmentKeyCardService extends ServiceImpl<EnrollmentKeyCardMappe
 
             EnrollmentKeyCard report = keyCardMapper.getById(registration.getId());
             if (report != null){
+                registration.setEnrollmentRegistrationId(report.getEnrollmentRegistrationId());
                 return update(registration);
             }
         }
@@ -125,7 +126,7 @@ public class EnrollmentKeyCardService extends ServiceImpl<EnrollmentKeyCardMappe
             wageCard.setCreateById("1");
             wageCard.setUpdateById("1");
             wageCard.setProcessDefinitionId(procDefId);
-            wageCard.setEnrollmentRegistrationId(report.getId());
+            wageCard.setEnrollmentRegistrationId(report.getEnrollmentRegistrationId());
             riceCardService.save(wageCard);
 
             String procDefKey = map2.get("key")+"";

+ 12 - 8
jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentRiceCardService.java

@@ -60,6 +60,7 @@ public class EnrollmentRiceCardService extends ServiceImpl<EnrollmentRiceCardMap
 
             EnrollmentRiceCard report = riceCardMapper.getById(registration.getId());
             if (report != null){
+                registration.setEnrollmentRegistrationId(report.getEnrollmentRegistrationId());
                 return update(registration);
             }
         }
@@ -103,15 +104,18 @@ public class EnrollmentRiceCardService extends ServiceImpl<EnrollmentRiceCardMap
             PostDTO postDTO = SpringUtil.getBean(IPostApi.class).getPostDTOByName("考勤统计人");
             List<UserDTO> listByRoleId = SpringUtil.getBean(IUserApi.class).findListFlowAbleByPostId(postDTO.getId());
             String randomCode = "员工:" + registration.getName() + "已办理入职!";
-            Map<String, Object> stringObjectMap = SpringUtil.getBean(IUserApi.class).sendRandomCodes(listByRoleId.get(0).getMobile(), randomCode);
-            String statusCode = (String) stringObjectMap.get("statusCode");
-            if (("000000").equals(statusCode)) {
-                System.out.println("短信发送成功!");
-            }else if(statusCode.equals("160040")){
-                System.out.println("手机号获取验证码次数已达每日上限!");
-            }else{
-                System.out.println("短信发送失败,错误代码:101,请联系管理员!");
+            if (StringUtils.isNotBlank(listByRoleId.get(0).getMobile())){
+                Map<String, Object> stringObjectMap = SpringUtil.getBean(IUserApi.class).sendRandomCodes(listByRoleId.get(0).getMobile(), randomCode);
+                String statusCode = (String) stringObjectMap.get("statusCode");
+                if (("000000").equals(statusCode)) {
+                    System.out.println("短信发送成功!");
+                }else if(statusCode.equals("160040")){
+                    System.out.println("手机号获取验证码次数已达每日上限!");
+                }else{
+                    System.out.println("短信发送失败,错误代码:101,请联系管理员!");
+                }
             }
+
         }
 
         return report;