Skip to content

8
8timerapiv200
Commit f35aef14 by ilal
Options

提交

parent 20e143a7
Showing with 9 additions and 28 deletions
src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
...@@ -3032,64 +3032,50 @@ public class ClockInController { ...@@ -3032,64 +3032,50 @@ public class ClockInController {
if(rul.getRulesType() != null) { if(rul.getRulesType() != null) {
if(rul.getRulesType() == 1) { if(rul.getRulesType() == 1) {
dkjl.setCalendar_status_type(1); dkjl.setCalendar_status_type(1);
ash.setCalendar_status_type(1); ash.setCalendar_status_type(1);
}else if(rul.getRulesType() == 2) { }else if(rul.getRulesType() == 2) {
dkjl.setCalendar_status_type(2); dkjl.setCalendar_status_type(2);
ash.setCalendar_status_type(2); ash.setCalendar_status_type(2);
}else if(rul.getRulesType() == 3) { }else if(rul.getRulesType() == 3) {
dkjl.setCalendar_status_type(3); dkjl.setCalendar_status_type(3);
ash.setCalendar_status_type(3); ash.setCalendar_status_type(3);
}else if(rul.getRulesType() == 4) { }else if(rul.getRulesType() == 4) {
dkjl.setCalendar_status_type(4); dkjl.setCalendar_status_type(4);
ash.setCalendar_status_type(4); ash.setCalendar_status_type(4);
}else if(rul.getRulesType() == 5) { }else if(rul.getRulesType() == 5) {
dkjl.setCalendar_status_type(5); dkjl.setCalendar_status_type(5);
ash.setCalendar_status_type(5); ash.setCalendar_status_type(5);
}else if(rul.getRulesType() == 6) { }else if(rul.getRulesType() == 6) {
dkjl.setCalendar_status_type(6); dkjl.setCalendar_status_type(6);
ash.setCalendar_status_type(6); ash.setCalendar_status_type(6);
}else if(rul.getRulesType() == 7) { }else if(rul.getRulesType() == 7) {
dkjl.setCalendar_status_type(7); dkjl.setCalendar_status_type(7);
ash.setCalendar_status_type(7); ash.setCalendar_status_type(7);
}else if(rul.getRulesType() == 8) { }else if(rul.getRulesType() == 8) {
dkjl.setCalendar_status_type(8); dkjl.setCalendar_status_type(8);
ash.setCalendar_status_type(8); ash.setCalendar_status_type(8);
}else if(rul.getRulesType() == 9) { }else if(rul.getRulesType() == 9) {
dkjl.setCalendar_status_type(9); dkjl.setCalendar_status_type(9);
ash.setCalendar_status_type(9); ash.setCalendar_status_type(9);
}else if(rul.getRulesType() == 10) { }else if(rul.getRulesType() == 10) {
dkjl.setCalendar_status_type(10); dkjl.setCalendar_status_type(10);
ash.setCalendar_status_type(10); ash.setCalendar_status_type(10);
} }
}else { }else {
dkjl.setCalendar_status_type(-1); dkjl.setCalendar_status_type(-1);
dkjl.setCalendar_status_name(rul.getName()); dkjl.setCalendar_status_name(rul.getName());
ash.setCalendar_status_type(-1); ash.setCalendar_status_type(-1);
dkjl.setCalendar_status_name(rul.getName()); dkjl.setCalendar_status_name(rul.getName());
} }
}else if(asssum1.getApprovalType() == 3) { }else if(asssum1.getApprovalType() == 3) {
dkjl.setCalendar_status_type(12); dkjl.setCalendar_status_type(12);
ash.setCalendar_status_type(12); ash.setCalendar_status_type(12);
}else if(asssum1.getApprovalType() == 4) { }else if(asssum1.getApprovalType() == 4) {
dkjl.setCalendar_status_type(13); dkjl.setCalendar_status_type(13);
ash.setCalendar_status_type(13); ash.setCalendar_status_type(13);
} }
}else { }else {
dkjl.setCalendar_status_type(0); dkjl.setCalendar_status_type(0);
ash.setCalendar_status_type(0); ash.setCalendar_status_type(0);
} }
/****/ /****/
...@@ -3310,10 +3296,14 @@ public class ClockInController { ...@@ -3310,10 +3296,14 @@ public class ClockInController {
} }
//没有打卡按钮时
for(int y=0;y<bc;y++) {
AttSchedule attc = attsch.get(y);
if(attc.getDajl().getCardType() == null && attc.getDajl().getId() == null && attc.getDajl().getStatus() == null) {
attc.setIsdk(0);
break;
}
}
} }
}else { }else {
...@@ -3327,15 +3317,10 @@ public class ClockInController { ...@@ -3327,15 +3317,10 @@ public class ClockInController {
//自由工时 //自由工时
List<AttSchedule> attsch = new ArrayList<AttSchedule>(); List<AttSchedule> attsch = new ArrayList<AttSchedule>();
// List<KqglAssoDkjl> dajllist_ = kqglassodkjlmapper.getDetailedRecordClock(startDate,endDate,userBean.getEmpNum());
// KqglAssoDkjl dkjl = KqglAssoDkjl.builder().build();
if(dajllist_.size() > 0) { if(dajllist_.size() > 0) {
for(int i=1;i<=dajllist_.size();i++){ for(int i=1;i<=dajllist_.size();i++){
KqglAssoDkjl dkjl = KqglAssoDkjl.builder().build(); KqglAssoDkjl dkjl = KqglAssoDkjl.builder().build();
// for(KqglAssoDkjl ddk : dajllist_) { BeanUtil.copyProperties(dajllist_.get(i-1), dkjl,"attdate","bcid","remarks","userId","attime","dkmxid","commentary","punchequipment","punchmode");
BeanUtil.copyProperties(dajllist_.get(i-1), dkjl,"attdate","bcid","remarks","userId","attime","dkmxid","commentary","punchequipment","punchmode");
// }
AttSchedule ast = AttSchedule.builder().build(); AttSchedule ast = AttSchedule.builder().build();
ast.setId(0); ast.setId(0);
ast.setIsdk(1); ast.setIsdk(1);
...@@ -3344,8 +3329,6 @@ public class ClockInController { ...@@ -3344,8 +3329,6 @@ public class ClockInController {
attsch.add(ast); attsch.add(ast);
attdate.setAttsch(attsch); attdate.setAttsch(attsch);
} }
KqglAssoDkjl dkjj_ = KqglAssoDkjl.builder().build(); KqglAssoDkjl dkjj_ = KqglAssoDkjl.builder().build();
AttSchedule ast_ = AttSchedule.builder().build(); AttSchedule ast_ = AttSchedule.builder().build();
ast_.setId(0); ast_.setId(0);
...@@ -3354,8 +3337,6 @@ public class ClockInController { ...@@ -3354,8 +3337,6 @@ public class ClockInController {
ast_.setSort(dajllist_.size() + 1); ast_.setSort(dajllist_.size() + 1);
attsch.add(ast_); attsch.add(ast_);
attdate.setAttsch(attsch); attdate.setAttsch(attsch);
}else { }else {
KqglAssoDkjl dkjj = KqglAssoDkjl.builder().build(); KqglAssoDkjl dkjj = KqglAssoDkjl.builder().build();
AttSchedule ast = AttSchedule.builder().build(); AttSchedule ast = AttSchedule.builder().build();
......
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