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:32:14 +08:00
parent 07f30c1a47 2aaea69282
commit 3c4417ffde
2 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
ruoyi-system/src/main/java/com/ruoyi/common/controller/AnnexController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/AnnexController.java
View File

@ -1,26 +1,30 @@
package com.ruoyi.common.controller;
package com.ruoyi.web.controller.common;
import java.util.List;
import java.util.Arrays;
import com.ruoyi.common.domain.Annex;
import lombok.RequiredArgsConstructor;
import javax.validation.constraints.*;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.bo.AnnexQueryBo;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.domain.Annex;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.bo.AnnexQueryBo;
import com.ruoyi.common.service.IAnnexService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.Arrays;
import java.util.List;
import static com.ruoyi.common.constant.Constants.WGZ;
/**
* 附件Controller
@ -105,4 +109,17 @@ public class AnnexController extends BaseController {
@PathVariable String[] ids) {
return toAjax(iAnnexService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
}
@ApiOperation("包工头获取务工者附件")
@GetMapping("/getWgzAnnex")
public AjaxResult<List<Annex>> getWgzAnnex(Long recruitId,Long userId,String annexType) {
List<Annex> list = iAnnexService.list(Wrappers.<Annex>lambdaQuery()
.eq(Annex::getRecruitId, recruitId)
.eq(Annex::getUserId, userId)
.eq(Annex::getUserType, WGZ)
.eq(Annex::getAnnexType, annexType)
);
return AjaxResult.success(list);
}
}

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

@ -35,7 +35,6 @@ import com.ruoyi.wgz.domain.WgzReissueacard;
import com.ruoyi.wgz.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -47,6 +46,7 @@ import java.util.Map;
import java.util.stream.Collectors;
import static com.ruoyi.common.constants.BgtMessageConstant.*;
import static com.ruoyi.common.constants.WgzAndBgtMessageConstant.OPERATION_ALREADY;
import static com.ruoyi.common.constants.WgzAndBgtMessageConstant.OPERATION_NEED;
/**
@ -265,7 +265,6 @@ public class BgtMessageServiceImpl extends ServicePlusImpl<BgtMessageMapper, Bgt
}
@Override
@Async
public void operation(String senderType,Long senderId,String recipientType,Long recipientId,Long tableId,String tableName) {
LambdaUpdateWrapper<BgtMessage> wrapper = new LambdaUpdateWrapper<>();
wrapper.eq(BgtMessage::getRecipientId, recipientId);
@ -274,7 +273,7 @@ public class BgtMessageServiceImpl extends ServicePlusImpl<BgtMessageMapper, Bgt
wrapper.eq(BgtMessage::getSenderType, senderType);
wrapper.eq(BgtMessage::getTableId, tableId);
wrapper.eq(BgtMessage::getTableName, tableName);
wrapper.set(BgtMessage::getIsOperation, OPERATION_NEED);
wrapper.set(BgtMessage::getIsOperation, OPERATION_ALREADY);
update(wrapper);
}
}