小程序修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/business/PolicyMenuController.java

@@ -51,6 +51,14 @@ public class PolicyMenuController extends BaseController
         return AjaxResult.success(list);
     }
 
+    @PreAuthorize("@ss.hasPermi('system:menu:list')")
+    @GetMapping("/listApp")
+    public AjaxResult listApp(PolicyMenu policyMenu)
+    {
+        List<PolicyMenu> list = policyMenuService.selectPolicyMenuListApp(policyMenu);
+        return AjaxResult.success(list);
+    }
+
     /**
      * 查询类别列表（排除节点）
      * @param menuId
@@ -164,7 +172,7 @@ public class PolicyMenuController extends BaseController
      * 获取政策类别（APP）
      */
     @GetMapping("/listPolicyMenuApp")
-    public AjaxResult listApp(String idCard)
+    public AjaxResult listPolicyMenuApp(String idCard)
     {
         return policyMenuService.listApp(idCard);
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/h5/H5Controller.java

@@ -53,7 +53,7 @@ public class H5Controller extends BaseController {
      */
     @GetMapping("/policy/list")
     public AjaxResult policyList(PolicyMenu policyMenu) {
-        List<PolicyMenu> list = policyMenuService.selectPolicyMenuList(policyMenu);
+        List<PolicyMenu> list = policyMenuService.selectPolicyMenuListApp(policyMenu);
         return AjaxResult.success(list);
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/domain/UsageRecord.java

@@ -83,6 +83,9 @@ public class UsageRecord extends BaseEntity
         return children;
     }
 
+    /** 时间 */
+    private String time;
+
     public void setChildren(List<UsageRecord> children) {
         this.children = children;
     }
@@ -220,6 +223,14 @@ public class UsageRecord extends BaseEntity
         this.idCard = idCard;
     }
 
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+
     @Override
     public String toString() {
         return "UsageRecord{" +

ruoyi-system/src/main/java/com/ruoyi/system/service/IPolicyMenuService.java

@@ -93,4 +93,7 @@ public interface IPolicyMenuService
     int selectNormalChildrenMenuById(Long menuId);
 
     AjaxResult listApp(String idCard);
+
+    List<PolicyMenu> selectPolicyMenuListApp(PolicyMenu policyMenu);
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PolicyMenuServiceImpl.java

@@ -59,6 +59,12 @@ public class PolicyMenuServiceImpl implements IPolicyMenuService {
      */
     @Override
     public List<PolicyMenu> selectPolicyMenuList(PolicyMenu policyMenu) {
+        //policyMenu.setParentId(0L);
+        return policyMenuMapper.selectPolicyMenuList(policyMenu);
+    }
+
+    @Override
+    public List<PolicyMenu> selectPolicyMenuListApp(PolicyMenu policyMenu) {
         policyMenu.setParentId(0L);
         return policyMenuMapper.selectPolicyMenuList(policyMenu);
     }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsageRecordServiceImpl.java

@@ -1,19 +1,19 @@
 package com.ruoyi.system.service.impl;
 
-import java.util.Comparator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.CreditUser;
 import com.ruoyi.system.domain.InterestsNumberTable;
 import com.ruoyi.system.domain.InterestsTable;
 import com.ruoyi.system.mapper.CreditUserMapper;
 import com.ruoyi.system.mapper.InterestsNumberTableMapper;
 import com.ruoyi.system.mapper.InterestsTableMapper;
+import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.UsageRecordMapper;
@@ -58,9 +58,15 @@ public class UsageRecordServiceImpl implements IUsageRecordService
      * @param usageRecord 使用记录
      * @return 使用记录
      */
+    @SneakyThrows
     @Override
     public List<UsageRecord> selectUsageRecordList(UsageRecord usageRecord)
     {
+        if(usageRecord.getCreateTime()!=null){
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            String time = simpleDateFormat.format(usageRecord.getCreateTime());
+            usageRecord.setTime(time);
+        }
         return usageRecordMapper.selectUsageRecordList(usageRecord);
     }
 

ruoyi-system/src/main/resources/mapper/system/UsageRecordMapper.xml

@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="creditName != null  and creditName != ''"> and credit_name like concat( #{creditName}, '%')</if>
             <if test="recordYear != null  and recordYear != ''"> and record_year = #{recordYear }</if>
             <if test="recordLevel != null  and recordLevel != ''"> and record_level = #{recordLevel}</if>
-            <if test="createTime != null "> and create_time like concat( #{createTime}, '%')</if>
+            <if test="time != null "> and create_time like concat( #{time}, '%')</if>
         </where>
     </select>