代码修改

web/backmanagerconfig/src/main/java/com/gyee/backconfig/controller/ProjectstudyController.java

@@ -41,9 +41,10 @@ public class ProjectstudyController {
     @GetMapping(value = "/List")
     public R findList(@RequestParam(value = "id", required = false) String id,
                       @RequestParam(value = "projectid", required = false) String projectid,
+                      @RequestParam(value = "windpower", required = false) String windpower,
                       @RequestParam(value = "pageNum", required = true) String pageNum,
                       @RequestParam(value = "pageSize", required = true) String pageSize) {
-        IPage<Projectstudy> list = projectstudyService.getList(id, projectid, pageNum, pageSize);
+        IPage<Projectstudy> list = projectstudyService.getList(id, windpower,projectid, pageNum, pageSize);
         if (null != list) {
             return R.ok().data(list);
         } else {

web/backmanagerconfig/src/main/java/com/gyee/backconfig/controller/WindpowerstationController.java

@@ -230,10 +230,11 @@ public class WindpowerstationController {
     @CrossOrigin(origins = "*", maxAge = 3600)
     @GetMapping(value = "/getAdmList")
     public R getAdmList(
+            @RequestParam(value = "id",required = false) String id,
             @RequestParam(value = "regionid",required = false) String regionid,
             @RequestParam(value = "companyid",required = false) String companyid){
         try {
-            List<WindpowerstationAdmVo> list = windpowerstationService.getList(regionid,companyid);
+            List<WindpowerstationAdmVo> list = windpowerstationService.getList(id,regionid,companyid);
             if (null != list){
                 return R.ok().data(list);
             }else {

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/IProjectstudyService.java

@@ -14,5 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2022-10-25
  */
 public interface IProjectstudyService extends IService<Projectstudy> {
-    IPage<Projectstudy> getList(String id, String projectid, String pageNum, String pageSize);
+    IPage<Projectstudy> getList(String id, String windpower,String projectid, String pageNum, String pageSize);
 }

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/IWindpowerstationService.java

@@ -32,7 +32,7 @@ public interface IWindpowerstationService extends IService<Windpowerstation> {
     List<Windpowerstation> getList(String companyid);
 
 
-    List<WindpowerstationAdmVo> getList(String regionid, String companyid) throws Exception;
+    List<WindpowerstationAdmVo> getList(String id,String regionid, String companyid) throws Exception;
 
 
     List<PersisVo> getPersis(String stationDate, Date startdate, Date enddate) throws Exception;

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/impl/ProjectstudyServiceImpl.java

@@ -23,7 +23,7 @@ import org.springframework.stereotype.Service;
 public class ProjectstudyServiceImpl extends ServiceImpl<ProjectstudyMapper, Projectstudy> implements IProjectstudyService {
 
     @Override
-    public IPage<Projectstudy> getList(String id, String projectid, String pageNum, String pageSize) {
+    public IPage<Projectstudy> getList(String id, String windpower,String projectid, String pageNum, String pageSize) {
         QueryWrapper<Projectstudy> qw = new QueryWrapper<>();
 
         if (StringUtils.isNotEmpty(id)){
@@ -34,6 +34,10 @@ public class ProjectstudyServiceImpl extends ServiceImpl<ProjectstudyMapper, Pro
             qw.like("projectid",projectid);
         }
 
+        if (StringUtils.isNotEmpty(windpower)){
+            qw.like("windpower",windpower);
+        }
+
         Page<Projectstudy> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
         IPage<Projectstudy> companysPage = getBaseMapper().selectPage(page, qw);
 //        List<Project> list = companysPage.getRecords();

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/impl/WindpowerstationServiceImpl.java

@@ -107,11 +107,14 @@ public class WindpowerstationServiceImpl extends ServiceImpl<WindpowerstationMap
     }
 
     @Override
-    public List<WindpowerstationAdmVo> getList(String regionid, String companyid) throws Exception {
+    public List<WindpowerstationAdmVo> getList(String id,String regionid, String companyid) throws Exception {
 
         List<WindpowerstationAdmVo> admvos =  new ArrayList<>();
         QueryWrapper<Windpowerstation> qw = new QueryWrapper<>();
 
+        if (StringUtils.isNotEmpty(id)){
+            qw.eq("id",id);
+        }
         if (StringUtils.isNotEmpty(regionid)){
             qw.eq("regionid",regionid);
         }