Commit a27e4ed2 by liyanlin

增加获取4k费用单接口

parent 2fbc76ef
......@@ -507,4 +507,15 @@ public class CostController {
return resp;
}
@LoginIgnore
@ApiOperation("获取4k数据")
@GetMapping("/costFor4k/{sourceFrom}/{pageSize}/{pageNum}")
public CostResult<Page<CostDomain>> getTypeName(@PathVariable("sourceFrom") String sourceFrom,
@PathVariable("pageSize") long pageSize,
@PathVariable("pageNum") long pageNum) {
// 获取费用单详细信息
Page<CostDomain> costDomainPage = costService.queryPageFor4k(new Page(pageNum,pageSize),sourceFrom);
return CostResult.success(costDomainPage);
}
}
......@@ -93,4 +93,7 @@ public interface CostDao extends BaseMapper<CostDomain> {
List<CostDomain> getCostList(@Param("page") IPage<CostDomain> page,
@Param("startDate") String startDate,
@Param("endDate") String endDate);
Page<CostDomain> queryPageFor4k(@Param("page") Page<Object> page,
@Param("sourceFrom") String sourceFrom);
}
......@@ -139,4 +139,6 @@ public interface CostService {
* @return res
*/
Page<CostDomain> queryPage(CostQueryPageReq req);
Page<CostDomain> queryPageFor4k(Page page,String sourceFrom);
}
......@@ -518,6 +518,16 @@ public abstract class AbstractCostService implements CostService {
return page;
}
@Override
public Page<CostDomain> queryPageFor4k(Page page,String sourceFrom){
Page<CostDomain> data = costDao.queryPageFor4k(page,sourceFrom);
List<CostDetailDomain> costDetailList = costDetailDao.selectList(new LambdaQueryWrapper<CostDetailDomain>()
.in(CostDetailDomain::getCostNo,data.getRecords().stream().map(x -> x.getCostNo()).collect(Collectors.toList())));
Map<String,List<CostDetailDomain>> listMap = costDetailList.stream().collect(Collectors.groupingBy(x -> x.getCostNo()));
data.getRecords().forEach(x -> x.setCostDetailDomainList(listMap.get(x.getCostNo())));
return data;
}
@Resource
CostCashiercallbackService costCashiercallbackService;
......
......@@ -377,4 +377,17 @@
and t1.last_modify_date &lt;= #{endDate}
</select>
<select id="queryPageFor4k" resultType="com.blt.other.module.cost.model.CostDomain">
select
c.*
from
cost c
left join oa_user ou on
ou.oa_user_id = c.create_userid
where
ou.company_id in(18, 27, 32)
and c.source_from in(#{sourceFrom})
order by id desc
</select>
</mapper>
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