1
0
Эх сурвалжийг харах

调整导出按照选择数据导出,响应数据格式错误问题

chenendian 3 өдөр өмнө
parent
commit
0cec4f165e

+ 5 - 2
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/YdbpDataController.java

@@ -7,6 +7,7 @@ import com.siwei.apply.domain.vo.YdbpDataVo;
 import com.siwei.apply.domain.vo.YdbpExcelVo;
 import com.siwei.apply.service.YdbpDataService;
 import com.siwei.common.core.domain.R;
+import com.siwei.common.core.utils.bean.BeanUtils;
 import com.siwei.common.core.utils.poi.ExcelUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -89,12 +90,14 @@ public class YdbpDataController {
     /**
      * 用地报批数据导出
      *
-     * @param filterVo
+     * @param ydbpExcelVo
      * @return
      */
     @PostMapping("/export")
-    public void exportList(HttpServletResponse response, @RequestBody YdbpDataFilterVo filterVo) {
+    public void exportList(HttpServletResponse response,   YdbpExcelVo ydbpExcelVo) {
         try {
+            YdbpDataFilterVo filterVo = new YdbpDataFilterVo();
+            BeanUtils.copyProperties(ydbpExcelVo, filterVo);
             Map<String, Object> result = ydbpDataService.getList(filterVo);
             List<YdbpExcelVo> list = ydbpDataService.transformation(result);
             ExcelUtil<YdbpExcelVo> util = new ExcelUtil<>(YdbpExcelVo.class);

+ 3 - 1
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/vo/YdbpExcelVo.java

@@ -8,10 +8,11 @@ import lombok.Data;
  * 用地报批 导出对象
  */
 @Data
-public class YdbpExcelVo extends BaseEntity {
+public class YdbpExcelVo extends YdbpDataFilterVo {
     private static final long serialVersionUID = 1L;
     @Excel(name = "项目名称")
     private String name;
+
     @Excel(name = "用地总面积")
     private String allArea;
 
@@ -23,4 +24,5 @@ public class YdbpExcelVo extends BaseEntity {
 
     @Excel(name = "批复时间")
     private String theDate;
+
 }

+ 2 - 2
siwei-modules/siwei-system/src/main/java/com/siwei/system/controller/SysRoleController.java

@@ -57,9 +57,9 @@ public class SysRoleController extends BaseController
     }
 
     @Log(title = "角色管理", businessType = BusinessType.EXPORT)
-    //@RequiresPermissions("system:role:export")
+    @RequiresPermissions("system:role:export")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, @RequestBody SysRole role)
+    public void export(HttpServletResponse response, SysRole role)
     {
         List<SysRole> list = roleService.selectRoleList(role);
         ExcelUtil<SysRole> util = new ExcelUtil<SysRole>(SysRole.class);