Commit 097b1553 authored by 耿迪迪's avatar 耿迪迪

调查结果

parent e5cab16a
package com.zehong.web.controller.supervision;
import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.zehong.common.annotation.Log;
import com.zehong.common.core.controller.BaseController;
import com.zehong.common.core.domain.AjaxResult;
import com.zehong.common.enums.BusinessType;
import com.zehong.system.domain.TInsSpotRecInfor;
import com.zehong.system.service.ITInsSpotRecInforService;
import com.zehong.common.utils.poi.ExcelUtil;
import com.zehong.common.core.page.TableDataInfo;
/**
* 监督检查-调查结果Controller
*
* @author zehong
* @date 2024-05-22
*/
@RestController
@RequestMapping("/supervision/findings")
public class TInsSpotRecInforController extends BaseController
{
@Autowired
private ITInsSpotRecInforService tInsSpotRecInforService;
/**
* 查询监督检查-调查结果列表
*/
@PreAuthorize("@ss.hasPermi('supervision:findings:list')")
@GetMapping("/list")
public TableDataInfo list(TInsSpotRecInfor tInsSpotRecInfor)
{
startPage();
List<TInsSpotRecInfor> list = tInsSpotRecInforService.selectTInsSpotRecInforList(tInsSpotRecInfor);
return getDataTable(list);
}
/**
* 导出监督检查-调查结果列表
*/
@PreAuthorize("@ss.hasPermi('supervision:findings:export')")
@Log(title = "监督检查-调查结果", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(TInsSpotRecInfor tInsSpotRecInfor)
{
List<TInsSpotRecInfor> list = tInsSpotRecInforService.selectTInsSpotRecInforList(tInsSpotRecInfor);
ExcelUtil<TInsSpotRecInfor> util = new ExcelUtil<TInsSpotRecInfor>(TInsSpotRecInfor.class);
return util.exportExcel(list, "监督检查-调查结果数据");
}
/**
* 获取监督检查-调查结果详细信息
*/
@PreAuthorize("@ss.hasPermi('supervision:findings:query')")
@GetMapping(value = "/{fInsSpotRecInforId}")
public AjaxResult getInfo(@PathVariable("fInsSpotRecInforId") Long fInsSpotRecInforId)
{
return AjaxResult.success(tInsSpotRecInforService.selectTInsSpotRecInforById(fInsSpotRecInforId));
}
/**
* 新增监督检查-调查结果
*/
@PreAuthorize("@ss.hasPermi('supervision:findings:add')")
@Log(title = "监督检查-调查结果", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TInsSpotRecInfor tInsSpotRecInfor)
{
return toAjax(tInsSpotRecInforService.insertTInsSpotRecInfor(tInsSpotRecInfor));
}
/**
* 修改监督检查-调查结果
*/
@PreAuthorize("@ss.hasPermi('supervision:findings:edit')")
@Log(title = "监督检查-调查结果", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TInsSpotRecInfor tInsSpotRecInfor)
{
return toAjax(tInsSpotRecInforService.updateTInsSpotRecInfor(tInsSpotRecInfor));
}
/**
* 删除监督检查-调查结果
*/
@PreAuthorize("@ss.hasPermi('supervision:findings:remove')")
@Log(title = "监督检查-调查结果", businessType = BusinessType.DELETE)
@DeleteMapping("/{fInsSpotRecInforIds}")
public AjaxResult remove(@PathVariable Long[] fInsSpotRecInforIds)
{
return toAjax(tInsSpotRecInforService.deleteTInsSpotRecInforByIds(fInsSpotRecInforIds));
}
}
package com.zehong.system.domain;
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;
import com.zehong.common.core.domain.BaseEntity;
/**
* 监督检查-调查结果对象 t_ins_spot_rec_infor
*
* @author zehong
* @date 2024-05-22
*/
public class TInsSpotRecInfor extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** id */
private Long fInsSpotRecInforId;
/** 检查记录编码,实施检查的燃气主管部门对应 6 位行
政区划编码+4 位年份+6 位 */
@Excel(name = "检查记录编码")
private String fCheckCode;
/** 调研项目名称 */
@Excel(name = "调研项目名称")
private String fName;
/** 调研内容 */
@Excel(name = "调研内容")
private String fContent;
/** 调研方法
1-现场检查、
2-现场检测、
3-现场检查并测试、
4-现场检查和查阅记录、
5-查阅检测报告、
6- 查阅检定记录、
7-查阅记录、
8-其他 */
@Excel(name = "调研方法",dictType = "t_survey_method")
private String fMethod;
/** 调研结果 */
@Excel(name = "调研结果")
private String fResult;
/** 更新时间 yyyy-MM-dd hh:mm:ss */
@JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
@Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd hh:mm:ss")
private Date fUpdateTime;
public void setfInsSpotRecInforId(Long fInsSpotRecInforId)
{
this.fInsSpotRecInforId = fInsSpotRecInforId;
}
public Long getfInsSpotRecInforId()
{
return fInsSpotRecInforId;
}
public void setfCheckCode(String fCheckCode)
{
this.fCheckCode = fCheckCode;
}
public String getfCheckCode()
{
return fCheckCode;
}
public void setfName(String fName)
{
this.fName = fName;
}
public String getfName()
{
return fName;
}
public void setfContent(String fContent)
{
this.fContent = fContent;
}
public String getfContent()
{
return fContent;
}
public void setfMethod(String fMethod)
{
this.fMethod = fMethod;
}
public String getfMethod()
{
return fMethod;
}
public void setfResult(String fResult)
{
this.fResult = fResult;
}
public String getfResult()
{
return fResult;
}
public void setfUpdateTime(Date fUpdateTime)
{
this.fUpdateTime = fUpdateTime;
}
public Date getfUpdateTime()
{
return fUpdateTime;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("fInsSpotRecInforId", getfInsSpotRecInforId())
.append("fCheckCode", getfCheckCode())
.append("fName", getfName())
.append("fContent", getfContent())
.append("fMethod", getfMethod())
.append("fResult", getfResult())
.append("fUpdateTime", getfUpdateTime())
.toString();
}
}
package com.zehong.system.mapper;
import java.util.List;
import com.zehong.system.domain.TInsSpotRecInfor;
/**
* 监督检查-调查结果Mapper接口
*
* @author zehong
* @date 2024-05-22
*/
public interface TInsSpotRecInforMapper
{
/**
* 查询监督检查-调查结果
*
* @param fInsSpotRecInforId 监督检查-调查结果ID
* @return 监督检查-调查结果
*/
public TInsSpotRecInfor selectTInsSpotRecInforById(Long fInsSpotRecInforId);
/**
* 查询监督检查-调查结果列表
*
* @param tInsSpotRecInfor 监督检查-调查结果
* @return 监督检查-调查结果集合
*/
public List<TInsSpotRecInfor> selectTInsSpotRecInforList(TInsSpotRecInfor tInsSpotRecInfor);
/**
* 新增监督检查-调查结果
*
* @param tInsSpotRecInfor 监督检查-调查结果
* @return 结果
*/
public int insertTInsSpotRecInfor(TInsSpotRecInfor tInsSpotRecInfor);
/**
* 修改监督检查-调查结果
*
* @param tInsSpotRecInfor 监督检查-调查结果
* @return 结果
*/
public int updateTInsSpotRecInfor(TInsSpotRecInfor tInsSpotRecInfor);
/**
* 删除监督检查-调查结果
*
* @param fInsSpotRecInforId 监督检查-调查结果ID
* @return 结果
*/
public int deleteTInsSpotRecInforById(Long fInsSpotRecInforId);
/**
* 批量删除监督检查-调查结果
*
* @param fInsSpotRecInforIds 需要删除的数据ID
* @return 结果
*/
public int deleteTInsSpotRecInforByIds(Long[] fInsSpotRecInforIds);
}
package com.zehong.system.service;
import java.util.List;
import com.zehong.system.domain.TInsSpotRecInfor;
/**
* 监督检查-调查结果Service接口
*
* @author zehong
* @date 2024-05-22
*/
public interface ITInsSpotRecInforService
{
/**
* 查询监督检查-调查结果
*
* @param fInsSpotRecInforId 监督检查-调查结果ID
* @return 监督检查-调查结果
*/
public TInsSpotRecInfor selectTInsSpotRecInforById(Long fInsSpotRecInforId);
/**
* 查询监督检查-调查结果列表
*
* @param tInsSpotRecInfor 监督检查-调查结果
* @return 监督检查-调查结果集合
*/
public List<TInsSpotRecInfor> selectTInsSpotRecInforList(TInsSpotRecInfor tInsSpotRecInfor);
/**
* 新增监督检查-调查结果
*
* @param tInsSpotRecInfor 监督检查-调查结果
* @return 结果
*/
public int insertTInsSpotRecInfor(TInsSpotRecInfor tInsSpotRecInfor);
/**
* 修改监督检查-调查结果
*
* @param tInsSpotRecInfor 监督检查-调查结果
* @return 结果
*/
public int updateTInsSpotRecInfor(TInsSpotRecInfor tInsSpotRecInfor);
/**
* 批量删除监督检查-调查结果
*
* @param fInsSpotRecInforIds 需要删除的监督检查-调查结果ID
* @return 结果
*/
public int deleteTInsSpotRecInforByIds(Long[] fInsSpotRecInforIds);
/**
* 删除监督检查-调查结果信息
*
* @param fInsSpotRecInforId 监督检查-调查结果ID
* @return 结果
*/
public int deleteTInsSpotRecInforById(Long fInsSpotRecInforId);
}
package com.zehong.system.service.impl;
import java.util.Date;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zehong.system.mapper.TInsSpotRecInforMapper;
import com.zehong.system.domain.TInsSpotRecInfor;
import com.zehong.system.service.ITInsSpotRecInforService;
/**
* 监督检查-调查结果Service业务层处理
*
* @author zehong
* @date 2024-05-22
*/
@Service
public class TInsSpotRecInforServiceImpl implements ITInsSpotRecInforService
{
@Autowired
private TInsSpotRecInforMapper tInsSpotRecInforMapper;
/**
* 查询监督检查-调查结果
*
* @param fInsSpotRecInforId 监督检查-调查结果ID
* @return 监督检查-调查结果
*/
@Override
public TInsSpotRecInfor selectTInsSpotRecInforById(Long fInsSpotRecInforId)
{
return tInsSpotRecInforMapper.selectTInsSpotRecInforById(fInsSpotRecInforId);
}
/**
* 查询监督检查-调查结果列表
*
* @param tInsSpotRecInfor 监督检查-调查结果
* @return 监督检查-调查结果
*/
@Override
public List<TInsSpotRecInfor> selectTInsSpotRecInforList(TInsSpotRecInfor tInsSpotRecInfor)
{
return tInsSpotRecInforMapper.selectTInsSpotRecInforList(tInsSpotRecInfor);
}
/**
* 新增监督检查-调查结果
*
* @param tInsSpotRecInfor 监督检查-调查结果
* @return 结果
*/
@Override
public int insertTInsSpotRecInfor(TInsSpotRecInfor tInsSpotRecInfor)
{
tInsSpotRecInfor.setfUpdateTime(new Date());
return tInsSpotRecInforMapper.insertTInsSpotRecInfor(tInsSpotRecInfor);
}
/**
* 修改监督检查-调查结果
*
* @param tInsSpotRecInfor 监督检查-调查结果
* @return 结果
*/
@Override
public int updateTInsSpotRecInfor(TInsSpotRecInfor tInsSpotRecInfor)
{
tInsSpotRecInfor.setfUpdateTime(new Date());
return tInsSpotRecInforMapper.updateTInsSpotRecInfor(tInsSpotRecInfor);
}
/**
* 批量删除监督检查-调查结果
*
* @param fInsSpotRecInforIds 需要删除的监督检查-调查结果ID
* @return 结果
*/
@Override
public int deleteTInsSpotRecInforByIds(Long[] fInsSpotRecInforIds)
{
return tInsSpotRecInforMapper.deleteTInsSpotRecInforByIds(fInsSpotRecInforIds);
}
/**
* 删除监督检查-调查结果信息
*
* @param fInsSpotRecInforId 监督检查-调查结果ID
* @return 结果
*/
@Override
public int deleteTInsSpotRecInforById(Long fInsSpotRecInforId)
{
return tInsSpotRecInforMapper.deleteTInsSpotRecInforById(fInsSpotRecInforId);
}
}
......@@ -45,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="fIsEnforcement != null and fIsEnforcement != ''"> and f_is_enforcement = #{fIsEnforcement}</if>
<if test="fEnforcementType != null and fEnforcementType != ''"> and f_enforcement_type = #{fEnforcementType}</if>
</where>
ORDER BY f_last_time DESC
</select>
<select id="selectTInsHazRefById" parameterType="Long" resultMap="TInsHazRefResult">
......
......@@ -34,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="fCheckManName != null and fCheckManName != ''"> and f_check_man_name like concat('%', #{fCheckManName}, '%')</if>
<if test="fCheckManPhone != null and fCheckManPhone != ''"> and f_check_man_phone like concat('%', #{fCheckManPhone}, '%')</if>
</where>
ORDER BY f_last_update_time DESC
</select>
<select id="selectTInsRecInforById" parameterType="Long" resultMap="TInsRecInforResult">
......
......@@ -32,6 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="fObjType != null and fObjType != ''"> and f_obj_type = #{fObjType}</if>
<if test="fIsEnforcement != null and fIsEnforcement != ''"> and f_is_enforcement = #{fIsEnforcement}</if>
</where>
ORDER BY f_last_time DESC
</select>
<select id="selectTInsSpotHazardRefById" parameterType="Long" resultMap="TInsSpotHazardRefResult">
......
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zehong.system.mapper.TInsSpotRecInforMapper">
<resultMap type="TInsSpotRecInfor" id="TInsSpotRecInforResult">
<result property="fInsSpotRecInforId" column="f_ins_spot_rec_infor_id" />
<result property="fCheckCode" column="f_check_code" />
<result property="fName" column="f_name" />
<result property="fContent" column="f_content" />
<result property="fMethod" column="f_method" />
<result property="fResult" column="f_result" />
<result property="fUpdateTime" column="f_update_time" />
</resultMap>
<sql id="selectTInsSpotRecInforVo">
select f_ins_spot_rec_infor_id, f_check_code, f_name, f_content, f_method, f_result, f_update_time from t_ins_spot_rec_infor
</sql>
<select id="selectTInsSpotRecInforList" parameterType="TInsSpotRecInfor" resultMap="TInsSpotRecInforResult">
<include refid="selectTInsSpotRecInforVo"/>
<where>
<if test="fCheckCode != null and fCheckCode != ''"> and f_check_code like concat('%', #{fCheckCode}, '%')</if>
<if test="fName != null and fName != ''"> and f_name like concat('%', #{fName}, '%')</if>
<if test="fMethod != null and fMethod != ''"> and f_method = #{fMethod}</if>
</where>
</select>
<select id="selectTInsSpotRecInforById" parameterType="Long" resultMap="TInsSpotRecInforResult">
<include refid="selectTInsSpotRecInforVo"/>
where f_ins_spot_rec_infor_id = #{fInsSpotRecInforId}
</select>
<insert id="insertTInsSpotRecInfor" parameterType="TInsSpotRecInfor" useGeneratedKeys="true" keyProperty="fInsSpotRecInforId">
insert into t_ins_spot_rec_infor
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="fCheckCode != null and fCheckCode != ''">f_check_code,</if>
<if test="fName != null and fName != ''">f_name,</if>
<if test="fContent != null">f_content,</if>
<if test="fMethod != null and fMethod != ''">f_method,</if>
<if test="fResult != null">f_result,</if>
<if test="fUpdateTime != null">f_update_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="fCheckCode != null and fCheckCode != ''">#{fCheckCode},</if>
<if test="fName != null and fName != ''">#{fName},</if>
<if test="fContent != null">#{fContent},</if>
<if test="fMethod != null and fMethod != ''">#{fMethod},</if>
<if test="fResult != null">#{fResult},</if>
<if test="fUpdateTime != null">#{fUpdateTime},</if>
</trim>
</insert>
<update id="updateTInsSpotRecInfor" parameterType="TInsSpotRecInfor">
update t_ins_spot_rec_infor
<trim prefix="SET" suffixOverrides=",">
<if test="fCheckCode != null and fCheckCode != ''">f_check_code = #{fCheckCode},</if>
<if test="fName != null and fName != ''">f_name = #{fName},</if>
<if test="fContent != null">f_content = #{fContent},</if>
<if test="fMethod != null and fMethod != ''">f_method = #{fMethod},</if>
<if test="fResult != null">f_result = #{fResult},</if>
<if test="fUpdateTime != null">f_update_time = #{fUpdateTime},</if>
</trim>
where f_ins_spot_rec_infor_id = #{fInsSpotRecInforId}
</update>
<delete id="deleteTInsSpotRecInforById" parameterType="Long">
delete from t_ins_spot_rec_infor where f_ins_spot_rec_infor_id = #{fInsSpotRecInforId}
</delete>
<delete id="deleteTInsSpotRecInforByIds" parameterType="String">
delete from t_ins_spot_rec_infor where f_ins_spot_rec_infor_id in
<foreach item="fInsSpotRecInforId" collection="array" open="(" separator="," close=")">
#{fInsSpotRecInforId}
</foreach>
</delete>
</mapper>
\ No newline at end of file
......@@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="fTypeCode != null and fTypeCode != ''"> and f_type_code = #{fTypeCode}</if>
<if test="fResType != null "> and f_res_type = #{fResType}</if>
</where>
ORDER BY f_last_update_time DESC
</select>
<select id="selectTInsSurListInforById" parameterType="Long" resultMap="TInsSurListInforResult">
......
import request from '@/utils/request'
// 查询监督检查-调查结果列表
export function listInfor(query) {
return request({
url: '/supervision/findings/list',
method: 'get',
params: query
})
}
// 查询监督检查-调查结果详细
export function getInfor(fInsSpotRecInforId) {
return request({
url: '/supervision/findings/' + fInsSpotRecInforId,
method: 'get'
})
}
// 新增监督检查-调查结果
export function addInfor(data) {
return request({
url: '/supervision/findings',
method: 'post',
data: data
})
}
// 修改监督检查-调查结果
export function updateInfor(data) {
return request({
url: '/supervision/findings',
method: 'put',
data: data
})
}
// 删除监督检查-调查结果
export function delInfor(fInsSpotRecInforId) {
return request({
url: '/supervision/findings/' + fInsSpotRecInforId,
method: 'delete'
})
}
// 导出监督检查-调查结果
export function exportInfor(query) {
return request({
url: '/supervision/findings/export',
method: 'get',
params: query
})
}
<template>
<el-dialog title="详情" :visible.sync="detailOpen" width="900px" append-to-body destroy-on-close :close-on-click-modal="false">
<el-form label-width="120px">
<el-row class="el-row-table">
<el-col :span="12">
<el-form-item label="检查记录编码">
<span v-if="detailInfo.fCheckCode">{{ detailInfo.fCheckCode }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="调研项目名称">
<span v-if="detailInfo.fName">{{ detailInfo.fName }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="调研方法">
<span v-if="detailInfo.fMethod">{{ detailInfo.fMethod }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="调研内容">
<span v-if="detailInfo.fContent">{{ detailInfo.fContent }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="调研结果">
<span v-if="detailInfo.fResult">{{ detailInfo.fResult }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-dialog>
</template>
<script>
import { getInfor } from "@/api/supervision/findings";
export default {
name: "detail-info",
data(){
return{
detailInfo: {
fDeleteFlag: 0
},
detailOpen: false
}
},
methods:{
getDetailInfo(id){
getInfor(id).then(res =>{
if(res.code == 200 && res.data){
this.detailInfo = res.data;
this.detailOpen = true;
}
})
}
}
}
</script>
<style scoped>
</style>
This diff is collapsed.
......@@ -216,10 +216,10 @@
style="width: 100%"
>
<el-option
v-for="dict in records"
:key="dict.fInsRecInforId"
:label="dict.fCheckTaskCode"
:value="dict.fCheckTaskCode"
v-for="record in records"
:key="record.fInsRecInforId"
:label="record.fCheckTaskCode"
:value="record.fCheckTaskCode"
></el-option>
</el-select>
</el-form-item>
......
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