zt/platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
罗成
2025-03-20 17:41:26 +08:00
parent 3c4417ffde ca8375ae48
commit c51f7c8cc8
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzLeaveServiceImpl.java
View File

@ -330,10 +330,10 @@ public class WgzLeaveServiceImpl extends ServicePlusImpl<WgzLeaveMapper, WgzLeav
attendanceService.save(wgzAttendance);
}
}
if(AuditStatus.getAudit().contains(dto.getAuditorType())){{
//处理消息
iBgtMessageService.operation(USERTYPE_WGZ, wgzLeave.getUserId(), USERTYPE_BGT, SecurityUtils.getAppUserId(), wgzLeave.getId(),SqlHelper.table(WgzLeave.class).getTableName());
iBgtMessageService.operation(USERTYPE_WGZ, wgzLeave.getUserId(), USERTYPE_BGT, SecurityUtils.getAppUserId(), wgzLeave.getId(),SqlHelper.table(WgzLeave.class).getTableName());
}}
return updateById(wgzLeave);
}

7
ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java
View File

@ -447,8 +447,11 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl<WgzPayCalculat
.setMessageLargeType(LARGE_SALARY);
wgzMessageService.sendAMessage(wgzMessage);
//处理消息
iBgtMessageService.operation(USERTYPE_WGZ, payCalculation.getUserId(), USERTYPE_BGT, SecurityUtils.getAppUserId(), payCalculation.getId(),SqlHelper.table(WgzPayCalculation.class).getTableName());
if(AuditStatus.getAudit().contains(dto.getAuditorType())){{
//处理消息
iBgtMessageService.operation(USERTYPE_WGZ, payCalculation.getUserId(), USERTYPE_BGT, SecurityUtils.getAppUserId(), payCalculation.getId(),SqlHelper.table(WgzPayCalculation.class).getTableName());
}}
return updateById(payCalculation);
}

6
ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzReissueacardServiceImpl.java
View File

@ -291,8 +291,10 @@ public class WgzReissueacardServiceImpl extends ServicePlusImpl<WgzReissueacardM
.setMessageSmallType(SMALL_CARD);
wgzMessageService.sendAMessage(wgzMessage);
//处理消息
iBgtMessageService.operation(USERTYPE_WGZ, byId.getUserId(), USERTYPE_BGT, SecurityUtils.getAppUserId(), byId.getId(),SqlHelper.table(WgzReissueacard.class).getTableName());
if(AuditStatus.getAudit().contains(dto.getAuditorType())){
//处理消息
iBgtMessageService.operation(USERTYPE_WGZ, byId.getUserId(), USERTYPE_BGT, SecurityUtils.getAppUserId(), byId.getId(),SqlHelper.table(WgzReissueacard.class).getTableName());
}
return b;
}