Browse Source

先提一半

dev_shibei_match
zxc 4 years ago
parent
commit
ddcc808863
  1. 9
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
  2. 5
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
  3. 12
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
  4. 8
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
  5. 8
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
  6. 11
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
  7. 7
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

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

@ -398,4 +398,13 @@ public interface GovOrgOpenFeignClient {
@PostMapping("/gov/org/customergrid/selectorgnamebytype")
Result<List<String>> selectOrgNameByType(@RequestBody List<String> formList);
/**
* @Description 根据人查询所在组织
* @Param userId
* @author zxc
* @date 2021/8/5 10:08 上午
*/
@PostMapping("/gov/org/customergrid/selectorgsbyuserid")
Result<List<String>> selectOrgsByUserId(@RequestParam("userId")String userId);
}

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

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

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

@ -274,4 +274,16 @@ public class CustomerGridController {
public Result<List<String>> selectOrgNameByType(@RequestBody List<String> formList){
return new Result<List<String>>().ok(customerGridService.selectOrgNameByType(formList));
}
/**
* @Description 根据人查询所在组织
* @Param userId
* @author zxc
* @date 2021/8/5 10:08 上午
*/
@PostMapping("/selectorgsbyuserid")
public Result<List<String>> selectOrgsByUserId(@RequestParam("userId")String userId){
return new Result<List<String>>().ok(customerGridService.selectOrgsByUserId(userId));
}
}

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

@ -292,4 +292,12 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
* @date 2021/8/4 6:25 下午
*/
List<String> selectOrgNameByType(@Param("orgIds") List<String> orgIds);
/**
* @Description 根据人查询所在组织
* @Param userId
* @author zxc
* @date 2021/8/5 10:08 上午
*/
List<String> selectOrgsByUserId(@Param("userId") String userId);
}

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

@ -311,4 +311,12 @@ public interface CustomerGridService extends BaseService<CustomerGridEntity> {
* @date 2021/8/4 6:14 下午
*/
List<String> selectOrgNameByType(List<String> formList);
/**
* @Description 根据人查询所在组织
* @Param userId
* @author zxc
* @date 2021/8/5 10:08 上午
*/
List<String> selectOrgsByUserId(String userId);
}

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

@ -743,4 +743,15 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
public List<String> selectOrgNameByType(List<String> formList) {
return baseDao.selectOrgNameByType(formList);
}
/**
* @Description 根据人查询所在组织
* @Param userId
* @author zxc
* @date 2021/8/5 10:08 上午
*/
@Override
public List<String> selectOrgsByUserId(String userId) {
return baseDao.selectOrgsByUserId(userId);
}
}

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

@ -611,4 +611,11 @@
</foreach>
)
</select>
<!-- 根据人查询所在组织 -->
<select id="selectOrgsByUserId" resultType="java.lang.String">
SELECT GRID_ID AS orgId FROM customer_staff_grid WHERE del_flag = '0' AND USER_ID = #{userId}
union ALL
SELECT agency_id AS orgId FROM customer_staff_agency WHERE del_flag = '0' and USER_ID = #{userId}
</select>
</mapper>

Loading…
Cancel
Save