更正账单类型对不上问题
This commit is contained in:
@@ -6,11 +6,9 @@ import com.accompany.admin.vo.BillRecordVo;
|
||||
import com.accompany.business.model.Gift;
|
||||
import com.accompany.business.service.gift.GiftService;
|
||||
import com.accompany.business.service.record.BillRecordService;
|
||||
import com.accompany.common.constant.Constant;
|
||||
import com.accompany.common.utils.BlankUtil;
|
||||
import com.accompany.common.utils.DateTimeUtil;
|
||||
import com.accompany.core.enumeration.BillObjTypeEnum;
|
||||
import com.accompany.core.enumeration.CurrencyEnum;
|
||||
import com.accompany.core.enumeration.PartitionEnum;
|
||||
import com.accompany.core.model.Users;
|
||||
import com.accompany.core.service.user.UsersBaseService;
|
||||
@@ -58,15 +56,7 @@ public class BillRecordAdminService extends BaseService {
|
||||
|
||||
|
||||
if(billType != null){
|
||||
List<Integer> bList = new ArrayList<>();
|
||||
if(billType.equals(Constant.BillType.openNoble)){
|
||||
bList = Arrays.asList(Constant.BillType.openNoble, Constant.BillType.renewNoble);
|
||||
}else if(billType.equals(Constant.BillType.purchaseCarGoods)){
|
||||
bList = Arrays.asList(Constant.BillType.purchaseCarGoods, Constant.BillType.renewCarGoods);
|
||||
}else {
|
||||
bList.add(billType);
|
||||
}
|
||||
wrapper.lambda().in(BillRecord::getObjType, bList)
|
||||
wrapper.lambda().eq(BillRecord::getObjType, billType)
|
||||
.in(BillRecord::getPartitionId, Arrays.stream(PartitionEnum.values()).map(PartitionEnum::getId).sorted().toList());
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user