liuc/biz_supplier_manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'master'

Browse Source 
1、增加采购经理查看分页

See merge request eshop/biz_service_ebtp_project!14
This commit is contained in:
代兴成
2021-03-23 08:35:01 +08:00
parent 535cc57f7b 219d5e2329
commit 96e1fb6273
3 changed files with 50 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/controller/ProjectRecordController.java
View File

@ -222,4 +222,16 @@ public class ProjectRecordController{
return BaseResponse.success(projectRecordService.getBudgetAmountById(id));
}
/**
* 采购经理查询分页数据
* @param projectRecord 分页信息
* @return 返回结果
*/
@ApiOperation("采购经理查询分页数据")
@PostMapping("/purchase/getPage")
public BaseResponse<IPage<ProjectRecordVO>> getPageByPurchase(@ApiParam(value = "对象数据", required = true) @RequestBody ProjectRecordVO projectRecord){
return BaseResponse.success(projectRecordService.getPageByPurchase(projectRecord));
}
}

7
src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/IProjectRecordService.java
View File

@ -144,4 +144,11 @@ public interface IProjectRecordService extends IBaseService<ProjectRecord>{
* @return
*/
BigDecimal getBudgetAmountById(String id);
/**
* 采购经理分页信息
* @param projectRecord 查询条件
* @return 返回结果
*/
IPage<ProjectRecordVO> getPageByPurchase(ProjectRecordVO projectRecord);
}

41
src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java
View File

@ -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<ProjectRecordMappe
query.eq("bid_method_dict", projectRecordVO.getBidMethodDict());
}
if(StringUtils.isNotBlank(projectRecordVO.getBidOrgDict())){
query.eq("bid_org_dict", projectRecordVO.getBidOrgDict());
}
if(StringUtils.isNotBlank(projectRecordVO.getOwnerContactId())){
query.eq("owner_contact_id", projectRecordVO.getOwnerContactId());
}
if(null != projectRecordVO.getLimit()){
query.last("limit "+ projectRecordVO.getLimit());
}
@ -447,6 +453,24 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
return budgetAmount.setScale(4,BigDecimal.ROUND_HALF_UP);
}
@Override
public IPage<ProjectRecordVO> getPageByPurchase(ProjectRecordVO projectRecordVO) {
BaseCacheUser cacheUser = cacheUserService.getCacheUser();
projectRecordVO.setBidOrgDict(ProjectCommonUtil.ORGANIZATION_1);
projectRecordVO.setOwnerContactId(cacheUser.getUserId());
QueryWrapper<ProjectRecord> query = getProjectRecordQueryWrapper(projectRecordVO);
if(null == projectRecordVO.getBasePageRequest()){
projectRecordVO.setBasePageRequest(new BasePageRequest());
}
query.orderByDesc("create_date");
//查询
IPage<ProjectRecord> p = new Page<>(projectRecordVO.getBasePageRequest().getPageNo(), projectRecordVO.getBasePageRequest().getPageSize());
IPage<ProjectRecord> 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<ProjectRecordMappe
ProjectRecordVO vo = new ProjectRecordVO();
vo.setAppManagerId(cacheUser.getUserId());
vo.setSelectDate(selectDate);
List<Map<String,Integer>> result = projectRecordMapper.getUserProjectRecordCount(vo);
return result;
return projectRecordMapper.getUserProjectRecordCount(vo);
}
/**
@ -850,12 +873,10 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
//采购方式
record.setBidMethodDict(projectEntrust.getProcurementMode());
//代理机构项目经理
// record.setAppManagerId(projectEntrust.getProjectManager());
// record.setAppManagerName(projectEntrust.getProjectManagerName());
// record.setAppManagerTel(projectEntrust.getProjectManagerPhone());
record.setAppManagerId("ex-wanghy623");
record.setAppManagerName("曹鹏");
record.setAppManagerTel("18900000000");
record.setAppManagerId(projectEntrust.getProjectManager());
record.setAppManagerName(projectEntrust.getProjectManagerName());
record.setAppManagerTel(projectEntrust.getProjectManagerPhone());
//项目状态 进行中
record.setStatus(ProjectCommonUtil.PROJECT_STATUS_2);
//询价项目ID