diff --git a/jwtech-admin/src/main/java/com/kms/web/controller/tool/TestController.java b/jwtech-admin/src/main/java/com/kms/web/controller/tool/TestController.java index 5e5daeda..6eef55e8 100644 --- a/jwtech-admin/src/main/java/com/kms/web/controller/tool/TestController.java +++ b/jwtech-admin/src/main/java/com/kms/web/controller/tool/TestController.java @@ -4,19 +4,13 @@ import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; import cn.hutool.core.collection.CollectionUtil; -import com.alibaba.fastjson.JSONObject; -import com.google.common.base.Joiner; -import com.jianwei.common.core.domain.BaseEntity; import com.kms.build.domain.BsSgcjsjdBuiProInfo; -import com.kms.build.domain.dto.LatitudeLongitude; import com.kms.build.service.BsSgcjsjdBuiProInfoService; import com.kms.config.WaterRequestUtil; import com.kms.config.WaterResult; import com.kms.config.singleDomain.SingleMenu; -import com.kms.config.singleDomain.SingleUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import com.jianwei.common.core.controller.BaseController; diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcjsjdBuiProInfo.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcjsjdBuiProInfo.java index 8e1eaa78..9fb2f00f 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcjsjdBuiProInfo.java +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcjsjdBuiProInfo.java @@ -1,9 +1,7 @@ package com.kms.build.domain; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; -import com.kms.build.domain.dto.LatitudeLongitude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml b/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml index bafaa533..bc85e68b 100644 --- a/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml +++ b/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml @@ -13,7 +13,10 @@ pi.CONSTRUCTION_NATURE, pi.is_major, pi.total, - pi.pro_no + pi.pro_no, + pi.point_latitude_longitude_list, + pi.line_latitude_longitude_list, + pi.all_latitude_longitude_list from bs_sgc_jsjd_bui_pro_info pi left join bs_slgc_qqjd_spe_pro_proposal pp on pi.pro_code = pp.project_code and pi.pro_no = pp.pro_no