反馈列表接口问题、反馈信息表删除remarks字段，修复反馈功能页面问题

gassafety-system/src/main/java/com/zehong/system/domain/TOrderFeedback.java

@@ -57,10 +57,6 @@ public class TOrderFeedback extends BaseEntity
     @Excel(name = "图片地址3")
     private String pictureUrl3;
 
-    /** 备注 */
-    @Excel(name = "备注")
-    private String remarks;
-
     public void setFeedbackId(int feedbackId)
     {
         this.feedbackId = feedbackId;
@@ -151,15 +147,6 @@ public class TOrderFeedback extends BaseEntity
     {
         return pictureUrl3;
     }
-    public void setRemarks(String remarks) 
-    {
-        this.remarks = remarks;
-    }
-
-    public String getRemarks() 
-    {
-        return remarks;
-    }
 
     @Override
     public String toString() {
@@ -174,7 +161,6 @@ public class TOrderFeedback extends BaseEntity
             .append("pictureUrl1", getPictureUrl1())
             .append("pictureUrl2", getPictureUrl2())
             .append("pictureUrl3", getPictureUrl3())
-            .append("remarks", getRemarks())
             .toString();
     }
 }

gassafety-system/src/main/java/com/zehong/system/domain/vo/OrderFeedbackVo.java

@@ -55,9 +55,6 @@ public class OrderFeedbackVo extends BaseEntity
     /** 图片地址3 */
     private String pictureUrl3;
 
-    /** 备注 */
-    private String remarks;
-
     public void setFeedbackId(int feedbackId)
     {
         this.feedbackId = feedbackId;
@@ -174,16 +171,6 @@ public class OrderFeedbackVo extends BaseEntity
         return pictureUrl3;
     }
 
-    public void setRemarks(String remarks) 
-    {
-        this.remarks = remarks;
-    }
-
-    public String getRemarks() 
-    {
-        return remarks;
-    }
-
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -197,7 +184,6 @@ public class OrderFeedbackVo extends BaseEntity
             .append("pictureUrl1", getPictureUrl1())
             .append("pictureUrl2", getPictureUrl2())
             .append("pictureUrl3", getPictureUrl3())
-            .append("remarks", getRemarks())
             .toString();
     }
 }

gassafety-system/src/main/java/com/zehong/system/service/impl/TWorkOrderServiceImpl.java

@@ -144,24 +144,28 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
         OrderFeedbackVo feedbackVo = new OrderFeedbackVo();
         TDeviceInfo device = null;
 
