新增使用记录

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

@@ -70,10 +70,8 @@ public class H5Controller extends BaseController
      * 查询使用记录列表
      */
     @GetMapping(value = "/record/{creditId}")
-    public TableDataInfo getRecordList(@PathVariable("creditId") Long creditId)
+    public AjaxResult getRecordList(@PathVariable("creditId") Long creditId)
     {
-        startPage();
-        List<UsageRecord> list = usageRecordService.selectUsageRecordListByRecordId(creditId);
-        return getDataTable(list);
+        return usageRecordService.selectUsageRecordListByRecordId(creditId);
     }
 }

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

@@ -1,10 +1,14 @@
 package com.ruoyi.system.domain;
 
+import com.ruoyi.common.core.domain.entity.PolicyMenu;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 使用记录对象 usage_record
  * 
@@ -45,8 +49,20 @@ public class UsageRecord extends BaseEntity
     /** 剩余次数 */
     @Excel(name = "剩余次数")
     private String surplusNum;
+    /**
+     * 子菜单
+     */
+    private List<UsageRecord> children = new ArrayList<UsageRecord>();
+
+    public List<UsageRecord> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<UsageRecord> children) {
+        this.children = children;
+    }
 
-    public void setRecordId(Long recordId) 
+    public void setRecordId(Long recordId)
     {
         this.recordId = recordId;
     }

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

@@ -1,6 +1,8 @@
 package com.ruoyi.system.service;
 
 import java.util.List;
+
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.system.domain.UsageRecord;
 
 /**
@@ -65,5 +67,5 @@ public interface IUsageRecordService
      * @param recordId
      * @return
      */
-    public List<UsageRecord> selectUsageRecordListByRecordId(Long recordId);
+    public AjaxResult selectUsageRecordListByRecordId(Long recordId);
 }

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

@@ -1,6 +1,11 @@
 package com.ruoyi.system.service.impl;
 
+import java.util.Comparator;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -8,6 +13,8 @@ import com.ruoyi.system.mapper.UsageRecordMapper;
 import com.ruoyi.system.domain.UsageRecord;
 import com.ruoyi.system.service.IUsageRecordService;
 
+import static com.ruoyi.common.utils.PageUtils.startPage;
+
 /**
  * 使用记录Service业务层处理
  * 
@@ -100,7 +107,10 @@ public class UsageRecordServiceImpl implements IUsageRecordService
      * @return
      */
     @Override
-    public List<UsageRecord> selectUsageRecordListByRecordId(Long recordId) {
-        return usageRecordMapper.selectUsageRecordListByRecordId(recordId);
+    public AjaxResult selectUsageRecordListByRecordId(Long recordId) {
+        startPage();
+        List<UsageRecord> usageRecords = usageRecordMapper.selectUsageRecordListByRecordId(recordId);
+        Map<String, List<UsageRecord>> collect = usageRecords.stream().collect(Collectors.groupingBy(UsageRecord::getRecordYear));
+        return AjaxResult.success(collect);
     }
 }

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

@@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectUsageRecordListByRecordId" resultMap="UsageRecordResult">
         <include refid="selectUsageRecordVo"/>
         where credit_id = #{creditId}
+        order by create_time DESC
     </select>
 
     <insert id="insertUsageRecord" parameterType="UsageRecord" useGeneratedKeys="true" keyProperty="recordId">
@@ -52,10 +53,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="creditId != null">credit_id,</if>
             <if test="surplusNum != null">surplus_num,</if>
             <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
+            create_time
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="recordYear != null and recordYear != ''">#{recordYear},</if>
@@ -66,10 +67,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="creditId != null">#{creditId},</if>
             <if test="surplusNum != null">#{surplusNum},</if>
             <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
+            sysdate()
          </trim>
     </insert>