|
@@ -90,11 +90,10 @@ public class PersonDeviceFilterLogController {
|
|
|
@RequestMapping(value = "list",method = RequestMethod.POST)
|
|
|
@ApiImplicitParams({
|
|
|
@ApiImplicitParam(name="token",value = "令牌",required = true,paramType = "form"),
|
|
|
- @ApiImplicitParam(name = "personId",value = "人员编号", required = true, paramType = "form",dataType = "Long"),
|
|
|
@ApiImplicitParam(name = "recordDate",value = "查询日期(yyyy-MM-dd)", required = true, paramType = "form",dataType = "String")
|
|
|
})
|
|
|
- public MessageResult<List<PersonDeviceFilterLogDTO>> list(@RequestParam(value="personId",defaultValue="") Long personId,
|
|
|
- @RequestParam(value="recordDate",defaultValue="") String recordDate,
|
|
|
+ public MessageResult<List<PersonDeviceFilterLogDTO>> list(@RequestParam(value="recordDate",defaultValue="") String recordDate,
|
|
|
+ @RequestAttribute String subject,
|
|
|
String token){
|
|
|
MessageResult<List<PersonDeviceFilterLogDTO>> msgResult = new MessageResult<>();
|
|
|
|
|
@@ -110,7 +109,7 @@ public class PersonDeviceFilterLogController {
|
|
|
List<PersonDeviceFilterLogDTO> listPersonDeviceFilterLogDTO = new ArrayList<>();
|
|
|
|
|
|
Map<String,Object> searchParams = new HashMap<>();
|
|
|
- searchParams.put("personId",personId);
|
|
|
+ searchParams.put("personId",subject);
|
|
|
searchParams.put("beginTime",beginTime);
|
|
|
searchParams.put("endTime",endTime);
|
|
|
List<Sort> sortList = new ArrayList<>();
|