-        for(TOrderFeedback feedback : feedbackList){
-            if(feedback != null) {
-                BeanUtils.copyProperties(feedback, feedbackVo);
-            }
+        if(feedbackList.size() != 0) {
 
-            device = tDeviceInfoMapper.selectTDeviceInfoByCode(feedback.getDeviceCode());
-            if(device != null){
-                feedbackVo.setDeviceName(device.getDeviceName());
-                feedbackVo.setDeviceType(device.getDeviceType());
+            for (TOrderFeedback feedback : feedbackList) {
+                if (feedback != null) {
+                    BeanUtils.copyProperties(feedback, feedbackVo);
+                }
+
+                device = tDeviceInfoMapper.selectTDeviceInfoByCode(feedback.getDeviceCode());
+                if (device != null) {
+                    feedbackVo.setDeviceName(device.getDeviceName());
+                    feedbackVo.setDeviceType(device.getDeviceType());
+                }
+
+                if (feedbackVo != null) {
+                    feedbackVoList.add(feedbackVo);
+                }
             }
 
-            if(feedbackVo != null){
-                feedbackVoList.add(feedbackVo);
+            if (feedbackVoList.size() != 0) {
+                workOrderVo.setFeedbackList(feedbackVoList);
             }
         }
-        if(feedbackVoList.size() != 0) {
-            workOrderVo.setFeedbackList(feedbackVoList);
-        }
 
         return workOrderVo;
     }

gassafety-system/src/main/resources/mapper/system/TOrderFeedbackMapper.xml

@@ -15,11 +15,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="pictureUrl1"    column="picture_url_1"    />
         <result property="pictureUrl2"    column="picture_url_2"    />
         <result property="pictureUrl3"    column="picture_url_3"    />
-        <result property="remarks"    column="remarks"    />
     </resultMap>
 
     <sql id="selectTOrderFeedbackVo">
-        select feedback_id, order_id, device_code, contents, feedback_time, is_hidden_danger, deal_status, picture_url_1, picture_url_2, picture_url_3, remarks from t_order_feedback
+        select feedback_id, order_id, device_code, contents, feedback_time, is_hidden_danger, deal_status, picture_url_1, picture_url_2, picture_url_3 from t_order_feedback
     </sql>
 
     <select id="selectTOrderFeedbackList" parameterType="TOrderFeedback" resultMap="TOrderFeedbackResult">
@@ -34,7 +33,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="pictureUrl1 != null  and pictureUrl1 != ''"> and picture_url_1 = #{pictureUrl1}</if>
             <if test="pictureUrl2 != null  and pictureUrl2 != ''"> and picture_url_2 = #{pictureUrl2}</if>
             <if test="pictureUrl3 != null  and pictureUrl3 != ''"> and picture_url_3 = #{pictureUrl3}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
         </where>
     </select>
     
@@ -61,7 +59,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="pictureUrl1 != null">picture_url_1,</if>
             <if test="pictureUrl2 != null">picture_url_2,</if>
             <if test="pictureUrl3 != null">picture_url_3,</if>
-            <if test="remarks != null">remarks,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="orderId != null">#{orderId},</if>
@@ -73,7 +70,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="pictureUrl1 != null">#{pictureUrl1},</if>
             <if test="pictureUrl2 != null">#{pictureUrl2},</if>
             <if test="pictureUrl3 != null">#{pictureUrl3},</if>
-            <if test="remarks != null">#{remarks},</if>
          </trim>
     </insert>
 
@@ -89,7 +85,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="pictureUrl1 != null">picture_url_1 = #{pictureUrl1},</if>
             <if test="pictureUrl2 != null">picture_url_2 = #{pictureUrl2},</if>
             <if test="pictureUrl3 != null">picture_url_3 = #{pictureUrl3},</if>
-            <if test="remarks != null">remarks = #{remarks},</if>
         </trim>
         where feedback_id = #{feedbackId}
     </update>

gassafety-web/src/views/workOrder/feedback/index.vue

@@ -154,18 +154,13 @@
           />
         </el-form-item>
         <el-form-item label="是否存在隐患" prop="isHiddenDanger">
-          <el-radio-group v-model="form.isHiddenDanger">
-            <el-radio :label="1">是</el-radio>
-            <el-radio :label="2">否</el-radio>
-          </el-radio-group>
-          <!--<el-switch
+          <el-switch
             v-model="isHiddenDanger"
             active-text="是"
             inactive-text="否">
-          </el-switch>-->
+          </el-switch>
         </el-form-item>
-        <el-form-item label="处理结果" prop="dealStatus">
-<!--        <el-form-item label="处理结果" prop="dealStatus" v-if="isHiddenDanger == true">-->
+        <el-form-item label="处理结果" prop="dealStatus" v-if="isHiddenDanger == true">
           <el-radio-group v-model="form.dealStatus">
             <el-radio :label="2">已处理完成</el-radio>
             <el-radio :label="3">未处理完成</el-radio>
@@ -347,13 +342,6 @@
         const orderId = row.orderId || this.ids
         getBasicsInfo(orderId).then(response => {
           this.form = response.data;
-          this.form.pictureUrl1 = null;
-          this.form.pictureUrl2 = null;
-          this.form.pictureUrl3 = null;
-          this.form.contents = null;
-          this.form.remarks = null;
-          this.fileList = [];
-          this.fileIndex = 0;
           this.open = true;
           this.title = "工单反馈";
         });
@@ -369,11 +357,11 @@
       },
       /** 提交按钮 */
       submitForm() {
-        // if(this.isHiddenDanger == false){
-        //   this.form.isHiddenDanger = "2";
-        // } else {
-        //   this.form.isHiddenDanger = "1";
-        // }
+        if(this.isHiddenDanger == false){
+          this.form.isHiddenDanger = "2";
+        } else {
+          this.form.isHiddenDanger = "1";
+        }
         this.$refs["form"].validate(valid => {
           if (valid) {
             if(this.form.orderStatus == '1' || this.form.orderStatus == '2'){