buzhanyi 2 лет назад
Родитель
Сommit
eabc0c3773

+ 18 - 9
purchase-admin/src/main/java/com/ozs/web/controller/plan/PlanYearsController.java

@@ -49,6 +49,24 @@ public class PlanYearsController extends BaseController {
         return AjaxResult.success(page);
     }
 
+    @ApiOperation(value = "导出年度计划数据")
+    @PostMapping("/exportPlan")
+    public void exportPlan(HttpServletResponse response, @RequestBody PlanYearsStandardVo yearsStandardVo) throws Exception {
+        PageInfo<PlanYears> page = planYearsService.selectPlanYearsList(yearsStandardVo);
+        List<PlanYears> list = page.getList();
+        ExcelUtil<PlanYears> util = new ExcelUtil<PlanYears>(PlanYears.class);
+        util.exportExcel(response, list, "年度计划数据");
+    }
+
+    @ApiOperation(value = "导出年度计划数据(审核单位)")
+    @PostMapping("/exportPlanExamine")
+    public void exportPlanExamine(HttpServletResponse response, @RequestBody PlanYearsStandardVo yearsStandardVo) throws Exception {
+        PageInfo<PlanYears> page = planYearsService.selectPlanYearsExamineList(yearsStandardVo);
+        List<PlanYears> list = page.getList();
+        ExcelUtil<PlanYears> util = new ExcelUtil<PlanYears>(PlanYears.class);
+        util.exportExcel(response, list, "年度计划数据(审核单位)");
+    }
+
     @ApiOperation(value = "创建年度计划")
     @PostMapping("/add")
     public AjaxResult add(@RequestBody PlanYearsStandardVo yearsStandardVo, HttpServletRequest request) {
@@ -136,14 +154,5 @@ public class PlanYearsController extends BaseController {
         return success(message);
     }
 
-    @ApiOperation(value = "导出年度计划数据")
-    @PostMapping("/exportPlan")
-    public void exportPlan(HttpServletResponse response, PlanYearsStandardVo yearsStandardVo) throws Exception {
-        PageInfo<PlanYears> page = planYearsService.selectPlanYearsList(yearsStandardVo);
-        List<PlanYears> list = page.getList();
-        ExcelUtil<PlanYears> util = new ExcelUtil<>(PlanYears.class);
-        util.exportExcel(response, list, "年度计划数据");
-    }
-
 
 }

+ 1 - 1
purchase-system/src/main/java/com/ozs/plan/doman/PlanYears.java

@@ -17,7 +17,7 @@ import java.util.Date;
  * @author buzhanyi
  */
 @Data
-public class PlanYears implements Serializable {
+public class PlanYears {
 
     /**
      * 主键编号

+ 1 - 1
purchase-system/src/main/java/com/ozs/plan/doman/vo/requestVo/PlanYearsStandardVo.java

@@ -16,7 +16,7 @@ import java.util.List;
  * @author buzhanyi
  */
 @Data
-public class PlanYearsStandardVo extends PageVo implements Serializable {
+public class PlanYearsStandardVo extends PageVo {
 
     /**
      * 主键编号