admin/wisdomisitezw_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
pengjie 2023-09-12 18:57:31 +08:00
parent 36ebb5a7ed
commit 79111fdd18
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/ProjectMapper.xml
View File

@ -2,10 +2,11 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!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"> <mapper namespace="com.zhgd.xmgl.modules.basicdata.mapper.ProjectMapper">
<sql id="detailInfo"> <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> </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 SELECT <include refid="detailInfo"></include> FROM project p
INNER JOIN system_user u ON p.project_sn = u.sn AND u.is_manager = 1 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 LEFT JOIN government g ON p.government_sn = g.government_sn

9
src/main/java/com/zhgd/xmgl/modules/basicdata/statistics/EngineeringStat.java
View File

@ -6,6 +6,9 @@ import lombok.Data;
@Data @Data
public class EngineeringStat { public class EngineeringStat {
@ApiModelProperty(value = "工程ID")
private Long id;
@ApiModelProperty(value = "工程名称") @ApiModelProperty(value = "工程名称")
private String engineeringName; private String engineeringName;
@ -45,6 +48,12 @@ public class EngineeringStat {
@ApiModelProperty(value = "建设地址") @ApiModelProperty(value = "建设地址")
private String address; private String address;
@ApiModelProperty(value = "经度")
private String longitude;
@ApiModelProperty(value = "纬度")
private String latitude;
@ApiModelProperty(value = "工程类别(1:房屋建筑;2:市政公用工程;3:轨道交通工程;4:公共建设项目;5:其他)") @ApiModelProperty(value = "工程类别(1:房屋建筑;2:市政公用工程;3:轨道交通工程;4:公共建设项目;5:其他)")
private Integer engineeringType; private Integer engineeringType;