Skip to content

G
gassafety-progress
Commit 2d87bd69 authored by wuqinghua's avatar wuqinghua
Browse files
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	gassafetyprogress-web/src/views/regulation/pipe/index.vue
parents bca02f50 274fd254
Show whitespace changes
Inline Side-by-side
Showing with 68 additions and 71 deletions
gassafetyprogress-system/src/main/java/com/zehong/system/domain/TPipeInfo.java
View file @ 2d87bd69
package com.zehong.system.domain;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.zehong.common.annotation.Excel;
......@@ -12,7 +10,7 @@ import com.zehong.common.core.domain.BaseEntity;
* 管道信息对象 t_pipe_info
*
* @author zehong
* @date 2022-01-26
* @date 2022-02-09
*/
public class TPipeInfo extends BaseEntity
{
......@@ -37,6 +35,10 @@ public class TPipeInfo extends BaseEntity
@Excel(name = "材质")
private String pipeMaterial;
/** 管道地址 */
@Excel(name = "管道地址")
private String pipeAddr;
/** 埋深 */
@Excel(name = "埋深")
private BigDecimal buriedDepth;
......@@ -45,14 +47,9 @@ public class TPipeInfo extends BaseEntity
@Excel(name = "走向")
private String pipeTrend;
/** 人员类型：1.运行维护人员 2.抢修人员 */
@Excel(name = "人员类型")
private String peopleOccupation;
/** 建设年代 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "建设年代", width = 30, dateFormat = "yyyy-MM-dd")
private Date buildDate;
@Excel(name = "建设年代")
private String buildDate;
/** 建设单位 */
@Excel(name = "建设单位")
......@@ -71,6 +68,7 @@ public class TPipeInfo extends BaseEntity
private String coordinates;
/** 是否删除(0正常，1删除) */
@Excel(name = "是否删除(0正常，1删除)")
private String isDel;
/** 备注 */
......@@ -122,6 +120,15 @@ public class TPipeInfo extends BaseEntity
{
return pipeMaterial;
}
public void setPipeAddr(String pipeAddr)
{
this.pipeAddr = pipeAddr;
}
public String getPipeAddr()
{
return pipeAddr;
}
public void setBuriedDepth(BigDecimal buriedDepth)
{
this.buriedDepth = buriedDepth;
......@@ -140,21 +147,12 @@ public class TPipeInfo extends BaseEntity
{
return pipeTrend;
}
public void setPeopleOccupation(String peopleOccupation)
{
this.peopleOccupation = peopleOccupation;
}
public String getPeopleOccupation()
{
return peopleOccupation;
}
public void setBuildDate(Date buildDate)
public void setBuildDate(String buildDate)
{
this.buildDate = buildDate;
}
public Date getBuildDate()
public String getBuildDate()
{
return buildDate;
}
......@@ -221,9 +219,9 @@ public class TPipeInfo extends BaseEntity
.append("pipeDiameter", getPipeDiameter())
.append("pipePressure", getPipePressure())
.append("pipeMaterial", getPipeMaterial())
.append("pipeAddr", getPipeAddr())
.append("buriedDepth", getBuriedDepth())
.append("pipeTrend", getPipeTrend())
.append("peopleOccupation", getPeopleOccupation())
.append("buildDate", getBuildDate())
.append("buildUnit", getBuildUnit())
.append("beyondEnterpriseId", getBeyondEnterpriseId())
......
gassafetyprogress-system/src/main/resources/mapper/system/TPipeInfoMapper.xml
View file @ 2d87bd69
......@@ -10,9 +10,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="pipeDiameter" column="pipe_diameter" />
<result property="pipePressure" column="pipe_pressure" />
<result property="pipeMaterial" column="pipe_material" />
<result property="pipeAddr" column="pipe_addr" />
<result property="buriedDepth" column="buried_depth" />
<result property="pipeTrend" column="pipe_trend" />
<result property="peopleOccupation" column="people_occupation" />
<result property="buildDate" column="build_date" />
<result property="buildUnit" column="build_unit" />
<result property="beyondEnterpriseId" column="beyond_enterprise_id" />
......@@ -27,21 +27,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectTPipeInfoVo">
select pipe_id, pipe_length, pipe_diameter, pipe_pressure, pipe_material, buried_depth, pipe_trend, (CASE people_occupation WHEN '1' THEN '运行维护人员' WHEN '2' THEN '抢修人员'end ) as people_occupation, build_date, build_unit, beyond_enterprise_id, beyond_enterprise_name, coordinates, create_by, create_time, update_by, update_time, is_del, remarks from t_pipe_info
select pipe_id, pipe_length, pipe_diameter, pipe_pressure, pipe_material, pipe_addr, buried_depth, pipe_trend, build_date, build_unit, beyond_enterprise_id, beyond_enterprise_name, coordinates, create_by, create_time, update_by, update_time, is_del, remarks from t_pipe_info
</sql>
<select id="selectTPipeInfoList" parameterType="TPipeInfo" resultMap="TPipeInfoResult">
<include refid="selectTPipeInfoVo"/>
<where>
is_del='0'
<if test="pipeLength != null "> and pipe_length = #{pipeLength}</if>
<if test="pipeDiameter != null "> and pipe_diameter = #{pipeDiameter}</if>
<if test="pipePressure != null "> and pipe_pressure = #{pipePressure}</if>
<if test="pipeMaterial != null and pipeMaterial != ''"> and pipe_material = #{pipeMaterial}</if>
<if test="pipeAddr != null and pipeAddr != ''"> and pipe_addr = #{pipeAddr}</if>
<if test="buriedDepth != null "> and buried_depth = #{buriedDepth}</if>
<if test="pipeTrend != null and pipeTrend != ''"> and pipe_trend = #{pipeTrend}</if>
<if test="peopleOccupation != null and peopleOccupation != ''"> and people_occupation = #{peopleOccupation}</if>
<if test="buildDate != null "> and build_date = #{buildDate}</if>
<if test="buildDate != null and buildDate != ''"> and build_date = #{buildDate}</if>
<if test="buildUnit != null and buildUnit != ''"> and build_unit = #{buildUnit}</if>
<if test="beyondEnterpriseId != null "> and beyond_enterprise_id = #{beyondEnterpriseId}</if>
<if test="beyondEnterpriseName != null and beyondEnterpriseName != ''"> and beyond_enterprise_name like concat('%', #{beyondEnterpriseName}, '%')</if>
......@@ -52,8 +51,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectTPipeInfoById" parameterType="Long" resultMap="TPipeInfoResult">
select pipe_id, pipe_length, pipe_diameter, pipe_pressure, pipe_material, buried_depth, pipe_trend,people_occupation, build_date, build_unit, beyond_enterprise_id, beyond_enterprise_name, coordinates, create_by, create_time, update_by, update_time, is_del, remarks from t_pipe_info
where pipe_id = #{pipeId} and is_del='0'
<include refid="selectTPipeInfoVo"/>
where pipe_id = #{pipeId}
</select>
<insert id="insertTPipeInfo" parameterType="TPipeInfo" useGeneratedKeys="true" keyProperty="pipeId">
......@@ -63,9 +62,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="pipeDiameter != null">pipe_diameter,</if>
<if test="pipePressure != null">pipe_pressure,</if>
<if test="pipeMaterial != null">pipe_material,</if>
<if test="pipeAddr != null">pipe_addr,</if>
<if test="buriedDepth != null">buried_depth,</if>
<if test="pipeTrend != null">pipe_trend,</if>
<if test="peopleOccupation != null">people_occupation,</if>
<if test="buildDate != null">build_date,</if>
<if test="buildUnit != null">build_unit,</if>
<if test="beyondEnterpriseId != null">beyond_enterprise_id,</if>
......@@ -83,9 +82,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="pipeDiameter != null">#{pipeDiameter},</if>
<if test="pipePressure != null">#{pipePressure},</if>
<if test="pipeMaterial != null">#{pipeMaterial},</if>
<if test="pipeAddr != null">#{pipeAddr},</if>
<if test="buriedDepth != null">#{buriedDepth},</if>
<if test="pipeTrend != null">#{pipeTrend},</if>
<if test="peopleOccupation != null">#{peopleOccupation},</if>
<if test="buildDate != null">#{buildDate},</if>
<if test="buildUnit != null">#{buildUnit},</if>
<if test="beyondEnterpriseId != null">#{beyondEnterpriseId},</if>
......@@ -107,9 +106,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="pipeDiameter != null">pipe_diameter = #{pipeDiameter},</if>
<if test="pipePressure != null">pipe_pressure = #{pipePressure},</if>
<if test="pipeMaterial != null">pipe_material = #{pipeMaterial},</if>
<if test="pipeAddr != null">pipe_addr = #{pipeAddr},</if>
<if test="buriedDepth != null">buried_depth = #{buriedDepth},</if>
<if test="pipeTrend != null">pipe_trend = #{pipeTrend},</if>
<if test="peopleOccupation != null">people_occupation = #{peopleOccupation},</if>
<if test="buildDate != null">build_date = #{buildDate},</if>
<if test="buildUnit != null">build_unit = #{buildUnit},</if>
<if test="beyondEnterpriseId != null">beyond_enterprise_id = #{beyondEnterpriseId},</if>
......@@ -125,14 +124,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where pipe_id = #{pipeId}
</update>
<update id="deleteTPipeInfoById" parameterType="Long">
update t_pipe_info set is_del='1' where pipe_id = #{pipeId}
</update>
<delete id="deleteTPipeInfoById" parameterType="Long">
delete from t_pipe_info where pipe_id = #{pipeId}
</delete>
<update id="deleteTPipeInfoByIds" parameterType="String">
update t_pipe_info set is_del='1' where pipe_id in
<delete id="deleteTPipeInfoByIds" parameterType="String">
delete from t_pipe_info where pipe_id in
<foreach item="pipeId" collection="array" open="(" separator="," close=")">
#{pipeId}
</foreach>
</update>
</delete>
</mapper>
\ No newline at end of file
gassafetyprogress-web/src/views/regulation/pipe/index.vue
View file @ 2d87bd69
......@@ -89,7 +89,7 @@
<el-table-column label="人员类型" align="center" prop="peopleOccupation" />
<el-table-column label="建设年代" align="center" prop="buildDate" />
<el-table-column label="建设单位" align="center" prop="buildUnit" />
<el-table-column label="权属单位" align="center" prop="beyondEnterpriseName" />
<el-table-column label="权属单位" align="center" prop="beyondEnterpriseId" />
<el-table-column label="坐标" align="center" prop="coordinates" />
<el-table-column label="备注" align="center" prop="remarks" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
......@@ -216,7 +216,7 @@ export default {
// 总条数
total: 0,
// 管道信息表格数据
pipeList: [],
infoList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment