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

优化

Browse Source
This commit is contained in:
zt
2025-03-13 18:04:13 +08:00
parent ee0411263f
commit eeada32164
8 changed files with 42 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtMessageServiceImpl.java
View File

@ -9,6 +9,7 @@ import com.ruoyi.bgt.bo.BgtMessageQueryBo;
import com.ruoyi.bgt.domain.BgtMessage;
import com.ruoyi.bgt.domain.BgtProjectRecruit;
import com.ruoyi.bgt.domain.BgtProjectRecruitApply;
import com.ruoyi.bgt.domain.BgtWageApplication;
import com.ruoyi.bgt.domain.dto.BgtMessageDetailDTO;
import com.ruoyi.bgt.domain.dto.BgtMessageMyListDTO;
import com.ruoyi.bgt.domain.vo.BgtMessageCountVO;
@ -18,6 +19,7 @@ import com.ruoyi.bgt.mapper.BgtMessageMapper;
import com.ruoyi.bgt.service.IBgtMessageService;
import com.ruoyi.bgt.service.IBgtProjectRecruitApplyService;
import com.ruoyi.bgt.service.IBgtProjectRecruitService;
import com.ruoyi.bgt.service.IBgtWageApplicationService;
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BgtMessageType;
@ -76,6 +78,9 @@ public class BgtMessageServiceImpl extends ServicePlusImpl<BgtMessageMapper, Bgt
@Autowired
private IWgzDailyClockService dailyClockService;
@Autowired
private IBgtWageApplicationService wageApplicationService;
@Override
public BgtMessage queryById(Long id) {
return getById(id);
@ -201,7 +206,8 @@ public class BgtMessageServiceImpl extends ServicePlusImpl<BgtMessageMapper, Bgt
FbsProjectTask task = taskService.getById(message.getTableId());
bgtMessageDetailVO.setTaskName(task.getTaskName());
} else if (BGT_LARGE_SETTLEMENT.equals(message.getMessageLargeType())) {
FbsProjectTask task = taskService.getById(message.getTableId());
BgtWageApplication wageApplication = wageApplicationService.getById(message.getTableId());
FbsProjectTask task = taskService.getById(wageApplication.getTaskId());
bgtMessageDetailVO.setTaskName(task.getTaskName());
} else if (BGT_LARGE_OTHER.equals(message.getMessageLargeType())) {
switch (message.getMessageSmallType()) {
@ -218,27 +224,27 @@ public class BgtMessageServiceImpl extends ServicePlusImpl<BgtMessageMapper, Bgt
case BGT_SMALL_LEAVE:
WgzLeave wgzLeave = leaveService.getById(message.getTableId());
bgtMessageDetailVO.setReason(wgzLeave.getReason());
bgtMessageDetailVO.setUsername(wgzUserService.getById(wgzLeave.getUserId()).getUsername());
bgtMessageDetailVO.setUsername(wgzUserService.findByUserId(wgzLeave.getUserId()).getUsername());
bgtMessageDetailVO.setStartTime(wgzLeave.getStartTime());
bgtMessageDetailVO.setEndTime(wgzLeave.getEndTime());
break;
case BGT_SMALL_MAKE_UP:
WgzReissueacard reissueCard = reissueacardService.getById(message.getTableId());
bgtMessageDetailVO.setReason(reissueCard.getReason());
bgtMessageDetailVO.setUsername(wgzUserService.getById(reissueCard.getUserId()).getUsername());
bgtMessageDetailVO.setUsername(wgzUserService.findByUserId(reissueCard.getUserId()).getUsername());
bgtMessageDetailVO.setNowTime(reissueCard.getNowTime());
break;
case BGT_SMALL_REPORT_MAKE_UP:
WgzDailyClock dailyClock = dailyClockService.getById(message.getTableId());
BgtProjectRecruit recruitClock = recruitService.getById(dailyClock.getRecruitId());
bgtMessageDetailVO.setUsername(wgzUserService.getById(dailyClock.getUserId()).getUsername());
bgtMessageDetailVO.setUsername(wgzUserService.findByUserId(dailyClock.getUserId()).getUsername());
bgtMessageDetailVO.setRecruitName(recruitClock.getRecruitName());
break;
default:
break;
}
bgtMessageVOS.add(bgtMessageDetailVO);
}
bgtMessageVOS.add(bgtMessageDetailVO);
}
bgtMessageVOPage.setRecords(bgtMessageVOS);
return PageUtils.buildDataInfo(bgtMessageVOPage);

2
ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtWageApplicationServiceImpl.java
View File

@ -102,7 +102,7 @@ public class BgtWageApplicationServiceImpl extends ServicePlusImpl<BgtWageApplic
.setHeadline(map.get(HEADLINE))
.setSubheading(map.get(SUBHEADING))
.setTableId(add.getId())
.setTableName(SqlHelper.table(FbsProjectTask.class).getTableName())
.setTableName(SqlHelper.table(BgtWageApplication.class).getTableName())
.setMessageLargeType(BGT_LARGE_SETTLEMENT);
bgtMessageService.sendAMessage(bgtMessage);
return save;

5
ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppUserReplacementCardRecordDetailsRes.java
View File

@ -28,6 +28,9 @@ public class WgzAppUserReplacementCardRecordDetailsRes implements Serializable {
@ApiModelProperty("申请人姓名")
private String userName;
@ApiModelProperty("申请人头像")
private String avatarName;
@ApiModelProperty("打卡ID")
private Long attendanceId;
@ -70,4 +73,6 @@ public class WgzAppUserReplacementCardRecordDetailsRes implements Serializable {
@ApiModelProperty("创建时间|申请时间")
private LocalDateTime createTime;
@ApiModelProperty("周几")
private String weekday;
}

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

@ -356,7 +356,7 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl<WgzPayCalculat
@Override
public BgtPayCalculationDetailBaseVO baseInfo(Long userId, Long recruitId) {
BgtPayCalculationDetailBaseVO vo = new BgtPayCalculationDetailBaseVO();
WgzUser wgzUser = wgzUserService.getById(userId);
WgzUser wgzUser = wgzUserService.findByUserId(userId);
vo.setScore(wgzUser.getScore());
vo.setUsername(wgzUser.getUsername());
vo.setAvatarName(wgzUser.getAvatarName());
@ -372,7 +372,7 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl<WgzPayCalculat
.last("limit 1"));
vo.setEntryTime(apply.getEntryTime());
Integer i = attendanceService.attendanceDetail(userId, apply.getId(), null);
Integer i = attendanceService.attendanceDetail(userId, recruitId, null);
BigDecimal totalAmount = recruit.getRecruitAmount().multiply(BigDecimal.valueOf(i));
vo.setAllAmount(totalAmount);
@ -383,7 +383,7 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl<WgzPayCalculat
BigDecimal multiply = gz.getRecruitAmount().multiply(BigDecimal.valueOf(gz.getNum()));
addSum = addSum.add(multiply);
}
vo.setPayAmount(totalAmount);
vo.setPayAmount(addSum);
vo.setResidueAmount(vo.getAllAmount().subtract(vo.getPayAmount()));
return vo;