Commit ac99f63e authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.7.8' into MVP1.7.8

parents 4cebd6a5 47830630
......@@ -425,11 +425,9 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
smsEmployee.setMessage(res.getMessage());
employeeService.updateById(smsEmployee);
this.updateById(updatePre);
return R.ok();
} else {
smsEmployee.setMessage("短信发送失败");
employeeService.updateById(smsEmployee);
return R.failed("短信发送失败");
}
}
}
......@@ -470,16 +468,14 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
if (Common.isNotNull(updatePre)) {
this.updateById(updatePre);
}
return R.ok();
} else {
smsEmployee.setMessage("短信发送失败");
employeeService.updateById(smsEmployee);
return R.failed("短信发送失败");
}
}
}
}
return R.ok();
return R.ok("短信发送成功");
}
@Override
......
......@@ -683,7 +683,7 @@ if((sd.id is not null and NOW() <![CDATA[ <= ]]> sd.SOCIAL_END_DATE) or ( sd.id
left join t_dispatch_info d on d.SOCIAL_ID = a.id
left join t_social_deadline_info sd on sd.MONTH = DATE_FORMAT(d.AUDIT_TIME,'%Y%m') and sd.STATUS = '0'
and sd.PROVINCE=a.SOCIAL_PROVINCE and sd.CITY=a.SOCIAL_CITY and ( (a.SOCIAL_TOWN is null and sd.TOWN is null) or (sd.TOWN=a.SOCIAL_TOWN))
where a.YSD_REQUEST_ID is not null a.YSD_REQUEST_ID != '' and d.AUTO_FLAG='0'
where a.YSD_REQUEST_ID is not null and a.YSD_REQUEST_ID != '' and d.AUTO_FLAG='0'
and (DATE_FORMAT(d.AUDIT_TIME,'%Y%m') = DATE_FORMAT(now(),'%Y%m') or DATE_FORMAT(d.AUDIT_TIME,'%Y%m') = DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 1 MONTH),'%Y%m'))
and a.YSD_HANDLE_STATUS in ('1','2')
group by a.id
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment