修复 bug

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);