合并

CODE/smart-community/app-api/src/main/resources/mapper/TpActivityMapper.xml

@@ -270,7 +270,8 @@
     </if>
   ORDER BY
       a.sort,
-      a.activity_end_time DESC,
+      a.activity_end_time,
+      a.update_date,
 	  a.create_date DESC
   </select>
 

CODE/smart-community/app-api/src/main/resources/mapper/TpAnnouncementMapper.xml

@@ -176,6 +176,7 @@
       </if>
   ORDER BY
       a.sort,
+      a.update_date,
       a.create_date DESC
   </select>
 

CODE/smart-community/app-api/src/main/resources/mapper/TpTransactionMapper.xml

@@ -214,7 +214,7 @@ LEFT JOIN ta_sys_role sr ON sr.id = tsur.role_id
       and transaction_title LIKE concat('%',#{transactionTitle,jdbcType=VARCHAR},'%')
     </if>
     and status = 1
-    order by create_date DESC
+    order by update_date, create_date DESC
   </select>
 
   <select id="selectTransaction" resultMap="BaseResultMap">
@@ -227,7 +227,7 @@ LEFT JOIN ta_sys_role sr ON sr.id = tsur.role_id
       and type = #{type,jdbcType=INTEGER}
     </if>
     and status = 1
-    order by create_date DESC
+    order by update_date, create_date DESC
   </select>
 
   <update id="updateTransaction" parameterType="com.community.huiju.model.TpTransaction" >
@@ -249,7 +249,7 @@ LEFT JOIN ta_sys_role sr ON sr.id = tsur.role_id
   </select>
 
   <select id="getReportReasons" resultType="java.util.Map">
-    SELECT id,reason FROM sys_report_reason ORDER BY sort
+    SELECT id,reason FROM sys_report_reason ORDER BY sort,update_date DESC
   </select>
 
   <insert id="saveReportReason">

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpActivityServiceImpl.java

@@ -197,11 +197,21 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
             responseBean.addError("活动不存在!");
             return responseBean;
         }
+        // 状态
+        int temp = Integer.valueOf(selectTpActivity.getStatus());
 
         BeanTools.copyProperties(tpActivity, selectTpActivity);
 
-        selectTpActivity.setUpdateDate(LocalDateTime.now());
-        selectTpActivity.setUpdateUser(userElement.getId());
+        /**
+         * 如果是草稿, 则只需要变更创建时间! 因为前端页面的活动修改, 就是发布按钮, 这样前端就不会显示为已修改状态
+         */
+        if (temp == 2) {
+            selectTpActivity.setCreateDate(LocalDateTime.now());
+        } else {
+            selectTpActivity.setUpdateDate(LocalDateTime.now());
+            selectTpActivity.setUpdateUser(userElement.getId());
+        }
+
 
         int row = tpActivityMapper.updateById(selectTpActivity);
 
@@ -259,7 +269,7 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
                 throw new WisdomException("已作废活动无法修改");
             }
             e.setStatus("0");
-            e.setUpdateUser(userElement.getId());
+            // e.setUpdateUser(userElement.getId());
         });
         updateBatchById(tpActivityList);
 

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

@@ -229,7 +229,15 @@ export default {
         this.$message.error('请选择一行数据进行修改!')
         return
       }
-      this.$router.push({ name: 'activity-edi', params: { id: ids[0] }})
+      this.$store.dispatch('ActivityById', ids).then((res) => {
+        if (res.data.info.status === '0') {
+          this.$message.error('已作废活动无法修改')
+          return
+        }
+        this.$router.push({ name: 'activity-edi', params: { id: ids[0] }})
+      }).catch(() => {
+        console.log('error InvalidActivity')
+      })
     },
     infoActivity(id) { // 查看活动
       this.$router.push({ name: 'activity-info', params: { id: id }})

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

@@ -11,8 +11,8 @@
         <el-option label="无举报" value="0"/>
         <el-option label="被举报" value="1"/>
       </el-select>
-      <el-button v-waves class="filter-item" type="info" icon="el-icon-warning" @click="clearListQuery">清空</el-button>
-      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">查询</el-button>
+      <el-button v-waves class="filter-item" type="info" @click="clearListQuery">清空</el-button>
+      <el-button v-waves class="filter-item" type="primary" @click="handleFilter">查询</el-button>
     </div>
 
     <el-table