|
|
@@ -46,7 +46,8 @@ public class CostShareParamServiceImpl extends ServiceImpl<CostShareParamMapper,
|
|
|
Page<CostShareParam> costShareParamPage = new Page<>(current, pageSize);
|
|
|
Page<CostShareParam> pages = this.page(costShareParamPage, new QueryWrapper<CostShareParam>().lambda()
|
|
|
.eq(!StringUtils.isEmpty(hospId), CostShareParam::getHospId, hospId)
|
|
|
- .like(!StringUtils.isEmpty(name), CostShareParam::getShareParamName, name).orderByDesc(CostShareParam::getCreateTime))
|
|
|
+ .like(!StringUtils.isEmpty(name), CostShareParam::getShareParamName, name)
|
|
|
+ .orderByDesc(CostShareParam::getCreateTime))
|
|
|
;
|
|
|
List<CostShareParam> records = pages.getRecords();
|
|
|
List<CostShareParamVO> costShareParamVOList = BeanUtil.convertList(records, CostShareParamVO.class);
|
|
|
@@ -125,7 +126,7 @@ public class CostShareParamServiceImpl extends ServiceImpl<CostShareParamMapper,
|
|
|
Integer costShareParamId = costShareParamAccountDto.getCostShareParamId();
|
|
|
CostShareParam costShareParam = baseMapper.selectById(costShareParamId);
|
|
|
// 判断当前操作的分层参数的计算方式是不是按科目计算
|
|
|
- if (NumberConstant.ONE.equals(costShareParam.getCalcType())){
|
|
|
+ if (NumberConstant.TWO.equals(costShareParam.getCalcType())){
|
|
|
String[] accountIds = costShareParamAccountDto.getAccountIds();
|
|
|
List<String> accountList = Arrays.asList(accountIds);
|
|
|
if (!CollectionUtil.isEmpty(accountList)){
|
hr