admin-server/src/main/java/com/estate/expert/admin/controller/admin/CheckController.java
@@ -35,9 +35,9 @@ @Resource private CheckService checkService; @ApiOperation(value = "列表") @ApiOperation(value = "列表",response = OnDutyVo.class) @PostMapping("/list") public Result list(@Validated @RequestBody OnDutyRequest request) { public Result<Page<CheckVo>> list(@Validated @RequestBody OnDutyRequest request) { Page<CheckVo> page = new Page<>(request.getPageReq().getPage(), request.getPageReq().getSize()); List<CheckVo> res = checkService.pageList(page, request); @@ -46,9 +46,9 @@ } @ApiOperation(value = "详情") @ApiOperation(value = "详情",response = OnDutyVo.class) @PostMapping("/detail/{id}") public Result detail(@PathVariable Integer id) { public Result<CheckVo> detail(@PathVariable Integer id) { CheckVo vo = checkService.detail(id); return Result.success(vo); } admin-server/src/main/java/com/estate/expert/admin/controller/admin/option/OptionEntityController.java
@@ -86,6 +86,12 @@ return Result.success(SelectOptionVo.buildOptions(title, projectService.listByClient(clientId))); } @ApiOperation(value = "项目下拉框-进入大屏") @RequestMapping("/projectsSelect") public Result projectsSelect(@RequestParam(value = "name", required = false) String name) { return Result.success( projectService.listByTitle(name)); } ////////// 综合体系 ////////// @ApiOperation(value = "综合模型") admin-server/src/main/java/com/estate/expert/admin/domain/project/ProjectRepository.java
@@ -36,5 +36,11 @@ @Query("select p.id from Project p where ( :keyword is null or :keyword = '' or p.name like %:keyword% ) " + "and p.deleted = false " ) List<Integer> listProjectIds(@Param("keyword") String keyword); @Query("select p from Project p where ( :name is null or :name = '' or p.name like %:name% ) " + "and p.deleted = false " + "order by p.updateTime desc") List<Project> findAllByTitleIdAndDeleted(String name); } admin-server/src/main/java/com/estate/expert/admin/domain/repository/ScreenAccountMybatisMapper.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.estate.expert.admin.domain.business.screenaccount.ScreenAccount; import com.estate.expert.admin.domain.business.screenaccount.ScreenAccountDto; import com.estate.expert.admin.domain.project.Project; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -42,4 +43,6 @@ ScreenAccount getUserFromMobile(@Param("mobile") String mobile); List<Project> findAllByTitleIdAndDeleted(@Param("name") String name); } admin-server/src/main/java/com/estate/expert/admin/service/ProjectService.java
@@ -40,4 +40,5 @@ */ List<Project> listByClient(Integer clientId); List<Project> listByTitle(String name); } admin-server/src/main/java/com/estate/expert/admin/service/impl/ProjectServiceImpl.java
@@ -8,11 +8,13 @@ import com.estate.expert.admin.domain.project.ProjectDto; import com.estate.expert.admin.domain.project.ProjectRepository; import com.estate.expert.admin.domain.project.enums.ProjectType; import com.estate.expert.admin.domain.repository.ScreenAccountMybatisMapper; import com.estate.expert.admin.domain.standard.hierachy.HierarchyIds; import com.estate.expert.admin.domain.user.User; import com.estate.expert.admin.service.DeviceUsageService; import com.estate.expert.admin.service.HierarchyService; import com.estate.expert.admin.service.ProjectService; import com.estate.expert.admin.service.UserFileService; import com.estate.expert.admin.service.common.CrudServiceBaseImpl; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -40,6 +42,9 @@ @Resource private GeoTranslateComponent geoTranslateComponent; @Resource private ScreenAccountMybatisMapper screenAccountMybatisMapper; @Override public PageResp<ProjectDto> list(String keyword, List<ProjectType> projectTypes, List<Integer> clientIds, PageReq pageReq) { @@ -56,6 +61,10 @@ public List<Project> listByClient(Integer clientId) { return projectRepository.findAllByClientIdAndDeleted(clientId, false); } @Override public List<Project> listByTitle(String name) { return screenAccountMybatisMapper.findAllByTitleIdAndDeleted(name); } @Override protected void beforeDelete(Project entity) { admin-server/src/main/resources/mapper/ScreenAccountMapper.xml
@@ -111,4 +111,10 @@ resultType="com.estate.expert.admin.domain.business.screenaccount.ScreenAccount"> select * from screen_account where deleted = false and account = #{mobile} </select> <select id="findAllByTitleIdAndDeleted" resultType="com.estate.expert.admin.domain.project.Project"> select id,name from project where deleted = false <if test="name !=null and name !=''"> and name like concat('%',#{name},'%') </if> </select> </mapper>
