Browse Source

责任单位、行政区划列表去重1.1

master
Jinyuanyuan 3 months ago
parent
commit
e0659200ac
  1. 3
      huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouProjectinfoMapper.java
  2. 3
      huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouProjectinfoMapper.xml
  3. 7
      huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java

3
huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouProjectinfoMapper.java

@ -31,6 +31,9 @@ public interface HuzhouProjectinfoMapper extends BaseMapper<HuzhouProjectinfo> {
*/
List<HuzhouProjectinfo> getProjectInfoPageList(@Param("info") HuzhouProjectinfo info);
//无权限
List<HuzhouProjectinfo> getAllProjectInfoList();
/**
* 获取项目信息和子项目信息支持分页
* @param page 分页信息

3
huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouProjectinfoMapper.xml

@ -187,6 +187,9 @@ order by create_date desc
</where>
order by u.create_date desc
</select>
<select id="getAllProjectInfoList" resultMap="HuzhouProjectinfoMap" parameterType="com.easy.admin.modules.huzhou.entity.HuzhouProjectinfo">
SELECT * from huzhou_projectinfo u
</select>
<select id="getProjectAndChildInfoPageListNew" resultMap="HuzhouProjectinfoMap" parameterType="com.easy.admin.modules.huzhou.entity.HuzhouProjectinfo">
SELECT * from huzhou_projectinfo u
<where>

7
huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java

@ -1153,16 +1153,15 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
@Override
public List<String> getDutyWorkplaceList() {
HuzhouProjectinfo info = new HuzhouProjectinfo();
List<HuzhouProjectinfoOV> infoList = projectinfoMapper.getProjectAndChildInfoPageList(info);
List<HuzhouProjectinfo> infoList = projectinfoMapper.getAllProjectInfoList();
List<String> result = infoList.stream().map(x -> x.getDutyWorkplace()).distinct().collect(Collectors.toList());
return result;
}
@Override
public List<String> getAdminDivisionList() {
HuzhouProjectinfo info = new HuzhouProjectinfo();
List<HuzhouProjectinfoOV> infoList = projectinfoMapper.getProjectAndChildInfoPageList(info);
List<HuzhouProjectinfo> infoList = projectinfoMapper.getAllProjectInfoList();
List<String> result = infoList.stream().map(x -> x.getAdminDivision()).distinct().collect(Collectors.toList());
return result;
}

Loading…
Cancel
Save