活动管理优化

platform-admin/src/main/resources/com/platform/dao/ActivityDao.xml

@@ -66,14 +66,14 @@
                 order by ${sidx} ${order}
             </when>
 			<otherwise>
-                order by id desc
+                order by status desc,create_time desc
 			</otherwise>
         </choose>
 		<if test="offset != null and limit != null">
 			limit #{offset}, #{limit}
 		</if>
 	</select>
-	
+
  	<select id="queryTotal" resultType="int">
 		select count(*) from activity
 		WHERE 1=1
@@ -81,7 +81,7 @@
             AND name LIKE concat('%',#{name},'%')
         </if>
 	</select>
-	 
+
 	<insert id="save" parameterType="com.platform.entity.ActivityEntity">
 		insert into activity(
 			`id`,
@@ -114,9 +114,9 @@
 			#{updateTime},
 			#{content})
 	</insert>
-	 
+
 	<update id="update" parameterType="com.platform.entity.ActivityEntity">
-		update activity 
+		update activity
 		<set>
 			<if test="name != null">`name` = #{name}, </if>
 			<if test="type != null">`type` = #{type}, </if>
@@ -134,16 +134,16 @@
 		</set>
 		where id = #{id}
 	</update>
-	
+
 	<delete id="delete">
 		delete from activity where id = #{value}
 	</delete>
-	
+
 	<delete id="deleteBatch">
-		delete from activity where id in 
+		delete from activity where id in
 		<foreach item="id" collection="array" open="(" separator="," close=")">
 			#{id}
 		</foreach>
 	</delete>
 
-</mapper>
+</mapper>
\ No newline at end of file

platform-admin/src/main/webapp/js/sys/tbcfclassification.js

@@ -5,7 +5,7 @@ $(function () {
             {label: 'id', name: 'id', index: 'id', key: true, hidden: true},
             /*{label: '一级分类ID', name: 'goodtypeId', index: 'goodtype_id', width: 80},*/
             {label: '标题', name: 'classTitle', index: 'class_title', width: 80},
-            {label: '类型', name: 'type', index: 'type', width: 80 , formatter: typeFormat},
+            {label: '类型', name: 'type', index: 'type', width: 80 , formatter: typeFormat2},
             {label: '排序', name: 'sort', index: 'sort', width: 80},
             {label: '图片', name: 'picture', index: 'picture', width: 80, formatter: imageFormat},
             {label: '是否展示', name: 'isShow', index: 'is_show', width: 80, formatter: validFormat},