|
@@ -43,7 +43,6 @@ public class CompanysController {
|
|
* @param id
|
|
* @param id
|
|
* @param name
|
|
* @param name
|
|
* @param aname
|
|
* @param aname
|
|
- * @param capacity
|
|
|
|
* @param pageNum
|
|
* @param pageNum
|
|
* @param pageSize
|
|
* @param pageSize
|
|
* @return
|
|
* @return
|
|
@@ -52,24 +51,9 @@ public class CompanysController {
|
|
public R findList(@RequestParam(value = "id", required = false) String id,
|
|
public R findList(@RequestParam(value = "id", required = false) String id,
|
|
@RequestParam(value = "name", required = false) String name,
|
|
@RequestParam(value = "name", required = false) String name,
|
|
@RequestParam(value = "aname", required = false) String aname,
|
|
@RequestParam(value = "aname", required = false) String aname,
|
|
- @RequestParam(value = "windcapacity", required = false) Integer windcapacity,
|
|
|
|
- @RequestParam(value = "windcapacityunit", required = false) String windcapacityunit,
|
|
|
|
- @RequestParam(value = "windquantity", required = false) Integer windquantity,
|
|
|
|
- @RequestParam(value = "capacity", required = false) Integer capacity,
|
|
|
|
- @RequestParam(value = "capacityunit", required = false) String capacityunit,
|
|
|
|
- @RequestParam(value = "quantityjz", required = false) Integer quantityjz,
|
|
|
|
- @RequestParam(value = "quantityzc", required = false) Integer quantityzc,
|
|
|
|
- @RequestParam(value = "jrwindcapacity", required = false) Integer jrwindcapacity,
|
|
|
|
- @RequestParam(value = "jrwindcapacityunit", required = false) String jrwindcapacityunit,
|
|
|
|
- @RequestParam(value = "jrwindquantity", required = false) Integer jrwindquantity,
|
|
|
|
- @RequestParam(value = "jrcapacity", required = false) Integer jrcapacity,
|
|
|
|
- @RequestParam(value = "jrcapacityunit", required = false) String jrcapacityunit,
|
|
|
|
- @RequestParam(value = "jrquantityjz", required = false) Integer jrquantityjz,
|
|
|
|
- @RequestParam(value = "jrquantityzc", required = false) Integer jrquantityzc,
|
|
|
|
- @RequestParam(value = "ordernum", required = false) Integer ordernum,
|
|
|
|
@RequestParam(value = "pageNum", required = true) String pageNum,
|
|
@RequestParam(value = "pageNum", required = true) String pageNum,
|
|
@RequestParam(value = "pageSize", required = true) String pageSize) {
|
|
@RequestParam(value = "pageSize", required = true) String pageSize) {
|
|
- IPage<Companys> list = companysService.list(id, name, aname,windcapacity, windcapacityunit, windquantity, capacity, capacityunit, quantityjz, quantityzc, jrwindcapacity, jrwindcapacityunit, jrwindquantity, jrcapacity, jrcapacityunit, jrquantityjz, jrquantityzc, ordernum, pageNum, pageSize);
|
|
|
|
|
|
+ IPage<Companys> list = companysService.list(id, name, aname, pageNum, pageSize);
|
|
if (null != list) {
|
|
if (null != list) {
|
|
return R.ok().data(list);
|
|
return R.ok().data(list);
|
|
} else {
|
|
} else {
|