diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java index fac395079..f900f8b05 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java @@ -356,8 +356,8 @@ public class SysDeptController { * @date 2020-12-08 11:16 * @return com.elink.esua.epdc.commons.tools.utils.Result> */ - @GetMapping("getKpiGridIds") - public Result> getKpiGridIds(KpiGridIdsFormDTO dto){ + @PostMapping("getKpiGridIds") + public Result> getKpiGridIds(@RequestBody KpiGridIdsFormDTO dto){ List list= sysDeptService.getKpiGridIds(dto); return new Result>().ok(list); } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/SubDetailDictChildResultDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/SubDetailDictChildResultDTO.java new file mode 100644 index 000000000..5cf1ec3fc --- /dev/null +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/SubDetailDictChildResultDTO.java @@ -0,0 +1,19 @@ +package com.elink.esua.epdc.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * + *详情页面子 - 组成返回类 + * @author sarnath + * @version 1.0 + * @date 2020-12-08 14:13 + */ +@Data +public class SubDetailDictChildResultDTO implements Serializable { + private static final long serialVersionUID = -1L; + private String id; + private String label; +} diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/SubDetailDictResultDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/SubDetailDictResultDTO.java new file mode 100644 index 000000000..570dbcd94 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/SubDetailDictResultDTO.java @@ -0,0 +1,20 @@ +package com.elink.esua.epdc.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 详情页面 - 组成返回类 + * @author sarnath + * @version 1.0 + * @date 2020-12-08 14:11 + */ +@Data +public class SubDetailDictResultDTO implements Serializable { + private static final long serialVersionUID = -1L; + private String id; + private String label; + private List childDiction; +} diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/SubCheckDictionaryController.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/SubCheckDictionaryController.java index 2367686c2..fbe1c645f 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/SubCheckDictionaryController.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/SubCheckDictionaryController.java @@ -27,6 +27,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.dto.SubCheckDictionaryDTO; import com.elink.esua.epdc.dto.result.CheckResourcesListResultDTO; +import com.elink.esua.epdc.dto.result.SubDetailDictResultDTO; import com.elink.esua.epdc.excel.SubCheckDictionaryExcel; import com.elink.esua.epdc.service.SubCheckDictionaryService; import org.springframework.beans.factory.annotation.Autowired; @@ -97,5 +98,16 @@ public class SubCheckDictionaryController { List list = subCheckDictionaryService.list(params); ExcelUtils.exportExcelToTarget(response, null, list, SubCheckDictionaryExcel.class); } + /* + * + * 组装详情页面 + * @author wk + * @date 2020-12-08 14:19 + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("getdetaildict") + public Result> getDetailDict(){ + return subCheckDictionaryService.getDetailDict(); + } } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/SubCheckDictionaryDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/SubCheckDictionaryDao.java index 648f40478..835cdd937 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/SubCheckDictionaryDao.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/SubCheckDictionaryDao.java @@ -19,6 +19,7 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.result.CheckResourcesListResultDTO; +import com.elink.esua.epdc.dto.result.SubDetailDictResultDTO; import com.elink.esua.epdc.entity.SubCheckDictionaryEntity; import org.apache.ibatis.annotations.Mapper; @@ -35,4 +36,13 @@ public interface SubCheckDictionaryDao extends BaseDao List getResourceList(); + /* + * + * 组装详情页面 + * @author wk + * @date 2020-12-08 14:21 + * @return com.elink.esua.epdc.dto.result.SubDetailDictResultDTO + */ + List getDetailDict(); + } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java index 71f223843..d58dfbca5 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java @@ -116,6 +116,6 @@ public interface AdminFeignClient { * @date 2020-12-08 13:57 * @return com.elink.esua.epdc.commons.tools.utils.Result> */ - @GetMapping("/sys/dept/getKpiGridIds") + @PostMapping("/sys/dept/getKpiGridIds") Result> getKpiGridIds(KpiGridIdsFormDTO dto); } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/SubCheckDictionaryService.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/SubCheckDictionaryService.java index bde98fba6..67fe4c42b 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/SubCheckDictionaryService.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/SubCheckDictionaryService.java @@ -19,7 +19,9 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.SubCheckDictionaryDTO; +import com.elink.esua.epdc.dto.result.SubDetailDictResultDTO; import com.elink.esua.epdc.entity.SubCheckDictionaryEntity; import java.util.List; @@ -101,4 +103,13 @@ public interface SubCheckDictionaryService extends BaseService + */ + Result> getDetailDict(); } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubCheckDictionaryServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubCheckDictionaryServiceImpl.java index c93e89ab7..bbb876b69 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubCheckDictionaryServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubCheckDictionaryServiceImpl.java @@ -24,11 +24,13 @@ import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.utils.TreeUtils; import com.elink.esua.epdc.commons.tools.utils.TreeUtilsNew; import com.elink.esua.epdc.dao.SubCheckDictionaryDao; import com.elink.esua.epdc.dto.SubCheckDictionaryDTO; import com.elink.esua.epdc.dto.result.CheckResourcesListResultDTO; +import com.elink.esua.epdc.dto.result.SubDetailDictResultDTO; import com.elink.esua.epdc.entity.SubCheckDictionaryEntity; import com.elink.esua.epdc.redis.SubCheckDictionaryRedis; import com.elink.esua.epdc.service.SubCheckDictionaryService; @@ -138,4 +140,17 @@ public class SubCheckDictionaryServiceImpl extends BaseServiceImpl> getDetailDict() { + List resultdto = baseDao.getDetailDict(); + return new Result>().ok(resultdto); + } + } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubPositionCheckDetailServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubPositionCheckDetailServiceImpl.java index 3e524d66f..36ef29480 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubPositionCheckDetailServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubPositionCheckDetailServiceImpl.java @@ -55,6 +55,7 @@ public class SubPositionCheckDetailServiceImpl extends BaseServiceImpl + + + + + + + + + + + +