This commit is contained in:
parent
981d6e6d3e
commit
d32431708a
|
|
@ -187,7 +187,14 @@ public class PlanApplicationController {
|
||||||
return "待审核";
|
return "待审核";
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@GetMapping("getTypeList")
|
||||||
|
@DecryptAndVerify(decryptedClass = PlanDevBean.class)
|
||||||
|
public PageInfo<PlanDevBean> getTypeList(EncryptedReq<PlanDevBean> dto) {
|
||||||
|
PageHelper.startPage(dto.getPageNum(),dto.getPageSize());
|
||||||
|
List<PlanDevBean> list = service.getTypeList(dto.getData());;
|
||||||
|
PageInfo<PlanDevBean> pageInfo = new PageInfo<>(list);
|
||||||
|
return pageInfo;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,9 @@ package com.bonus.gzgqj.business.plan.entity;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 设备实体类
|
||||||
|
*/
|
||||||
public class PlanDevBean {
|
public class PlanDevBean {
|
||||||
|
|
||||||
private String id;
|
private String id;
|
||||||
|
|
|
||||||
|
|
@ -89,5 +89,11 @@ public interface PlanApplicationMapper {
|
||||||
*/
|
*/
|
||||||
List<PlanApplyBean> findByPage(PlanApplyBean data);
|
List<PlanApplyBean> findByPage(PlanApplyBean data);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 设备下拉选查询
|
||||||
|
* @param data
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
|
||||||
|
List<PlanDevBean> getTypeList(PlanDevBean data);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -58,5 +58,10 @@ public interface PlanApplicationService {
|
||||||
|
|
||||||
List<PlanApplyBean> findByPage(PlanApplyBean data);
|
List<PlanApplyBean> findByPage(PlanApplyBean data);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 分页查询下拉选树结果数据
|
||||||
|
* @param data
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
List<PlanDevBean> getTypeList(PlanDevBean data);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -213,6 +213,22 @@ public class PlanApplicationServiceImp implements PlanApplicationService {
|
||||||
return new ArrayList<>();
|
return new ArrayList<>();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 分页查询下拉项树结构数据
|
||||||
|
* @param data
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public List<PlanDevBean> getTypeList(PlanDevBean data) {
|
||||||
|
try {
|
||||||
|
List<PlanDevBean> list=dao.getTypeList(data);
|
||||||
|
return list;
|
||||||
|
}catch (Exception e) {
|
||||||
|
log.error(e.toString(), e);
|
||||||
|
|
||||||
|
}
|
||||||
|
return new ArrayList<>();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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 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
|
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
|
WHERE mt.IS_ACTIVE=1
|
||||||
ORDER BY mt.`NAME` desc
|
ORDER BY mt.`NAME` desc
|
||||||
</select>
|
</select>
|
||||||
<select id="getTodayPlanNum" resultType="java.lang.Integer" parameterType="com.bonus.gzgqj.business.plan.entity.PlanApplyBean">
|
<select id="getTodayPlanNum" resultType="java.lang.Integer" parameterType="com.bonus.gzgqj.business.plan.entity.PlanApplyBean">
|
||||||
select count(1)
|
select count(1)
|
||||||
|
|
@ -166,5 +166,14 @@
|
||||||
where IS_ACTIVE=1
|
where IS_ACTIVE=1
|
||||||
ORDER BY TIME desc
|
ORDER BY TIME desc
|
||||||
</select>
|
</select>
|
||||||
|
<select id="getTypeList" resultType="com.bonus.gzgqj.business.plan.entity.PlanDevBean">
|
||||||
|
SELECT mt.ID id ,mt.PARENT_ID pId,mt.`LEVEL` level,mt.UNIT unit,mt.NUM num ,mt.`NAME` name ,mt1.`NAME` pName ,
|
||||||
|
mt2.`NAME` ppName
|
||||||
|
from mm_type mt
|
||||||
|
LEFT JOIN mm_type mt1 on mt.PARENT_ID=mt1.id and mt1.IS_ACTIVE=1
|
||||||
|
LEFT JOIN mm_type mt2 on mt1.PARENT_ID=mt2.id and mt2.IS_ACTIVE=1
|
||||||
|
WHERE mt.IS_ACTIVE=1 and mt.`LEVEL`=4
|
||||||
|
ORDER BY mt.`NAME` desc
|
||||||
|
</select>
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
||||||
Loading…
Reference in New Issue