فهرست منبع

bugfix-删除字段

Aslee 2 سال پیش
والد
کامیت
336dc52faa

+ 7 - 8
src/main/resources/mapper/ArticleMapper.xml

@@ -2,8 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei.mapper.cmMapper.ArticleMapper">
 <mapper namespace="com.caimei.mapper.cmMapper.ArticleMapper">
     <insert id="insertArticle">
     <insert id="insertArticle">
-        insert into cm_brand_article(authUserId, title, image, content, auditStatus, status, createTime, auditBy, auditTime, checkFlag, sort)
-        values (#{authUserId}, #{title}, #{image}, #{content}, #{auditStatus}, #{status}, #{createTime}, #{auditBy}, #{auditTime}, #{checkFlag}, #{sort})
+        insert into cm_brand_article(authUserId, title, image, content, auditStatus, status, createTime, auditBy, auditTime)
+        values (#{authUserId}, #{title}, #{image}, #{content}, #{auditStatus}, #{status}, #{createTime}, #{auditBy}, #{auditTime})
     </insert>
     </insert>
     <update id="updateArticleByArticleId">
     <update id="updateArticleByArticleId">
         update cm_brand_article
         update cm_brand_article
@@ -11,8 +11,7 @@
             image       = #{image},
             image       = #{image},
             content     = #{content},
             content     = #{content},
             status      = #{status},
             status      = #{status},
-            auditStatus = #{auditStatus},
-            sort        = #{sort}
+            auditStatus = #{auditStatus}
         where id = #{id}
         where id = #{id}
     </update>
     </update>
     <update id="updateArticleStatusByArticleId">
     <update id="updateArticleStatusByArticleId">
@@ -45,7 +44,7 @@
     <select id="getArticleList" resultType="com.caimei.model.vo.ArticleListVo">
     <select id="getArticleList" resultType="com.caimei.model.vo.ArticleListVo">
         select a.id as articleId,a.title as articleTitle,a.image as articleImage,
         select a.id as articleId,a.title as articleTitle,a.image as articleImage,
         a.auditStatus,a.invalidReason,a.status,a.createTime,
         a.auditStatus,a.invalidReason,a.status,a.createTime,
-        au.name as auditBy,a.auditTime,a.sort, a.checkFlag
+        au.name as auditBy,a.auditTime
         from cm_brand_article a
         from cm_brand_article a
         left join cm_brand_auth_user au on a.auditBy = au.authUserId
         left join cm_brand_auth_user au on a.auditBy = au.authUserId
         where a.authUserId = #{authUserId}
         where a.authUserId = #{authUserId}
@@ -63,12 +62,12 @@
                 order by a.auditStatus desc, a.createTime desc
                 order by a.auditStatus desc, a.createTime desc
             </when>
             </when>
             <otherwise>
             <otherwise>
-                order by -a.sort desc, a.createTime desc
+                order by a.createTime desc
             </otherwise>
             </otherwise>
         </choose>
         </choose>
     </select>
     </select>
     <select id="getArticleForm" resultType="com.caimei.model.vo.ArticleFormVo">
     <select id="getArticleForm" resultType="com.caimei.model.vo.ArticleFormVo">
-        select id as articleId, title as articleTitle, image as articleImage, content as articleContent, createTime, auditStatus, sort
+        select id as articleId, title as articleTitle, image as articleImage, content as articleContent, createTime, auditStatus
         from cm_brand_article
         from cm_brand_article
         where id = #{articleId}
         where id = #{articleId}
     </select>
     </select>
@@ -81,6 +80,6 @@
         <if test="articleTitle != null and articleTitle != ''">
         <if test="articleTitle != null and articleTitle != ''">
             and title like concat('%',#{articleTitle},'%')
             and title like concat('%',#{articleTitle},'%')
         </if>
         </if>
-        order by -a.sort desc, a.createTime desc
+        order by a.createTime desc
     </select>
     </select>
 </mapper>
 </mapper>

+ 3 - 6
src/main/resources/mapper/FileMapper.xml

@@ -3,9 +3,9 @@
 <mapper namespace="com.caimei.mapper.cmMapper.FileMapper">
 <mapper namespace="com.caimei.mapper.cmMapper.FileMapper">
     <insert id="insertFile" keyColumn="id" keyProperty="id" parameterType="com.caimei.model.po.FilePo" useGeneratedKeys="true">
     <insert id="insertFile" keyColumn="id" keyProperty="id" parameterType="com.caimei.model.po.FilePo" useGeneratedKeys="true">
         insert into cm_brand_file(authUserId, fileType, title, name, previewUrl, downloadUrl, auditStatus, status,
         insert into cm_brand_file(authUserId, fileType, title, name, previewUrl, downloadUrl, auditStatus, status,
-                                  createTime, auditBy, auditTime, checkFlag)
+                                  createTime, auditBy, auditTime)
         values (#{authUserId}, #{fileType}, #{title}, #{name}, #{previewUrl}, #{downloadUrl}, #{auditStatus}, #{status},
         values (#{authUserId}, #{fileType}, #{title}, #{name}, #{previewUrl}, #{downloadUrl}, #{auditStatus}, #{status},
-                #{createTime}, #{auditBy}, #{auditTime}, #{checkFlag})
+                #{createTime}, #{auditBy}, #{auditTime})
     </insert>
     </insert>
     <insert id="insertCourseFile">
     <insert id="insertCourseFile">
         insert into cm_brand_course_file (title, name, ossName, type, module, createTime)
         insert into cm_brand_course_file (title, name, ossName, type, module, createTime)
@@ -53,9 +53,6 @@
             <if test="auditStatus != null">
             <if test="auditStatus != null">
                 auditStatus = #{auditStatus},
                 auditStatus = #{auditStatus},
             </if>
             </if>
-            <if test="checkFlag != null">
-                checkFlag = #{checkFlag},
-            </if>
         </set>
         </set>
         where id = #{id}
         where id = #{id}
     </update>
     </update>
@@ -82,7 +79,7 @@
     <select id="getFileList" resultType="com.caimei.model.vo.FileListVo">
     <select id="getFileList" resultType="com.caimei.model.vo.FileListVo">
         select a.id as fileId,a.title as fileTitle,a.name as fileName,a.previewUrl as filePreviewUrl,
         select a.id as fileId,a.title as fileTitle,a.name as fileName,a.previewUrl as filePreviewUrl,
         a.downloadUrl as fileDownloadUrl, a.auditStatus,a.invalidReason,a.status,a.createTime,
         a.downloadUrl as fileDownloadUrl, a.auditStatus,a.invalidReason,a.status,a.createTime,
-        au.name as auditBy,a.auditTime,a.checkFlag
+        au.name as auditBy,a.auditTime
         from cm_brand_file a
         from cm_brand_file a
         left join cm_brand_auth_user au on a.auditBy = au.authUserId
         left join cm_brand_auth_user au on a.auditBy = au.authUserId
         where a.authUserId = #{authUserId} and fileType = #{fileType}
         where a.authUserId = #{authUserId} and fileType = #{fileType}

+ 4 - 5
src/main/resources/mapper/ImageMapper.xml

@@ -2,8 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei.mapper.cmMapper.ImageMapper">
 <mapper namespace="com.caimei.mapper.cmMapper.ImageMapper">
     <insert id="insertImage" keyColumn="id" keyProperty="id" parameterType="com.caimei.model.po.ImagePo" useGeneratedKeys="true">
     <insert id="insertImage" keyColumn="id" keyProperty="id" parameterType="com.caimei.model.po.ImagePo" useGeneratedKeys="true">
-        insert into cm_brand_image(authUserId, title, zipUrl, auditStatus, status, createTime, auditBy, auditTime, checkFlag)
-        values (#{authUserId}, #{title}, #{zipUrl}, #{auditStatus}, #{status}, #{createTime}, #{auditBy}, #{auditTime}, #{checkFlag})
+        insert into cm_brand_image(authUserId, title, zipUrl, auditStatus, status, createTime, auditBy, auditTime)
+        values (#{authUserId}, #{title}, #{zipUrl}, #{auditStatus}, #{status}, #{createTime}, #{auditBy}, #{auditTime})
     </insert>
     </insert>
     <insert id="insertImageDetail">
     <insert id="insertImageDetail">
         insert into cm_brand_image_detail(imageId, image)
         insert into cm_brand_image_detail(imageId, image)
@@ -14,8 +14,7 @@
         set title       = #{title},
         set title       = #{title},
             zipUrl      = #{zipUrl},
             zipUrl      = #{zipUrl},
             status      = #{status},
             status      = #{status},
-            auditStatus = #{auditStatus},
-            checkFlag   = #{checkFlag}
+            auditStatus = #{auditStatus}
         where id = #{id}
         where id = #{id}
     </update>
     </update>
     <update id="updateImageStatusByImageId">
     <update id="updateImageStatusByImageId">
@@ -46,7 +45,7 @@
     <select id="getImageList" resultType="com.caimei.model.vo.ImageListVo">
     <select id="getImageList" resultType="com.caimei.model.vo.ImageListVo">
         select a.id as imageId,a.title as imageTitle,
         select a.id as imageId,a.title as imageTitle,
         a.auditStatus,a.invalidReason,a.status,a.createTime,
         a.auditStatus,a.invalidReason,a.status,a.createTime,
-        au.name as auditBy,a.auditTime,a.checkFlag
+        au.name as auditBy,a.auditTime
         from cm_brand_image a
         from cm_brand_image a
         left join cm_brand_auth_user au on a.auditBy = au.authUserId
         left join cm_brand_auth_user au on a.auditBy = au.authUserId
         where a.authUserId = #{authUserId}
         where a.authUserId = #{authUserId}

+ 3 - 6
src/main/resources/mapper/VideoMapper.xml

@@ -3,9 +3,9 @@
 <mapper namespace="com.caimei.mapper.cmMapper.VideoMapper">
 <mapper namespace="com.caimei.mapper.cmMapper.VideoMapper">
     <insert id="insertVideo" keyColumn="id" keyProperty="id" parameterType="com.caimei.model.po.VideoPo" useGeneratedKeys="true">
     <insert id="insertVideo" keyColumn="id" keyProperty="id" parameterType="com.caimei.model.po.VideoPo" useGeneratedKeys="true">
         insert into cm_brand_video(authUserId, title, image, name, previewUrl, downloadUrl, auditStatus, status, createTime,
         insert into cm_brand_video(authUserId, title, image, name, previewUrl, downloadUrl, auditStatus, status, createTime,
-                                   auditBy, auditTime, checkFlag)
+                                   auditBy, auditTime)
         values (#{authUserId}, #{title}, #{image}, #{name}, #{previewUrl}, #{downloadUrl}, #{auditStatus}, #{status},
         values (#{authUserId}, #{title}, #{image}, #{name}, #{previewUrl}, #{downloadUrl}, #{auditStatus}, #{status},
-                #{createTime}, #{auditBy}, #{auditTime}, #{checkFlag})
+                #{createTime}, #{auditBy}, #{auditTime})
     </insert>
     </insert>
     <update id="updateVideoByVideoId">
     <update id="updateVideoByVideoId">
         update cm_brand_video
         update cm_brand_video
@@ -52,9 +52,6 @@
             <if test="auditStatus != null">
             <if test="auditStatus != null">
                 auditStatus = #{auditStatus},
                 auditStatus = #{auditStatus},
             </if>
             </if>
-            <if test="checkFlag != null">
-                checkFlag = #{checkFlag},
-            </if>
         </set>
         </set>
         where id = #{id}
         where id = #{id}
     </update>
     </update>
@@ -67,7 +64,7 @@
     <select id="getVideoList" resultType="com.caimei.model.vo.VideoListVo">
     <select id="getVideoList" resultType="com.caimei.model.vo.VideoListVo">
         select a.id as videoId,a.title as videoTitle,a.image as videoImage, a.name as videoName, a.previewUrl as videoPreviewUrl, a.downloadUrl
         select a.id as videoId,a.title as videoTitle,a.image as videoImage, a.name as videoName, a.previewUrl as videoPreviewUrl, a.downloadUrl
         as videoDownloadUrl,a.auditStatus,a.invalidReason,a.status,a.createTime,
         as videoDownloadUrl,a.auditStatus,a.invalidReason,a.status,a.createTime,
-        au.name as auditBy,a.auditTime,a.checkFlag
+        au.name as auditBy,a.auditTime
         from cm_brand_video a
         from cm_brand_video a
         left join cm_brand_auth_user au on a.auditBy = au.authUserId
         left join cm_brand_auth_user au on a.auditBy = au.authUserId
         where a.authUserId = #{authUserId}
         where a.authUserId = #{authUserId}