diff --git a/src/main/java/com/bonus/gzgqj/business/plan/controller/PlanApplicationController.java b/src/main/java/com/bonus/gzgqj/business/plan/controller/PlanApplicationController.java index 47a4240..da1fa41 100644 --- a/src/main/java/com/bonus/gzgqj/business/plan/controller/PlanApplicationController.java +++ b/src/main/java/com/bonus/gzgqj/business/plan/controller/PlanApplicationController.java @@ -187,7 +187,14 @@ public class PlanApplicationController { return "待审核"; } - + @GetMapping("getTypeList") + @DecryptAndVerify(decryptedClass = PlanDevBean.class) + public PageInfo getTypeList(EncryptedReq dto) { + PageHelper.startPage(dto.getPageNum(),dto.getPageSize()); + List list = service.getTypeList(dto.getData());; + PageInfo pageInfo = new PageInfo<>(list); + return pageInfo; + } } diff --git a/src/main/java/com/bonus/gzgqj/business/plan/entity/PlanDevBean.java b/src/main/java/com/bonus/gzgqj/business/plan/entity/PlanDevBean.java index 8ea165c..d1747b5 100644 --- a/src/main/java/com/bonus/gzgqj/business/plan/entity/PlanDevBean.java +++ b/src/main/java/com/bonus/gzgqj/business/plan/entity/PlanDevBean.java @@ -2,6 +2,9 @@ package com.bonus.gzgqj.business.plan.entity; import java.util.List; +/** + * 设备实体类 + */ public class PlanDevBean { private String id; diff --git a/src/main/java/com/bonus/gzgqj/business/plan/mapper/PlanApplicationMapper.java b/src/main/java/com/bonus/gzgqj/business/plan/mapper/PlanApplicationMapper.java index 5b6bd19..888a078 100644 --- a/src/main/java/com/bonus/gzgqj/business/plan/mapper/PlanApplicationMapper.java +++ b/src/main/java/com/bonus/gzgqj/business/plan/mapper/PlanApplicationMapper.java @@ -89,5 +89,11 @@ public interface PlanApplicationMapper { */ List findByPage(PlanApplyBean data); + /** + * 设备下拉选查询 + * @param data + * @return + */ + List getTypeList(PlanDevBean data); } diff --git a/src/main/java/com/bonus/gzgqj/business/plan/service/PlanApplicationService.java b/src/main/java/com/bonus/gzgqj/business/plan/service/PlanApplicationService.java index d802785..ac907fe 100644 --- a/src/main/java/com/bonus/gzgqj/business/plan/service/PlanApplicationService.java +++ b/src/main/java/com/bonus/gzgqj/business/plan/service/PlanApplicationService.java @@ -58,5 +58,10 @@ public interface PlanApplicationService { List findByPage(PlanApplyBean data); - + /** + * 分页查询下拉选树结果数据 + * @param data + * @return + */ + List getTypeList(PlanDevBean data); } diff --git a/src/main/java/com/bonus/gzgqj/business/plan/service/PlanApplicationServiceImp.java b/src/main/java/com/bonus/gzgqj/business/plan/service/PlanApplicationServiceImp.java index 0888351..2c39fbf 100644 --- a/src/main/java/com/bonus/gzgqj/business/plan/service/PlanApplicationServiceImp.java +++ b/src/main/java/com/bonus/gzgqj/business/plan/service/PlanApplicationServiceImp.java @@ -213,6 +213,22 @@ public class PlanApplicationServiceImp implements PlanApplicationService { return new ArrayList<>(); } + /** + * 分页查询下拉项树结构数据 + * @param data + * @return + */ + @Override + public List getTypeList(PlanDevBean data) { + try { + List list=dao.getTypeList(data); + return list; + }catch (Exception e) { + log.error(e.toString(), e); + + } + return new ArrayList<>(); + } } diff --git a/src/main/resources/mappers/plan/PlanApplicationMapper.xml b/src/main/resources/mappers/plan/PlanApplicationMapper.xml index 03deae6..f209057 100644 --- a/src/main/resources/mappers/plan/PlanApplicationMapper.xml +++ b/src/main/resources/mappers/plan/PlanApplicationMapper.xml @@ -48,7 +48,7 @@ LEFT JOIN mm_type mt1 on mt.PARENT_ID=mt1.id and mt.`LEVEL`=4 and mt1.`LEVEL`=3 and mt1.IS_ACTIVE=1 LEFT JOIN mm_type mt2 on mt1.PARENT_ID=mt2.id and mt1.`LEVEL`=3 and mt2.IS_ACTIVE=1 WHERE mt.IS_ACTIVE=1 - ORDER BY mt.`NAME` desc + ORDER BY mt.`NAME` desc + \ No newline at end of file