增加消息逻辑删除,排错

This commit is contained in:
2025-02-28 14:08:35 +08:00
parent 900265b8b2
commit b32a787f5f
4 changed files with 5 additions and 2 deletions

View File

@ -413,6 +413,9 @@ public class WgzAppController {
setAmount(recruitAmount); setAmount(recruitAmount);
//3、查询当前进行中的项目是否有工资结算(多次追加) //3、查询当前进行中的项目是否有工资结算(多次追加)
List<WgzPayCalculation> gzs = iWgzPayCalculationService.findByUserIdRecruitIdNewestData(appUserId, appById.getId()); List<WgzPayCalculation> gzs = iWgzPayCalculationService.findByUserIdRecruitIdNewestData(appUserId, appById.getId());
if (gzs.isEmpty()){
return AjaxResult.success(res);
}
BigDecimal addSum = new BigDecimal(0); BigDecimal addSum = new BigDecimal(0);
for (WgzPayCalculation gz : gzs) { for (WgzPayCalculation gz : gzs) {
//金额*天数=实际工资 //金额*天数=实际工资

View File

@ -117,6 +117,7 @@ public class BusinessTask
//表示有上班缺卡,添加缺卡信息 //表示有上班缺卡,添加缺卡信息
if (count == 0) { if (count == 0) {
//添加缺卡信息 //添加缺卡信息
System.out.println("上班缺卡-------"+by.getUserId());
WgzAttendance attendance = new WgzAttendance() WgzAttendance attendance = new WgzAttendance()
.setRecruitId(by.getRecruitId()) .setRecruitId(by.getRecruitId())
.setUserId(by.getUserId()) .setUserId(by.getUserId())

View File

@ -94,6 +94,7 @@ public class WgzMessage implements Serializable {
/** 删除标志0代表存在 2代表删除 */ /** 删除标志0代表存在 2代表删除 */
@Excel(name = "删除标志" , readConverterExp = "0=代表存在,2=代表删除") @Excel(name = "删除标志" , readConverterExp = "0=代表存在,2=代表删除")
@ApiModelProperty("删除标志0代表存在 2代表删除") @ApiModelProperty("删除标志0代表存在 2代表删除")
@TableLogic
private String delFlag; private String delFlag;
/** 创建者 */ /** 创建者 */

View File

@ -163,8 +163,6 @@ public class WgzMessageServiceImpl extends ServicePlusImpl<WgzMessageMapper, Wgz
public TableDataInfo<WgzAppGetMessageListRes> userGetMessageList(WgzAppGetMessageListReq req) { public TableDataInfo<WgzAppGetMessageListRes> userGetMessageList(WgzAppGetMessageListReq req) {
Long appUserId = SecurityUtils.getAppUserId(); Long appUserId = SecurityUtils.getAppUserId();
WgzUser wgz = wgzUserService.findByUserId(appUserId); WgzUser wgz = wgzUserService.findByUserId(appUserId);
req.setRecipientId(appUserId); req.setRecipientId(appUserId);
Page<WgzAppGetMessageListReq> queryDTOPage = new Page<>(); Page<WgzAppGetMessageListReq> queryDTOPage = new Page<>();
queryDTOPage.setCurrent(req.getPageNum()); queryDTOPage.setCurrent(req.getPageNum());