监督检查-检查范围

zh-baseversion-admin/src/main/java/com/zehong/web/controller/supervision/TInsScopeInforController.java

+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.TInsScopeInfor;
+import com.zehong.system.service.ITInsScopeInforService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 监督检查-检查范围Controller
+ * 
+ * @author zehong
+ * @date 2024-05-16
+ */
+@RestController
+@RequestMapping("/supervision/scope")
+public class TInsScopeInforController extends BaseController
+{
+    @Autowired
+    private ITInsScopeInforService tInsScopeInforService;
+
+    /**
+     * 查询监督检查-检查范围列表
+     */
+    @PreAuthorize("@ss.hasPermi('supervision:scope:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TInsScopeInfor tInsScopeInfor)
+    {
+        startPage();
+        List<TInsScopeInfor> list = tInsScopeInforService.selectTInsScopeInforList(tInsScopeInfor);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出监督检查-检查范围列表
+     */
+    @PreAuthorize("@ss.hasPermi('supervision:scope:export')")
+    @Log(title = "监督检查-检查范围", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TInsScopeInfor tInsScopeInfor)
+    {
+        List<TInsScopeInfor> list = tInsScopeInforService.selectTInsScopeInforList(tInsScopeInfor);
+        ExcelUtil<TInsScopeInfor> util = new ExcelUtil<TInsScopeInfor>(TInsScopeInfor.class);
+        return util.exportExcel(list, "监督检查-检查范围数据");
+    }
+
+    /**
+     * 获取监督检查-检查范围详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('supervision:scope:query')")
+    @GetMapping(value = "/{fScopeInforId}")
+    public AjaxResult getInfo(@PathVariable("fScopeInforId") Long fScopeInforId)
+    {
+        return AjaxResult.success(tInsScopeInforService.selectTInsScopeInforById(fScopeInforId));
+    }
+
+    /**
+     * 新增监督检查-检查范围
+     */
+    @PreAuthorize("@ss.hasPermi('supervision:scope:add')")
+    @Log(title = "监督检查-检查范围", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TInsScopeInfor tInsScopeInfor)
+    {
+        return toAjax(tInsScopeInforService.insertTInsScopeInfor(tInsScopeInfor));
+    }
+
+    /**
+     * 修改监督检查-检查范围
+     */
+    @PreAuthorize("@ss.hasPermi('supervision:scope:edit')")
+    @Log(title = "监督检查-检查范围", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TInsScopeInfor tInsScopeInfor)
+    {
+        return toAjax(tInsScopeInforService.updateTInsScopeInfor(tInsScopeInfor));
+    }
+
+    /**
+     * 删除监督检查-检查范围
+     */
+    @PreAuthorize("@ss.hasPermi('supervision:scope:remove')")
+    @Log(title = "监督检查-检查范围", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{fScopeInforIds}")
+    public AjaxResult remove(@PathVariable Long[] fScopeInforIds)
+    {
+        return toAjax(tInsScopeInforService.deleteTInsScopeInforByIds(fScopeInforIds));
+    }
+}

zh-baseversion-admin/src/main/java/com/zehong/web/controller/supervision/TInsTaskInforController.java

@@ -45,6 +45,15 @@ public class TInsTaskInforController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 查询监督检查-检查任务列表
+     */
+    @GetMapping("/taskList")
+    public AjaxResult taskList(TInsTaskInfor tInsTaskInfor){
+        List<TInsTaskInfor> list = tInsTaskInforService.selectTInsTaskInforList(tInsTaskInfor);
+        return AjaxResult.success(list);
+    }
+
     /**
      * 导出监督检查-检查任务列表
      */

zh-baseversion-system/src/main/java/com/zehong/system/domain/TInsScopeInfor.java

+package com.zehong.system.domain;
+
+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_scope_infor
+ * 
+ * @author zehong
+ * @date 2024-05-16
+ */
+public class TInsScopeInfor extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long fScopeInforId;
+
+    /** 关联检查任务表 */
+    private Long fHazardCheckTaskId;
+
+    @Excel(name = "任务名称")
+    private String fName;
+
+    /** 对象分类, RGASU-农村管道燃气用户, LPGRR-农村液化石油气
+
+            用户, URBAN-城镇管道燃气用户, LPGUR-城镇液化石油气用
+
+            户, UNITG-单位燃气用户, GASPL-燃气厂站, GASPT-燃气管道, GASCO-燃气企业, ICS-第三方施工, GRD-燃气主管部门 */
+    @Excel(name = "对象分类",dictType = "t_object_type")
+    private String fObjectType;
+
+    /** 检查表实例关联Id */
+    @Excel(name = "检查表实例关联Id")
+    private Long fHazardCheckTableRecordId;
+
+    /** 抽查要求 1：抽查;0-全覆盖 */
+    @Excel(name = "抽查要求",dictType = "t_spot_check_type")
+    private String fSpotCheckType;
+
+    /** {"district":2,"town":1,"countByDistrict":2,"village":1,"house":1,"to
+
+            wnBottleGas":0.3,"townBottleGasCon":2} */
+    @Excel(name = "范围数据")
+    private String fSpotCheck;
+
+    /** T-主城区(默认)，F-三市 */
+    @Excel(name = "城区标识",dictType = "t_special_flag")
+    private String fSpecialFlag;
+
+    /** 此对象应检数据 */
+    @Excel(name = "此对象应检数据")
+    private Long fLotCount;
+
+    /** 抽查细类：全覆盖为空，其他情况是不分，多个细节用，拼接 */
+    @Excel(name = "抽查细类")
+    private String fSubobjecttypeCheckTypeDesc;
+
+    /** 删除标记，0-可用，1-已删除 */
+    @Excel(name = "删除标记",dictType = "t_delete_flag")
+    private Long fDeleteFlag;
+
+    /** 描述 */
+    @Excel(name = "描述")
+    private String fRemark;
+
+    /** 创建时间 */
+    @Excel(name = "创建时间")
+    private String fCreateTime;
+
+    /** 创建人，当前操作人登录名称 */
+    @Excel(name = "创建人")
+    private String fCreateBy;
+
+    /** 修改时间 */
+    @Excel(name = "修改时间")
+    private String fUpdateTime;
+
+    /** 修改人，当前操作人登录名称 */
+    @Excel(name = "修改人")
+    private String fModifyBy;
+
+    public void setfScopeInforId(Long fScopeInforId) 
+    {
+        this.fScopeInforId = fScopeInforId;
+    }
+
+    public Long getfScopeInforId() 
+    {
+        return fScopeInforId;
+    }
+    public void setfHazardCheckTaskId(Long fHazardCheckTaskId) 
+    {
+        this.fHazardCheckTaskId = fHazardCheckTaskId;
+    }
+
+    public Long getfHazardCheckTaskId() 
+    {
+        return fHazardCheckTaskId;
+    }
+
+    public String getfName() {
+        return fName;
+    }
+
+    public void setfName(String fName) {
+        this.fName = fName;
+    }
+
+    public void setfObjectType(String fObjectType)
+    {
+        this.fObjectType = fObjectType;
+    }
+
+    public String getfObjectType() 
+    {
+        return fObjectType;
+    }
+    public void setfHazardCheckTableRecordId(Long fHazardCheckTableRecordId) 
+    {
+        this.fHazardCheckTableRecordId = fHazardCheckTableRecordId;
+    }
+
+    public Long getfHazardCheckTableRecordId() 
+    {
+        return fHazardCheckTableRecordId;
+    }
+    public void setfSpotCheckType(String fSpotCheckType) 
+    {
+        this.fSpotCheckType = fSpotCheckType;
+    }
+
+    public String getfSpotCheckType() 
+    {
+        return fSpotCheckType;
+    }
+    public void setfSpotCheck(String fSpotCheck) 
+    {
+        this.fSpotCheck = fSpotCheck;
+    }
+
+    public String getfSpotCheck() 
+    {
+        return fSpotCheck;
+    }
+    public void setfSpecialFlag(String fSpecialFlag) 
+    {
+        this.fSpecialFlag = fSpecialFlag;
+    }
+
+    public String getfSpecialFlag() 
+    {
+        return fSpecialFlag;
+    }
+    public void setfLotCount(Long fLotCount) 
+    {
+        this.fLotCount = fLotCount;
+    }
+
+    public Long getfLotCount() 
+    {
+        return fLotCount;
+    }
+    public void setfSubobjecttypeCheckTypeDesc(String fSubobjecttypeCheckTypeDesc) 
+    {
+        this.fSubobjecttypeCheckTypeDesc = fSubobjecttypeCheckTypeDesc;
+    }
+
+    public String getfSubobjecttypeCheckTypeDesc() 
+    {
+        return fSubobjecttypeCheckTypeDesc;
+    }
+    public void setfDeleteFlag(Long fDeleteFlag) 
+    {
+        this.fDeleteFlag = fDeleteFlag;
+    }
+
+    public Long getfDeleteFlag() 
+    {
+        return fDeleteFlag;
+    }
+    public void setfRemark(String fRemark) 
+    {
+        this.fRemark = fRemark;
+    }
+
+    public String getfRemark() 
+    {
+        return fRemark;
+    }
+    public void setfCreateTime(String fCreateTime) 
+    {
+        this.fCreateTime = fCreateTime;
+    }
+
+    public String getfCreateTime() 
+    {
+        return fCreateTime;
+    }
+    public void setfCreateBy(String fCreateBy) 
+    {
+        this.fCreateBy = fCreateBy;
+    }
+
+    public String getfCreateBy() 
+    {
+        return fCreateBy;
+    }
+    public void setfUpdateTime(String fUpdateTime) 
+    {
+        this.fUpdateTime = fUpdateTime;
+    }
+
+    public String getfUpdateTime() 
+    {
+        return fUpdateTime;
+    }
+    public void setfModifyBy(String fModifyBy) 
+    {
+        this.fModifyBy = fModifyBy;
+    }
+
+    public String getfModifyBy() 
+    {
+        return fModifyBy;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("fScopeInforId", getfScopeInforId())
+            .append("fHazardCheckTaskId", getfHazardCheckTaskId())
+            .append("fObjectType", getfObjectType())
+            .append("fHazardCheckTableRecordId", getfHazardCheckTableRecordId())
+            .append("fSpotCheckType", getfSpotCheckType())
+            .append("fSpotCheck", getfSpotCheck())
+            .append("fSpecialFlag", getfSpecialFlag())
+            .append("fLotCount", getfLotCount())
+            .append("fSubobjecttypeCheckTypeDesc", getfSubobjecttypeCheckTypeDesc())
+            .append("fDeleteFlag", getfDeleteFlag())
+            .append("fRemark", getfRemark())
+            .append("fCreateTime", getfCreateTime())
+            .append("fCreateBy", getfCreateBy())
+            .append("fUpdateTime", getfUpdateTime())
+            .append("fModifyBy", getfModifyBy())
+            .toString();
+    }
+}

zh-baseversion-system/src/main/java/com/zehong/system/mapper/TInsScopeInforMapper.java

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TInsScopeInfor;
+
+/**
+ * 监督检查-检查范围Mapper接口
+ * 
+ * @author zehong
+ * @date 2024-05-16
+ */
+public interface TInsScopeInforMapper 
+{
+    /**
+     * 查询监督检查-检查范围
+     * 
+     * @param fScopeInforId 监督检查-检查范围ID
+     * @return 监督检查-检查范围
+     */
+    public TInsScopeInfor selectTInsScopeInforById(Long fScopeInforId);
+
+    /**
+     * 查询监督检查-检查范围列表
+     * 
+     * @param tInsScopeInfor 监督检查-检查范围
+     * @return 监督检查-检查范围集合
+     */
+    public List<TInsScopeInfor> selectTInsScopeInforList(TInsScopeInfor tInsScopeInfor);
+
+    /**
+     * 新增监督检查-检查范围
+     * 
+     * @param tInsScopeInfor 监督检查-检查范围
+     * @return 结果
+     */
+    public int insertTInsScopeInfor(TInsScopeInfor tInsScopeInfor);
+
+    /**
+     * 修改监督检查-检查范围
+     * 
+     * @param tInsScopeInfor 监督检查-检查范围
+     * @return 结果
+     */
+    public int updateTInsScopeInfor(TInsScopeInfor tInsScopeInfor);
+
+    /**
+     * 删除监督检查-检查范围
+     * 
+     * @param fScopeInforId 监督检查-检查范围ID
+     * @return 结果
+     */
+    public int deleteTInsScopeInforById(Long fScopeInforId);
+
+    /**
+     * 批量删除监督检查-检查范围
+     * 
+     * @param fScopeInforIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTInsScopeInforByIds(Long[] fScopeInforIds);
+}

zh-baseversion-system/src/main/java/com/zehong/system/service/ITInsScopeInforService.java

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TInsScopeInfor;
+
+/**
+ * 监督检查-检查范围Service接口
+ * 
+ * @author zehong
+ * @date 2024-05-16
+ */
+public interface ITInsScopeInforService 
+{
+    /**
+     * 查询监督检查-检查范围
+     * 
+     * @param fScopeInforId 监督检查-检查范围ID
+     * @return 监督检查-检查范围
+     */
+    public TInsScopeInfor selectTInsScopeInforById(Long fScopeInforId);
+
+    /**
+     * 查询监督检查-检查范围列表
+     * 
+     * @param tInsScopeInfor 监督检查-检查范围
+     * @return 监督检查-检查范围集合
+     */
+    public List<TInsScopeInfor> selectTInsScopeInforList(TInsScopeInfor tInsScopeInfor);
+
+    /**
+     * 新增监督检查-检查范围
+     * 
+     * @param tInsScopeInfor 监督检查-检查范围
+     * @return 结果
+     */
+    public int insertTInsScopeInfor(TInsScopeInfor tInsScopeInfor);
+
+    /**
+     * 修改监督检查-检查范围
+     * 
+     * @param tInsScopeInfor 监督检查-检查范围
+     * @return 结果
+     */
+    public int updateTInsScopeInfor(TInsScopeInfor tInsScopeInfor);
+
+    /**
+     * 批量删除监督检查-检查范围
+     * 
+     * @param fScopeInforIds 需要删除的监督检查-检查范围ID
+     * @return 结果
+     */
+    public int deleteTInsScopeInforByIds(Long[] fScopeInforIds);
+
+    /**
+     * 删除监督检查-检查范围信息
+     * 
+     * @param fScopeInforId 监督检查-检查范围ID
+     * @return 结果
+     */
+    public int deleteTInsScopeInforById(Long fScopeInforId);
+}

zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TInsScopeInforServiceImpl.java

+package com.zehong.system.service.impl;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+import com.zehong.common.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TInsScopeInforMapper;
+import com.zehong.system.domain.TInsScopeInfor;
+import com.zehong.system.service.ITInsScopeInforService;
+
+/**
+ * 监督检查-检查范围Service业务层处理
+ * 
+ * @author zehong
+ * @date 2024-05-16
+ */
+@Service
+public class TInsScopeInforServiceImpl implements ITInsScopeInforService 
+{
+    @Autowired
+    private TInsScopeInforMapper tInsScopeInforMapper;
+
+    /**
+     * 查询监督检查-检查范围
+     * 
+     * @param fScopeInforId 监督检查-检查范围ID
+     * @return 监督检查-检查范围
+     */
+    @Override
+    public TInsScopeInfor selectTInsScopeInforById(Long fScopeInforId)
+    {
+        return tInsScopeInforMapper.selectTInsScopeInforById(fScopeInforId);
+    }
+
+    /**
+     * 查询监督检查-检查范围列表
+     * 
+     * @param tInsScopeInfor 监督检查-检查范围
+     * @return 监督检查-检查范围
+     */
+    @Override
+    public List<TInsScopeInfor> selectTInsScopeInforList(TInsScopeInfor tInsScopeInfor)
+    {
+        return tInsScopeInforMapper.selectTInsScopeInforList(tInsScopeInfor);
+    }
+
+    /**
+     * 新增监督检查-检查范围
+     * 
+     * @param tInsScopeInfor 监督检查-检查范围
+     * @return 结果
+     */
+    @Override
+    public int insertTInsScopeInfor(TInsScopeInfor tInsScopeInfor)
+    {
+        tInsScopeInfor.setfCreateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+        tInsScopeInfor.setfCreateBy(SecurityUtils.getUsername());
+        return tInsScopeInforMapper.insertTInsScopeInfor(tInsScopeInfor);
+    }
+
+    /**
+     * 修改监督检查-检查范围
+     * 
+     * @param tInsScopeInfor 监督检查-检查范围
+     * @return 结果
+     */
+    @Override
+    public int updateTInsScopeInfor(TInsScopeInfor tInsScopeInfor)
+    {
+        tInsScopeInfor.setfUpdateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+        tInsScopeInfor.setfModifyBy(SecurityUtils.getUsername());
+        return tInsScopeInforMapper.updateTInsScopeInfor(tInsScopeInfor);
+    }
+
+    /**
+     * 批量删除监督检查-检查范围
+     * 
+     * @param fScopeInforIds 需要删除的监督检查-检查范围ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTInsScopeInforByIds(Long[] fScopeInforIds)
+    {
+        return tInsScopeInforMapper.deleteTInsScopeInforByIds(fScopeInforIds);
+    }
+
+    /**
+     * 删除监督检查-检查范围信息
+     * 
+     * @param fScopeInforId 监督检查-检查范围ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTInsScopeInforById(Long fScopeInforId)
+    {
+        return tInsScopeInforMapper.deleteTInsScopeInforById(fScopeInforId);
+    }
+}

zh-baseversion-system/src/main/resources/mapper/system/TInsScopeInforMapper.xml

+<?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.TInsScopeInforMapper">
+    
+    <resultMap type="TInsScopeInfor" id="TInsScopeInforResult">
+        <result property="fScopeInforId"    column="f_scope_infor_id"    />
+        <result property="fHazardCheckTaskId"    column="f_hazard_check_task_id"    />
+        <result property="fObjectType"    column="f_object_type"    />
+        <result property="fHazardCheckTableRecordId"    column="f_hazard_check_table_record_id"    />
+        <result property="fSpotCheckType"    column="f_spot_check_type"    />
+        <result property="fSpotCheck"    column="f_spot_check"    />
+        <result property="fSpecialFlag"    column="f_special_flag"    />
+        <result property="fLotCount"    column="f_lot_count"    />
+        <result property="fSubobjecttypeCheckTypeDesc"    column="f_subobjecttype_check_type_desc"    />
+        <result property="fDeleteFlag"    column="f_delete_flag"    />
+        <result property="fRemark"    column="f_remark"    />
+        <result property="fCreateTime"    column="f_create_time"    />
+        <result property="fCreateBy"    column="f_create_by"    />
+        <result property="fUpdateTime"    column="f_update_time"    />
+        <result property="fModifyBy"    column="f_modify_by"    />
+    </resultMap>
+
+    <sql id="selectTInsScopeInforVo">
+        SELECT
+            scope.f_scope_infor_id,
+            scope.f_hazard_check_task_id,
+            scope.f_object_type,
+            scope.f_hazard_check_table_record_id,
+            scope.f_spot_check_type,
+            scope.f_spot_check,
+            scope.f_special_flag,
+            scope.f_lot_count,
+            scope.f_subobjecttype_check_type_desc,
+            scope.f_delete_flag,
+            scope.f_remark,
+            scope.f_create_time,
+            scope.f_create_by,
+            scope.f_update_time,
+            scope.f_modify_by,
+            task.f_name AS fName
+        FROM
+            t_ins_scope_infor scope
+        LEFT JOIN t_ins_task_infor task ON task.f_ins_task_infor_id = scope.f_hazard_check_task_id
+    </sql>
+
+    <select id="selectTInsScopeInforList" parameterType="TInsScopeInfor" resultMap="TInsScopeInforResult">
+        <include refid="selectTInsScopeInforVo"/>
+        <where>
+            <if test="fName != null  and fName != ''"> and task.f_name like concat('%', #{fName}, '%')</if>
+            <if test="fObjectType != null  and fObjectType != ''"> and scope.f_object_type = #{fObjectType}</if>
+            <if test="fSpotCheckType != null  and fSpotCheckType != ''"> and scope.f_spot_check_type = #{fSpotCheckType}</if>
+        </where>
+        ORDER BY scope.f_create_time DESC
+    </select>
+    
+    <select id="selectTInsScopeInforById" parameterType="Long" resultMap="TInsScopeInforResult">
+        <include refid="selectTInsScopeInforVo"/>
+        where scope.f_scope_infor_id = #{fScopeInforId}
+    </select>
+        
+    <insert id="insertTInsScopeInfor" parameterType="TInsScopeInfor" useGeneratedKeys="true" keyProperty="fScopeInforId">
+        insert into t_ins_scope_infor
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="fHazardCheckTaskId != null">f_hazard_check_task_id,</if>
+            <if test="fObjectType != null and fObjectType != ''">f_object_type,</if>
+            <if test="fHazardCheckTableRecordId != null">f_hazard_check_table_record_id,</if>
+            <if test="fSpotCheckType != null">f_spot_check_type,</if>
+            <if test="fSpotCheck != null">f_spot_check,</if>
+            <if test="fSpecialFlag != null">f_special_flag,</if>
+            <if test="fLotCount != null">f_lot_count,</if>
+            <if test="fSubobjecttypeCheckTypeDesc != null">f_subobjecttype_check_type_desc,</if>
+            <if test="fDeleteFlag != null">f_delete_flag,</if>
+            <if test="fRemark != null">f_remark,</if>
+            <if test="fCreateTime != null">f_create_time,</if>
+            <if test="fCreateBy != null">f_create_by,</if>
+            <if test="fUpdateTime != null">f_update_time,</if>
+            <if test="fModifyBy != null">f_modify_by,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="fHazardCheckTaskId != null">#{fHazardCheckTaskId},</if>
+            <if test="fObjectType != null and fObjectType != ''">#{fObjectType},</if>
+            <if test="fHazardCheckTableRecordId != null">#{fHazardCheckTableRecordId},</if>
+            <if test="fSpotCheckType != null">#{fSpotCheckType},</if>
+            <if test="fSpotCheck != null">#{fSpotCheck},</if>
+            <if test="fSpecialFlag != null">#{fSpecialFlag},</if>
+            <if test="fLotCount != null">#{fLotCount},</if>
+            <if test="fSubobjecttypeCheckTypeDesc != null">#{fSubobjecttypeCheckTypeDesc},</if>
+            <if test="fDeleteFlag != null">#{fDeleteFlag},</if>
+            <if test="fRemark != null">#{fRemark},</if>
+            <if test="fCreateTime != null">#{fCreateTime},</if>
+            <if test="fCreateBy != null">#{fCreateBy},</if>
+            <if test="fUpdateTime != null">#{fUpdateTime},</if>
+            <if test="fModifyBy != null">#{fModifyBy},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTInsScopeInfor" parameterType="TInsScopeInfor">
+        update t_ins_scope_infor
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="fHazardCheckTaskId != null">f_hazard_check_task_id = #{fHazardCheckTaskId},</if>
+            <if test="fObjectType != null and fObjectType != ''">f_object_type = #{fObjectType},</if>
+            <if test="fHazardCheckTableRecordId != null">f_hazard_check_table_record_id = #{fHazardCheckTableRecordId},</if>
+            <if test="fSpotCheckType != null">f_spot_check_type = #{fSpotCheckType},</if>
+            <if test="fSpotCheck != null">f_spot_check = #{fSpotCheck},</if>
+            <if test="fSpecialFlag != null">f_special_flag = #{fSpecialFlag},</if>
+            <if test="fLotCount != null">f_lot_count = #{fLotCount},</if>
+            <if test="fSubobjecttypeCheckTypeDesc != null">f_subobjecttype_check_type_desc = #{fSubobjecttypeCheckTypeDesc},</if>
+            <if test="fDeleteFlag != null">f_delete_flag = #{fDeleteFlag},</if>
+            <if test="fRemark != null">f_remark = #{fRemark},</if>
+            <if test="fCreateTime != null">f_create_time = #{fCreateTime},</if>
+            <if test="fCreateBy != null">f_create_by = #{fCreateBy},</if>
+            <if test="fUpdateTime != null">f_update_time = #{fUpdateTime},</if>
+            <if test="fModifyBy != null">f_modify_by = #{fModifyBy},</if>
+        </trim>
+        where f_scope_infor_id = #{fScopeInforId}
+    </update>
+
+    <delete id="deleteTInsScopeInforById" parameterType="Long">
+        delete from t_ins_scope_infor where f_scope_infor_id = #{fScopeInforId}
+    </delete>
+
+    <delete id="deleteTInsScopeInforByIds" parameterType="String">
+        delete from t_ins_scope_infor where f_scope_infor_id in 
+        <foreach item="fScopeInforId" collection="array" open="(" separator="," close=")">
+            #{fScopeInforId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

zh-baseversion-web/src/api/supervision/scope.js

+import request from '@/utils/request'
+
+// 查询监督检查-检查范围列表
+export function listInfor(query) {
+  return request({
+    url: '/supervision/scope/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询监督检查-检查范围详细
+export function getInfor(fScopeInforId) {
+  return request({
+    url: '/supervision/scope/' + fScopeInforId,
+    method: 'get'
+  })
+}
+
+// 新增监督检查-检查范围
+export function addInfor(data) {
+  return request({
+    url: '/supervision/scope',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改监督检查-检查范围
+export function updateInfor(data) {
+  return request({
+    url: '/supervision/scope',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除监督检查-检查范围
+export function delInfor(fScopeInforId) {
+  return request({
+    url: '/supervision/scope/' + fScopeInforId,
+    method: 'delete'
+  })
+}
+
+// 导出监督检查-检查范围
+export function exportInfor(query) {
+  return request({
+    url: '/supervision/scope/export',
+    method: 'get',
+    params: query
+  })
+}

zh-baseversion-web/src/api/supervision/task.js

@@ -51,3 +51,12 @@ export function exportInfor(query) {
     params: query
   })
 }
+
+//所有任务
+export function taskList(query) {
+  return request({
+    url: '/supervision/task/taskList',
+    method: 'get',
+    params: query
+  })
+}

zh-baseversion-web/src/views/supervision/scope/components/DetailInfo.vue

+<template>
+  <el-dialog title="详情" :visible.sync="detailOpen" width="1000px" append-to-body destroy-on-close :close-on-click-modal="false">
+
+    <el-form label-width="130px">
+      <el-row class="el-row-table">
+        <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.fObjectType">{{ $parent.fObjectTypeFormat(detailInfo) }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="检查表实例关联Id">
+            <span v-if="detailInfo.fHazardCheckTableRecordId">{{ detailInfo.fHazardCheckTableRecordId }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="抽查要求">
+            <span v-if="detailInfo.fSpotCheckType">{{ $parent.fSpotCheckTypeFormat(detailInfo) }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="检查范围数据">
+            <span v-if="detailInfo.fSpotCheck">{{ detailInfo.fSpotCheck }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="城区标识">
+            <span v-if="detailInfo.fSpecialFlag">{{ $parent.fSpecialFlagFormat(detailInfo) }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="此对象应检数据">
+            <span v-if="detailInfo.fLotCount">{{ detailInfo.fLotCount }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="抽查细类">
+            <span v-if="detailInfo.fSubobjecttypeCheckTypeDesc">{{ detailInfo.fSubobjecttypeCheckTypeDesc }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="删除标记">
+            <span v-if="detailInfo.fDeleteFlag.toString()">{{ $parent.fDeleteFlagFormat(detailInfo) }}</span>
+            <span v-else>-{{detailInfo.fDeleteFlag}}</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-col :span="12">
+          <el-form-item label="创建时间">
+            <span v-if="detailInfo.fCreateTime">{{ detailInfo.fCreateTime }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="创建人">
+            <span v-if="detailInfo.fCreateBy">{{ detailInfo.fCreateBy }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="修改时间">
+            <span v-if="detailInfo.fUpdateTime">{{ detailInfo.fUpdateTime }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="修改人">
+            <span v-if="detailInfo.fModifyBy">{{ detailInfo.fModifyBy }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+      </el-row>
+
+    </el-form>
+
+  </el-dialog>
+
+</template>
+
+<script>
+  import { getInfor } from "@/api/supervision/scope.js";
+  export default {
+    name: "detail-info",
+    data(){
+        return{
+          detailInfo: {},
+          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>

zh-baseversion-web/src/views/supervision/task/components/DetailInfo.vue

@@ -69,7 +69,7 @@
 
         <el-col :span="12">
           <el-form-item label="删除标记">
-            <span v-if="detailInfo.fEndTime">{{ $parent.fDeleteFlagFormat(detailInfo) }}</span>
+            <span v-if="detailInfo.fDeleteFlag.toString()">{{ $parent.fDeleteFlagFormat(detailInfo) }}</span>
             <span v-else>-</span>
           </el-form-item>
         </el-col>

zh-baseversion-web/src/views/supervision/task/index.vue

 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="任务名称" prop="fName">
+        <el-input
+          v-model="queryParams.fName"
+          placeholder="请输入任务名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
       <el-form-item label="任务唯一编码" prop="fUniqueCode">
         <el-input
           v-model="queryParams.fUniqueCode"
@@ -39,15 +49,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="任务名称" prop="fName">
-        <el-input
-          v-model="queryParams.fName"
-          placeholder="请输入任务名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+
       <el-form-item label="任务状态" prop="fStatus">
         <el-select v-model="queryParams.fStatus" placeholder="请选择任务状态" clearable size="small">
           <el-option
@@ -113,9 +115,9 @@
 
     <el-table v-loading="loading" :data="inforList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="任务名称" align="center" prop="fName" />
-      <el-table-column label="任务唯一编码" align="center" prop="fUniqueCode" />
-      <el-table-column label="任务归属" align="center" prop="fTaskBelong" />
+      <el-table-column label="任务名称" align="center" prop="fName" :show-overflow-tooltip="true"/>
+      <el-table-column label="任务唯一编码" align="center" prop="fUniqueCode" :show-overflow-tooltip="true"/>
+      <el-table-column label="任务归属" align="center" prop="fTaskBelong" :show-overflow-tooltip="true"/>
       <el-table-column label="任务类型" align="center" prop="fTaskType" :formatter="fTaskTypeFormat" />
       <el-table-column label="是否下发" align="center" prop="fDistributeFlag" :formatter="fDistributeFlagFormat" />
       <el-table-column label="任务开始时间" align="center" prop="fStartTime" />
@@ -334,6 +336,9 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        fName: [
+          { required: true, message: "任务唯名称不能为空", trigger: "blur" }
+        ],
         fUniqueCode: [
           { required: true, message: "任务唯一编码不能为空", trigger: "blur" }
         ],