Skip to content

Z
zh-baseversion-project
Commit fc03ce85 authored by 耿迪迪's avatar 耿迪迪
Browse files
Options

Merge branch 'master' of http://111.61.77.35:9999/wanghao/zh-baseversion-project

parents 485a6e12 8ca0008e
Show whitespace changes
Inline Side-by-side
Showing with 336 additions and 39 deletions
zh-baseversion-admin/src/main/java/com/zehong/web/controller/supervision/TInsSpotHazardRefController.java
View file @ fc03ce85
......@@ -84,6 +84,16 @@ public class TInsSpotHazardRefController extends BaseController
return toAjax(tInsSpotHazardRefService.updateTInsSpotHazardRef(tInsSpotHazardRef));
}
/**
* 修改监督检查-抽查隐患-处置
*/
@Log(title = "监督检查-抽查隐患", businessType = BusinessType.UPDATE)
@PutMapping(value = "/disposeOfInsSpotHazardRef")
public AjaxResult disposeOfInsSpotHazardRef(@RequestBody TInsSpotHazardRef tInsSpotHazardRef)
{
return toAjax(tInsSpotHazardRefService.disposeOfInsSpotHazardRef(tInsSpotHazardRef));
}
/**
* 删除监督检查-抽查隐患
*/
......
zh-baseversion-system/src/main/java/com/zehong/system/domain/TInsSpotHazardRef.java
View file @ fc03ce85
package com.zehong.system.domain;
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;
import com.zehong.common.core.domain.BaseEntity;
import java.util.Date;
/**
* 监督检查-抽查隐患对象 t_ins_spot_hazard_ref
*
......@@ -63,7 +66,7 @@ public class TInsSpotHazardRef extends BaseEntity
private String fObjCode;
/** 对象所在行政区，县级行政区ID */
private String fObjBelongRegionId;
private Long fObjBelongRegionId;
@Excel(name = "县级行政区")
private String countyName;
......@@ -100,6 +103,49 @@ public class TInsSpotHazardRef extends BaseEntity
/** 最后修改时间 yyyy-MM-dd hh:mm:ss */
private String fLastTime;
/**
* 隐患整改后照片
*/
@Excel(name = "隐患整改后照片")
private String afterPicture;
/**
* 处置描述
*/
@Excel(name = "处置描述")
private String disposalDetails;
/**
* 处置描述
*/
@Excel(name = "处置时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date disposalTime;
public Date getDisposalTime() {
return disposalTime;
}
public void setDisposalTime(Date disposalTime) {
this.disposalTime = disposalTime;
}
public String getAfterPicture() {
return afterPicture;
}
public void setAfterPicture(String afterPicture) {
this.afterPicture = afterPicture;
}
public String getDisposalDetails() {
return disposalDetails;
}
public void setDisposalDetails(String disposalDetails) {
this.disposalDetails = disposalDetails;
}
public void setfInsSpotHazardRefId(Long fInsSpotHazardRefId)
{
this.fInsSpotHazardRefId = fInsSpotHazardRefId;
......@@ -154,12 +200,12 @@ public class TInsSpotHazardRef extends BaseEntity
{
return fObjCode;
}
public void setfObjBelongRegionId(String fObjBelongRegionId)
public void setfObjBelongRegionId(Long fObjBelongRegionId)
{
this.fObjBelongRegionId = fObjBelongRegionId;
}
public String getfObjBelongRegionId()
public Long getfObjBelongRegionId()
{
return fObjBelongRegionId;
}
......
zh-baseversion-system/src/main/java/com/zehong/system/mapper/TInsSpotHazardRefMapper.java
View file @ fc03ce85
......@@ -43,6 +43,13 @@ public interface TInsSpotHazardRefMapper
*/
public int updateTInsSpotHazardRef(TInsSpotHazardRef tInsSpotHazardRef);
/**
* 抽查隐患处置
* @param tInsSpotHazardRef t
* @return r
*/
public int disposeOfInsSpotHazardRef(TInsSpotHazardRef tInsSpotHazardRef);
/**
* 删除监督检查-抽查隐患
*
......
zh-baseversion-system/src/main/java/com/zehong/system/service/ITInsSpotHazardRefService.java
View file @ fc03ce85
......@@ -43,6 +43,13 @@ public interface ITInsSpotHazardRefService
*/
public int updateTInsSpotHazardRef(TInsSpotHazardRef tInsSpotHazardRef);
/**
* 抽查隐患-处置
* @param tInsSpotHazardRef t
* @return r
*/
public int disposeOfInsSpotHazardRef(TInsSpotHazardRef tInsSpotHazardRef);
/**
* 批量删除监督检查-抽查隐患
*
......
zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TInsSpotHazardRefServiceImpl.java
View file @ fc03ce85
......@@ -98,6 +98,17 @@ public class TInsSpotHazardRefServiceImpl implements ITInsSpotHazardRefService
}
}
/**
* 抽查隐患-处置
* @param tInsSpotHazardRef t
* @return
*/
@Override
public int disposeOfInsSpotHazardRef(TInsSpotHazardRef tInsSpotHazardRef) {
tInsSpotHazardRef.setDisposalTime(new Date());
return tInsSpotHazardRefMapper.disposeOfInsSpotHazardRef(tInsSpotHazardRef);
}
/**
* 批量删除监督检查-抽查隐患
*
......
zh-baseversion-system/src/main/resources/mapper/system/TInsSpotHazardRefMapper.xml
View file @ fc03ce85
......@@ -19,6 +19,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="fIsEnforcement" column="f_is_enforcement" />
<result property="fRemark" column="f_remark" />
<result property="fLastTime" column="f_last_time" />
<result property="afterPicture" column="f_after_picture" />
<result property="disposalDetails" column="f_disposal_details" />
<result property="disposalTime" column="f_disposal_time" />
</resultMap>
<sql id="selectTInsSpotHazardRefVo">
......@@ -37,6 +41,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
spot.f_is_enforcement,
spot.f_remark,
spot.f_last_time,
spot.f_after_picture,
spot.f_disposal_details,
spot.f_disposal_time,
(select rec.f_name from t_county_level_region rec where rec.f_id = spot.f_obj_belong_region_id) AS countyName,
(select en.enterprise_name from t_enterprise_info en where enterprise_id = spot.f_involve_enterprise_code)AS enterpriseName,
(select inf.f_hazard_name from t_ins_sta_infor inf where inf.f_ins_sta_infor_id = spot.f_hazard_type_level_id)AS levelName
......@@ -112,6 +119,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
where f_ins_spot_hazard_ref_id = #{fInsSpotHazardRefId}
</update>
<update id="disposeOfInsSpotHazardRef" parameterType="TInsSpotHazardRef">
update t_ins_spot_hazard_ref
<trim prefix="SET" suffixOverrides=",">
<if test="afterPicture != null and afterPicture != ''">f_after_picture = #{afterPicture},</if>
<if test="disposalDetails != null and disposalDetails != ''">f_disposal_details = #{disposalDetails},</if>
<if test="disposalTime != null">f_disposal_time = #{disposalTime},</if>
</trim>
where f_ins_spot_hazard_ref_id = #{fInsSpotHazardRefId}
</update>
<delete id="deleteTInsSpotHazardRefById" parameterType="Long">
delete from t_ins_spot_hazard_ref where f_ins_spot_hazard_ref_id = #{fInsSpotHazardRefId}
......
zh-baseversion-web/src/api/supervision/spot.js
View file @ fc03ce85
......@@ -35,6 +35,15 @@ export function updateRef(data) {
})
}
// 监督检查-抽查隐患-处置
export function disposeOfInsSpotHazardRef(data) {
return request({
url: '/supervision/spot/disposeOfInsSpotHazardRef',
method: 'put',
data: data
})
}
// 删除监督检查-抽查隐患
export function delRef(fInsSpotHazardRefId) {
return request({
......
zh-baseversion-web/src/views/supervision/spot/components/DetailInfo.vue
View file @ fc03ce85
......@@ -59,20 +59,21 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="24">
<el-form-item label="隐患描述">
<span v-if="detailInfo.fHazardDesc">{{ detailInfo.fHazardDesc }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<!-- 先隐藏掉 -->
<!-- <el-col :span="12">
<el-form-item label="是否执行" prop="fIsEnforcement">
<span v-if="detailInfo.fIsEnforcement == '1'">是</span>
<span v-else-if="detailInfo.fIsEnforcement == '0'">否</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="12">
......@@ -87,12 +88,39 @@
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注">
<span v-if="detailInfo.fRemark">{{ detailInfo.fRemark }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
<el-divider v-if="detailInfo.afterPicture != null" content-position="left">处置</el-divider>
<el-row v-if="detailInfo.afterPicture != null">
<el-form-item label="隐患整改后照片">
<el-col :span="24">
<el-image
:src="detailInfo.afterPicture"
:preview-src-list="[detailInfo.afterPicture]"
v-if="detailInfo.afterPicture != '' && detailInfo.afterPicture != null"
:z-index=5000
style="width: 200px;height: 200px;"
></el-image>
<span v-else>-</span>
</el-col>
</el-form-item>
<el-col :span="24">
<el-form-item label="处置描述" prop="disposalDetails">
<span v-if="detailInfo.disposalDetails">{{ detailInfo.disposalDetails }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注">
<span v-if="detailInfo.fRemark">{{ detailInfo.fRemark }}</span>
<el-form-item label="处置时间" prop="disposalDetails">
<span v-if="detailInfo.disposalTime">{{ detailInfo.disposalTime }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
......
zh-baseversion-web/src/views/supervision/spot/index.vue
View file @ fc03ce85
......@@ -20,12 +20,6 @@
/>
</el-select>
</el-form-item>
<el-form-item label="是否执行" prop="fIsEnforcement">
<el-select v-model="queryParams.fIsEnforcement" placeholder="请选择是否执行" clearable size="small">
<el-option label="是" value="1" />
<el-option label="否" value="0" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
......@@ -99,12 +93,6 @@
</template>
</el-table-column>
<el-table-column label="检查对象分类" align="center" prop="fObjType"/>
<el-table-column label="对象编码" align="center" prop="fObjCode">
<template slot-scope="scope">
<span v-if="scope.row.fObjCode">{{ scope.row.fObjCode }}</span>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="行政区县级行政区" align="center" prop="fObjBelongRegionId" width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.countyName">{{ scope.row.countyName }}</span>
......@@ -118,25 +106,26 @@
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="隐患描述" align="center" prop="fHazardDesc" :show-overflow-tooltip="true">
<!-- <el-table-column label="隐患描述" align="center" prop="fHazardDesc" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.fHazardDesc">{{ scope.row.fHazardDesc }}</span>
<span v-else>-</span>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="隐患整改前照片" align="center" prop="fBeforePicture">
<template slot-scope="scope">
<el-image v-if="scope.row.fBeforePicture" :src="scope.row.fBeforePicture" :preview-src-list="[scope.row.fBeforePicture]" :z-index="9999" style="width: 30px;height: 30px;"></el-image>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="是否执行" align="center" prop="fIsEnforcement">
<!-- 省平台的接口不知道什么意思，先不显示 -->
<!-- <el-table-column label="是否执行" align="center" prop="fIsEnforcement">
<template slot-scope="scope">
<span v-if="scope.row.fIsEnforcement == '1'">是</span>
<span v-else-if="scope.row.fIsEnforcement == '0'">否</span>
<span v-else>-</span>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
<template slot-scope="scope">
<el-button
......@@ -157,6 +146,13 @@
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>删除</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit-outline"
@click="handleDispose(scope.row)"
v-if="scope.row.afterPicture == null"
>处置</el-button>
</template>
</el-table-column>
</el-table>
......@@ -231,8 +227,7 @@
<el-select
v-model="form.fObjBelongRegionId"
placeholder="请选择县级行政区"
style="width: 100%"
>
style="width: 100%">
<el-option
v-for="county in countyInfo"
:key="county.fId"
......@@ -272,13 +267,14 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="24">
<el-form-item label="隐患描述" prop="fHazardDesc">
<el-input v-model="form.fHazardDesc" placeholder="隐患描述" />
</el-form-item>
</el-col>
<el-col :span="12">
<!-- 省平台接口不知道什么意思，先不使用 -->
<!-- <el-col :span="12">
<el-form-item label="是否执行" prop="fIsEnforcement">
<el-select
v-model="form.fIsEnforcement"
......@@ -289,27 +285,173 @@
<el-option label="否" value="0" />
</el-select>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="24">
<el-form-item label="隐患整改前照片" prop="fBeforePicture">
<imageUpload v-model="form.fBeforePicture"/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" prop="fRemark">
<el-input type="textarea" v-model="form.fRemark" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<!-- 处置对话框 -->
<el-dialog :title="disposeTitle" :visible.sync="disposeOpen" width="900px" append-to-body destroy-on-close :close-on-click-modal="false">
<el-form ref="form" :model="form" label-width="140px">
<el-row class="el-row-table" >
<el-col :span="12">
<el-form-item label="隐患唯一编码" prop="fHazardUniqueCode">
<el-input disabled v-model="form.fHazardUniqueCode" placeholder="请输入隐患唯一编码" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="隐患自有编号" prop="fHazardOutUniqueCode">
<el-input disabled v-model="form.fHazardOutUniqueCode" placeholder="请输入隐患自有编号" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="供气企业编码" prop="fInvolveEnterpriseCode">
<el-select
v-model="form.fInvolveEnterpriseCode"
placeholder="请选择供气企业"
style="width: 100%" disabled
>
<el-option
v-for="enterprise in enterpriseList"
:key="enterprise.companyType"
:label="enterprise.enterpriseName"
:value="enterprise.companyType"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="检查对象分类" prop="fObjType">
<el-select
v-model="form.fObjType"
placeholder="请选择检查对象分类"
@change="objectTypeChange"
style="width: 100%" disabled
>
<el-option
v-for="dict in fObjTypeOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictLabel"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="对象编码" prop="fObjCode">
<el-input disabled v-model="form.fObjCode" placeholder="请输入对象编码" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="行政区县级行政区" prop="fObjBelongRegionId">
<el-select
v-model="form.fObjBelongRegionId"
placeholder="请选择县级行政区"
style="width: 100%" disabled
>
<el-option
v-for="county in countyInfo"
:key="county.fId"
:label="county.fName.trim()"
:value="county.fId"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="监督检查时间" prop="fCheckTime">
<el-date-picker
style="width: 100%"
v-model="form.fCheckTime"
type="datetime"
disabled
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择监督检查时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="隐患分类分级编码" prop="fHazardTypeLevelId">
<el-select
v-model="form.fHazardTypeLevelId"
placeholder="请选择隐患分类分级标准"
style="width: 100%" disabled
>
<el-option
v-for="hidden in hiddenData"
:key="hidden.fInsStaInforId"
:label="hidden.fHazardName"
:value="hidden.fInsStaInforId"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24" >
<el-form-item label="隐患描述" prop="fHazardDesc">
<el-input disabled v-model="form.fHazardDesc" placeholder="隐患描述" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="隐患整改前照片" prop="fBeforePicture">
<el-image
:src="form.fBeforePicture"
:preview-src-list="[form.fBeforePicture]"
v-if="form.fBeforePicture != '' && form.fBeforePicture != null"
:z-index=5000
style="width: 200px;height: 200px;"
></el-image>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" prop="fRemark">
<el-input type="textarea" v-model="form.fRemark" placeholder="请输入备注" />
<el-input disabled type="textarea" v-model="form.fRemark" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
<el-divider content-position="left">处置</el-divider>
<el-row>
<el-col :span="24">
<el-form-item label="隐患整改后照片" prop="afterPicture">
<imageUpload v-model="form.afterPicture"/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="处置描述" prop="disposalDetails">
<el-input type="textarea" v-model="form.disposalDetails" placeholder="请输入处置描述" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button type="primary" @click="dispnseSubmitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
......@@ -320,7 +462,7 @@
</template>
<script>
import { listRef, getRef, delRef, addRef, updateRef, exportRef } from "@/api/supervision/spot";
import { listRef, getRef, delRef, addRef, updateRef, exportRef,disposeOfInsSpotHazardRef } from "@/api/supervision/spot";
import ImageUpload from '@/components/ImageUpload';
import DetailInfo from "./components/DetailInfo";
import { getTask } from "@/api/govermentdata/GovermentData";
......@@ -355,6 +497,10 @@ export default {
title: "",
// 是否显示弹出层
open: false,
//处置对话框 标题
disposeTitle:"",
// 是否显示 处置对话框
disposeOpen: false,
// 检查对象分类
fObjTypeOptions: [],
// 查询参数
......@@ -480,6 +626,23 @@ export default {
this.title = "修改抽查隐患";
});
},
/** 处置按钮 */
handleDispose(row) {
const fInsSpotHazardRefId = row.fInsSpotHazardRefId
getRef(fInsSpotHazardRefId).then(response => {
this.form = response.data;
this.disposeOpen = true;
this.disposeTitle = "处置抽查隐患";
});
},
//处置提交
dispnseSubmitForm() {
disposeOfInsSpotHazardRef(this.form).then(response => {
this.msgSuccess("处置成功");
this.disposeOpen = false;
this.getList();
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
......
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