Merge branch 'f-xiaogu' into dev

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/res/FzxzResultDTO.java

@@ -30,6 +30,8 @@ public class FzxzResultDTO {
     // 结果返回地块信息
     @TableField(exist = false)
     private List<Map<String, Object>> dks = new ArrayList<>();
+    @TableField(exist = false)
+    private int landCount = 0;
 
     // TODO 选址条件信息，数据源，面积起始、终止
     // 结果返回选址因子信息

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/service/impl/FzssServiceImpl.java

@@ -501,6 +501,15 @@ public class FzssServiceImpl implements IFzssService {
         return RequestResult.success("查询成功！", result);
     }
 
+    /**
+     * 获取选址结果列表
+     * @param startTime
+     * @param endTime
+     * @param name
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
     @Override
     public RequestResult GetXzResList(String startTime, String endTime, String name, Integer pageNum, Integer pageSize) {
         Long userId = SecurityUtils.getUserId();

onemap-modules/onemap-analyse/src/main/resources/mapper/oracle/fzss/FzxzMapper.xml

@@ -63,7 +63,8 @@
         where  t.RWBSM = #{rwbsm}
     </select>
     <select id="getList" parameterType="java.lang.String" resultType="com.onemap.analyse.domain.res.FzxzResultDTO">
-        select *
+        select t_fzss_fzxz.*,
+        ( SELECT COUNT ( * ) FROM t_fzss_fzxz_res WHERE t_fzss_fzxz_res.rwbsm = t_fzss_fzxz.bsm ) AS landCount
         from t_fzss_fzxz
         where is_delete = false
         <if test="userId != null and userId != ''">