Skip to content

8
8timerapiv200
Commit 44bfe51c by leialin
Options

Merge branch 'lal' into 'develop' 

Lal

See merge request 8timerv2/8timerapiv200!377
parents f061f73d 4fcb5965
Showing with 64 additions and 5 deletions
src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
......@@ -39,6 +39,7 @@ import cn.timer.api.bean.kqmk.KqglAssoDkjl;
import cn.timer.api.bean.kqmk.KqglAssoDkmx;
import cn.timer.api.bean.kqmk.KqglAssoKqj;
import cn.timer.api.bean.kqmk.KqglAssoKqzdkfs;
import cn.timer.api.bean.kqmk.KqglAssoLeaveRules;
import cn.timer.api.bean.kqmk.KqglAssoPbmx;
import cn.timer.api.bean.kqmk.KqglAssoRelationSummary;
import cn.timer.api.bean.kqmk.KqglAssoTeshu;
......@@ -2804,15 +2805,19 @@ public class ClockInController {
if(attdate.getAttsch().size() == 2 || attdate.getAttsch().size() == 4 || attdate.getAttsch().size() == 6) {
if(dkmc.getSbdk1() != null && dkmc.getSbdk1jg() == 0 && dkmc.getXbdk1() != null && dkmc.getXbdk1jg() == 0) {
wocal.setCalendar_status(1);//打卡正常
wocal.setCalendar_status_type(0);
}else {
if(dkmc.getXbdk1() == null && attdate.getAttsch().size() == 2) {
if(bcsts.getIsXbdk()==1) {//下班不用打卡
wocal.setCalendar_status(1);//打卡正常
wocal.setCalendar_status_type(0);
}else {
wocal.setCalendar_status(3);//打卡异常
wocal.setCalendar_status_type(0);
}
}else {
wocal.setCalendar_status(3);//打卡异常
wocal.setCalendar_status_type(0);
}
// wocal.setCalendar_status(3);//打卡异常
}
......@@ -2821,15 +2826,19 @@ public class ClockInController {
if(attdate.getAttsch().size() == 4 || attdate.getAttsch().size() == 6) {
if(dkmc.getSbdk2() != null && dkmc.getSbdk2jg() == 0 && dkmc.getXbdk2() != null && dkmc.getXbdk2jg() == 0) {
wocal.setCalendar_status(1);//打卡正常
wocal.setCalendar_status_type(0);
}else {
if(dkmc.getXbdk2() == null && attdate.getAttsch().size() == 4) {
if(bcsts.getIsXbdk()==1) {//下班不用打卡
wocal.setCalendar_status(1);//打卡正常
wocal.setCalendar_status_type(0);
}else {
wocal.setCalendar_status(3);//打卡异常
wocal.setCalendar_status_type(0);
}
}else {
wocal.setCalendar_status(3);//打卡异常
wocal.setCalendar_status_type(0);
}
// wocal.setCalendar_status(3);//打卡异常
}
......@@ -2838,36 +2847,84 @@ public class ClockInController {
if(attdate.getAttsch().size() == 6) {
if(dkmc.getSbdk3() != null && dkmc.getSbdk3jg() == 0 && dkmc.getXbdk3() != null && dkmc.getXbdk3jg() == 0) {
wocal.setCalendar_status(1);//打卡正常
wocal.setCalendar_status_type(0);
}else {
if(dkmc.getXbdk3() == null && attdate.getAttsch().size() == 6) {
if(bcsts.getIsXbdk()==1) {//下班不用打卡
wocal.setCalendar_status(1);//打卡正常
wocal.setCalendar_status_type(0);
}else {
wocal.setCalendar_status(3);//打卡异常
wocal.setCalendar_status_type(0);
}
}else {
wocal.setCalendar_status(3);//打卡异常
wocal.setCalendar_status_type(0);
}
// wocal.setCalendar_status(3);//打卡异常
}
}
KqglAssoRelationSummary asssum = KqglAssoRelationSummary.builder().build().selectOne(new QueryWrapper<KqglAssoRelationSummary>().lambda().eq(KqglAssoRelationSummary::getUserId, userBean.getEmpNum())
.eq(KqglAssoRelationSummary::getAppTime, num).last("LIMIT 1"));
if(asssum != null) {
wocal.setCalendar_status(2);//事务(请假，加班，调休，出差)
}
// KqglAssoRelationSummary asssum = KqglAssoRelationSummary.builder().build().selectOne(new QueryWrapper<KqglAssoRelationSummary>().lambda().eq(KqglAssoRelationSummary::getUserId, userBean.getEmpNum())
// .eq(KqglAssoRelationSummary::getAppTime, num).last("LIMIT 1"));
// if(asssum != null) {
// wocal.setCalendar_status(2);//事务(请假，加班，调休，出差)
// }
}else {
wocal.setCalendar_status(3);//打卡异常
wocal.setCalendar_status_type(0);
}
//事务(请假，加班，调休，出差)
KqglAssoRelationSummary asssum = KqglAssoRelationSummary.builder().build().selectOne(new QueryWrapper<KqglAssoRelationSummary>().lambda().eq(KqglAssoRelationSummary::getUserId, userBean.getEmpNum())
.eq(KqglAssoRelationSummary::getAppTime, num).last("LIMIT 1"));
if(asssum != null) {
wocal.setCalendar_status(2);//事务(请假，加班，调休，出差)
//0:无；1：事假；2：调休；3：病假；4：年假；5：产假；6：陪产假；7：婚假；8：例假；9：丧假；10：哺乳假；11：加班；12：出差；13：外出
if(asssum.getApprovalType() == 1) {
wocal.setCalendar_status_type(11);
}else if(asssum.getApprovalType() == 2) {
//请假
KqglAssoLeaveRules rul = KqglAssoLeaveRules.builder().build().selectOne(new QueryWrapper<KqglAssoLeaveRules>().lambda().eq(KqglAssoLeaveRules::getId,asssum.getLeaveTypeId()));
if(rul.getRulesType() == 1) {
wocal.setCalendar_status_type(1);
}else if(rul.getRulesType() == 2) {
wocal.setCalendar_status_type(2);
}else if(rul.getRulesType() == 3) {
wocal.setCalendar_status_type(3);
}else if(rul.getRulesType() == 4) {
wocal.setCalendar_status_type(4);
}else if(rul.getRulesType() == 5) {
wocal.setCalendar_status_type(5);
}else if(rul.getRulesType() == 6) {
wocal.setCalendar_status_type(6);
}else if(rul.getRulesType() == 7) {
wocal.setCalendar_status_type(7);
}else if(rul.getRulesType() == 8) {
wocal.setCalendar_status_type(8);
}else if(rul.getRulesType() == 9) {
wocal.setCalendar_status_type(9);
}else if(rul.getRulesType() == 10) {
wocal.setCalendar_status_type(10);
}
}else if(asssum.getApprovalType() == 3) {
wocal.setCalendar_status_type(12);
}else if(asssum.getApprovalType() == 4) {
wocal.setCalendar_status_type(13);
}
}
}else {
wocal.setCalendar_status(4);//休息
wocal.setCalendar_status_type(0);
}
}else {
wocal.setCalendar_status(0);//无排班
wocal.setCalendar_status_type(0);
}
}else {
wocal.setCalendar_status(0);//无排班
wocal.setCalendar_status_type(0);
}
workcal.add(wocal);
}
......
src/main/java/cn/timer/api/dto/kqmk/WorkbenchCalendarDto.java
......@@ -16,5 +16,7 @@ public class WorkbenchCalendarDto {
private Integer calendar_status;//日历状态 0：无； 1：正常；2：事务(请假，加班，调休，出差)；3：异常 4：休息
private Integer calendar_status_type;//0:无；1：事假；2：调休；3：病假；4：年假；5：产假；6：陪产假；7：婚假；8：例假；9：丧假；10：哺乳假；11：加班；12：出差；13：外出
private List<CalendarPunchDetailsDto> detailed;
}
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