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

定时器修改

This commit is contained in:
方亮 2025-10-23 20:19:37 +08:00
parent 79a8afe6c0
commit 733c6b378b
6 changed files with 58 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/service/TokenService.java
View File

@ -63,7 +63,7 @@ public class TokenService {
*/
public Map<String, Object> createToken(LoginUser loginUser) {
// 检查并删除已有的token
if (!isWindows() || !"admin".equals(loginUser.getSysUser().getUserName())) {
if (!isWindows() || !"admin".equals(loginUser.getSysUser().getUserName()) || !"15955147004".equals(loginUser.getSysUser().getUserName())) {
delExistingToken(loginUser.getSysUser().getUserId());
}
String token = IdUtils.fastUUID();

4
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java
View File

@ -114,7 +114,7 @@ public class PmWorkerServiceImpl implements PmWorkerService{
//判断是否上传base64人脸，优先base64
if(StringUtils.isNotEmpty(record.getFacePhotoBase64())){
//人脸的数据添加
UploadFileVo uploadFileVo = fileUploadUtils.uploadBast64(record.getFacePhotoBase64(), Constants.FILE_UPLOAD_WORKER, record.getId().toString(), "人脸照片","", "");
UploadFileVo uploadFileVo = fileUploadUtils.uploadBast64(record.getFacePhotoBase64(), Constants.FILE_UPLOAD_WORKER, record.getId().toString(), "1","", "");
uploadFileVos.add(uploadFileVo);
isBase64 = true;
}else{
@ -313,7 +313,7 @@ public class PmWorkerServiceImpl implements PmWorkerService{
MultipartFile facePhoto = null;
if(record.getFacePhotoBase64() != null){
//判断是否上传base64人脸，优先base64
UploadFileVo uploadFileVo = fileUploadUtils.uploadBast64(record.getFacePhotoBase64(), Constants.FILE_UPLOAD_WORKER, record.getId().toString(), "人脸照片","", "");
UploadFileVo uploadFileVo = fileUploadUtils.uploadBast64(record.getFacePhotoBase64(), Constants.FILE_UPLOAD_WORKER, record.getId().toString(), "1","", "");
uploadFileVos.add(uploadFileVo);
isBase64 = true;
}else{

7
bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/ProStatisticsMapper.xml
View File

@ -112,18 +112,17 @@
FROM
tb_pro_month_table pp
WHERE
pp.pro_id = #{proId}
pp.pro_id = #{proId} and pp.status = 2
</select>
<select id="getWorkerSalaryNum" resultType="int">
SELECT
count(distinct pp.user_id) AS workerSalaryNum
FROM
tb_pro_month_table_roster pp
inner join tb_pro_month_table tbmt on tbmt.id = pp.month_id
WHERE
pp.pro_id = #{proId}
pp.pro_id = #{proId} and tbmt.status = 2
</select>
<select id="getProSubMsg" resultType="com.bonus.bmw.domain.vo.HomePageSubProVo">

6
bonus-modules/bonus-job/src/main/java/com/bonus/job/mapper/WorkerJobMapper.java
View File

@ -105,7 +105,11 @@ public interface WorkerJobMapper {
* @param currentDay
* @return
*/
List<PmWorkerJob> getNotAttWorker(String currentDay);
List<PmWorkerJob> getAttWorker(String currentDay);
int updateWorkerEinDayRecord(List<PmWorkerJob> matchedWorkers);
List<PmWorkerJob> getNoContractWorker();
void updateWorkerContractByList(List<PmWorkerJob> list);
}

29
bonus-modules/bonus-job/src/main/java/com/bonus/job/task/WorkerEinDayRecordTask.java
View File

@ -35,6 +35,20 @@ public class WorkerEinDayRecordTask{
dateList.add(startDate);
//更新指定日期的记录
updateWorkerEinDayRecord(dateList);
updateWorkerContract();
}catch (Exception e){
logger.error("人员入场更新表失败，{}",e.getMessage());
}
}
/**
* 不传更新，当天
*/
public void updateWorkerContract(){
try{
List<PmWorkerJob> list = mapper.getNoContractWorker();
//更新指定日期的记录
mapper.updateWorkerContractByList(list);
}catch (Exception e){
logger.error("人员入场更新表失败，{}",e.getMessage());
}
@ -46,15 +60,15 @@ public class WorkerEinDayRecordTask{
//如果这个人没换工程，换了分包或班组，没打卡，想在新分包换班组打卡会打不上
//执行时将未打卡的人数据更新一下
//已记录入场,未打卡的人员
List<PmWorkerJob> workerEinDayRecord = mapper.getNotAttWorker(currentDay);
List<PmWorkerJob> workerEinDayRecord = mapper.getAttWorker(currentDay);
// 分成两个list：匹配和不匹配
List<PmWorkerJob> matchedWorkers = new ArrayList<>();
List<PmWorkerJob> unmatchedWorkers = new ArrayList<>();
for (PmWorkerJob worker : workerList) {
boolean isMatched = false;
for (PmWorkerJob notAttWorker : workerEinDayRecord) {
if (worker.getWorkerId().equals(notAttWorker.getWorkerId())
&& worker.getProId().equals(notAttWorker.getProId())) {
for (PmWorkerJob attWorker : workerEinDayRecord) {
if (worker.getWorkerId().equals(attWorker.getWorkerId())
&& worker.getProId().equals(attWorker.getProId())) {
matchedWorkers.add(worker);
isMatched = true;
break;
@ -67,9 +81,10 @@ public class WorkerEinDayRecordTask{
if (!unmatchedWorkers.isEmpty()) {
mapper.insertEinDayRecord(unmatchedWorkers);
}
if (!matchedWorkers.isEmpty()) {
mapper.updateWorkerEinDayRecord(matchedWorkers);
}
//打卡的人无需更新入场了
// if (!matchedWorkers.isEmpty()) {
// mapper.updateWorkerEinDayRecord(matchedWorkers);
// }
}
}

27
bonus-modules/bonus-job/src/main/resources/mapper/job/WorkerJobMapper.xml
View File

@ -361,15 +361,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update tb_pro_month_table_roster set month_id=#{id} where pro_id=#{proId} and month=#{month}
</update>
<select id="getNotAttWorker" resultType="com.bonus.job.domain.PmWorkerJob">
<select id="getAttWorker" resultType="com.bonus.job.domain.PmWorkerJob">
SELECT
d.pro_id,
d.worker_id
FROM
bm_worker_ein_day_record d
left join bm_att_person b on d.pro_id = b.pro_id and d.sub_id = b.sub_id and d.team_id = b.team_id and d.worker_id = b.worker_id and d.ein_day = b.att_day
where d.ein_day = #{currentDay} and b.att_day is null
where d.ein_day = #{currentDay} and b.att_day is not null
</select>
<select id="getNoContractWorker" resultType="com.bonus.job.domain.PmWorkerJob">
SELECT
aa.worker_id,
bb.id as contract_id
from
(
SELECT
DISTINCT
worker_id
FROM
bm_worker_ein_day_record
WHERE
contract_id IS NULL) aa
LEFT JOIN bm_worker_contract bb ON aa.worker_id = bb.worker_id and bb.is_active = 1
WHERE bb.id is not null
GROUP BY aa.worker_id
</select>
<update id="updateWorkerContractByList">
<foreach item="item" collection="list" index="index" separator=";">
update bm_worker_ein_day_record set contract_id = #{item.contractId} where worker_id = #{item.workerId} and contract_id is null
</foreach>
</update>
</mapper>