合并

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/ToUserServerImpl.java

@@ -421,6 +421,8 @@ public class ToUserServerImpl implements IToUserService {
         String handleRemark= object.getString("handleRemark");
         Integer[] arrID = object.getJSONArray("id").toArray(new Integer[]{});
 
+        //减少数据库链接
+        List<TaFeedback> taFeedbackList = new ArrayList<>();
         for (Integer id:arrID){
             TaFeedback taFeedback = new TaFeedback();
                        taFeedback.setId(id);
@@ -429,8 +431,10 @@ public class ToUserServerImpl implements IToUserService {
                        taFeedback.setHandleRemark(handleRemark);
                        taFeedback.setHandleTime(new Date());
                        taFeedback.setUpdateDate(new Date());
+            taFeedbackList.add(taFeedback);
             taFeedbackMapper.updateByPrimaryKeySelective(taFeedback);
         }
+//        taFeedbackMapper.batchUpdate(taFeedbackList);
         response.addSuccess("成功");
         return response;
     }

CODE/smart-community/operate-api/src/main/resources/mapper/TaFeedbackMapper.xml

@@ -176,14 +176,16 @@
   </update>
 
   <select id="getFeedback" resultMap="BaseResultMap">
-    select * from  ta_feedback
+    select
+    <include refid="Base_Column_List" />
+     from  ta_feedback
     <where>
       <if test="tel != null and tel !=''">
         and ta_user_tel like CONCAT('%', #{tel,jdbcType=VARCHAR}, '%')
       </if>
 
       <if test="content != null and content !=''">
-        and handle_remark like CONCAT('%', #{content,jdbcType=VARCHAR}, '%')
+        and content like CONCAT('%', #{content,jdbcType=VARCHAR}, '%')
       </if>
 
       <if test="handleStatus != null and handleStatus !=''">

VUECODE/smart-operate-manage/src/views/banner/feedback/index.vue

@@ -43,6 +43,16 @@
     <el-table-column
      prop="content"
       label="反馈内容">
+      <template slot-scope="scope">
+      <a :title="scope.row.content" v-if="scope.row.content !=null">
+          <span style="color: #8B8378	">
+            {{ scope.row.content.length>='20'?scope.row.content.substring(0,20)+'..':scope.row.content }}
+          </span>
+          <span v-if="scope.row.content==='null'">
+            {{ scope.row.content='' }}
+          </span>
+      </a>
+      </template>
     </el-table-column>
     <el-table-column prop="transactionTitle" label="反馈截图" align="center">
            <template slot-scope="scope">
@@ -74,6 +84,16 @@
     <el-table-column
       prop="handleRemark"
       label="处理备注">
+       <template slot-scope="scope">
+      <a :title="scope.row.handleRemark" v-if="scope.row.handleRemark !=null">
+          <span style="color: #8B8378	">
+            {{ scope.row.handleRemark.length>='20'?scope.row.handleRemark.substring(0,20)+'..':scope.row.handleRemark }}
+          </span>
+          <!-- <span v-if="scope.row.handleRemark==='null'">
+            {{ scope.row.handleRemark='' }}
+          </span> -->
+      </a>
+       </template>
     </el-table-column>
     <el-table-column
       prop="handleUser"

VUECODE/smart-property-manage/src/views/social/activity/add/index.vue

@@ -7,7 +7,7 @@
       <el-form-item  prop="activityCarouselImg">
         <div >
         <div style="transform:translateY(250%);">活动轮播图</div>
-        <div  style="width: 500px;padding-left:13%;">
+        <div  style="width: 500px;padding-left:14%;">
         <el-upload
           :show-file-list="false"
           :on-success="handleAvatarSuccess"
@@ -23,7 +23,7 @@
       </el-form-item>
       <el-form-item>
         <span style="transform:translateY(700%)">活动详情描述</span>
-       <div style="padding-left:12%;transform:translateY(-15%)"><wangeditor :content="ruleForm.activityContent" @wangeditorEvent="wangeditorValue"/></div>
+       <div style="padding-left:14%;transform:translateY(-15%)"><wangeditor :content="ruleForm.activityContent" @wangeditorEvent="wangeditorValue"/></div>
       </el-form-item> 
       <!-- <el-form-item>
         <div >