diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java index a9038d5294..93f897586e 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java @@ -10,7 +10,6 @@ import com.epmet.dto.IssueSuggestionDTO; import com.epmet.dto.*; import com.epmet.dto.form.*; import com.epmet.dto.result.*; -import com.epmet.feign.fallback.GovIssueOpenFeignClientFallBack; import com.epmet.feign.fallback.GovIssueOpenFeignClientFallBackFactory; import com.epmet.project.dto.CustomerCategoryDTO; import com.epmet.project.dto.result.ProjectCategoryDictResultDTO; @@ -365,4 +364,12 @@ public interface GovIssueOpenFeignClient { @PostMapping(value = "/gov/issue/issue/projectcountbygrid") Result> getProjectCountByGrid(@RequestBody ProjectDistributionAnalysisFormDTO formDTO); + /** + * @param formDTO + * @return + * @Description 批量查询分类信息 + * @Author yinzuomei + **/ + @PostMapping(value = "/gov/issue/issueprojectcategorydict/getcategorylist") + public Result> getCategoryList(@RequestBody IssueProjectCategoryDictListFormDTO formDTO); } diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java index 5e6236c364..5e59dc20fe 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java @@ -23,7 +23,6 @@ import com.epmet.resi.group.dto.group.result.ApplicationListResultDTO; import com.epmet.resi.group.dto.group.result.*; import com.epmet.resi.mine.dto.from.MyShiftIssueTopicsFormDTO; import com.epmet.resi.mine.dto.result.MyShiftIssueTopicsResultDTO; -import org.springframework.stereotype.Component; import java.util.List; import java.util.Map; @@ -295,4 +294,15 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient public Result> getProjectCountByGrid(ProjectDistributionAnalysisFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getProjectCountByGrid", formDTO); } + + /** + * @param formDTO + * @return + * @Description 批量查询分类信息 + * @Author yinzuomei + **/ + @Override + public Result> getCategoryList(IssueProjectCategoryDictListFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getCategoryList", formDTO); + } } diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml index 465bd2454a..24acbb220f 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml @@ -50,7 +50,7 @@ ) - SELECT * FROM project_category diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index c9af6f06e4..8414cf5e4b 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -357,7 +357,7 @@ ic_resi_user m WHERE m.DEL_FLAG = '0' - AND m.id != #{isResiUserId} + AND m.id != #{currentIcResiUserId} and m.HOME_ID=#{homeId} order by m.CREATED_TIME asc