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

111

Browse Source
This commit is contained in:
罗成
2025-03-20 17:25:22 +08:00
parent 8476158fc1
commit 07f30c1a47
3 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAppController.java
View File

@ -494,7 +494,7 @@
*/
@ApiOperation("【首页】【项目进行中】 项目进行中·申请工资结算（列表）")
//@PreAuthorize("@ss.hasPermi('wgzApp:user:userApplyForPayrollSettlementList')")
// @GetMapping("/WgzAppUserApplyForPayrollSettlementList")
@GetMapping("/WgzAppUserApplyForPayrollSettlementList")
public TableDataInfo<WgzAppApplyForPayrollSettlementListRes> userApplyForPayrollSettlementList(@Validated WgzAppApplyForPayrollSettlementListReq req) {
return iWgzPayCalculationService.userApplyForPayrollSettlementList(req);
}

2
ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzAttendanceServiceImpl.java
View File

@ -162,7 +162,7 @@ public class WgzAttendanceServiceImpl extends ServicePlusImpl<WgzAttendanceMappe
//3、根据工地id得到完整的工地信息
BgtProjectRecruit appById = iBgtProjectRecruitService.getAppById(by.getRecruitId());
//4、在进场时间时才能打卡，如果有退场记录就不允许打卡
if (by.getEntryTime() == null) {
if (by.getEntryTime() == null || !by.getStatus().equals("5")) {
throw new RuntimeException("需要进场才能实现打卡操作！");
}
if (by.getLeaveTime() != null) {

35
ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzMessageServiceImpl.java
View File

@ -150,9 +150,9 @@ public class WgzMessageServiceImpl extends ServicePlusImpl<WgzMessageMapper, Wgz
@Override
public WgzAppMessageTypeStatisticsRes userMessageTypeStatistics(Long id) {
Long appUserId = SecurityUtils.getAppUserId();
BgtProjectRecruitApply by = iBgtProjectRecruitApplyService.selectByUserIdProjectRecruitApplyId(appUserId);
BgtProjectRecruit appById = iBgtProjectRecruitService.getAppById(by.getRecruitId());
// Long appUserId = SecurityUtils.getAppUserId();
// BgtProjectRecruitApply by = iBgtProjectRecruitApplyService.selectByUserIdProjectRecruitApplyId(appUserId);
// BgtProjectRecruit appById = iBgtProjectRecruitService.getAppById(by.getRecruitId());
WgzAppMessageTypeStatisticsRes res = new WgzAppMessageTypeStatisticsRes();
Map<String, Integer> mp = new HashMap<>();
@ -167,16 +167,16 @@ public class WgzMessageServiceImpl extends ServicePlusImpl<WgzMessageMapper, Wgz
eq(WgzMessage::getMessageLargeType, datum.getDictValue());
mp.put(datum.getDictValue(),baseMapper.selectCount(wp));
}
//2、单独获取待办中的消息
Integer daiBanCount = baseMapper.selectCount(
new LambdaQueryWrapper<WgzMessage>().
eq(WgzMessage::getSenderType, USERTYPE_BGT).
eq(WgzMessage::getSenderId, appById.getUserId()).
eq(WgzMessage::getRecipientType, USERTYPE_WGZ).
eq(WgzMessage::getRecipientId, appUserId).
eq(WgzMessage::getIsOperation, "1")
);
mp.put("daiban",daiBanCount);
// //2、单独获取待办中的消息
// Integer daiBanCount = baseMapper.selectCount(
// new LambdaQueryWrapper<WgzMessage>().
// eq(WgzMessage::getSenderType, USERTYPE_BGT).
// eq(WgzMessage::getSenderId, appById.getUserId()).
// eq(WgzMessage::getRecipientType, USERTYPE_WGZ).
// eq(WgzMessage::getRecipientId, appUserId).
// eq(WgzMessage::getIsOperation, "1")
// );
// mp.put("daiban",daiBanCount);
return res.setMp(mp);
}
@ -188,10 +188,6 @@ public class WgzMessageServiceImpl extends ServicePlusImpl<WgzMessageMapper, Wgz
Page<WgzAppGetMessageListReq> queryDTOPage = new Page<>();
queryDTOPage.setCurrent(req.getPageNum());
queryDTOPage.setSize(req.getPageSize());
//0、待办的查询
if (req.getLargeType().equals("daiban")){
}
//1、分页查询出所有的小类型，然后循环查询小类型对应标题数据
if(req.getLargeType() !=null && req.getLargeType().equals("3") && req.getSmallType()==null){
Page<WgzAppGetMessageListRes> pe = baseMapper.pagingQueryTheMessageList(queryDTOPage, req);
@ -220,6 +216,11 @@ public class WgzMessageServiceImpl extends ServicePlusImpl<WgzMessageMapper, Wgz
}
//2、走正常的全部+大类型+具体的小类型
else{
//0、待办的查询
String largeType = req.getLargeType();
if (largeType!=null && largeType.equals("daiban")){
throw new RuntimeException("待办的查询暂未开发");
}
return PageUtils.buildDataInfo(baseMapper.userGetMessageList(queryDTOPage,req));
}
}