Bladeren bron

提交修改

wangb 2 jaren geleden
bovenliggende
commit
a29c9ee0f4

+ 2 - 1
web/backmanagerconfig/src/main/java/com/gyee/backconfig/controller/StandardpointController.java

@@ -41,9 +41,10 @@ public class StandardpointController {
     public R findList(@RequestParam(value = "id", required = false) String id,
     public R findList(@RequestParam(value = "id", required = false) String id,
                       @RequestParam(value = "code", required = false) String code,
                       @RequestParam(value = "code", required = false) String code,
                       @RequestParam(value = "name", required = false) String name,
                       @RequestParam(value = "name", required = false) String name,
+                      @RequestParam(value = "type", required = false) String type,
                       @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<Standardpoint> list = standardpointService.list(id, code, name, pageNum, pageSize);
+        IPage<Standardpoint> list = standardpointService.list(id, code, name,type,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/IStandardpointService.java

@@ -15,7 +15,7 @@ import com.gyee.backconfig.model.auto.Windturbine;
  */
  */
 public interface IStandardpointService extends IService<Standardpoint> {
 public interface IStandardpointService extends IService<Standardpoint> {
 
 
-    IPage<Standardpoint> list(String id, String code, String name, String pageNum, String pageSize);
+    IPage<Standardpoint> list(String id, String code, String name, String type,String pageNum, String pageSize);
 
 
     Standardpoint getOne(String id);
     Standardpoint getOne(String id);
 
 

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

@@ -25,7 +25,7 @@ public class StandardpointServiceImpl extends ServiceImpl<StandardpointMapper, S
 
 
 
 
     @Override
     @Override
-    public IPage<Standardpoint> list(String id, String code, String name, String pageNum, String pageSize) {
+    public IPage<Standardpoint> list(String id, String code, String name, String type,String pageNum, String pageSize) {
 
 
         QueryWrapper<Standardpoint> qw = new QueryWrapper<>();
         QueryWrapper<Standardpoint> qw = new QueryWrapper<>();
 
 
@@ -40,6 +40,9 @@ public class StandardpointServiceImpl extends ServiceImpl<StandardpointMapper, S
         if (StringUtils.isNotEmpty(name)){
         if (StringUtils.isNotEmpty(name)){
             qw.like("name",name);
             qw.like("name",name);
         }
         }
+        if (StringUtils.isNotEmpty(type)){
+            qw.like("type",type);
+        }
 
 
         Page<Standardpoint> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
         Page<Standardpoint> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
         IPage<Standardpoint> companysPage = getBaseMapper().selectPage(page, qw);
         IPage<Standardpoint> companysPage = getBaseMapper().selectPage(page, qw);