wangb 2 роки тому
батько
коміт
01c9f47371

+ 1 - 17
web/backmanagerconfig/src/main/java/com/gyee/backconfig/controller/CompanysController.java

@@ -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 {

+ 1 - 16
web/backmanagerconfig/src/main/java/com/gyee/backconfig/controller/RegionController.java

@@ -43,24 +43,9 @@ public class RegionController {
                       @RequestParam(value = "companyid",required = false) String companyid,
                       @RequestParam(value = "companyid",required = false) String companyid,
                       @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<Region> list = regionService.list(id,name,companyid,aname,windcapacity, windcapacityunit, windquantity, capacity, capacityunit, quantityjz, quantityzc, jrwindcapacity, jrwindcapacityunit, jrwindquantity, jrcapacity, jrcapacityunit, jrquantityjz, jrquantityzc, ordernum, pageNum, pageSize);
+        IPage<Region> list = regionService.list(id,name,companyid,aname, pageNum, pageSize);
         if (null != list){
         if (null != list){
             return R.ok().data(list);
             return R.ok().data(list);
         }else {
         }else {

+ 1 - 1
web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/ICompanysService.java

@@ -16,7 +16,7 @@ import java.util.List;
  */
  */
 public interface ICompanysService extends IService<Companys> {
 public interface ICompanysService extends IService<Companys> {
 
 
- IPage<Companys> list(String id, String name, String aname, Integer windcapacity, String windcapacityunit, Integer windquantity, Integer capacity, String capacityunit, Integer quantityjz, Integer quantityzc, Integer jrwindcapacity, String jrwindcapacityunit, Integer jrwindquantity, Integer jrcapacity, String jrcapacityunit, Integer jrquantityjz, Integer jrquantityzc, Integer ordernum, String pageNum, String pageSize);
+ IPage<Companys> list(String id, String name, String aname, String pageNum, String pageSize);
 
 
     List<Companys> getCompanysByidAndRid(String id);
     List<Companys> getCompanysByidAndRid(String id);
 
 

+ 1 - 1
web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/IRegionService.java

@@ -17,7 +17,7 @@ import java.util.List;
 public interface IRegionService extends IService<Region> {
 public interface IRegionService extends IService<Region> {
 
 
 
 
-    IPage<Region> list(String id, String name, String companyid, String aname, Integer windcapacity, String windcapacityunit, Integer windquantity, Integer capacity, String capacityunit, Integer quantityjz, Integer quantityzc, Integer jrwindcapacity, String jrwindcapacityunit, Integer jrwindquantity, Integer jrcapacity, String jrcapacityunit, Integer jrquantityjz, Integer jrquantityzc, Integer ordernum, String pageNum, String pageSize);
+    IPage<Region> list(String id, String name, String companyid, String aname, String pageNum, String pageSize);
 
 
     List<Region> getReginBycode(String companyid);
     List<Region> getReginBycode(String companyid);
 }
 }

+ 1 - 1
web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/impl/CompanysServiceImpl.java

@@ -24,7 +24,7 @@ import java.util.List;
 public class CompanysServiceImpl extends ServiceImpl<CompanysMapper, Companys> implements ICompanysService {
 public class CompanysServiceImpl extends ServiceImpl<CompanysMapper, Companys> implements ICompanysService {
 
 
     @Override
     @Override
-    public IPage<Companys> list(String id, String name, String aname, Integer windcapacity, String windcapacityunit, Integer windquantity, Integer capacity, String capacityunit, Integer quantityjz, Integer quantityzc, Integer jrwindcapacity, String jrwindcapacityunit, Integer jrwindquantity, Integer jrcapacity, String jrcapacityunit, Integer jrquantityjz, Integer jrquantityzc, Integer ordernum, String pageNum, String pageSize) {
+    public IPage<Companys> list(String id, String name, String aname, String pageNum, String pageSize) {
         QueryWrapper<Companys> qw = new QueryWrapper<>();
         QueryWrapper<Companys> qw = new QueryWrapper<>();
         if (StringUtils.isNotEmpty(id)) {
         if (StringUtils.isNotEmpty(id)) {
             qw.like("id", id);
             qw.like("id", id);

+ 1 - 1
web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/impl/RegionServiceImpl.java

@@ -25,7 +25,7 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
 
 
 
 
     @Override
     @Override
-    public IPage<Region> list(String id, String name, String companyid, String aname, Integer windcapacity, String windcapacityunit, Integer windquantity, Integer capacity, String capacityunit, Integer quantityjz, Integer quantityzc, Integer jrwindcapacity, String jrwindcapacityunit, Integer jrwindquantity, Integer jrcapacity, String jrcapacityunit, Integer jrquantityjz, Integer jrquantityzc, Integer ordernum, String pageNum, String pageSize) {
+    public IPage<Region> list(String id, String name, String companyid, String aname,String pageNum, String pageSize) {
         QueryWrapper<Region> qw = new QueryWrapper<>();
         QueryWrapper<Region> qw = new QueryWrapper<>();
 
 
         if (StringUtils.isNotEmpty(id)){
         if (StringUtils.isNotEmpty(id)){