|
|
@@ -98,7 +98,6 @@ public class TaDeviceJobController extends BaseController {
|
|
98
|
98
|
IPage<TaDeviceJob> pg = new Page<>(pageNum, pageSize);
|
|
99
|
99
|
IPage<TaDeviceJob> list = taDeviceJobService.statisOrgBy(pg, orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone, machineryId, userId);
|
|
100
|
100
|
Double totalArea = taDeviceJobService.statisTotalArea(orgName, deviceKind, deviceNo, startDate, endDate, machineryName, userName, phone, machineryId, userId);
|
|
101
|
|
-
|
|
102
|
101
|
return ResponseBean.success(new HashMap<String, Object>(){{
|
|
103
|
102
|
put("list", list);
|
|
104
|
103
|
put("totalArea", totalArea);
|
|
|
@@ -126,6 +125,7 @@ public class TaDeviceJobController extends BaseController {
|
|
126
|
125
|
@ApiParam("人员手机") @RequestParam(value = "phone", required = false) String phone,
|
|
127
|
126
|
@ApiParam("设备分类") @RequestParam(value = "deviceKind", required = false) String deviceKind,
|
|
128
|
127
|
@ApiParam("设备编号") @RequestParam(value = "deviceNo", required = false) String deviceNo,
|
|
|
128
|
+// @ApiParam("位置") @RequestParam(value = "address", required = false) String address,
|
|
129
|
129
|
@ApiParam(value = "开始时间", example = "2022-10-01") @RequestParam(value = "startDate") String startDate,
|
|
130
|
130
|
@ApiParam(value = "结束时间", example = "2022-10-31") @RequestParam(value = "endDate") String endDate,
|
|
131
|
131
|
HttpServletResponse response) throws Exception {
|
