Skip to content

H
huaxin-rq
Commit eaf9791e authored by 耿迪迪's avatar 耿迪迪
Browse files
Options

工业、商业、任务安检类型

parent 457a7eb1
Hide whitespace changes
Inline Side-by-side
Showing with 202 additions and 28 deletions
huaxin-system/src/main/java/com/zehong/system/domain/TBusiness.java
View file @ eaf9791e
......@@ -29,6 +29,12 @@ public class TBusiness extends BaseEntity
@Excel(name = "用户类型", readConverterExp = "1=小商业,2=大商业")
private String contract;
/**
* 安检类型，1华鑫季度一检，2华鑫半年一检，3鸿海季度一检，4鸿海半年一检
*/
@Excel(name = "安检类型", readConverterExp = "1=华鑫季度一检,2=华鑫半年一检,3=鸿海季度一检,4=鸿海半年一检")
private String taskType;
/** 市 */
private Long city;
......@@ -372,6 +378,13 @@ public class TBusiness extends BaseEntity
this.streetName = streetName;
}
public String getTaskType() {
return taskType;
}
public void setTaskType(String taskType) {
this.taskType = taskType;
}
@Override
public String toString() {
......
huaxin-system/src/main/java/com/zehong/system/domain/TIndustry.java
View file @ eaf9791e
......@@ -83,7 +83,7 @@ public class TIndustry extends BaseEntity
private String type;
/** 开通状态（字典表） */
@Excel(name = "开通状态", readConverterExp = "字=典表")
@Excel(name = "开通状态", dictType = "t_user_status")
private String status;
/** 通气日期 */
......@@ -92,9 +92,14 @@ public class TIndustry extends BaseEntity
private Date starttime;
/** 最新安检id */
@Excel(name = "最新安检id")
private Long taskInspectId;
/**
* 安检类型，1华鑫季度一检，2鸿海季度一检
*/
@Excel(name = "安检类型", readConverterExp = "1=华鑫季度一检,2=鸿海季度一检")
private String taskType;
//巡检人
private String inspector;
......@@ -357,6 +362,14 @@ public class TIndustry extends BaseEntity
this.taskId = taskId;
}
public String getTaskType() {
return taskType;
}
public void setTaskType(String taskType) {
this.taskType = taskType;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
......
huaxin-system/src/main/java/com/zehong/system/domain/TTask.java
View file @ eaf9791e
......@@ -35,13 +35,17 @@ public class TTask extends BaseEntity
private Long type;
/** 工业安检类型 1月度巡检 2季度巡检 */
@Excel(name = "工业安检类型",readConverterExp = "1=月度巡检,2=季度巡检" )
@Excel(name = "工业安检类型",readConverterExp = "1=华鑫季度一次,2=鸿海季度一次" )
private Long checkType;
/** 安检类型，1小区用户，2气代煤用户，3孤寡老人用户 */
@Excel(name = "安检类型",dictType = "t_inspect_user_type")
private String taskType;
/** 商业安检类型，1华鑫季度一次，2华鑫半年一次，3鸿海季度一次，4鸿海半年一次 */
@Excel(name = "安检类型", readConverterExp = "1=华鑫季度一次,2=华鑫半年一次,3=鸿海季度一次,4=鸿海半年一次")
private String businessType;
/** 开始日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "开始日期", width = 30, dateFormat = "yyyy-MM-dd")
......@@ -246,6 +250,14 @@ public class TTask extends BaseEntity
this.beyondVillage = beyondVillage;
}
public String getBusinessType() {
return businessType;
}
public void setBusinessType(String businessType) {
this.businessType = businessType;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
......
huaxin-system/src/main/resources/mapper/system/TBusinessMapper.xml
View file @ eaf9791e
......@@ -29,10 +29,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="taskId" column="task_id" />
<result property="remark" column="remark" />
<result property="branch" column="branch"/>
<result property="taskType" column="task_type"/>
</resultMap>
<sql id="selectTBusinessVo">
select t.id, t.usernum, t.contract, t.city, t.county, t.street, t.village, t.address, t.longitude, t.latitude,t.branch,
select t.id, t.usernum, t.contract, t.task_type, t.city, t.county, t.street, t.village, t.address, t.longitude, t.latitude,t.branch,
t.company, t.username,
t.phone, t.type, t.status, t.starttime, t.device, t.meter_type, t.meter_company, t.meter_model, t.direction,
t.task_id, t.remark,IFNULL(tp.status,-1)as ajstatus,
......@@ -111,6 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="taskId != null">task_id,</if>
<if test="remark != null">remark,</if>
<if test="branch !=null">branch,</if>
<if test="taskType !=null">task_type,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="usernum != null">#{usernum},</if>
......@@ -136,6 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="taskId != null">#{taskId},</if>
<if test="remark != null">#{remark},</if>
<if test="branch !=null">#{branch},</if>
<if test="taskType !=null">#{taskType},</if>
</trim>
</insert>
......@@ -165,6 +168,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="taskId != null">task_id = #{taskId},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="branch !=null">branch = #{branch},</if>
<if test="taskType !=null">task_type = #{taskType},</if>
</trim>
where id = #{id}
</update>
......
huaxin-system/src/main/resources/mapper/system/TIndustryMapper.xml
View file @ eaf9791e
......@@ -30,10 +30,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="inspectSign" column="inspect_sign" />
<result property="inspectTime" column="inspect_time" />
<result property="branch" column="branch" />
<result property="taskType" column="task_type" />
</resultMap>
<sql id="selectTIndustryVo">
select u.id, u.usernum, u.contract, u.city, u.county, u.street, u.village, u.address,u.branch,
select u.id, u.usernum, u.contract, u.city, u.county, u.street, u.village, u.address,u.branch,u.task_type,
u.longitude, u.latitude, u.company, u.username, u.phone, u.type, u.status, u.starttime,
u.task_inspect_id, u.remark, u.create_time,t.`area_name` AS countyName,
ts.`area_name` AS streetName,IFNULL(tp.status,-1)as ajstatus
......@@ -59,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectTIndustryById" parameterType="Long" resultMap="TIndustryResult">
select u.id, u.usernum, u.contract, u.city, u.county, u.street, u.village, u.address,u.branch,
select u.id, u.usernum, u.contract, u.city, u.county, u.street, u.village, u.address,u.branch,u.task_type,
u.longitude, u.latitude, u.company, u.username, u.phone, u.type, u.status, u.starttime,
u.task_inspect_id, u.remark, u.create_time,t.`area_name` AS countyName,
ts.`area_name` AS streetName
......@@ -91,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="remark != null">remark,</if>
<if test="createTime != null">create_time,</if>
<if test="branch !=null">branch,</if>
<if test="taskType !=null">task_type,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="usernum != null">#{usernum},</if>
......@@ -112,6 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="remark != null">#{remark},</if>
<if test="createTime != null">#{createTime},</if>
<if test="branch !=null"> #{branch},</if>
<if test="taskType !=null"> #{taskType},</if>
</trim>
</insert>
......@@ -137,6 +140,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="remark != null">remark = #{remark},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="branch !=null">branch = #{branch},</if>
<if test="taskType !=null">task_type = #{taskType},</if>
</trim>
where id = #{id}
</update>
......
huaxin-system/src/main/resources/mapper/system/TTaskMapper.xml
View file @ eaf9791e
......@@ -17,6 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="adminId" column="admin_id" />
<result property="createTime" column="create_time" />
<result property="remarks" column="remarks" />
<result property="businessType" column="business_type" />
</resultMap>
<sql id="selectTTaskVo">
......@@ -28,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
t.check_type,
t.task_type,
t.start_time,
t.business_type,
t.end_time,
t.STATUS,
t.admin_id,
......@@ -92,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="adminId != null">admin_id,</if>
<if test="createTime != null">create_time,</if>
<if test="remarks != null">remarks,</if>
<if test="businessType != null">business_type,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
......@@ -106,6 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="adminId != null">#{adminId},</if>
<if test="createTime != null">#{createTime},</if>
<if test="remarks != null">#{remarks},</if>
<if test="businessType != null">#{businessType},</if>
</trim>
</insert>
......@@ -123,6 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="adminId != null">admin_id = #{adminId},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="remarks != null">remarks = #{remarks},</if>
<if test="businessType != null">business_type = #{businessType},</if>
</trim>
where id = #{id}
</update>
......@@ -145,6 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
task.`describe`,
task.type,
task.check_type,
task.business_type,
task.start_time,
task.end_time,
task. STATUS,
......@@ -176,6 +182,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
task.`describe`,
task.type,
task.check_type,
task.business_type,
task.start_time,
task.end_time,
task. STATUS,
......
huaxin-web/src/views/baseinfo/businessinfo/components/DetailInfo.vue
View file @ eaf9791e
......@@ -26,6 +26,18 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="安检类型">
<span v-if="detailInfo.taskType == '1'">华鑫季度一检</span>
<span v-else-if="detailInfo.taskType == '2'">华鑫半年一检</span>
<span v-else-if="detailInfo.taskType == '3'">鸿海季度一检</span>
<span v-else-if="detailInfo.taskType == '4'">鸿海半年一检</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="单位名称">
<span>{{ detailInfo.company }}</span>
......
huaxin-web/src/views/baseinfo/businessinfo/index.vue
View file @ eaf9791e
......@@ -99,6 +99,15 @@
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="安检类型" align="center" prop="taskType" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.taskType == '1'">华鑫季度一检</span>
<span v-else-if="scope.row.taskType == '2'">华鑫半年一检</span>
<span v-else-if="scope.row.taskType == '3'">鸿海季度一检</span>
<span v-else-if="scope.row.taskType == '4'">鸿海半年一检</span>
<span v-else>-</span>
</template>
</el-table-column>
<!-- <el-table-column label="所属市" align="center" prop="county" width="120" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.city">{{ getAddressFormatter(scope.row.city) }}</span>
......@@ -197,6 +206,23 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="安检类型" prop="taskType">
<el-select
v-model="form.taskType"
palceholder="请选择安检类型"
style="width: 100%"
>
<el-option label="华鑫季度一检" value="1" />
<el-option label="华鑫半年一检" value="2" />
<el-option label="鸿海季度一检" value="3" />
<el-option label="鸿海半年一检" value="4" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="单位名称" prop="company">
<el-input v-model="form.company" placeholder="请输入单位名称" />
......@@ -568,6 +594,9 @@ export default {
usernum: [
{ required: true, message: "表具编号不能为空", trigger: "blur" }
],
taskType: [
{ required: true, message: "请选择安检类型", trigger: "change" }
],
contract: [
{ required: true, message: "合同号不能为空", trigger: "blur" }
],
......
huaxin-web/src/views/baseinfo/industry/components/DetailInfo.vue
View file @ eaf9791e
......@@ -53,11 +53,18 @@
</el-row>
<el-row>
<el-col :span="20">
<el-col :span="12">
<el-form-item label="营业网点">
<span>{{ $parent.branchFormat(detailInfo,null) }}</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="安检类型">
<span v-if="detailInfo.taskType == '1'">华鑫季度一检</span>
<span v-else-if="detailInfo.taskType == '2'">鸿海季度一检</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
......
huaxin-web/src/views/baseinfo/industry/index.vue
View file @ eaf9791e
......@@ -97,6 +97,13 @@
<el-table v-loading="loading" :data="industryList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="单位名称" align="center" prop="company" width="180" :show-overflow-tooltip="true"/>
<el-table-column label="安检类型" align="center" prop="taskType">
<template slot-scope="scope">
<span v-if="scope.row.taskType == '1'">华鑫季度一检</span>
<span v-else-if="scope.row.taskType == '2'">鸿海季度一检</span>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="联系人姓名" align="center" prop="username" />
<el-table-column label="联系电话" align="center" prop="phone" />
<el-table-column label="流量计品牌" align="center" prop="usernum" :formatter="meterModelCompanyFormatter"/>
......@@ -170,6 +177,16 @@
<el-input v-model="form.company" placeholder="请输入单位名称" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="安检类型" prop="taskType">
<el-select v-model="form.taskType" placeholder="请选择安检类型">
<el-option label="华鑫季度一检" value="1" />
<el-option label="鸿海季度一检" value="2" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="生产品种" prop="contract">
<el-input v-model="form.contract" placeholder="请输入生产品种" />
......@@ -190,12 +207,6 @@
<el-col :span="12">
<el-form-item label="流量计型号" prop="type">
<el-select v-model="form.type" placeholder="请选择流量计型号">
<!--<el-option
v-for="dict in typeOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
></el-option>-->
<el-option label="DN25" value="1" />
<el-option label="DN50" value="2" />
<el-option label="DN80" value="3" />
......@@ -211,11 +222,13 @@
<el-input v-model="form.username" placeholder="请输入联系人姓名" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="联系电话" prop="phone">
<el-input v-model="form.phone" placeholder="请输入联系电话" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="营业网点" prop="branch">
<el-select v-model="form.branch" placeholder="请选择营业网点">
......@@ -413,6 +426,9 @@ export default {
usernum: [
{ required: true, message: "流量计品牌不能为空", trigger: "blur" }
],
taskType: [
{ required: true, message: "请选择安检类型", trigger: "change" }
],
type: [
{ required: true, message: "用气设置不能为空", trigger: "blur" }
],
......@@ -499,6 +515,7 @@ export default {
reset() {
this.form = {
id: null,
taskType: null,
usernum: null,
contract: null,
city: null,
......
huaxin-web/src/views/checktask/task/components/ItemJc.vue
View file @ eaf9791e
......@@ -44,6 +44,18 @@
{{ itemData.createTime || "-" }}
</div>
</div>
<div v-if="itemData.type == 1" class="list flex">
<div class="a">任务类型:</div>
<div class="b">
{{ residentTypeOptions[itemData.taskType] }}
</div>
</div>
<div v-if="itemData.type == 2" class="list flex">
<div class="a">任务类型:</div>
<div class="b">
{{ businessTypeOptions[itemData.businessType] }}
</div>
</div>
<div v-if="itemData.type == 3" class="list flex">
<div class="a">任务类型:</div>
<div class="b">
......@@ -132,10 +144,21 @@ export default {
loading,
right,
imgList: [jm, cy, gy],
residentTypeOptions: {
"1":"小区用户",
"2":"气代煤用户",
"3":"孤寡老人用户"
},
businessTypeOptions: {
"1":"华鑫季度一次",
"2":"华鑫半年一次",
"3":"鸿海季度一次",
"4":"鸿海半年一次"
},
typeOptions: {
1:"月度任务",
2:"季度任务",
1:"华鑫季度一次",
2:"鸿海季度一次",
},
};
},
......
huaxin-web/src/views/checktask/task/cyindex.vue
View file @ eaf9791e
......@@ -242,7 +242,7 @@
@pagination="getList"
/>
<!-- 添加或修改入户安检任务对话框 -->
<!-- 添加或修改商业安检任务对话框 -->
<el-dialog
:title="title"
:visible.sync="open"
......@@ -261,6 +261,17 @@
placeholder="请输入任务描述"
/>
</el-form-item>
<el-form-item label="安检类型" prop="businessType">
<el-select v-model="form.businessType" placeholder="请选择安检类型">
<el-option
v-for="dict in typeOptions"
:key="dict.id"
:label="dict.name"
:value="dict.id"
></el-option>
</el-select>
</el-form-item>
<!--<el-form-item label="用户类型，1是居民，2是工商户，3是工业" prop="type">-->
<!--<el-select v-model="form.type" placeholder="请选择用户类型，1是居民，2是工商户，3是工业">-->
<!--<el-option label="请选择字典生成" value="" />-->
......@@ -363,7 +374,7 @@ export default {
showSearch: true,
// 总条数
total: 0,
// 入户安检任务表格数据
// 商业安检任务表格数据
taskList: [],
// 弹出层标题
title: "",
......@@ -394,16 +405,37 @@ export default {
endTime: [
{ required: true, message: "结束日期不能为空", trigger: "blur" },
],
businessType: [
{ required: true, message: "请选择安检类型", trigger: "change" },
],
},
visitorDialogOpen: false,
taskDetailData:{}
taskDetailData:{},
typeOptions: [
{
id: "1",
name: "华鑫季度一次",
},
{
id: "2",
name: "华鑫半年一次",
},
{
id: "3",
name: "鸿海季度一次",
},
{
id: "4",
name: "鸿海半年一次",
},
],
};
},
created() {
this.getList();
},
methods: {
/** 查询入户安检任务列表 */
/** 查询商业安检任务列表 */
getList() {
this.loading = true;
listTask(this.queryParams).then((response) => {
......@@ -425,6 +457,7 @@ export default {
describe: null,
type: 2,
checkType: null,
businessType: null,
startTime: null,
endTime: null,
status: 0,
......@@ -454,7 +487,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加入户安检任务";
this.title = "添加商业安检任务";
},
/** 修改按钮操作 */
handleUpdate(row) {
......@@ -463,7 +496,7 @@ export default {
getTask(id).then((response) => {
this.form = response.data;
this.open = true;
this.title = "修改入户安检任务";
this.title = "修改商业安检任务";
});
},
//详情
......@@ -498,7 +531,7 @@ export default {
handleDelete(row) {
const ids = row.id || this.ids;
this.$confirm(
'是否确认删除入户安检任务编号为"' + ids + '"的数据项?',
'是否确认删除商业安检任务编号为"' + ids + '"的数据项?',
"警告",
{
confirmButtonText: "确定",
......@@ -518,7 +551,7 @@ export default {
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
this.$confirm("是否确认导出所有入户安检任务数据项?", "警告", {
this.$confirm("是否确认导出所有商业安检任务数据项?", "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
......@@ -535,7 +568,7 @@ export default {
},
handleEnd(row) {
this.$confirm(
'是否确认结束入户安检任务名称为"' + row.title + '"的数据项?',
'是否确认结束商业安检任务名称为"' + row.title + '"的数据项?',
"警告",
{
confirmButtonText: "确定",
......
huaxin-web/src/views/checktask/task/gyindex.vue
View file @ eaf9791e
......@@ -388,13 +388,13 @@ export default {
// 是否显示弹出层
open: false,
typeOptions: [
/*{
{
id: 1,
name: "月度巡检",
},*/
name: "华鑫季度一次",
},
{
id: 2,
name: "季度巡检",
name: "鸿海季度一次",
},
],
......
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