Skip to content

H
huaxin-rq
Commit 01197a82 authored by zhangjianqian's avatar zhangjianqian
Browse files
Options

修改用户字段信息

parent 6109e78f
Expand all Show whitespace changes
Inline Side-by-side
Showing with 200 additions and 121 deletions
huaxin-system/src/main/java/com/zehong/system/domain/TUser.java
View file @ 01197a82
...@@ -20,6 +20,10 @@ public class TUser extends BaseEntity ...@@ -20,6 +20,10 @@ public class TUser extends BaseEntity
/** $column.columnComment */ /** $column.columnComment */
private Long id; private Long id;
//表具编号
@Excel(name = "表具编号")
private String meternum;
/** 用户编号（表号） */ /** 用户编号（表号） */
@Excel(name = "用户编号") @Excel(name = "用户编号")
private String usernum; private String usernum;
...@@ -56,8 +60,17 @@ public class TUser extends BaseEntity ...@@ -56,8 +60,17 @@ public class TUser extends BaseEntity
@Excel(name = "联系电话") @Excel(name = "联系电话")
private String phone; private String phone;
//身份证
@Excel(name = "身份证")
private String idcard;
//身份证
@Excel(name = "营业网点")
private String branch;
/** 表计类型(字典) */ /** 表计类型(字典) */
@Excel(name = "表计类型",dictType = "t_meter_type") //@Excel(name = "表计类型",dictType = "t_meter_type")
private String type; private String type;
/** 开通状态（字典表 */ /** 开通状态（字典表 */
...@@ -70,11 +83,11 @@ public class TUser extends BaseEntity ...@@ -70,11 +83,11 @@ public class TUser extends BaseEntity
private Date starttime; private Date starttime;
/** 用气设施（字典表） */ /** 用气设施（字典表） */
@Excel(name = "用气设施", dictType = "t_user_scene") //@Excel(name = "用气设施", dictType = "t_user_scene")
private String device; private String device;
/** 表具类型1皮膜2超声 */ /** 表具类型1皮膜2超声 */
@Excel(name = "表具类型1皮膜2超声") //@Excel(name = "表具类型1皮膜2超声")
private Integer meterType; private Integer meterType;
/** 表具厂家1金卡2秦川 */ /** 表具厂家1金卡2秦川 */
...@@ -82,7 +95,7 @@ public class TUser extends BaseEntity ...@@ -82,7 +95,7 @@ public class TUser extends BaseEntity
private Integer meterCompany; private Integer meterCompany;
/** 表具型号1 G1.5、2 G2.5、3 G4 */ /** 表具型号1 G1.5、2 G2.5、3 G4 */
@Excel(name = "表具型号1 G1.5、2 G2.5、3 G4") //@Excel(name = "表具型号1 G1.5、2 G2.5、3 G4")
private Integer meterModel; private Integer meterModel;
/** 进气方向1左2右 */ /** 进气方向1左2右 */
...@@ -120,6 +133,31 @@ public class TUser extends BaseEntity ...@@ -120,6 +133,31 @@ public class TUser extends BaseEntity
//用户信息 //用户信息
private String userInfo; private String userInfo;
public String getMeternum() {
return meternum;
}
public void setMeternum(String meternum) {
this.meternum = meternum;
}
public String getIdcard() {
return idcard;
}
public void setIdcard(String idcard) {
this.idcard = idcard;
}
public String getBranch() {
return branch;
}
public void setBranch(String branch) {
this.branch = branch;
}
public Integer getSelectFrom() { public Integer getSelectFrom() {
return selectFrom; return selectFrom;
} }
......
huaxin-system/src/main/resources/mapper/system/TUserMapper.xml
View file @ 01197a82
...@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="TUser" id="TUserResult"> <resultMap type="TUser" id="TUserResult">
<result property="id" column="id" /> <result property="id" column="id" />
<result property="usernum" column="usernum" /> <result property="usernum" column="usernum" />
<result property="meternum" column="meternum" />
<result property="city" column="city"/> <result property="city" column="city"/>
<result property="county" column="county" /> <result property="county" column="county" />
<result property="street" column="street" /> <result property="street" column="street" />
...@@ -17,6 +18,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -17,6 +18,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="position" column="position" /> <result property="position" column="position" />
<result property="username" column="username" /> <result property="username" column="username" />
<result property="phone" column="phone" /> <result property="phone" column="phone" />
<result property="idcard" column="idcard" />
<result property="branch" column="branch" />
<result property="type" column="type" /> <result property="type" column="type" />
<result property="status" column="status" /> <result property="status" column="status" />
<result property="starttime" column="starttime" /> <result property="starttime" column="starttime" />
...@@ -33,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -33,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectTUserVo"> <sql id="selectTUserVo">
SELECT u.id, u.usernum,u.city, u.county, u.street, u.village, u.address,u.longitude,u.latitude, SELECT u.id, u.usernum,u.city, u.county, u.street, u.village, u.address,u.longitude,u.latitude,u.meternum,u.idcard,u.branch,
u.username, u.phone, u.type, u.status, u.starttime, u.device, u.meter_type, u.meter_company,u.imgurl,u.position,u.task_Type, u.username, u.phone, u.type, u.status, u.starttime, u.device, u.meter_type, u.meter_company,u.imgurl,u.position,u.task_Type,
u.meter_model, u.direction, u.task_id, u.remark,t.`area_name` AS countyName, u.meter_model, u.direction, u.task_id, u.remark,t.`area_name` AS countyName,
ts.`area_name` AS streetName,c.name AS villageName,IFNULL(tp.status,-1)as ajstatus ts.`area_name` AS streetName,c.name AS villageName,IFNULL(tp.status,-1)as ajstatus
...@@ -90,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -90,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into t_user insert into t_user
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if> <if test="id != null">id,</if>
<if test="meternum != null">meternum,</if>
<if test="usernum != null">usernum,</if> <if test="usernum != null">usernum,</if>
<if test="city != null">city,</if> <if test="city != null">city,</if>
<if test="county != null">county,</if> <if test="county != null">county,</if>
...@@ -100,6 +104,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -100,6 +104,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="latitude != null">latitude,</if> <if test="latitude != null">latitude,</if>
<if test="username != null">username,</if> <if test="username != null">username,</if>
<if test="phone != null">phone,</if> <if test="phone != null">phone,</if>
<if test="idcard != null">idcard,</if>
<if test="branch != null">branch,</if>
<if test="type != null">type,</if> <if test="type != null">type,</if>
<if test="status != null">status,</if> <if test="status != null">status,</if>
<if test="starttime != null">starttime,</if> <if test="starttime != null">starttime,</if>
...@@ -117,6 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -117,6 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if> <if test="id != null">#{id},</if>
<if test="meternum != null">#{meternum},</if>
<if test="usernum != null">#{usernum},</if> <if test="usernum != null">#{usernum},</if>
<if test="city != null">#{city},</if> <if test="city != null">#{city},</if>
<if test="county != null">#{county},</if> <if test="county != null">#{county},</if>
...@@ -127,6 +134,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -127,6 +134,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="latitude != null">#{latitude},</if> <if test="latitude != null">#{latitude},</if>
<if test="username != null">#{username},</if> <if test="username != null">#{username},</if>
<if test="phone != null">#{phone},</if> <if test="phone != null">#{phone},</if>
<if test="idcard != null">#{idcard},</if>
<if test="branch != null">#{branch},</if>
<if test="type != null">#{type},</if> <if test="type != null">#{type},</if>
<if test="status != null">#{status},</if> <if test="status != null">#{status},</if>
<if test="starttime != null">#{starttime},</if> <if test="starttime != null">#{starttime},</if>
...@@ -148,6 +157,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -148,6 +157,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update t_user update t_user
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="usernum != null">usernum = #{usernum},</if> <if test="usernum != null">usernum = #{usernum},</if>
<if test="meternum != null">meternum = #{meternum},</if>
<if test="city != null">city = #{city},</if> <if test="city != null">city = #{city},</if>
<if test="county != null">county = #{county},</if> <if test="county != null">county = #{county},</if>
<if test="street != null">street = #{street},</if> <if test="street != null">street = #{street},</if>
...@@ -157,6 +167,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -157,6 +167,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="latitude != null">latitude = #{latitude},</if> <if test="latitude != null">latitude = #{latitude},</if>
<if test="username != null">username = #{username},</if> <if test="username != null">username = #{username},</if>
<if test="phone != null">phone = #{phone},</if> <if test="phone != null">phone = #{phone},</if>
<if test="idcard != null">idcard = #{idcard},</if>
<if test="branch != null">branch = #{branch},</if>
<if test="type != null">`type` = #{type},</if> <if test="type != null">`type` = #{type},</if>
<if test="status != null">status = #{status},</if> <if test="status != null">status = #{status},</if>
<if test="starttime != null">starttime = #{starttime},</if> <if test="starttime != null">starttime = #{starttime},</if>
......
huaxin-web/src/views/baseinfo/jmuser/components/DetailInfo.vue
View file @ 01197a82
...@@ -16,6 +16,19 @@ ...@@ -16,6 +16,19 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :span="12">
<el-form-item label="身份证">
<span>{{ detailInfo.idcard }}</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="营业网点">
<span>{{ $parent.branchFormat(this.detailInfo) }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="用户编号"> <el-form-item label="用户编号">
...@@ -23,8 +36,26 @@ ...@@ -23,8 +36,26 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="表计类型"> <el-form-item label="表具厂家">
<span>{{ $parent.typeFormat(this.detailInfo) }}</span> {{$parent.companyFormat(this.detailInfo)}}
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="表具编号">
<span>{{ detailInfo.meternum }}</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="表具位置">
<span v-if="detailInfo.position==1">单元屋内</span>
<span v-if="detailInfo.position==2">单元屋外</span>
<span v-if="detailInfo.position==3">院内</span>
<span v-if="detailInfo.position==4">院外</span>
<span v-if="detailInfo.position==null">-</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -44,14 +75,6 @@ ...@@ -44,14 +75,6 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :span="24">
<el-form-item label="用气设施">
<span>{{ $parent.sheshiFormat(this.detailInfo) }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="通气日期"> <el-form-item label="通气日期">
...@@ -67,33 +90,16 @@ ...@@ -67,33 +90,16 @@
</el-row> </el-row>
<el-row>
<el-col :span="12">
<el-form-item label="表具类型">
<span v-if="detailInfo.meterType==1">皮膜</span>
<span v-if="detailInfo.meterType==2">超声</span>
<span v-if="detailInfo.meterType==null">-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="表具厂家">
<span v-if="detailInfo.meterCompany==1">金卡</span>
<span v-if="detailInfo.meterCompany==2">秦川</span>
<span v-if="detailInfo.meterCompany==null">-</span>
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="12"> <!--<el-col :span="12">-->
<el-form-item label="表具型号"> <!--<el-form-item label="表具型号">-->
<span v-if="detailInfo.meterModel==1">G1.5</span> <!--<span v-if="detailInfo.meterModel==1">G1.5</span>-->
<span v-if="detailInfo.meterModel==2">G2.5</span> <!--<span v-if="detailInfo.meterModel==2">G2.5</span>-->
<span v-if="detailInfo.meterModel==3">G4</span> <!--<span v-if="detailInfo.meterModel==3">G4</span>-->
<span v-if="detailInfo.meterModel==null">-</span> <!--<span v-if="detailInfo.meterModel==null">-</span>-->
</el-form-item> <!--</el-form-item>-->
</el-col> <!--</el-col>-->
<el-col :span="12"> <el-col :span="12">
<el-form-item label="进气方向"> <el-form-item label="进气方向">
<span v-if="detailInfo.direction==1">左</span> <span v-if="detailInfo.direction==1">左</span>
...@@ -215,6 +221,7 @@ ...@@ -215,6 +221,7 @@
this.initMap(); this.initMap();
}); });
}, },
initMap(){ initMap(){
this.$nextTick(() => { this.$nextTick(() => {
const path = eval(this.systemSetting.map_center); const path = eval(this.systemSetting.map_center);
......
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