fix(service): 自助服务新增排序

src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/RichTextMapper.xml

@@ -23,7 +23,8 @@
                                        , create_time
                                        , create_user
                                        , cmpt_id
-                                       , icon_url)
+                                       , icon_url
+                                       , sort)
         VALUES ( #{userId}
                , #{type}
                , #{path}
@@ -44,7 +45,8 @@
                , now()
                , #{userId}
                , #{cmptId}
-               , #{iconUrl})
+               , #{iconUrl}
+               , #{sort})
     </insert>
 
     <update id="update">
@@ -71,6 +73,7 @@
           ,update_time = now()
           ,update_user = #{userId}
           ,cmpt_id = #{cmptId}
+          ,sort = #{sort}
         WHERE
             id = #{id}
     </update>
@@ -91,6 +94,7 @@
              , userId
              , cmpt_id AS cmptId
              , app_id AS appId
+             , sort
              , path
              , type
              , title
@@ -116,6 +120,7 @@
         ,title
         ,address
         ,app_id AS appId
+         ,sort
         ,path
         ,lng
         ,lat
@@ -145,6 +150,7 @@
         <if test="moduleId != null and moduleId != ''">
             AND FIND_IN_SET(#{moduleId}, module_id)
         </if>
+        ORDER BY sort
         LIMIT #{pageSize} OFFSET #{page}
     </select>
 </mapper>
\ No newline at end of file

src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/model/RichText.java

@@ -32,4 +32,6 @@ public class RichText {
     private String appId;
     // 小程序路径/文件地址/图片地址
     private String path;
+    // 排序
+    private Integer sort;
 }
\ No newline at end of file

src/main/webapp/WEB-INF/views/cmpt/service.jsp

@@ -528,7 +528,20 @@
                                                 </label>
                                             </div>
                                         </div>
+                                        <div class="func">
+                                            <span class="title-new">排序</span>
+                                            <span style="font-size: 16px;color: #ce3939;margin:10px 0;">
+                                                <span
+                                                    style="font-size: 12px;display: inline-block;border-radius: 50%;height: 18px;width: 18px;background: #ce3939;color: white;text-align: center;">注</span>
+                                                <span style="display: inline">越小越靠前</span>
+                                            </span>
+                                            <div>
+                                                <input class="input" type="number" v-model="service.sort"
+                                                    placeholder="请输入排序">
+                                            </div>
+                                        </div>
                                     </div>
+
                                     <div class="saveDiv">
                                         <span @click="cancel" class="cancel">取消</span>
                                         <span @click="submit" class="submit">保存</span>
@@ -569,6 +582,7 @@
                                             "delFlg": null, // 删除状态（0：未删除 1：已删除）
                                             "appId": null, // 小程序appid
                                             "path": null, // 小程序路径/文件地址/图片地址
+                                            sort: 100, // 排序
                                         },
                                         moduleIndex: 0,
                                         keyword: '',
@@ -753,6 +767,7 @@
                                                 remark4: null,
                                                 status: 1,
                                                 delFlg: null,
+                                                sort: 100, // 排序
                                             };
                                         },
                                         // 编辑