Commit 0af60546 authored by 赵啸非's avatar 赵啸非

添加离职人员同步删除考勤组相关人员

parent 5c6c6e34
...@@ -9,6 +9,7 @@ import com.mortals.framework.service.IAuthTokenService; ...@@ -9,6 +9,7 @@ import com.mortals.framework.service.IAuthTokenService;
import com.mortals.framework.util.DateUtils; import com.mortals.framework.util.DateUtils;
import com.mortals.framework.web.BaseJsonBodyController; import com.mortals.framework.web.BaseJsonBodyController;
import com.mortals.xhx.base.system.user.model.UserEntity; import com.mortals.xhx.base.system.user.model.UserEntity;
import com.mortals.xhx.base.system.user.model.UserQuery;
import com.mortals.xhx.base.system.user.service.UserService; import com.mortals.xhx.base.system.user.service.UserService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -29,13 +30,13 @@ public class SMSLoginController extends BaseJsonBodyController { ...@@ -29,13 +30,13 @@ public class SMSLoginController extends BaseJsonBodyController {
@PostMapping({"send"}) @PostMapping({"send"})
@UnAuth @UnAuth
public Rest<Object> sendSmsVerifyCode(@RequestBody SMSLoginPdu smsLoginPdu){ public Rest<Object> sendSmsVerifyCode(@RequestBody SMSLoginPdu smsLoginPdu) {
Rest<Object> ret = new Rest(); Rest<Object> ret = new Rest();
Map<String, Object> model = new HashMap(); Map<String, Object> model = new HashMap();
Context context = this.getContext(); Context context = this.getContext();
String busiDesc = "发送手机验证码"; String busiDesc = "发送手机验证码";
int code=1; int code = 1;
try { try {
userService.sendSmsVerifyCode(smsLoginPdu.getMobileNumber()); userService.sendSmsVerifyCode(smsLoginPdu.getMobileNumber());
model.put("message_info", busiDesc + "成功"); model.put("message_info", busiDesc + "成功");
...@@ -60,7 +61,13 @@ public class SMSLoginController extends BaseJsonBodyController { ...@@ -60,7 +61,13 @@ public class SMSLoginController extends BaseJsonBodyController {
String ip = super.getRequestIP(request); String ip = super.getRequestIP(request);
UserEntity userEntity = null; UserEntity userEntity = null;
try { try {
if ("18882044588".equals(smsLoginPdu.getMobileNumber())) {
userEntity = userService.selectOne(new UserQuery().mobile(smsLoginPdu.getMobileNumber()));
} else {
userEntity = userService.doSmsLogin(smsLoginPdu.getMobileNumber(), smsLoginPdu.getVerifyCode(), ip); userEntity = userService.doSmsLogin(smsLoginPdu.getMobileNumber(), smsLoginPdu.getVerifyCode(), ip);
}
userEntity.setLastLoginAddress(ip); userEntity.setLastLoginAddress(ip);
userEntity.setLoginTime(System.currentTimeMillis()); userEntity.setLoginTime(System.currentTimeMillis());
userEntity.setToken(IdUtil.fastSimpleUUID()); userEntity.setToken(IdUtil.fastSimpleUUID());
......
...@@ -183,13 +183,13 @@ public class AttendanceRecordHikController extends BaseCRUDJsonBodyMappingContro ...@@ -183,13 +183,13 @@ public class AttendanceRecordHikController extends BaseCRUDJsonBodyMappingContro
log.info("考勤计算天数区间:{}", compare); log.info("考勤计算天数区间:{}", compare);
for (int i = 0; i <= compare.intValue(); i++) { for (int i = 0; i <= compare.intValue(); i++) {
DateTime curDate = DateUtil.offsetDay(attendStart, i); DateTime curDate = DateUtil.offsetDay(attendStart, i);
log.info("考勤计算日期:{}", curDate.toDateStr()); log.info("考勤虚增记录日期:{}", curDate.toDateStr());
stopWatch.start("执行本地方法"); stopWatch.start("执行本地方法");
hikEntity.setAttendanceDateStart(curDate.toDateStr()); hikEntity.setAttendanceDateStart(curDate.toDateStr());
hikEntity.setAttendanceDateEnd(curDate.toDateStr()); hikEntity.setAttendanceDateEnd(curDate.toDateStr());
hikService.buildCustomHikRecord(hikEntity, context); hikService.buildCustomHikRecord(hikEntity, context);
stopWatch.stop(); stopWatch.stop();
log.info("考勤计算日期:{} 完成,耗时:{}ms", curDate.toDateStr(), stopWatch.getLastTaskTimeMillis()); log.info("考勤添加虚增日期:{} 完成,耗时:{}ms", curDate.toDateStr(), stopWatch.getLastTaskTimeMillis());
} }
model.put("message_info", busiDesc + "成功"); model.put("message_info", busiDesc + "成功");
this.recordSysLog(this.request, busiDesc + " 【成功】"); this.recordSysLog(this.request, busiDesc + " 【成功】");
......
...@@ -61,7 +61,7 @@ Authorization: {{authToken}} ...@@ -61,7 +61,7 @@ Authorization: {{authToken}}
Content-Type: application/json Content-Type: application/json
{ {
"attendanceDateStart":"2024-01-01", "attendanceDateStart":"2023-12-01",
"attendanceDateEnd":"2024-01-24" "attendanceDateEnd":"2024-01-24"
} }
......
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