diff --git a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat
index 885d3e3..ae2fca4 100644
Binary files a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat and b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat differ
diff --git a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values
index bb57555..fc773c2 100644
Binary files a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values and b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values differ
diff --git a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.at b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.at
index 85e00a7..a66731e 100644
Binary files a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.at and b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.at differ
diff --git a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s
index cc22fb7..9c3c0e3 100644
--- a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s
+++ b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s
@@ -1 +1 @@
-~|}}}y{~{|x}|{{}W\X\UXRXZ[ZTVQYY[ZUZVXPUS]\Vdeb^U\VVQ[UW_xxyu|{{wy{{x{yxwvWX\XVY[[][[nltonosswpntopkqqotlzrvtutvtxԋݏ̏ώގɐːЏێːÐȐҐƏώܓ͓ё؏ʌˑΐڎɔώבÓݎݏϐڍܑʎٓǒƐݐ͓ÒŒ͏ϐ֒ӐڏޏђđێԒߎߒxsxxxuxvwyywxvvvvuw{mnliihlfkihlkjkt~|~~}{}}}|~~}}~~|~~~}{
\ No newline at end of file
+~~}}}}~~}}~}~~~|~}Ā~~}~~}||~vlhjkikliliijjom|vuwuxvyxxyvvxvyxytwɉגߐǔِّۏӑٍđޑēԒِҐԑђĒёܑǏܐݓđϏŒލȓِ͓ړՌďڍގӑۏێϑ؎ҏ̍ǑڎݎȒُҏxtvsvtvryksoqpnpnrnqvqunopsjnZY][]ZVXZWWuvxy{z}{wx{{}vyxxƃ_WUZQVWZT]cfcV[^SVPWV[VZ[YZQVTY[ZXRVU\W]Wԁ||z|x{z|z{}~|~}NMMMMMMMMNMMMLLLLMMMJKKKKKKKKKKJJJKKKKKKKLKKKKKJJJKKLKKKKKKKKKJJIJKKKKKKKLKKKKJJJKKKLKKKKKKKKKJJJKKKKKKKKLKKKK
\ No newline at end of file
diff --git a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat_i b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat_i
index d041140..69a52f6 100644
Binary files a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat_i and b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat_i differ
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b62c0b5..823fc2e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -12,26 +12,14 @@
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -623,7 +611,8 @@
-
+
+
@@ -667,21 +656,6 @@
26
-
- file://$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.java
- 122
-
-
-
- file://$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.java
- 157
-
-
-
- file://$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/impl/ShiftServiceImpl.java
- 204
-
-
diff --git a/src/com/engine/attendance/attendanceanalysis/cmd/GetScheduleResultListCmd.java b/src/com/engine/attendance/attendanceanalysis/cmd/GetScheduleResultListCmd.java
index 38ea728..70e408c 100644
--- a/src/com/engine/attendance/attendanceanalysis/cmd/GetScheduleResultListCmd.java
+++ b/src/com/engine/attendance/attendanceanalysis/cmd/GetScheduleResultListCmd.java
@@ -62,7 +62,7 @@ public class GetScheduleResultListCmd extends AbstractCommonCommand>> resultMap = Maps.newHashMap();
- String sql = "select a.id bcxx,a.edsc,a.zgzsc,a.bcsdxx,a.sfdx,a.sfkt,b.bdlx,a.btgz,a.fgsjd,a.zddxfz,a.dxhs,b.kssj dtkssj,b.jssj dtjssj,b.ksdk,b.jsdk,b.tqdkfzs,b.thdkfzs,b.edxss,b.sfdx dtsfdx,b.zddxfz dtzddxfz,b.dxhs dtdxhs,b.gsrq from uf_jcl_kq_bcxx a left join uf_jcl_kq_bcxx_dt1 b on a.id=b.mainid where a.id in (";
+ String sql = "select a.xxbdkzdjb,a.sfxx,a.id bcxx,a.edsc,a.zgzsc,a.bcsdxx,a.sfdx,a.sfkt,b.bdlx,a.btgz,a.fgsjd,a.zddxfz,a.dxhs,b.kssj dtkssj,b.jssj dtjssj,b.ksdk,b.jsdk,b.tqdkfzs,b.thdkfzs,b.edxss,b.sfdx dtsfdx,b.zddxfz dtzddxfz,b.dxhs dtdxhs,b.gsrq from uf_jcl_kq_bcxx a left join uf_jcl_kq_bcxx_dt1 b on a.id=b.mainid where a.id in (";
String bcxxIds = "";
for (Map.Entry>> entry :schedulingMap.entrySet()){
if (!entry.getKey().equals("")){
@@ -102,7 +102,11 @@ public class GetScheduleResultListCmd extends AbstractCommonCommand candidateSchedulingResult:candidateSchedulingResultsList){
Map shiftResult = basicsetService.punchMatchShift(params.get("pbdx").toString(),candidateSchedulingResult,(List>)params.get("clockInData"),(Map>)params.get("clockInTimeMap"));
- resultMap.put(shiftResult.get("bcrq").toString(),(List>)shiftResult.get("bcData"));
+ List> bcData = (List>)shiftResult.get("bcData");
+ for(Map data:bcData){
+ adjustWorkOverTimeClass(data, attendanceItems,commandContext);
+ }
+ resultMap.put(shiftResult.get("bcrq").toString(),bcData);
}
/** 加班计划*/
diff --git a/src/com/engine/attendance/attendanceanalysis/service/impl/ShiftServiceImpl.java b/src/com/engine/attendance/attendanceanalysis/service/impl/ShiftServiceImpl.java
index 7f0e617..aad993a 100644
--- a/src/com/engine/attendance/attendanceanalysis/service/impl/ShiftServiceImpl.java
+++ b/src/com/engine/attendance/attendanceanalysis/service/impl/ShiftServiceImpl.java
@@ -338,7 +338,7 @@ public class ShiftServiceImpl extends Service implements ShiftService {
Map bcData = DbTools.getSqlToMap(bcSql);
String bcsdxx = Util.null2String(bcData.get("bcsdxx"));
- String sql = "select a.id bcxx,a.edsc,a.zgzsc,a.bcsdxx,a.sfdx,a.sfkt,b.bdlx,a.btgz,a.fgsjd,a.zddxfz,a.dxhs,b.kssj dtkssj,b.jssj dtjssj,b.ksdk,b.jsdk,b.tqdkfzs,b.thdkfzs,b.edxss,b.sfdx dtsfdx,b.zddxfz dtzddxfz,b.dxhs dtdxhs,b.gsrq from uf_jcl_kq_bcxx a left join uf_jcl_kq_bcxx_dt1 b on a.id=b.mainid where a.id =" + shiftId;
+ String sql = "select a.xxbdkzdjb,a.sfxx,a.id bcxx,a.edsc,a.zgzsc,a.bcsdxx,a.sfdx,a.sfkt,b.bdlx,a.btgz,a.fgsjd,a.zddxfz,a.dxhs,b.kssj dtkssj,b.jssj dtjssj,b.ksdk,b.jsdk,b.tqdkfzs,b.thdkfzs,b.edxss,b.sfdx dtsfdx,b.zddxfz dtzddxfz,b.dxhs dtdxhs,b.gsrq from uf_jcl_kq_bcxx a left join uf_jcl_kq_bcxx_dt1 b on a.id=b.mainid where a.id =" + shiftId;
List> dataList = DbTools.getSqlToList(sql);
Map>> resultMap = Maps.newHashMap();
List> classs = Lists.newArrayList();
diff --git a/src/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.java b/src/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.java
index c822a0c..2b1600e 100644
--- a/src/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.java
+++ b/src/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.java
@@ -15,6 +15,7 @@ import com.engine.core.impl.Service;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import lombok.extern.slf4j.Slf4j;
+import org.apache.struts.tiles.xmlDefinition.I18nFactorySet;
import weaver.general.Util;
import java.time.ZoneOffset;
@@ -179,6 +180,14 @@ public class AttendanceAnalysisWrapper extends Service {
updateAttendanceResultWrapper.recordNoClass(params);
return null;
}
+ //休息班次,休息班打卡自动加班不算自动加班
+ if (scheduleResult.get(0).get("sfxx") != null && CheckBoxEnum.CHECKED.getKey().equals(scheduleResult.get(0).get("sfxx")) &&
+ scheduleResult.get(0).get("xxbdkzdjb") != null && CheckBoxEnum.CHECKED.getKey().equals(scheduleResult.get(0).get("xxbdkzdjb"))){
+
+ updateAttendanceResultWrapper.recordRest(recordParam);
+ }
+
+
recordParam.put("rqlx",scheduleResult.get(0).get("rqlx"));
List> askForLeaveAndEvctionSchedule = Lists.newArrayList();
diff --git a/src/com/engine/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.java b/src/com/engine/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.java
index 74280db..139289f 100644
--- a/src/com/engine/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.java
+++ b/src/com/engine/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.java
@@ -512,4 +512,16 @@ public class UpdateAttendanceResultWrapper extends Service {
}
+ /**
+ * 休息班次，直接算成成休息
+ */
+ public void recordRest(Map recordParam){
+ recordParam.put("recordData",Lists.newArrayList());
+ recordParam.put("recordDataTime",Maps.newHashMap());
+ recordParam.put("attendanceDuration",0);
+ recordParam.put("cqzt",CheckBoxEnum.UNCHECKED.getKey());
+ recordParam.put("sfxx",CheckBoxEnum.CHECKED.getKey());
+ utilService.recordItem(recordParam);
+ }
+
}