|
@@ -42,7 +42,7 @@ public class OperationRecordController {
|
|
|
private CompanyMapper companyMapper;
|
|
|
|
|
|
@RequestMapping("/getList")
|
|
|
- public HttpRespMsg getList(String companyName,String startDate,String endDate,Integer pageIndex ,Integer pageSize){
|
|
|
+ public HttpRespMsg getList(String companyName,String startDate,String endDate,Integer pageIndex ,Integer pageSize,String projectName){
|
|
|
HttpRespMsg httpRespMsg=new HttpRespMsg();
|
|
|
List<Company> companyList = companyMapper.selectList(null);
|
|
|
QueryWrapper<OperationRecord> queryWrapper=new QueryWrapper<>();
|
|
@@ -59,6 +59,9 @@ public class OperationRecordController {
|
|
|
queryWrapper.ge("operation_time",start);
|
|
|
queryWrapper.le("operation_time",end);
|
|
|
}
|
|
|
+ if(projectName!=null){
|
|
|
+ queryWrapper.like("project_name",projectName);
|
|
|
+ }
|
|
|
queryWrapper.orderByDesc("operation_time");
|
|
|
IPage<OperationRecord> operationRecordIPage = operationRecordMapper.selectPage(new Page<>(pageIndex, pageSize), queryWrapper);
|
|
|
List<OperationRecord> list = operationRecordIPage.getRecords();
|