parent
3c22b9da81
commit
127ae3f86e
|
|
@ -116,7 +116,12 @@ public class SecurityUtils
|
|||
public static boolean matchesPassword(String rawPassword, String encodedPassword)
|
||||
{
|
||||
BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
|
||||
System.out.println(passwordEncoder.encode(rawPassword));
|
||||
return passwordEncoder.matches(rawPassword, encodedPassword);
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
System.out.println(encryptPassword("GZkq@123456!"));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
package com.bonus.system.att.tasks;
|
||||
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import com.bonus.system.att.entity.AttMonthReportBean;
|
||||
import com.bonus.system.att.service.AttCalService;
|
||||
import com.bonus.system.holiday.entity.HolidayBean;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
|
@ -171,6 +172,19 @@ public class NewAttTask {
|
|||
log.info("--------报表数据生成--月报表定时器完毕------");
|
||||
}
|
||||
|
||||
/**
|
||||
* 月报表--是否全勤
|
||||
*/
|
||||
@Scheduled(cron = "0 0 23 * * ?")
|
||||
@Async
|
||||
public void getMonthReportFullAttTask() {
|
||||
log.info("--------月报表--是否全勤定时器开启------");
|
||||
String today = DateUtil.today();
|
||||
List<AttMonthReportBean> list = attCalService.getNotFullAtt(today);
|
||||
updateMonthReportData(today);
|
||||
log.info("--------月报表--是否全勤定时器完毕------");
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -325,7 +325,8 @@ public class WechatTasks {
|
|||
|
||||
} else if (wechatUser.getUpdateTime().after(user.getUpdateTime())) {
|
||||
//更新后端密码
|
||||
dao.updateWebPassword(wechatUser);
|
||||
//20250729 不让小程序改密码
|
||||
// dao.updateWebPassword(wechatUser);
|
||||
}
|
||||
//openId 单向更新
|
||||
if (StringUtils.isNotEmpty(wechatUser.getOpenId()) && !wechatUser.getOpenId().equals(user.getOpenId())) {
|
||||
|
|
|
|||
|
|
@ -479,8 +479,8 @@ public class ExportFileController {
|
|||
AttDataDetailsBean vo = attList.get(i);
|
||||
BeanUtils.copyProperties(vo, exportVo);
|
||||
exportVo.setId((i + 1) + "");
|
||||
exportVo.setToWorkAttStatus(getAttStatus(exportVo.getToWorkAttStatus()));
|
||||
exportVo.setOffWorkAttStatus(getAttStatus(exportVo.getOffWorkAttStatus()));
|
||||
exportVo.setToWorkAttStatus(getAttStatusAtAll(exportVo.getToWorkAttStatus()));
|
||||
exportVo.setOffWorkAttStatus(getAttStatusAtAll(exportVo.getOffWorkAttStatus()));
|
||||
tableData.add(exportVo);
|
||||
}
|
||||
extracted(tableData, AttDataTableBean.class, "考勤明细表格导出", "考勤明细表格导出", "考勤明细表格导出", response);
|
||||
|
|
@ -1117,6 +1117,96 @@ public class ExportFileController {
|
|||
}
|
||||
}
|
||||
|
||||
private String getAttStatusAtAll(String attStatus) {
|
||||
switch (attStatus) {
|
||||
case "1":
|
||||
attStatus = "正常";
|
||||
break;
|
||||
case "2":
|
||||
attStatus = "迟到";
|
||||
break;
|
||||
case "3":
|
||||
attStatus = "旷工";
|
||||
break;
|
||||
case "4":
|
||||
attStatus = "早退";
|
||||
break;
|
||||
case "5":
|
||||
attStatus = "轮休";
|
||||
break;
|
||||
case "6":
|
||||
attStatus = "请假";
|
||||
break;
|
||||
case "7":
|
||||
attStatus = "临时外出";
|
||||
break;
|
||||
case "8":
|
||||
attStatus = "出入异常";
|
||||
break;
|
||||
case "9":
|
||||
attStatus = "打卡地异常";
|
||||
break;
|
||||
case "10":
|
||||
attStatus = "出差";
|
||||
break;
|
||||
case "11":
|
||||
attStatus = "法定节假日";
|
||||
break;
|
||||
case "12":
|
||||
attStatus = "年休假";
|
||||
break;
|
||||
case "13":
|
||||
attStatus = "探亲假";
|
||||
break;
|
||||
case "14":
|
||||
attStatus = "事假";
|
||||
break;
|
||||
case "15":
|
||||
attStatus = "病假";
|
||||
break;
|
||||
case "16":
|
||||
attStatus = "产假";
|
||||
break;
|
||||
case "17":
|
||||
attStatus = "婚假";
|
||||
break;
|
||||
case "18":
|
||||
attStatus = "丧假";
|
||||
break;
|
||||
case "19":
|
||||
attStatus = "育儿假";
|
||||
break;
|
||||
case "20":
|
||||
attStatus = "陪护假";
|
||||
break;
|
||||
case "21":
|
||||
attStatus = "流产假";
|
||||
break;
|
||||
case "22":
|
||||
attStatus = "哺乳假";
|
||||
break;
|
||||
case "23":
|
||||
attStatus = "节育假";
|
||||
break;
|
||||
case "24":
|
||||
attStatus = "父母护理假";
|
||||
break;
|
||||
case "25":
|
||||
attStatus = "其他";
|
||||
break;
|
||||
case "26":
|
||||
attStatus = "外勤";
|
||||
break;
|
||||
case "28":
|
||||
attStatus = "培训";
|
||||
break;
|
||||
default:
|
||||
attStatus = "休假";
|
||||
break;
|
||||
}
|
||||
return attStatus;
|
||||
}
|
||||
|
||||
private String getAttStatus(String attStatus) {
|
||||
switch (attStatus) {
|
||||
case "1":
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@
|
|||
vat.offWorkAttAddress as offWorkAddress,
|
||||
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_user su on vat.user_id = su.user_id
|
||||
left join sys_organization so on vat.org_id = so.id
|
||||
where 1=1
|
||||
<if test="userId != null ">
|
||||
|
|
|
|||
Loading…
Reference in New Issue