调整项报批数据导出

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

@@ -4,11 +4,15 @@ import com.siwei.apply.domain.YdbpData;
 import com.siwei.apply.domain.vo.YdbpDataFilterVo;
 import com.siwei.apply.domain.vo.YdbpDataUpdateVo;
 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.poi.ExcelUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -80,4 +84,25 @@ public class YdbpDataController {
             return R.fail(e.getMessage());
         }
     }
+
+
+    /**
+     * 用地报批数据导出
+     *
+     * @param filterVo
+     * @return
+     */
+    @PostMapping("/export")
+    public void exportList(HttpServletResponse response, @RequestBody YdbpDataFilterVo filterVo) {
+        try {
+            Map<String, Object> result = ydbpDataService.getList(filterVo);
+            List<YdbpExcelVo> list = ydbpDataService.transformation(result);
+            ExcelUtil<YdbpExcelVo> util = new ExcelUtil<>(YdbpExcelVo.class);
+            util.exportExcel(response, list, "报批数据");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
 }

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

@@ -0,0 +1,26 @@
+package com.siwei.apply.domain.vo;
+
+import com.siwei.common.core.annotation.Excel;
+import com.siwei.common.core.web.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 用地报批 导出对象
+ */
+@Data
+public class YdbpExcelVo extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+    @Excel(name = "项目名称")
+    private String name;
+    @Excel(name = "用地总面积")
+    private String allArea;
+
+    @Excel(name = "征收土地面积")
+    private String zsArea;
+
+    @Excel(name = "批复文号")
+    private String pfNumber;
+
+    @Excel(name = "批复时间")
+    private String theDate;
+}

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/YdbpDataService.java

@@ -4,7 +4,9 @@ import com.siwei.apply.domain.YdbpData;
 import com.siwei.apply.domain.vo.YdbpDataFilterVo;
 import com.siwei.apply.domain.vo.YdbpDataUpdateVo;
 import com.siwei.apply.domain.vo.YdbpDataVo;
+import com.siwei.apply.domain.vo.YdbpExcelVo;
 
+import java.util.List;
 import java.util.Map;
 
 public interface YdbpDataService {
@@ -16,4 +18,6 @@ public interface YdbpDataService {
 
     void update(YdbpDataUpdateVo ydbpDataVo);
 
+    List<YdbpExcelVo>  transformation(Map<String, Object> mapData);
+
 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/YdbpDataImpl.java

@@ -4,8 +4,10 @@ import com.siwei.apply.domain.YdbpData;
 import com.siwei.apply.domain.vo.YdbpDataFilterVo;
 import com.siwei.apply.domain.vo.YdbpDataUpdateVo;
 import com.siwei.apply.domain.vo.YdbpDataVo;
+import com.siwei.apply.domain.vo.YdbpExcelVo;
 import com.siwei.apply.mapper.YdbpDataMapper;
 import com.siwei.apply.service.YdbpDataService;
+import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -57,4 +59,26 @@ public class YdbpDataImpl implements YdbpDataService {
         entity.setUpdatedAt(new java.util.Date());
         ydbpDataMapper.update(entity);
     }
+
+    @Override
+    public List<YdbpExcelVo> transformation(Map<String, Object> mapData) {
+        List<YdbpExcelVo> list = null;
+        if(MapUtils.isNotEmpty(mapData) && mapData.get("rows") != null){
+            list = new java.util.ArrayList<>();
+            List<YdbpData> rows  = (List<YdbpData>) mapData.get("rows");
+            for(YdbpData row : rows){
+                YdbpExcelVo excelVo = new YdbpExcelVo();
+                excelVo.setName(row.getName());
+                excelVo.setAllArea(row.getYdArea()+row.getYdUnit());
+                excelVo.setZsArea(row.getZsArea()+row.getZsUnit());
+                excelVo.setPfNumber(row.getPfwh());
+                excelVo.setTheDate(row.getPfDate());
+                list.add(excelVo);
+            }
+        }
+        return  list;
+    }
+
+
+
 }

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, SysRole role)
+    public void export(HttpServletResponse response, @RequestBody SysRole role)
     {
         List<SysRole> list = roleService.selectRoleList(role);
         ExcelUtil<SysRole> util = new ExcelUtil<SysRole>(SysRole.class);