监督检查新增日常检查频率和对象数量比例

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

@@ -80,6 +80,12 @@ public class TInsTaskInfor extends BaseEntity
     @Excel(name = "修改人")
     private String fModifyBy;
 
+    @Excel(name = "日常检查频率")
+    private String inspectionFrequency;
+
+    @Excel(name = "对象数量比例")
+    private String quantityRatio;
+
     public void setfInsTaskInforId(Long fInsTaskInforId) 
     {
         this.fInsTaskInforId = fInsTaskInforId;
@@ -225,6 +231,22 @@ public class TInsTaskInfor extends BaseEntity
         return fModifyBy;
     }
 
+    public String getInspectionFrequency() {
+        return inspectionFrequency;
+    }
+
+    public void setInspectionFrequency(String inspectionFrequency) {
+        this.inspectionFrequency = inspectionFrequency;
+    }
+
+    public String getQuantityRatio() {
+        return quantityRatio;
+    }
+
+    public void setQuantityRatio(String quantityRatio) {
+        this.quantityRatio = quantityRatio;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -21,10 +21,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="fCreateBy"    column="f_create_by"    />
         <result property="fUpdateTime"    column="f_update_time"    />
         <result property="fModifyBy"    column="f_modify_by"    />
+        <result property="inspectionFrequency"    column="inspection_frequency"    />
+        <result property="quantityRatio"    column="quantity_ratio"    />
     </resultMap>
 
     <sql id="selectTInsTaskInforVo">
-        select f_ins_task_infor_id, f_unique_code, f_task_belong, f_task_type, f_distribute_flag, f_name, f_desc, f_start_time, f_end_time, f_status, f_delete_flag, f_remark, f_create_time, f_create_by, f_update_time, f_modify_by from t_ins_task_infor
+        select f_ins_task_infor_id, f_unique_code, f_task_belong, f_task_type, f_distribute_flag, f_name, f_desc, f_start_time, f_end_time, f_status, f_delete_flag, f_remark, f_create_time, f_create_by, f_update_time, f_modify_by, inspection_frequency, quantity_ratio from t_ins_task_infor
     </sql>
 
     <select id="selectTInsTaskInforList" parameterType="TInsTaskInfor" resultMap="TInsTaskInforResult">
@@ -45,6 +47,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fCreateBy != null  and fCreateBy != ''"> and f_create_by = #{fCreateBy}</if>
             <if test="fUpdateTime != null  and fUpdateTime != ''"> and f_update_time = #{fUpdateTime}</if>
             <if test="fModifyBy != null  and fModifyBy != ''"> and f_modify_by = #{fModifyBy}</if>
+            <if test="inspectionFrequency != null  and inspectionFrequency != ''"> and inspection_frequency = #{inspectionFrequency}</if>
+            <if test="quantityRatio != null  and quantityRatio != ''"> and quantity_ratio = #{quantityRatio}</if>
         </where>
         ORDER BY f_create_time DESC
     </select>
@@ -72,6 +76,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fCreateBy != null">f_create_by,</if>
             <if test="fUpdateTime != null">f_update_time,</if>
             <if test="fModifyBy != null">f_modify_by,</if>
+            <if test="inspectionFrequency != null">inspection_frequency,</if>
+            <if test="quantityRatio != null">quantity_ratio,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fUniqueCode != null and fUniqueCode != ''">#{fUniqueCode},</if>
@@ -89,6 +95,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fCreateBy != null">#{fCreateBy},</if>
             <if test="fUpdateTime != null">#{fUpdateTime},</if>
             <if test="fModifyBy != null">#{fModifyBy},</if>
+            <if test="inspectionFrequency != null">#{inspectionFrequency},</if>
+            <if test="quantityRatio != null">#{quantityRatio},</if>
          </trim>
     </insert>
 
@@ -110,6 +118,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
+            <if test="inspectionFrequency != null">inspection_frequency = #{inspectionFrequency},</if>
+            <if test="quantityRatio != null">quantity_ratio = #{quantityRatio},</if>
         </trim>
         where f_ins_task_infor_id = #{fInsTaskInforId}
     </update>
@@ -141,7 +151,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             f_create_time,
             f_create_by,
             f_update_time,
-            f_modify_by
+            f_modify_by,
+            inspection_frequency,
+            quantity_ratio
         )values
         <foreach collection="list" separator="," item="item">
             (
@@ -159,7 +171,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item.fCreateTime},
                 #{item.fCreateBy},
                 #{item.fUpdateTime},
-                #{item.fModifyBy}
+                #{item.fModifyBy},
+                #{item.inspectionFrequency},
+                #{item.quantityRatio}
             )
         </foreach>
     </insert>

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

@@ -74,6 +74,20 @@
           </el-form-item>
         </el-col>
 
+        <el-col :span="12">
+          <el-form-item label="日常检查频率">
+            <span v-if="detailInfo.inspectionFrequency">{{ detailInfo.inspectionFrequency }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="对象数量比例">
+            <span v-if="detailInfo.quantityRatio">{{ detailInfo.quantityRatio }}</span>
+            <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>

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

@@ -279,6 +279,17 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="12">
+            <el-form-item label="日常检查频率" prop="inspectionFrequency">
+              <el-input v-model="form.inspectionFrequency" placeholder="请输入日常检查频率" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="对象数量比例" prop="quantityRatio">
+              <el-input v-model="form.quantityRatio" placeholder="请输入对象数量比例" />
+            </el-form-item>
+          </el-col>
+
           <el-col :span="24">
             <el-form-item label="描述" prop="fRemark">
               <el-input type="textarea" v-model="form.fRemark" placeholder="请输入描述" />
@@ -430,7 +441,9 @@ export default {
         fCreateTime: null,
         fCreateBy: null,
         fUpdateTime: null,
-        fModifyBy: null
+        fModifyBy: null,
+        inspectionFrequency:null,
+        quantityRatio:null
       };
       this.resetForm("form");
     },