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 @@ - 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 - SELECT 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;