Sfoglia il codice sorgente

费用支出报表修改

Qchen 2 anni fa
parent
commit
0d84086161

+ 1 - 1
src/main/java/com/ydtech/modules/inv/controller/invAccountExcelController.java

@@ -66,7 +66,7 @@ public class invAccountExcelController {
             Files.createDirectories(path);
         }
         String fileName = EasyExcelUtils.downExcel(uploadPath, "支出报表", InvDisburseExcel.class, insAccountExcels);
-        return HttpResult.ok(uploadUrl + "excel/" + fileName);
+        return HttpResult.ok("",uploadUrl + "excel/" + fileName);
     }
 
     @PostMapping("insert")

+ 0 - 2
src/main/java/com/ydtech/modules/inv/model/excel/InvDisburseExcel.java

@@ -5,7 +5,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -14,7 +13,6 @@ public class InvDisburseExcel implements Serializable {
     @ExcelProperty("日期")
     @ApiModelProperty(value = "申请时间")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @NotBlank
     private Date applyTime;
 
     @ExcelProperty("费用类型")

+ 1 - 0
src/main/java/com/ydtech/modules/inv/service/impl/InvAccountExcelServiceImpl.java

@@ -114,6 +114,7 @@ public class InvAccountExcelServiceImpl extends ServiceImpl<InvAccountExcelMappe
         pageRequest.setPageSize(invAccountExcelVo.getPageSize());
         Page page = PageRequest.buildPageRequest(pageRequest);
         IPage<InvAccountExcelVo> invAccountExcelIPage = insAccountExcelMapper.selectDisburse(page, invAccountExcelVo);
+        invAccountExcelIPage.setTotal(invAccountExcelIPage.getRecords().size());
         return HttpResult.ok("", invAccountExcelIPage);
     }