修改代码

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/MenuController.java

@@ -54,6 +54,7 @@ public class MenuController extends BaseController<MenuBiz, Menu> {
         if (StringUtils.isNotBlank(title)) {
             example.createCriteria().andLike("title", "%" + title + "%");
         }
+        example.orderBy("order_num asc, id asc");
         return getMenuTree(baseBiz.selectByExample(example), AdminCommonConstant.ROOT);
     }
 

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/dto/GainDataDTO.java

@@ -17,6 +17,8 @@ public class GainDataDTO extends PageParam {
     //
     private String time;
 
+    private Boolean needLog = false;
+
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date crtTimeStart;

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/GainDataBiz.java

@@ -3,10 +3,13 @@ package com.upyuns.platform.rs.website.biz;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.upyuns.platform.rs.gtdata.GtDataRestClient;
+import com.upyuns.platform.rs.website.controller.AdminGaindataController;
 import com.upyuns.platform.rs.website.dto.GainDataDTO;
 import com.upyuns.platform.rs.website.entity.DataMenu;
 import com.upyuns.platform.rs.website.entity.FileData;
+import com.upyuns.platform.rs.website.entity.GaindataLog;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
@@ -47,6 +50,8 @@ public class GainDataBiz extends BaseBiz<GainDataMapper,GainData> {
     @Autowired
     GtDataRestClient gtDataRestClient;
 
+    @Autowired
+    GaindataLogBiz gaindataLogBiz;
 
     public DataMenu getTopMenu(Map<Integer, DataMenu> dataMenuMap, DataMenu dataMenu){
         if(dataMenu != null && dataMenu.getParentId() != null && dataMenu.getParentId() != -1) {
@@ -175,4 +180,21 @@ public class GainDataBiz extends BaseBiz<GainDataMapper,GainData> {
             }
         }
     }
+
+    public PageDataVO<AdminGaindataController.GainDataVO> selectPageVO(GainDataDTO dto) {
+        Example example = new Example(GainData.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("isDel", 0);
+        example.setOrderByClause("crt_time desc");
+        PageDataVO<AdminGaindataController.GainDataVO> pageDataVO = PageDataVO.pageInfo(dto.initQuery(), ()->selectByExample(example), AdminGaindataController.GainDataVO.class);
+        if(dto.getNeedLog()) {
+            pageDataVO.getData().forEach(gainDataVO -> {
+                gainDataVO.setGaindataLogs(gaindataLogBiz.selectAll(new GaindataLog(){{
+                    setGainId(gainDataVO.getId());
+                    setIsDel(SYS_FALSE);
+                }}));
+            });
+        }
+        return pageDataVO;
+    }
 }
\ No newline at end of file

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/AdminGaindataController.java

@@ -20,10 +20,7 @@ import com.upyuns.platform.rs.website.biz.GainDataBiz;
 import com.upyuns.platform.rs.website.controller.web.GainDataController;
 import com.upyuns.platform.rs.website.dto.FileDataDTo;
 import com.upyuns.platform.rs.website.dto.GainDataDTO;
-import com.upyuns.platform.rs.website.entity.DataMenu;
-import com.upyuns.platform.rs.website.entity.DataTempcache;
-import com.upyuns.platform.rs.website.entity.FileData;
-import com.upyuns.platform.rs.website.entity.GainData;
+import com.upyuns.platform.rs.website.entity.*;
 import com.upyuns.platform.rs.website.vo.DataMenuTree;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -84,18 +81,15 @@ public class AdminGaindataController extends BaseController<GainDataBiz, GainDat
     }
 
     @RequestMapping(value = "/getPageList",method = RequestMethod.GET)
-    public ObjectRestResponse<List<GainData>> getPageList(GainDataDTO dto) {
-        Example example = new Example(GainData.class);
-        Example.Criteria criteria = example.createCriteria();
-        criteria.andEqualTo("isDel", 0);
-//        if (StringUtils.isNotBlank(dto.getName())){
-//            criteria.andLike("title", "%" + dto.getName() + "%");
-//        }
-        example.setOrderByClause("crt_time desc");
-        PageDataVO pageDataVO = PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), ()->baseBiz.selectByExample(example));
-        return ObjectRestResponse.succ(pageDataVO);
+    public ObjectRestResponse<PageDataVO> getPageList(GainDataDTO dto) {
+//        PageDataVO pageDataVO = PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), ()->baseBiz.selectByExample(example));
+        return ObjectRestResponse.succ(baseBiz.selectPageVO(dto));
     }
 
+    @Data
+    static public class GainDataVO extends GainData {
+        public List<GaindataLog> gaindataLogs;
+    }
 
     @RequestMapping(value = "/deleteById",method = RequestMethod.DELETE)
     public ObjectRestResponse deleteById(Integer id) {