Merge branch 'dev_ic_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

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<List<ProjectDistributionAnalysisRightDTO>> getProjectCountByGrid(@RequestBody ProjectDistributionAnalysisFormDTO formDTO);
 
+	/**
+	 * @param formDTO
+	 * @return
+	 * @Description 批量查询分类信息
+	 * @Author yinzuomei
+	 **/
+	@PostMapping(value = "/gov/issue/issueprojectcategorydict/getcategorylist")
+	public Result<List<IssueProjectCategoryDictDTO>> getCategoryList(@RequestBody IssueProjectCategoryDictListFormDTO formDTO);
 }

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<List<ProjectDistributionAnalysisRightDTO>> getProjectCountByGrid(ProjectDistributionAnalysisFormDTO formDTO) {
 		return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getProjectCountByGrid", formDTO);
     }
+
+	/**
+	 * @param formDTO
+	 * @return
+	 * @Description 批量查询分类信息
+	 * @Author yinzuomei
+	 **/
+	@Override
+	public Result<List<IssueProjectCategoryDictDTO>> getCategoryList(IssueProjectCategoryDictListFormDTO formDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getCategoryList", formDTO);
+	}
 }

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml

@@ -50,7 +50,7 @@
             )
     </select>
 
-    <select id="selectListByProjectId" parameterType="java.lang.String" resultMap="com.epmet.dto.ProjectCategoryDTO">
+    <select id="selectListByProjectId" parameterType="java.lang.String" resultType="com.epmet.dto.ProjectCategoryDTO">
         SELECT
             *
         FROM project_category

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
     </select>