Browse Source

工作端议题转项目,限值未废弃网格

dev
yinzuomei 3 years ago
parent
commit
4dff78a636
  1. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
  2. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
  3. 1
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

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

@ -172,7 +172,7 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
BelongGridNameResultDTO getGridNameByGridId(BelongGridNameFormDTO formDTO); BelongGridNameResultDTO getGridNameByGridId(BelongGridNameFormDTO formDTO);
/** /**
* @Description 根据组织机关Id查询机关下网格列表 * @Description 根据组织机关Id查询机关下网格列表:未废弃的
* @author sun * @author sun
*/ */
List<GridListResultDTO> selectGridList(@Param("agencyId") String agencyId); List<GridListResultDTO> selectGridList(@Param("agencyId") String agencyId);

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

@ -439,7 +439,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
}); });
} }
//3:根据组织Id查询该组织下网格、人员列表 //3:根据组织Id查询该组织下网格、人员列表
//3.1:查询组织下网格列表 //3.1:查询组织下网格列表:未废弃的
List<GridListResultDTO> gridList = customerGridDao.selectGridList(canTick.getAgencyId()); List<GridListResultDTO> gridList = customerGridDao.selectGridList(canTick.getAgencyId());
List<CustomerStaffGridDTO> gridStaffs = new ArrayList<>(); List<CustomerStaffGridDTO> gridStaffs = new ArrayList<>();
if (null != gridList && gridList.size() > NumConstant.ZERO) { if (null != gridList && gridList.size() > NumConstant.ZERO) {

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

@ -369,6 +369,7 @@
<!-- AND cg.del_flag = 0 --><!-- 网格被删除时,首次在该网格注册的居民就找不到了所属网格,暂时关闭这个查询条件,避免缓存中user的showname和组成员member的usershowname出现空值 --> <!-- AND cg.del_flag = 0 --><!-- 网格被删除时,首次在该网格注册的居民就找不到了所属网格,暂时关闭这个查询条件,避免缓存中user的showname和组成员member的usershowname出现空值 -->
</select> </select>
<!-- 根据组织机关Id查询机关下网格列表:未废弃的 -->
<select id="selectGridList" resultType="com.epmet.dto.result.GridListResultDTO"> <select id="selectGridList" resultType="com.epmet.dto.result.GridListResultDTO">
SELECT SELECT
id AS "gridId", id AS "gridId",

Loading…
Cancel
Save