diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/controller/ProjectRecordController.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/controller/ProjectRecordController.java index c338607..2b40c90 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/controller/ProjectRecordController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/controller/ProjectRecordController.java @@ -222,4 +222,16 @@ public class ProjectRecordController{ return BaseResponse.success(projectRecordService.getBudgetAmountById(id)); } + /** + * 采购经理查询分页数据 + * @param projectRecord 分页信息 + * @return 返回结果 + */ + @ApiOperation("采购经理查询分页数据") + @PostMapping("/purchase/getPage") + public BaseResponse> getPageByPurchase(@ApiParam(value = "对象数据", required = true) @RequestBody ProjectRecordVO projectRecord){ + + return BaseResponse.success(projectRecordService.getPageByPurchase(projectRecord)); + } + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/IProjectRecordService.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/IProjectRecordService.java index 004fe8f..b0ece1a 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/IProjectRecordService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/IProjectRecordService.java @@ -144,4 +144,11 @@ public interface IProjectRecordService extends IBaseService{ * @return */ BigDecimal getBudgetAmountById(String id); + + /** + * 采购经理分页信息 + * @param projectRecord 查询条件 + * @return 返回结果 + */ + IPage getPageByPurchase(ProjectRecordVO projectRecord); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java index 8914167..408f429 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java @@ -49,10 +49,8 @@ import com.chinaunicom.mall.ebtp.project.sectionsupplier.entity.SectionSupplierV import com.chinaunicom.mall.ebtp.project.sectionsupplier.service.ISectionSupplierService; import io.seata.core.context.RootContext; import io.seata.spring.annotation.GlobalTransactional; -import io.seata.tm.api.transaction.SuspendedResourcesHolder; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; -import org.springframework.security.core.parameters.P; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -164,6 +162,14 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl getPageByPurchase(ProjectRecordVO projectRecordVO) { + BaseCacheUser cacheUser = cacheUserService.getCacheUser(); + projectRecordVO.setBidOrgDict(ProjectCommonUtil.ORGANIZATION_1); + projectRecordVO.setOwnerContactId(cacheUser.getUserId()); + QueryWrapper query = getProjectRecordQueryWrapper(projectRecordVO); + + if(null == projectRecordVO.getBasePageRequest()){ + projectRecordVO.setBasePageRequest(new BasePageRequest()); + } + query.orderByDesc("create_date"); + //查询 + IPage p = new Page<>(projectRecordVO.getBasePageRequest().getPageNo(), projectRecordVO.getBasePageRequest().getPageSize()); + IPage result = this.page(p, query); + + return result.convert(c -> BeanUtil.toBean(c,ProjectRecordVO.class)); + } + @Override public boolean assent(String entrustId) { @@ -495,8 +519,7 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl> result = projectRecordMapper.getUserProjectRecordCount(vo); - return result; + return projectRecordMapper.getUserProjectRecordCount(vo); } /** @@ -850,12 +873,10 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl