|
|
@@ -116,7 +116,7 @@ public class WsPunchClockService extends CrudService<WsPunchClockMapper, WsPunch
|
|
|
if(wsPunchClock.getDuration()!=null){
|
|
|
//计算本周工时
|
|
|
sumDuration=sumDuration+wsPunchClock.getDuration();
|
|
|
- //计算本周钱
|
|
|
+ //计算本周钱 //3.4.5版本不在使用此参数
|
|
|
if(wsPunchClock.getDuration()>=wsSetting.getDailyAvailableMinHour()){
|
|
|
if(wsPunchClock.getDuration()<=wsSetting.getDailyAvailableMaxHour()){
|
|
|
sumMoney=businessAccountUtils.add(sumMoney,wsPunchClock.getDuration()*wsSetting.getHourlySalary());
|
|
|
@@ -198,6 +198,7 @@ public class WsPunchClockService extends CrudService<WsPunchClockMapper, WsPunch
|
|
|
}
|
|
|
returnMap.put("clockType", clockType);
|
|
|
returnMap.put("sumDuration", sumDuration);
|
|
|
+ //3.4.5版本不在使用此参数
|
|
|
returnMap.put("sumMoney", sumMoney);
|
|
|
} else {
|
|
|
returnMap.put("success", "1004");
|