|
@@ -64,7 +64,8 @@ public class TUploadDrgGroupService extends ServiceImpl<TUploadDrgGroupDao, TUpl
|
|
|
query.eq(uploadDrgGroup.getLedgerSn() !=null,"t1.ledger_sn", uploadDrgGroup.getLedgerSn());
|
|
|
query.ge(StringUtil.notBlank(uploadDrgGroup.getSetlStartTime()), "t1.setl_time", uploadDrgGroup.getSetlStartTime());
|
|
|
query.le(StringUtil.notBlank(uploadDrgGroup.getSetlEndTime()), "t1.setl_time", uploadDrgGroup.getSetlEndTime());
|
|
|
- query.likeRight(uploadDrgGroup.getBlType() != null && uploadDrgGroup.getBlType() != 0,"t1.bl", TUploadDrgGroup.BlTypeEnum.getNameByCode(uploadDrgGroup.getBlType()));
|
|
|
+ query.likeRight(uploadDrgGroup.getBlType() != null && uploadDrgGroup.getBlType() != 0 && uploadDrgGroup.getBlType() !=11,"t1.bl", TUploadDrgGroup.BlTypeEnum.getNameByCode(uploadDrgGroup.getBlType()));
|
|
|
+ query.likeLeft(uploadDrgGroup.getBlType() != null && uploadDrgGroup.getBlType()==11 ,"t1.code","QY" );
|
|
|
return query;
|
|
|
}
|
|
|
|