From 79111fdd182e7ceb242011e66e5228ebb3136e03 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Tue, 12 Sep 2023 18:57:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xmgl/modules/basicdata/mapper/xml/ProjectMapper.xml  | 5 +++--
 .../modules/basicdata/statistics/EngineeringStat.java    | 9 +++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/ProjectMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/ProjectMapper.xml
index ea115bb..4b3c6a1 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/ProjectMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/ProjectMapper.xml
@@ -2,10 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zhgd.xmgl.modules.basicdata.mapper.ProjectMapper">
     <sql id="detailInfo">
-        p.project_sn, p.project_id, p.project_name, p.state, p.project_manage, p.project_address,  p.project_tel, u.account, u.show_password, u.email, u.user_tel, g.government_name
+        p.project_sn, p.project_id, p.project_name, p.state, p.project_manage, p.project_address,  p.project_tel, u.account, u.show_password, u.email, u.user_tel, g.government_name,
+        p.longitude, p.latitude
     </sql>
 
-    <select id="getPageList" resultType="com.zhgd.xmgl.modules.basicdata.dto.ProjectDto">
+        <select id="getPageList" resultType="com.zhgd.xmgl.modules.basicdata.dto.ProjectDto">
         SELECT <include refid="detailInfo"></include> FROM project p
             INNER JOIN system_user u ON p.project_sn = u.sn AND u.is_manager = 1
             LEFT JOIN government g ON p.government_sn = g.government_sn
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/statistics/EngineeringStat.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/statistics/EngineeringStat.java
index 62643f7..2a4e5ca 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/statistics/EngineeringStat.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/statistics/EngineeringStat.java
@@ -6,6 +6,9 @@ import lombok.Data;
 @Data
 public class EngineeringStat {
 
+    @ApiModelProperty(value = "工程ID")
+    private Long id;
+
     @ApiModelProperty(value = "工程名称")
     private String engineeringName;
 
@@ -45,6 +48,12 @@ public class EngineeringStat {
     @ApiModelProperty(value = "建设地址")
     private String address;
 
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
+
     @ApiModelProperty(value = "工程类别(1:房屋建筑;2:市政公用工程;3:轨道交通工程;4:公共建设项目;5:其他)")
     private Integer engineeringType;