diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/controller/PropertyProjectController.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/controller/PropertyProjectController.java index dd63e57..88ed263 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/controller/PropertyProjectController.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/controller/PropertyProjectController.java @@ -29,6 +29,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.modules.smile.project.excel.PropertyProjectExcel; import com.elink.esua.epdc.modules.smile.project.service.PropertyProjectService; import com.elink.esua.epdc.smile.dto.project.PropertyProjectDTO; +import com.elink.esua.epdc.smile.dto.project.result.PropertyDictListResultDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -57,6 +58,11 @@ public class PropertyProjectController { return new Result>().ok(page); } + @GetMapping("dict") + public Result> dict() { + List page = propertyProjectService.dict(); + return new Result>().ok(page); + } @GetMapping("{id}") public Result get(@PathVariable("id") String id) { PropertyProjectDTO data = propertyProjectService.get(id); diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/dao/PropertyProjectDao.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/dao/PropertyProjectDao.java index 8a61d44..7bc418b 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/dao/PropertyProjectDao.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/dao/PropertyProjectDao.java @@ -24,6 +24,7 @@ import com.elink.esua.epdc.smile.dto.project.form.ProjectDetailFormDTO; import com.elink.esua.epdc.smile.dto.project.form.ProjectListFormDTO; import com.elink.esua.epdc.smile.dto.project.result.ProjectDetailResultDTO; import com.elink.esua.epdc.modules.smile.project.entity.PropertyProjectEntity; +import com.elink.esua.epdc.smile.dto.project.result.PropertyDictListResultDTO; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -48,6 +49,15 @@ public interface PropertyProjectDao extends BaseDao { */ List selectListOfProjects(Map params); + /** + * 物业项目列表 + * + * @return java.util.List + * @author zhangyuan + * @since 2019/10/11 14:54 + */ + List selectDictListOfProject(); + /** * 项目列表 * diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/service/PropertyProjectService.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/service/PropertyProjectService.java index 18fd210..6779d2e 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/service/PropertyProjectService.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/service/PropertyProjectService.java @@ -26,6 +26,7 @@ import com.elink.esua.epdc.smile.dto.project.result.ProjectDetailResultDTO; import com.elink.esua.epdc.smile.dto.project.result.ProjectListResultDTO; import com.elink.esua.epdc.modules.smile.project.entity.PropertyProjectEntity; import com.elink.esua.epdc.modules.smile.rocketmq.dto.OrganizationModifyDTO; +import com.elink.esua.epdc.smile.dto.project.result.PropertyDictListResultDTO; import java.util.List; import java.util.Map; @@ -48,6 +49,15 @@ public interface PropertyProjectService extends BaseService page(Map params); + /** + * 下拉菜单 + * + * @return PageData + * @author zhangyuan + * @date 2020-05-20 + */ + List dict(); + /** * 默认查询 * diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/service/impl/PropertyProjectServiceImpl.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/service/impl/PropertyProjectServiceImpl.java index 810e6c3..aa062f2 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/service/impl/PropertyProjectServiceImpl.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/project/service/impl/PropertyProjectServiceImpl.java @@ -49,6 +49,7 @@ import com.elink.esua.epdc.smile.dto.project.form.ProjectListFormDTO; import com.elink.esua.epdc.smile.dto.project.form.ProjectScoreFormDTO; import com.elink.esua.epdc.smile.dto.project.result.ProjectDetailResultDTO; import com.elink.esua.epdc.smile.dto.project.result.ProjectListResultDTO; +import com.elink.esua.epdc.smile.dto.project.result.PropertyDictListResultDTO; import io.netty.util.internal.StringUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -96,6 +97,13 @@ public class PropertyProjectServiceImpl extends BaseServiceImpl(list, page.getTotal()); } + @Override + public List dict() { + List entityList = baseDao.selectDictListOfProject(); + + return ConvertUtils.sourceToTarget(entityList, PropertyDictListResultDTO.class); + } + @Override public List list(Map params) { List entityList = baseDao.selectList(getWrapper(params)); diff --git a/epdc-cloud-property/src/main/resources/mapper/smile/project/PropertyProjectDao.xml b/epdc-cloud-property/src/main/resources/mapper/smile/project/PropertyProjectDao.xml index 2c8d9c2..3a8ca20 100644 --- a/epdc-cloud-property/src/main/resources/mapper/smile/project/PropertyProjectDao.xml +++ b/epdc-cloud-property/src/main/resources/mapper/smile/project/PropertyProjectDao.xml @@ -25,6 +25,16 @@ ORDER BY ep.CREATED_TIME DESC +