小程序分页查询项目及维保列表根据创建时间排序

ruoyi-abuwx/src/main/java/com/ruoyi/abuwxapi/WxLoginController.java

@@ -176,15 +176,27 @@ public class WxLoginController extends BaseController {
         return tokenService.createToken(loginUser);
     }
 
-    /**
+/*    *//**
      *
      *
      * 根据项目id获取维保记录列表
-     */
+     *//*
     @RequestMapping("/informationList")
     public AjaxResult getInformationList(@RequestParam Long projectId)
     {
-        return success(wbMaintenanceInformationService.selectWbMaintenanceInformationListByProjectId(projectId));
+        return success(wbMaintenanceInformationService.selectWbMaintenanceInformationListByProjectId(projectId))
+                .put("total",wbMaintenanceInformationService.selectWbMaintenanceInformationListByProjectId(projectId).size());
+    }*/
+
+    /**
+     * 小程序分页查询维保记录列表
+     */
+    @GetMapping("/informationList")
+    public TableDataInfo list(WbMaintenanceInformation wbMaintenanceInformation)
+    {
+        startPage();
+        List<WbMaintenanceInformation> list = wbMaintenanceInformationService.selectWbMaintenanceInformationList(wbMaintenanceInformation);
+        return getDataTable(list);
     }
 
     /**
@@ -239,6 +251,9 @@ public class WxLoginController extends BaseController {
      */
     @RequestMapping("/selectWXuserRole")
     public AjaxResult selectWXuserRole(@RequestParam String openid){
+        if (StringUtils.isEmpty(openid)){
+            return AjaxResult.error("请登录！");
+        }
         //获取当前用户信息
         SysUser user = iSysUserService.selectUserByopenid(openid);
         if(user == null){

ruoyi-abuwx/src/main/resources/mapper/abuwx/WbMaintenanceInformationMapper.xml

@@ -31,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="imageUrl != null  and imageUrl != ''"> and image_url = #{imageUrl}</if>
             <if test="fileUrl != null  and fileUrl != ''"> and file_url = #{fileUrl}</if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="selectWbMaintenanceInformationById" parameterType="Long" resultMap="WbMaintenanceInformationResult">

ruoyi-abuwx/src/main/resources/mapper/abuwx/WbProjectMapper.xml

@@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectName != null  and projectName != ''"> and project_name like concat('%', #{projectName}, '%')</if>
             <if test="projectOverview != null  and projectOverview != ''"> and project_overview = #{projectOverview}</if>
             <if test="fileUrl != null  and fileUrl != ''"> and file_url = #{fileUrl}</if>
+            order by create_time desc
         </where>
     </select>