|
|
@@ -1,5 +1,6 @@
|
|
|
package com.yh.saas.plugin.yiliangyiyun.service.impl;
|
|
|
|
|
|
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
|
|
|
import com.baomidou.mybatisplus.plugins.Page;
|
|
|
import com.google.common.collect.Lists;
|
|
|
import com.yh.saas.common.support.util.IdGenerator;
|
|
|
@@ -13,9 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
+import java.util.*;
|
|
|
|
|
|
/**
|
|
|
* <p>
|
|
|
@@ -39,30 +39,47 @@ public class LeaveInfoServiceImpl extends ServiceImpl<LeaveInfoMapper, LeaveInfo
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public String addLeave(LeaveInfo leaveInfo) {
|
|
|
+ //当天零点
|
|
|
+ SimpleDateFormat now = new SimpleDateFormat("yyyy-MM-dd 00:00:00");
|
|
|
+ Calendar a = Calendar.getInstance();
|
|
|
+ a.setTime(new Date());
|
|
|
+ a.add(Calendar.YEAR, 0);
|
|
|
+ Date x = a.getTime();
|
|
|
+ String timeOfDay = now.format(x);
|
|
|
String ClockId = IdGenerator.generateUUID();
|
|
|
//新增主键id
|
|
|
leaveInfo.setId(IdGenerator.generateUUID());
|
|
|
leaveInfo.setClockId(ClockId);
|
|
|
leaveInfo.setStatus("待审核");
|
|
|
leaveInfo.setStatusFlag("1");
|
|
|
- boolean one = this.insert(leaveInfo);
|
|
|
- //新增打卡信息
|
|
|
- ClockInfo clockInfo = new ClockInfo();
|
|
|
- clockInfo.setId(ClockId);
|
|
|
- clockInfo.setLeaveId(leaveInfo.getId());
|
|
|
- clockInfo.setCommonId(leaveInfo.getCommonId());
|
|
|
- clockInfo.setCompId(leaveInfo.getCompId());
|
|
|
- clockInfo.setDept(leaveInfo.getDept());
|
|
|
- clockInfo.setEmpName(leaveInfo.getEmpName());
|
|
|
- clockInfo.setPhone(leaveInfo.getPhone());
|
|
|
- clockInfo.setLeaveId(leaveInfo.getId());
|
|
|
- clockInfo.setLeaveType(leaveInfo.getLeaveType());
|
|
|
- boolean two = clockInfoService.insert(clockInfo);
|
|
|
- if (one && two) {
|
|
|
- return "OK";
|
|
|
- } else {
|
|
|
- return "NG";
|
|
|
+ this.insert(leaveInfo);
|
|
|
+ //查询打卡信息
|
|
|
+ ClockInfo clockInfo1 = clockInfoService.selectOne(new EntityWrapper<ClockInfo>()
|
|
|
+ .eq("comp_id",leaveInfo.getCompId())
|
|
|
+ .eq("common_id",leaveInfo.getCommonId())
|
|
|
+ .eq("delete_flag","0")
|
|
|
+ .gt("create_date",timeOfDay));
|
|
|
+ if(clockInfo1 != null){
|
|
|
+ clockInfo1.setLeaveId(leaveInfo.getId());
|
|
|
+ clockInfo1.setLeaveType(leaveInfo.getLeaveType());
|
|
|
+ //修改数据
|
|
|
+ clockInfoService.updateById(clockInfo1);
|
|
|
}
|
|
|
+ else {
|
|
|
+ //新增打卡信息
|
|
|
+ ClockInfo clockInfo = new ClockInfo();
|
|
|
+ clockInfo.setId(ClockId);
|
|
|
+ clockInfo.setLeaveId(leaveInfo.getId());
|
|
|
+ clockInfo.setCommonId(leaveInfo.getCommonId());
|
|
|
+ clockInfo.setCompId(leaveInfo.getCompId());
|
|
|
+ clockInfo.setDept(leaveInfo.getDept());
|
|
|
+ clockInfo.setEmpName(leaveInfo.getEmpName());
|
|
|
+ clockInfo.setPhone(leaveInfo.getPhone());
|
|
|
+ clockInfo.setLeaveType(leaveInfo.getLeaveType());
|
|
|
+ clockInfoService.insert(clockInfo);
|
|
|
+ }
|
|
|
+ return "OK";
|
|
|
+
|
|
|
}
|
|
|
|
|
|
/**
|
zxz