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

bug修改

This commit is contained in:
fl 2024-12-24 19:04:57 +08:00
parent 5bbf88ac2a
commit d28d076925
9 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/AttDayReportBean.java
View File

@ -87,7 +87,7 @@ public class AttDayReportBean {
public AttDayReportBean(String attCurrentDay, Long normalNum, Long lateNum, public AttDayReportBean(String attCurrentDay, Long normalNum, Long lateNum,
Long earlyNum, Long skippingNum, Long leaveNum, Long addressErrorNum, Long earlyNum, Long skippingNum, Long leaveNum, Long addressErrorNum,
Long einErrorNum, Long restNum, Long outNum) { Long einErrorNum, Long restNum, Long outNum, Long outCount) {
this.attCurrentDay = attCurrentDay; this.attCurrentDay = attCurrentDay;
this.addressErrorNum = addressErrorNum; this.addressErrorNum = addressErrorNum;
this.earlyNum = earlyNum; this.earlyNum = earlyNum;
@ -98,5 +98,6 @@ public class AttDayReportBean {
this.outNum = outNum; this.outNum = outNum;
this.restNum = restNum; this.restNum = restNum;
this.skippingNum = skippingNum; this.skippingNum = skippingNum;
this.outCount = outCount;
} }
} }

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

@ -114,9 +114,10 @@ public class AttendanceDetailsServiceImpl implements AttendanceDetailsService {
//只能查自己分公司的人 //只能查自己分公司的人
SysUser sysUser = SecurityUtils.getLoginUser().getSysUser(); SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
List<String> roleId = sysUser.getRoleList(); List<String> roleId = sysUser.getRoleList();
if (Collections.frequency(roleId, 1L)==0) { if(roleId !=null && !roleId.isEmpty() ){
if (Collections.frequency(roleId, "1")==0) {
List<MapVo> orgList = SecurityUtils.getLoginUser().getSysUser().getOrgList(); List<MapVo> orgList = SecurityUtils.getLoginUser().getSysUser().getOrgList();
if(!orgList.isEmpty()){ if (!orgList.isEmpty()) {
ArrayList<String> ids = new ArrayList<>(); ArrayList<String> ids = new ArrayList<>();
for (MapVo mapVo : orgList) { for (MapVo mapVo : orgList) {
ids.add(String.valueOf(mapVo.getId())); ids.add(String.valueOf(mapVo.getId()));
@ -124,6 +125,7 @@ public class AttendanceDetailsServiceImpl implements AttendanceDetailsService {
bean.setOrgList(ids); bean.setOrgList(ids);
} }
} }
}
return attendanceDetailsDao.selectAttUpdateList(bean); return attendanceDetailsDao.selectAttUpdateList(bean);
} }
@ -207,7 +209,7 @@ public class AttendanceDetailsServiceImpl implements AttendanceDetailsService {
AttDayReportBean::getAttCurrentDay, AttDayReportBean::getAttCurrentDay,
obj -> new AttDayReportBean(obj.getAttCurrentDay(), obj.getNormalNum(), obj.getLateNum(), obj -> new AttDayReportBean(obj.getAttCurrentDay(), obj.getNormalNum(), obj.getLateNum(),
obj.getEarlyNum(), obj.getSkippingNum(), obj.getLeaveNum(), obj.getAddressErrorNum(), obj.getEarlyNum(), obj.getSkippingNum(), obj.getLeaveNum(), obj.getAddressErrorNum(),
obj.getEinErrorNum(), obj.getRestNum(), obj.getOutNum()), obj.getEinErrorNum(), obj.getRestNum(), obj.getOutNum(), obj.getOutCount()),
(existing, replacement) -> new AttDayReportBean( (existing, replacement) -> new AttDayReportBean(
existing.getAttCurrentDay(), existing.getAttCurrentDay(),
existing.getNormalNum() + replacement.getNormalNum(), existing.getNormalNum() + replacement.getNormalNum(),
@ -218,7 +220,8 @@ public class AttendanceDetailsServiceImpl implements AttendanceDetailsService {
existing.getAddressErrorNum() + replacement.getAddressErrorNum(), existing.getAddressErrorNum() + replacement.getAddressErrorNum(),
existing.getEinErrorNum() + replacement.getEinErrorNum(), existing.getEinErrorNum() + replacement.getEinErrorNum(),
existing.getRestNum() + replacement.getRestNum(), existing.getRestNum() + replacement.getRestNum(),
existing.getOutNum() + replacement.getOutNum() existing.getOutNum() + replacement.getOutNum(),
existing.getOutCount() + replacement.getOutCount()
) )
)); ));
map.forEach((k, v) -> { map.forEach((k, v) -> {

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

@ -60,7 +60,7 @@ public class AttTasks {
private volatile boolean executed = false; // 标志位，表示任务是否已经执行过 private volatile boolean executed = false; // 标志位，表示任务是否已经执行过
// @Scheduled(cron = "0 0/10 * * * ?") // @Scheduled(cron = "0 0/10 * * * ?")
@Scheduled(initialDelay = 6000, fixedDelay = 60000 * 10) // @Scheduled(initialDelay = 6000, fixedDelay = 60000 * 10)
@Async @Async
public void getAttTasks() { public void getAttTasks() {
log.info("--------考勤定时器开启------"); log.info("--------考勤定时器开启------");

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

@ -77,7 +77,7 @@ public class WechatTasks {
* 人员基础数据同步定时器 * 人员基础数据同步定时器
*/ */
// @Scheduled(cron = "0 0/10 * * * ?") // @Scheduled(cron = "0 0/10 * * * ?")
// @Scheduled(initialDelay = 6000,fixedDelay = 60000 * 10) @Scheduled(initialDelay = 6000,fixedDelay = 60000 * 10)
@Async @Async
public void pushPersonTask() { public void pushPersonTask() {
log.info("--------人员基础数据同步定时器开启------"); log.info("--------人员基础数据同步定时器开启------");

4
bonus-modules/bonus-system/src/main/java/com/bonus/system/att/utils/IpAndPathConfig.java
View File

@ -14,12 +14,12 @@ public class IpAndPathConfig {
*/ */
// @Value("${environment}") // @Value("${environment}")
// public static String environment; // public static String environment;
public static String environment = "test"; public static String environment = "location";
/** /**
* 小程序相关 * 小程序相关
*/ */
public static String wechatDevUrl = "http://127.0.0.1:1907/gz_att_wechat"; public static String wechatDevUrl = "http://127.0.0.1:21907/gz_att_wechat";
public static String wechatTestUrl = "http://192.168.0.14:1907/gz_att_wechat"; public static String wechatTestUrl = "http://192.168.0.14:1907/gz_att_wechat";

2
bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/impl/SysOrgServiceImpl.java
View File

@ -67,7 +67,7 @@ public class SysOrgServiceImpl implements SysOrgService {
List<String> roleId = sysUser.getRoleList(); List<String> roleId = sysUser.getRoleList();
//管理员与人资角色可以看到所有 //管理员与人资角色可以看到所有
if( roleId !=null && !roleId.isEmpty()){ if( roleId !=null && !roleId.isEmpty()){
if (Collections.frequency(roleId, 1L)==0 && Collections.frequency(roleId, 16L)==0) { if (Collections.frequency(roleId, "1")==0 && Collections.frequency(roleId, "16")==0) {
List<MapVo> orgList = sysUser.getOrgList(); List<MapVo> orgList = sysUser.getOrgList();
if (!orgList.isEmpty()) { if (!orgList.isEmpty()) {
ArrayList<String> ids = new ArrayList<>(); ArrayList<String> ids = new ArrayList<>();

9
bonus-modules/bonus-system/src/main/java/com/bonus/system/dept/service/ProDeptRoleServiceImpl.java
View File

@ -43,7 +43,8 @@ public class ProDeptRoleServiceImpl implements ProDeptRoleService {
//只能查自己分公司的人 //只能查自己分公司的人
SysUser sysUser = SecurityUtils.getLoginUser().getSysUser(); SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
List<String> roleId = sysUser.getRoleList(); List<String> roleId = sysUser.getRoleList();
if (Collections.frequency(roleId, 1L)==0) { if(roleId !=null && !roleId.isEmpty() ){
if (Collections.frequency(roleId, "1")==0) {
List<MapVo> orgList = sysUser.getOrgList(); List<MapVo> orgList = sysUser.getOrgList();
if (!orgList.isEmpty()) { if (!orgList.isEmpty()) {
ArrayList<String> ids = new ArrayList<>(); ArrayList<String> ids = new ArrayList<>();
@ -52,7 +53,7 @@ public class ProDeptRoleServiceImpl implements ProDeptRoleService {
} }
bean.setOrgList(ids); bean.setOrgList(ids);
} }
}
} }
return proDeptRoleDao.getRoleUserList(bean); return proDeptRoleDao.getRoleUserList(bean);
} }
@ -61,7 +62,8 @@ public class ProDeptRoleServiceImpl implements ProDeptRoleService {
//只能查自己分公司的人 //只能查自己分公司的人
SysUser sysUser = SecurityUtils.getLoginUser().getSysUser(); SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
List<String> roleId = sysUser.getRoleList(); List<String> roleId = sysUser.getRoleList();
if (Collections.frequency(roleId, 1L) == 0) { if(roleId !=null && !roleId.isEmpty() ){
if (Collections.frequency(roleId, "1") == 0) {
List<MapVo> orgList = sysUser.getOrgList(); List<MapVo> orgList = sysUser.getOrgList();
if (!orgList.isEmpty()) { if (!orgList.isEmpty()) {
ArrayList<String> ids = new ArrayList<>(); ArrayList<String> ids = new ArrayList<>();
@ -75,6 +77,7 @@ public class ProDeptRoleServiceImpl implements ProDeptRoleService {
bean.setOrgList(ids); bean.setOrgList(ids);
} }
} }
}
return proDeptRoleDao.getRoleUserNoManagerList(bean); return proDeptRoleDao.getRoleUserNoManagerList(bean);
} }

16
bonus-modules/bonus-system/src/main/java/com/bonus/system/dept/service/SubOrgServiceImpl.java
View File

@ -53,14 +53,16 @@ public class SubOrgServiceImpl implements SubOrgService {
//只能查自己分公司的人 //只能查自己分公司的人
SysUser sysUser = SecurityUtils.getLoginUser().getSysUser(); SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
List<String> roleId = sysUser.getRoleList(); List<String> roleId = sysUser.getRoleList();
if (Collections.frequency(roleId, 1L)==0) { if(roleId !=null && !roleId.isEmpty() ) {
List<MapVo> orgList = SecurityUtils.getLoginUser().getSysUser().getOrgList(); if (Collections.frequency(roleId, "1") == 0) {
if (!orgList.isEmpty()) { List<MapVo> orgList = SecurityUtils.getLoginUser().getSysUser().getOrgList();
ArrayList<String> ids = new ArrayList<>(); if (!orgList.isEmpty()) {
for (MapVo mapVo : orgList) { ArrayList<String> ids = new ArrayList<>();
ids.add(String.valueOf(mapVo.getId())); for (MapVo mapVo : orgList) {
ids.add(String.valueOf(mapVo.getId()));
}
subOrgBean.setOrgList(ids);
} }
subOrgBean.setOrgList(ids);
} }
} }
return orgDao.selectOrgList(subOrgBean); return orgDao.selectOrgList(subOrgBean);

2
bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/service/HolidayServiceImpl.java
View File

@ -65,7 +65,7 @@ public class HolidayServiceImpl implements HolidayService {
SysUser sysUser = SecurityUtils.getLoginUser().getSysUser(); SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
List<String> roleId = sysUser.getRoleList(); List<String> roleId = sysUser.getRoleList();
if(roleId !=null && !roleId.isEmpty() ){ if(roleId !=null && !roleId.isEmpty() ){
if (Collections.frequency(roleId, 1L)==0) { if (Collections.frequency(roleId, "1")==0) {
List<MapVo> orgList = SecurityUtils.getLoginUser().getSysUser().getOrgList(); List<MapVo> orgList = SecurityUtils.getLoginUser().getSysUser().getOrgList();
if (!orgList.isEmpty()) { if (!orgList.isEmpty()) {
ArrayList<String> ids = new ArrayList<>(); ArrayList<String> ids = new ArrayList<>();