返回辅助结果列表

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

@@ -2,11 +2,13 @@ package com.onemap.analyse.domain.res;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.onemap.analyse.domain.FzxzResDTO;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.onemap.analyse.domain.FzxzXzyzDTO;
 import lombok.Data;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -15,10 +17,15 @@ import java.util.Map;
 public class FzxzResultDTO {
     private String bsm;
     private String xmmc;
+    private String xmlx;
     private String jsdw;
-    private String fxbg;//分析报告地址
+    private String fxbg;// 分析报告地址
     private String geom;
 
+    @JsonProperty("createAt")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date cjsj;
+
     // 结果返回地块信息
     @TableField(exist = false)
     private List<Map<String, Object>> dks = new ArrayList<>();

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/FzxzMapper.java

@@ -3,6 +3,7 @@ package com.onemap.analyse.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.onemap.analyse.domain.FzxzDTO;
 import com.onemap.analyse.domain.FzxzEntityDTO;
+import com.onemap.analyse.domain.res.FzxzResultDTO;
 import com.onemap.common.datasource.annotation.Master;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,5 +22,5 @@ public interface FzxzMapper extends BaseMapper<FzxzDTO> {
     FzxzEntityDTO GetFzxzByBsm(@Param("bsm") String bsm);
 
     @Master
-    List<FzxzDTO> getList(Map<String, Object> paramMap);
+    List<FzxzResultDTO> getList(Map<String, Object> paramMap);
 }

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

@@ -403,8 +403,7 @@ public class FzssServiceImpl implements IFzssService {
         paramMap.put("startTime", startTime);
         paramMap.put("endTime", endTime);
 
-
-        List<FzxzDTO> fzxzDTOS = fzxzMapper.getList(paramMap);
+        List<FzxzResultDTO> fzxzDTOS = fzxzMapper.getList(paramMap);
         return RequestResult.success("查询成功！", fzxzDTOS);
     }
 

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

@@ -62,18 +62,22 @@
         where  t.RWBSM = #{rwbsm}
     </select>
 
-    <select id="getList" parameterType="java.lang.String" resultType="com.onemap.analyse.domain.FzxzDTO">
+    <select id="getList" parameterType="java.lang.String" resultType="com.onemap.analyse.domain.res.FzxzResultDTO">
         select *
         from t_fzss_fzxz
-        where t_fzss_fzxz.cjyh = #{userId}
+        where 1=1
+        <if test="userId != null and userId != ''">
+            and user_id = #{userId}
+        </if>
         <if test="name != null and name != ''">
-            and t_fzss_fzxz.xmmc like '%'||#{name}||'%'
+            and xmmc like '%'||#{name}||'%'
         </if>
         <if test="startTime != null and startTime != ''">
-            and t_fzss_fzxz.cjsj &gt;= to_date(#{startTime}, 'YYYY-MM-DD')
+            and cjsj &gt;= to_date(#{startTime}, 'YYYY-MM-DD')
         </if>
         <if test="endTime != null and endTime != ''">
-            and t_fzss_fzxz.cjsj &lt;= to_date(#{endTime}, 'YYYY-MM-DD')
+            and cjsj &lt;= to_date(#{endTime}, 'YYYY-MM-DD')
         </if>
+        order by cjsj desc
     </select>
 </mapper>