Merge remote-tracking branch 'origin/dev_resi_event' into develop

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrgNameByTypeResultDTO.java

@@ -0,0 +1,22 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/8/4 5:48 下午
+ * @DESC
+ */
+@Data
+public class OrgNameByTypeResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -6544341694748437312L;
+
+    private String orgId;
+
+    private String orgType;
+
+    private String orgName;
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java

@@ -389,4 +389,13 @@ public interface GovOrgOpenFeignClient {
     @PostMapping("/gov/org/customergrid/selectgridname")
     Result<String> gridName(@RequestParam("gridId")String gridId);
 
+    /**
+     * @Description  根据类型查询组织名称
+     * @Param formList
+     * @author zxc
+     * @date 2021/8/4 6:14 下午
+     */
+    @PostMapping("/gov/org/customergrid/selectorgnamebytype")
+    Result<List<String>> selectOrgNameByType(@RequestBody List<String> formList);
+
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java

@@ -225,6 +225,11 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "gridName", gridId);
     }
 
+    @Override
+    public Result<List<String>> selectOrgNameByType(List<String> formList) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectOrgNameByType", formList);
+    }
+
     @Override
     public Result<String> selectPidsByGridId(String gridId) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectPidsByGridId", gridId);

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java

@@ -263,4 +263,15 @@ public class CustomerGridController {
     Result<String> gridName(@RequestParam("gridId")String gridId){
         return new Result<String>().ok(customerGridService.gridName(gridId));
     }
+
+    /**
+     * @Description  根据类型查询组织名称
+     * @Param formList
+     * @author zxc
+     * @date 2021/8/4 6:14 下午
+     */
+    @PostMapping("selectorgnamebytype")
+    public Result<List<String>> selectOrgNameByType(@RequestBody List<String> formList){
+        return new Result<List<String>>().ok(customerGridService.selectOrgNameByType(formList));
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java

@@ -284,4 +284,12 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      * @date 2021/8/4 4:30 下午
      */
     String gridName(String gridId);
+
+    /**
+     * @Description  查询组织名字
+     * @Param orgIds
+     * @author zxc
+     * @date 2021/8/4 6:25 下午
+     */
+    List<String> selectOrgNameByType(@Param("orgIds") List<String> orgIds);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java

@@ -303,4 +303,12 @@ public interface CustomerGridService extends BaseService<CustomerGridEntity> {
      * @date 2021/8/4 4:26 下午
      */
     String gridName(String gridId);
+
+    /**
+     * @Description  根据类型查询组织名称
+     * @Param formList
+     * @author zxc
+     * @date 2021/8/4 6:14 下午
+     */
+    List<String> selectOrgNameByType(List<String> formList);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java

@@ -732,4 +732,15 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     public String gridName(String gridId) {
         return baseDao.gridName(gridId);
     }
+
+    /**
+     * @Description  根据类型查询组织名称
+     * @Param formList
+     * @author zxc
+     * @date 2021/8/4 6:14 下午
+     */
+    @Override
+    public List<String> selectOrgNameByType(List<String> formList) {
+        return baseDao.selectOrgNameByType(formList);
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

@@ -594,4 +594,21 @@
         WHERE cg.DEL_FLAG = 0
           AND cg.ID = #{gridId}
     </select>
+
+    <!-- 查询组织名字 -->
+    <select id="selectOrgNameByType" resultType="java.lang.String">
+        SELECT GRID_NAME AS orgName FROM customer_grid WHERE DEL_FLAG = '0'
+        AND(
+            <foreach collection="orgIds" item="orgId" separator=" or ">
+                id = #{orgId}
+            </foreach>
+                )
+        UNION ALL
+        SELECT ORGANIZATION_NAME AS orgName FROM customer_agency WHERE DEL_FLAG = '0'
+        AND(
+            <foreach collection="orgIds" item="orgId" separator=" or ">
+                id = #{orgId}
+            </foreach>
+                )
+    </select>
 </mapper>