Commit 6b06b82e authored by 耿迪迪's avatar 耿迪迪

居民安检表具编号 居民小程序查询

parent ab89d5cc
...@@ -13,8 +13,13 @@ public class UserTaskInspect { ...@@ -13,8 +13,13 @@ public class UserTaskInspect {
private String username; private String username;
@Excel(name="联系方式") @Excel(name="联系方式")
private String phone; private String phone;
@Excel(name="表号")
//@Excel(name="表号")
private String usernum; private String usernum;
@Excel(name = "表具编号")
private String meternum;
private Long userId; private Long userId;
@Excel(name="所属区/县") @Excel(name="所属区/县")
private String countyName; private String countyName;
...@@ -224,4 +229,12 @@ public class UserTaskInspect { ...@@ -224,4 +229,12 @@ public class UserTaskInspect {
public void setMissNum(int missNum) { public void setMissNum(int missNum) {
this.missNum = missNum; this.missNum = missNum;
} }
public String getMeternum() {
return meternum;
}
public void setMeternum(String meternum) {
this.meternum = meternum;
}
} }
...@@ -97,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -97,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT inspect.id, SELECT inspect.id,
IFNULL(inspect.status,-1) AS inspectStatus, IFNULL(inspect.status,-1) AS inspectStatus,
inspect.satisfy , inspect.satisfy ,
u.usernum,u.username,u.phone,u.id AS userId, u.usernum,u.username,u.meternum,u.phone,u.id AS userId,
u.type as btype,u.address,u.create_time as userTime,u.status as ustatus, u.type as btype,u.address,u.create_time as userTime,u.status as ustatus,
t.`area_name` AS countyName, t.`area_name` AS countyName,
ts.`area_name` AS streetName, ts.`area_name` AS streetName,
...@@ -117,6 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -117,6 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where> <where>
<if test="username!=null and username!=''"> and u.username like concat('%',#{username},'%')</if> <if test="username!=null and username!=''"> and u.username like concat('%',#{username},'%')</if>
<if test="usernum!=null and usernum!=''"> and u.usernum like concat('%',#{usernum},'%')</if> <if test="usernum!=null and usernum!=''"> and u.usernum like concat('%',#{usernum},'%')</if>
<if test="meternum!=null and meternum!=''"> and u.meternum like concat('%',#{meternum},'%')</if>
<if test="satisfy!=null"> and inspect.satisfy = #{satisfy}</if> <if test="satisfy!=null"> and inspect.satisfy = #{satisfy}</if>
<if test="inspectStatus!=null and inspectStatus != -1" > and inspect.status = #{inspectStatus}</if> <if test="inspectStatus!=null and inspectStatus != -1" > and inspect.status = #{inspectStatus}</if>
<if test="inspectStatus!=null and inspectStatus== -1"> and inspect.status is null</if> <if test="inspectStatus!=null and inspectStatus== -1"> and inspect.status is null</if>
......
...@@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="community != null "> and c.id = #{community}</if> <if test="community != null "> and c.id = #{community}</if>
<if test="position != null and position != ''"> and u.position = #{position}</if> <if test="position != null and position != ''"> and u.position = #{position}</if>
<if test="taskType != null and taskType != ''"> and u.task_type = #{taskType}</if> <if test="taskType != null and taskType != ''"> and u.task_type = #{taskType}</if>
<if test="userInfo != null and userInfo != ''"> and (u.username like concat('%', #{userInfo}, '%') or u.usernum like concat('%', #{userInfo}, '%') or u.address like concat('%', #{userInfo}, '%'))</if> <if test="userInfo != null and userInfo != ''"> and (u.username like concat('%', #{userInfo}, '%') or u.meternum like concat('%', #{userInfo}, '%') or u.address like concat('%', #{userInfo}, '%'))</if>
<if test="meterCompany != null and meterCompany != ''"> and u.meter_company = #{meterCompany}</if> <if test="meterCompany != null and meterCompany != ''"> and u.meter_company = #{meterCompany}</if>
<if test="meterType != null and meterType != ''"> and u.meter_type = #{meterType}</if> <if test="meterType != null and meterType != ''"> and u.meter_type = #{meterType}</if>
<if test="meternum != null and meternum != ''"> and u.meternum = #{meternum}</if> <if test="meternum != null and meternum != ''"> and u.meternum = #{meternum}</if>
......
...@@ -88,9 +88,9 @@ ...@@ -88,9 +88,9 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="表号" prop="usernum"> <el-form-item label="表具编号" prop="meternum">
<el-input <el-input
v-model="queryParams.usernum" v-model="queryParams.meternum"
placeholder="请输入表号" placeholder="请输入表号"
clearable clearable
size="small" size="small"
...@@ -212,7 +212,7 @@ ...@@ -212,7 +212,7 @@
> >
<el-table-column label="用户姓名" align="center" prop="username" /> <el-table-column label="用户姓名" align="center" prop="username" />
<el-table-column label="联系方式" align="center" prop="phone" /> <el-table-column label="联系方式" align="center" prop="phone" />
<el-table-column label="表号" align="center" prop="usernum" /> <el-table-column label="表具编号" align="center" prop="meternum" />
<!--<el-table-column label="表计类型" align="center" prop="btype" :formatter="typeFormat"/>--> <!--<el-table-column label="表计类型" align="center" prop="btype" :formatter="typeFormat"/>-->
<el-table-column label="所属区域" align="center" prop="phone"> <el-table-column label="所属区域" align="center" prop="phone">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -378,7 +378,7 @@ export default { ...@@ -378,7 +378,7 @@ export default {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
taskId: null, taskId: null,
usernum: "", meternum: "",
username: "", username: "",
satisfy: "", satisfy: "",
inspectStatus: "", inspectStatus: "",
......
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