bonus
/
gz_att
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
史宗金 2025-01-23 13:01:46 +08:00
parent 37416e2539 a61a8a3715
commit d157580622
5 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttendanceDetailsServiceImpl.java
View File

@ -199,6 +199,10 @@ public class AttendanceDetailsServiceImpl implements AttendanceDetailsService {
public AjaxResult synchronous(AttDataDetailsBean bean) {
try {
List<String> dateList = attTasks.getStrDateListBetween(bean.getStartDate(), bean.getEndDate());
//只执行今天之前的时间（包含今天）
dateList = dateList.stream()
.filter(date -> attTasks.isBeforeToday(date))
.collect(Collectors.toList());
attTasks.hisAttPush(dateList);
return AjaxResult.success("数据同步成功");
}catch (Exception e){

2
bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/AttTasks.java
View File

@ -538,7 +538,7 @@ public class AttTasks {
* @param dateStr 传入的日期字符串，格式为 "yyyy-MM-dd"
* @return 如果传入的日期在今天的日期之前，返回 true；否则返回 false
*/
private boolean isBeforeToday(String dateStr) {
public boolean isBeforeToday(String dateStr) {
if (dateStr == null || dateStr.isEmpty()) {
return false;
}

23
bonus-modules/bonus-system/src/main/java/com/bonus/system/download/ExportFileController.java
View File

@ -612,25 +612,6 @@ public class ExportFileController {
@GetMapping("/exportMonthReport")
public void exportMonthReport(HttpServletResponse response, AttMonthReportBean bean) {
try {
// SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
// List<String> roleId = sysUser.getRoleList();
// //管理员与人资角色可以看到所有
// if (roleId != null && !roleId.isEmpty()) {
// if (Collections.frequency(roleId, "1") == 0 && Collections.frequency(roleId, "16") == 0) {
// List<MapVo> orgList = sysUser.getOrgList();
// if (!orgList.isEmpty()) {
// ArrayList<String> ids = new ArrayList<>();
// for (MapVo mapVo : orgList) {
// String id = proDeptRoleDao.getOrgChildById(mapVo.getId());
// // 使用 Arrays.asList() 将数组转换为 ArrayList
// ArrayList<String> idList = new ArrayList<>(Arrays.asList(id.split(",")));
// ids.addAll(idList);
//// ids.add(String.valueOf(mapVo.getId()));
// }
// bean.setOrgList(ids);
// }
// }
// }
SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
List<String> roleId = sysUser.getRoleList();
//管理员与人资角色可以看到所有
@ -713,7 +694,7 @@ public class ExportFileController {
dayTable.setOrgId(String.valueOf(bean.getOrgId()));
}else{
//受限于当前登录人
if(!bean.getOrgList().isEmpty()){
if(bean.getOrgList() != null && !bean.getOrgList().isEmpty()){
dayTable.setOrgList(bean.getOrgList());
}
}
@ -727,7 +708,7 @@ public class ExportFileController {
att.setOrgId(bean.getOrgId());
}else{
//受限于当前登录人
if(!bean.getOrgList().isEmpty()){
if(bean.getOrgList() != null && !bean.getOrgList().isEmpty()){
att.setOrgList(bean.getOrgList());
}
}

3
bonus-modules/bonus-system/src/main/resources/mapper/att/AttDetailByMonthMapper.xml
View File

@ -76,7 +76,6 @@
<if test="bean.name != null and bean.name != ''">
AND amr.name like concat('%', #{bean.name}, '%')
</if>
<if test='bean.orgList != null and bean.orgList.size() > 0'>
and amr.org_id in (
<foreach collection="bean.orgList" item="item" separator=",">
@ -170,7 +169,7 @@
vat.att_current_day as attCurrent
from v_att_update_data vat
left join sys_user su on vat.user_id = su.user_id and su.is_active = 1
left join sys_organization so on vat.org_id = so.id and so.is_active = 1
left join sys_organization so on vat.org_id = so.id
where 1=1
<if test="userId != null ">
and vat.user_id = #{userId}

1
bonus-modules/bonus-system/src/main/resources/mapper/evection/EvectionMapper.xml
View File

@ -111,7 +111,6 @@
LEFT JOIN sys_user_org suo on suo.user_id=l.user_id and suo.is_active=1
WHERE
l.is_active = '1' AND l.leave_type = '出差' AND l.source = '1'
<if test="params.beginTime != null and params.beginTime != ''">
and (
date_format(l.leave_start_date,'%y%m%d') between date_format(#{params.beginTime},'%y%m%d') and date_format(#{params.endTime},'%y%m%d') or