合规性分析添加来源，智慧选址的数据不显示

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/config/fzss/HgxfxDTO.java

@@ -26,6 +26,8 @@ public class HgxfxDTO {
     private List<HgxfxScxRwDTO> scxList;
     @TableField(exist = false)
     private String geom;
+    @TableField(value = "from_type")
+    private Integer fromType;// 1智慧选址 2合规性分析
 
     public String getBsm() {
         return bsm;
@@ -154,4 +156,12 @@ public class HgxfxDTO {
     public void setScsj(Date scsj) {
         this.scsj = scsj;
     }
+
+    public Integer getFromType() {
+        return fromType;
+    }
+
+    public void setFromType(Integer fromType) {
+        this.fromType = fromType;
+    }
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/fzss/HgxfxServiceImpl.java

@@ -106,6 +106,7 @@ public class HgxfxServiceImpl implements IHgxfxService {
         hgxfxDTO.setFxmj(area);
         hgxfxDTO.setCjsj(new Date());
         hgxfxDTO.setRwzt(0);
+        hgxfxDTO.setFromType(2);
         String bsm = insertHgxfx(hgxfxDTO);
         FixedThreadUtil.FIXED_THREAD_POOL.execute(() -> {
             hxfxHandleService.hgxfxHandle(bsm, ewkt);
@@ -146,6 +147,7 @@ public class HgxfxServiceImpl implements IHgxfxService {
         hgxfxDTO.setFxmj(area);
         hgxfxDTO.setCjsj(new Date());
         hgxfxDTO.setRwzt(0);
+        hgxfxDTO.setFromType(1);
         String bsm = insertHgxfx(hgxfxDTO);
         hxfxHandleService.hgxfxHandle(bsm, ewkt);
         return RequestResult.success(GetFxjg(bsm));

onemap-modules/onemap-apply/src/main/resources/mapper/oracle/fzss/HgxfxMapper.xml

@@ -14,7 +14,7 @@
         t.ydxz_bsm as "ydxz_bsm",
         t.fxbg as "fxbg",
         t.rwzt as "rwzt",
-        t.cjsj as "cjsj" from t_fzss_hgxfx t where 1 = 1
+        t.cjsj as "cjsj" from t_fzss_hgxfx t where t.from_type = 2
         <if test="kssj != null and kssj != ''">
             and t.cjsj &gt;= to_date(#{kssj}, 'yyyy-MM-dd hh24:mi:ss')
         </if>