Browse Source

Plan导出:添加字段表示时间正序还是倒叙

wangPH 2 năm trước cách đây
mục cha
commit
be704a7bf4

+ 1 - 0
background-common/src/main/java/cn/kdan/compdf/enums/ResponseEnum.java

@@ -15,6 +15,7 @@ public enum ResponseEnum {
     TOKEN_TIMEOUT("704","登录超时,请重新登录"),
     ROLE_NO_RIGHT("705","权限不足"),
     OLDPWD_EQUALS_NEWPWD("706","旧密码不能和新密码相同"),
+    PROJECT_NULL("707","Project name cannot be blank."),
 
     SYSTEM_ERROR("500","系统内部异常"),
 

+ 6 - 2
background-user/src/main/java/cn/kdan/compdf/controller/v1/BackgroundUserBalanceController.java

@@ -1,5 +1,6 @@
 package cn.kdan.compdf.controller.v1;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.kdan.compdf.base.R;
 import cn.kdan.compdf.dto.AddFreePlanDTO;
 import cn.kdan.compdf.dto.PlanStatisticsDTO;
@@ -54,8 +55,11 @@ public class BackgroundUserBalanceController {
      * 账户消费充值记录导出
      */
     @GetMapping("/exportBalanceRecordList")
-    public void exportBalanceRecordList(HttpServletResponse response) {
-        backgroundUserBalanceService.exportBalanceRecordList(TokenUtil.getRequestHeader().getId(), response);
+    public void exportBalanceRecordList(Integer isDecs,HttpServletResponse response) {
+        if (ObjectUtil.isEmpty(isDecs)) {
+            isDecs = 1;
+        }
+        backgroundUserBalanceService.exportBalanceRecordList(isDecs,TokenUtil.getRequestHeader().getId(), response);
     }
 
 

+ 6 - 1
background-user/src/main/java/cn/kdan/compdf/controller/v1/BackgroundUserProjectController.java

@@ -4,11 +4,12 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.kdan.compdf.base.R;
 import cn.kdan.compdf.dto.AddNewProjectDTO;
 import cn.kdan.compdf.dto.EditProjectDTO;
+import cn.kdan.compdf.enums.ResponseEnum;
 import cn.kdan.compdf.exception.BusinessException;
+import cn.kdan.compdf.exception.CommonException;
 import cn.kdan.compdf.service.BackgroundUserProjectService;
 import cn.kdan.compdf.utils.TokenUtil;
 import cn.kdan.compdf.vo.BackgroundUserProjectVO;
-import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -44,6 +45,10 @@ public class BackgroundUserProjectController {
      */
     @PostMapping("/addNewProject")
     public R<Void> addNewProject(@Validated @RequestBody AddNewProjectDTO addNewProjectDTO) {
+        if (ObjectUtil.isEmpty(addNewProjectDTO.getProjectName().trim())) {
+            throw new CommonException(ResponseEnum.PROJECT_NULL);
+        }
+
         addNewProjectDTO.setUserId(TokenUtil.getRequestHeader().getId());
         addNewProjectDTO.setTenantId(TokenUtil.getRequestHeader().getTenantId());
         backgroundUserProjectService.addNewProject(addNewProjectDTO);

+ 1 - 1
background-user/src/main/java/cn/kdan/compdf/service/BackgroundUserBalanceService.java

@@ -44,7 +44,7 @@ public interface BackgroundUserBalanceService extends IService<BackgroundUserBal
      * @param userId 用户id
      * @param response response
      */
-    void exportBalanceRecordList(Long userId, HttpServletResponse response);
+    void exportBalanceRecordList(Integer isDecs,Long userId, HttpServletResponse response);
 
     /**
      * plan 消费记录数据同步 一天一次

+ 4 - 2
background-user/src/main/java/cn/kdan/compdf/service/impl/BackgroundUserBalanceServiceImpl.java

@@ -122,7 +122,7 @@ public class BackgroundUserBalanceServiceImpl extends ServiceImpl<BackgroundUser
      * @param response response
      */
     @Override
-    public void exportBalanceRecordList(Long userId, HttpServletResponse response) {
+    public void exportBalanceRecordList(Integer isDecs, Long userId, HttpServletResponse response) {
         LambdaQueryWrapper<BackgroundUserBalance> eq = new LambdaQueryWrapper<BackgroundUserBalance>()
                 .eq(BackgroundUserBalance::getUserId, userId)
                 .orderByDesc(BackgroundUserBalance::getCreateDate);
@@ -141,7 +141,9 @@ public class BackgroundUserBalanceServiceImpl extends ServiceImpl<BackgroundUser
                 backgroundUserBalanceVOList.add(backgroundUserBalanceVO);
             });
         }
-
+        if (isDecs == 0) {
+            Collections.reverse(backgroundUserBalanceVOList);
+        }
         // 写入响应导出
         try {
             String fileName = URLEncoder.encode("Processing Files Balance (" + DateUtil.date().toString().replaceAll(":", "-") + ")", "UTF-8").replaceAll("\\+", "%20");