应急处置功能

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/complainDeal/TComplainDealController.java

@@ -51,7 +51,6 @@ public class TComplainDealController extends BaseController
         if(loginUser.getUser().getDeptId()!=-2){
             tComplainDeal.setComplainAssignEnterproseId(loginUser.getUser().getDeptId());
         }
-        System.out.println("=========="+loginUser.getUser().getDeptId());
         startPage();
         List<TComplainDeal> list = tComplainDealService.selectTComplainDealList(tComplainDeal);
         return getDataTable(list);

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TComplainDeal.java

 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_complain_deal
  * 
@@ -34,8 +37,11 @@ public class TComplainDeal extends BaseEntity
     @Excel(name = "转办记录")
     private String transferRecord;
 
+    @Excel(name = "反馈事件")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date dealTime;
     /** 办理情况 */
-    @Excel(name = "办理情况")
+    @Excel(name = "办理反馈情况")
     private String dealCondition;
 
     /** 指派单位名称 */
@@ -184,6 +190,14 @@ public class TComplainDeal extends BaseEntity
         return remarks;
     }
 
+    public Date getDealTime() {
+        return dealTime;
+    }
+
+    public void setDealTime(Date dealTime) {
+        this.dealTime = dealTime;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

gassafetyprogress-system/src/main/resources/mapper/system/TComplainDealMapper.xml

@@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="complainPhone"    column="complain_phone"    />
         <result property="complainMatter"    column="complain_matter"    />
         <result property="transferRecord"    column="transfer_record"    />
+        <result property="dealTime"    column="deal_time"    />
         <result property="dealCondition"    column="deal_condition"    />
         <result property="complainAssignEnterproseName"    column="complain_assign_enterprose_name"    />
         <result property="complainAssignEnterproseId"    column="complain_assign_enterprose_id"    />
@@ -25,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTComplainDealVo">
-        select complain_deal_id, complain_name, complain_phone, complain_matter, transfer_record, deal_condition, complain_assign_enterprose_name, complain_assign_enterprose_id, complain_assign_man_id, complain_assign_man, complain_status, create_by, create_time, update_by, update_time, is_del, remarks from t_complain_deal
+        select complain_deal_id, complain_name, complain_phone, complain_matter, transfer_record, deal_time,deal_condition, complain_assign_enterprose_name, complain_assign_enterprose_id, complain_assign_man_id, complain_assign_man, complain_status, create_by, create_time, update_by, update_time, is_del, remarks from t_complain_deal
     </sql>
 
     <select id="selectTComplainDealList" parameterType="TComplainDeal" resultMap="TComplainDealResult">
@@ -58,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="complainPhone != null">complain_phone,</if>
             <if test="complainMatter != null">complain_matter,</if>
             <if test="transferRecord != null">transfer_record,</if>
+            <if test="dealTime !=null">deal_time,</if>
             <if test="dealCondition != null">deal_condition,</if>
             <if test="complainAssignEnterproseName != null">complain_assign_enterprose_name,</if>
             <if test="complainAssignEnterproseId != null">complain_assign_enterprose_id,</if>
@@ -76,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="complainPhone != null">#{complainPhone},</if>
             <if test="complainMatter != null">#{complainMatter},</if>
             <if test="transferRecord != null">#{transferRecord},</if>
+            <if test="dealTime != null">#{dealTime},</if>
             <if test="dealCondition != null">#{dealCondition},</if>
             <if test="complainAssignEnterproseName != null">#{complainAssignEnterproseName},</if>
             <if test="complainAssignEnterproseId != null">#{complainAssignEnterproseId},</if>
@@ -98,6 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="complainPhone != null">complain_phone = #{complainPhone},</if>
             <if test="complainMatter != null">complain_matter = #{complainMatter},</if>
             <if test="transferRecord != null">transfer_record = #{transferRecord},</if>
+            <if test="dealTime != null">deal_time = #{dealTime},</if>
             <if test="dealCondition != null">deal_condition = #{dealCondition},</if>
             <if test="complainAssignEnterproseName != null">complain_assign_enterprose_name = #{complainAssignEnterproseName},</if>
             <if test="complainAssignEnterproseId != null">complain_assign_enterprose_id = #{complainAssignEnterproseId},</if>

gassafetyprogress-web/src/views/complainDeal/index.vue

@@ -82,10 +82,20 @@
       <el-table-column label="投诉人姓名" align="center" prop="complainName" />
       <el-table-column label="投诉人电话" align="center" prop="complainPhone" />
       <el-table-column label="投诉事项" align="center" prop="complainMatter" />
-      <el-table-column label="办理情况" align="center" prop="dealCondition" />
+      <!--<el-table-column label="反馈内容" align="center" prop="dealCondition" />-->
       <el-table-column label="指派单位名称" align="center" prop="complainAssignEnterproseName" />
       <el-table-column label="指派人" align="center" prop="complainAssignMan" />
       <el-table-column label="任务状态" align="center" prop="complainStatus" :formatter="taskStateFormat" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="反馈时间" align="center" prop="dealTime" width="180" >
+        <!--<template slot-scope="scope">-->
+          <!--<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>-->
+        <!--</template>-->
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="remarks" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
         <template slot-scope="scope" >
@@ -181,7 +191,7 @@
         <el-form-item label="投诉事项" prop="complainMatter">
           <el-input v-model="form.complainMatter" type = "textarea" placeholder="请输入投诉事项" :disabled="readonly"/>
         </el-form-item>
-        <el-form-item label="办理情况" prop="dealCondition" :style="display">
+        <el-form-item label="反馈内容" prop="dealCondition" :style="display">
           <el-input v-model="form.dealCondition" type = "textarea" placeholder="请输入办理情况" :disabled="readonly"/>
         </el-form-item>
         <el-form-item label="转办记录" prop="transferRecord" :style="display">
@@ -208,9 +218,16 @@
     </el-dialog>
     <el-dialog title="反馈内容" :visible.sync="dialogFormVisible" width="600px">
       <el-form :model="form2">
+        <div style="width: 100%;min-height: 100px;margin-top: -20px">
+          <el-form-item label="投诉事项" prop="complainMatter">
+            <textarea class="inputstyle1" v-model="form2.complainMatter"  readonly></textarea>
+          </el-form-item>
+        </div>
+        <el-form-item label="反馈" style = "margin-top: -15px;">
             <textarea class="inputstyle" v-model="form2.concent" type ="textarea" ></textarea>
+        </el-form-item>
       </el-form>
-      <div slot="footer" class="dialog-footer">
+      <div slot="footer" class="dialog-footer" style="margin-top: -30px;">
         <el-button @click="dialogFormVisible = false">取 消</el-button>
         <el-button type="primary"  @click="submint2">确 定</el-button>
       </div>
@@ -278,6 +295,7 @@ export default {
       },
       form2:{
         complainDealId:'',
+        complainMatter:'',
         concent:'',
       },
       //身份
@@ -498,6 +516,7 @@ export default {
       this.form2.concent="";
       this.dialogFormVisible = true;
       this.form2.complainDealId=row.complainDealId;
+      this.form2.complainMatter = row.complainMatter;
     },
     //提交反馈信息
     submint2(){
@@ -539,5 +558,13 @@ export default {
     border-color: 0.5px #99a9bf;
     outline:none;
   }
+  .inputstyle1{
+    min-height: 50px;
+    max-height: 200px;
+    width: 100%;
+    border : none;
+    resize:none;
+    outline:none;
+  }
 </style>