|
|
@ -205,10 +205,10 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
|
|
|
|
wrapper.like("company_name",keyword);
|
|
|
|
wrapper.like("company_name",keyword);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(null!=beginTime){
|
|
|
|
if(null!=beginTime){
|
|
|
|
wrapper.ge("create_date",beginTime);
|
|
|
|
wrapper.ge("create_date",new Date(beginTime));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(null!=endTime){
|
|
|
|
if(null!=endTime){
|
|
|
|
wrapper.le("create_date",endTime);
|
|
|
|
wrapper.le("create_date",new Date(endTime));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
List<Custom> customList = customMapper.selectList(wrapper);
|
|
|
|
List<Custom> customList = customMapper.selectList(wrapper);
|
|
|
|
if (customList.size() != 0) {
|
|
|
|
if (customList.size() != 0) {
|
|
|
@ -226,10 +226,10 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
|
|
|
|
wrapper.like("company_name",keyword);
|
|
|
|
wrapper.like("company_name",keyword);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(null!=beginTime){
|
|
|
|
if(null!=beginTime){
|
|
|
|
wrapper.ge("create_date",beginTime);
|
|
|
|
wrapper.ge("create_date",new Date(beginTime));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(null!=endTime){
|
|
|
|
if(null!=endTime){
|
|
|
|
wrapper.le("create_date",endTime);
|
|
|
|
wrapper.le("create_date",new Date(endTime));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
List<Custom> customList = customMapper.selectList(wrapper);
|
|
|
|
List<Custom> customList = customMapper.selectList(wrapper);
|
|
|
|
if (customList.size() != 0) {
|
|
|
|
if (customList.size() != 0) {
|
|
|
|