|
@@ -85,7 +85,7 @@ public class CostDepartmentProfitServiceImpl extends ServiceImpl<CostDepartmentP
|
|
.eq(StrUtil.isNotBlank(responsibilityCode), CostDepartmentProfit::getResponsibilityCode, responsibilityCode)
|
|
.eq(StrUtil.isNotBlank(responsibilityCode), CostDepartmentProfit::getResponsibilityCode, responsibilityCode)
|
|
.eq(StrUtil.isNotBlank(date), CostDepartmentProfit::getYear, year)
|
|
.eq(StrUtil.isNotBlank(date), CostDepartmentProfit::getYear, year)
|
|
.eq(StrUtil.isNotBlank(date), CostDepartmentProfit::getMonth, month)
|
|
.eq(StrUtil.isNotBlank(date), CostDepartmentProfit::getMonth, month)
|
|
- .ne(CostDepartmentProfit::getCalcType, NumberConstant.ZERO).orderByAsc(CostDepartmentProfit::getAmount));
|
|
|
|
|
|
+ .ne(CostDepartmentProfit::getCalcType, NumberConstant.ZERO).orderByDesc(CostDepartmentProfit::getAmount));
|
|
List<CostDepartmentProfit> records = pages.getRecords();
|
|
List<CostDepartmentProfit> records = pages.getRecords();
|
|
List<CostDepartmentProfitVO> costDepartmentProfitVOList = BeanUtil.convertList(records, CostDepartmentProfitVO.class);
|
|
List<CostDepartmentProfitVO> costDepartmentProfitVOList = BeanUtil.convertList(records, CostDepartmentProfitVO.class);
|
|
PageUtils pageUtils = new PageUtils(pages);
|
|
PageUtils pageUtils = new PageUtils(pages);
|