hbyt/evo-Financial-pc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

加班时长扣减调整

Browse Source
This commit is contained in:
andy 2025-07-31 15:06:43 +08:00
parent bb970a144a
commit d4658848cf
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
evo-admin/pom.xml
View File

@ -239,6 +239,7 @@
<version>2.5.15</version> <version>2.5.15</version>
<configuration> <configuration>
<fork>true</fork> <!-- 如果没有该配置，devtools不会生效 --> <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
<includeSystemScope>true</includeSystemScope>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>

2
evo-admin/src/main/java/com/evo/attendance/processor/KqUtils.java
View File

@ -147,7 +147,7 @@ public class KqUtils {
* B) 公司检查发现的按层级组织秩序，激励责任管理岗两级各-100元/项/次。 * B) 公司检查发现的按层级组织秩序，激励责任管理岗两级各-100元/项/次。
*/ */
if(!rzAttendanceDetail.getButtonType().contains("12") && !rzAttendanceDetail.getButtonType().contains("三班")){ if(!rzAttendanceDetail.getButtonType().contains("12") && !rzAttendanceDetail.getButtonType().contains("三班")){
minutes = minutes.subtract(new BigDecimal(ParamUtils.getShortBreakDeductionMinutes())); minutes = minutes.subtract(new BigDecimal(ParamUtils.getShortBreakDeductionMinutes("ZC")));
} }
//设置默认加班0小时 //设置默认加班0小时
double hours = 0; double hours = 0;

2
evo-admin/src/main/java/com/evo/attendance/processor/impl/TSDeviceExchangeProcessor.java
View File

@ -151,7 +151,7 @@ public class TSDeviceExchangeProcessor implements PunchTheClockStrategyExchangeP
Long overMinutes = DateUtils.getBetweenMinutes(rzSpecialAttendance.getWorkStartTime(), rzSpecialAttendance.getWorkEndTime()); Long overMinutes = DateUtils.getBetweenMinutes(rzSpecialAttendance.getWorkStartTime(), rzSpecialAttendance.getWorkEndTime());
//核查当前人员, 当天是否吃完饭 //如果吃晚饭, 扣减30分钟 //核查当前人员, 当天是否吃完饭 //如果吃晚饭, 扣减30分钟
if((rzSpecialAttendance.getWorkStartTime().compareTo(endMealDate) <= 0) && (rzRestaurantDetailMapper.checkDinnerByStaffIdAndDateAndSign(sysStaff.getUserId(), date, "晚餐").compareTo(0l) > 0)){ if((rzSpecialAttendance.getWorkStartTime().compareTo(endMealDate) <= 0) && (rzRestaurantDetailMapper.checkDinnerByStaffIdAndDateAndSign(sysStaff.getUserId(), date, "晚餐").compareTo(0l) > 0)){
overMinutes = new BigDecimal(overMinutes).subtract(new BigDecimal(ParamUtils.getShortBreakDeductionMinutes())).longValue(); overMinutes = new BigDecimal(overMinutes).subtract(new BigDecimal(ParamUtils.getShortBreakDeductionMinutes("TS"))).longValue();
} }
BigDecimal workHours = new BigDecimal(0); BigDecimal workHours = new BigDecimal(0);
if(overMinutes >= (maxHour*60)){ if(overMinutes >= (maxHour*60)){

8
evo-admin/src/main/java/com/evo/common/utils/ParamUtils.java
View File

@ -112,9 +112,11 @@ public class ParamUtils {
* 获取日薪全勤天数 * 获取日薪全勤天数
* @return * @return
*/ */
public static String getShortBreakDeductionMinutes(){ public static String getShortBreakDeductionMinutes(String type){
RzSysParam param= paramService.getRzSysParam("短休的工时扣减(分钟)", "short_break_deduction_minutes","30","短休的工时扣减(分钟)"); RzSysParam param= paramService.getRzSysParam("短休的工时扣减(分钟)", "short_break_deduction_minutes","{\"TS\":\"30\",\"ZC\":\"0\"}","短休的工时扣减(分钟)");
return param.getParamValue(); JSONObject jsonObject = JSONObject.parseObject(param.getParamValue());
String rulesVal = jsonObject.getString(type);
return (StringUtils.isEmpty(rulesVal) ? "0" : rulesVal);
} }

2
evo-admin/src/main/java/com/evo/system/service/impl/SysStaffServiceImpl.java
View File

@ -190,7 +190,7 @@ public class SysStaffServiceImpl extends ServiceImpl<SysStaffMapper, SysStaff> i
dkj_list.add(com.evo.equipment.constant.Constants.EQ_DEVICE_PUBLIC_CODE); //公共 dkj_list.add(com.evo.equipment.constant.Constants.EQ_DEVICE_PUBLIC_CODE); //公共
dkj_list.add(sysStaff.getTimeClock()); dkj_list.add(sysStaff.getTimeClock());
//下发照片 //下发照片
//eqSnDetailService.sendPhoto(dkj_list, Collections.asList(Collections.asMap("userId", String.valueOf(sysStaff.getUserId()), "name", sysStaff.getName(), "photoUrl", ParamUtils.getGlobalStaticUrl()+upload.getFileName()))); eqSnDetailService.sendPhoto(dkj_list, Collections.asList(Collections.asMap("userId", String.valueOf(sysStaff.getUserId()), "name", sysStaff.getName(), "photoUrl", ParamUtils.getGlobalStaticUrl()+upload.getFileName())));
} }
} }