Commit 8884f294 by huluobin

update

parent 32bceb3b
......@@ -15,7 +15,6 @@ import java.util.List;
public interface CostDao extends BaseMapper<CostDomain> {
/**
* 获取费用单列表
*/
......@@ -29,10 +28,8 @@ public interface CostDao extends BaseMapper<CostDomain> {
*/
CostDomain selectByCostNo(String costNo);
List<CostDomain> selectByKeys(CostDomain costDomain);
List<CostDomain> selectByCostPlanNo(String costPlanNo);
/**
......@@ -103,13 +100,12 @@ public interface CostDao extends BaseMapper<CostDomain> {
*/
List<CostDomain> selectBalanceSheetCost(@Param("startDate") Date startDate, @Param("endDate") Date endDate);
List<String> listCostNoAll(CostExportVo costExportVo);
/**
* 审核列表查询
*
* @param page page
* @param page page
* @return
*/
IPage<CostDomain> checkCostList(@Param("page") IPage<CostDomain> page,
......
......@@ -101,6 +101,7 @@ public abstract class AbstractCostService implements CostService {
projectTypeList = Lists.newArrayList(projectTypes.split(",")).stream().filter(str -> !StringUtils.isEmpty(str)).collect(Collectors.toList());
}
List<CostDomain> costDomains = costDao.selectAll(userId, projectTypeList);
this.setPrimaryDepartment(costDomains);
CostPageResult result = new CostPageResult();
result.setCosts(costDomains.stream().map(CostDomain::castToDto).collect(Collectors.toList()));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment