diff --git a/src/main/java/com/bonus/gzgqj/business/plan/controller/ExportController.java b/src/main/java/com/bonus/gzgqj/business/plan/controller/ExportController.java index 70e190c..52b7f4c 100644 --- a/src/main/java/com/bonus/gzgqj/business/plan/controller/ExportController.java +++ b/src/main/java/com/bonus/gzgqj/business/plan/controller/ExportController.java @@ -53,7 +53,7 @@ public class ExportController { @PostMapping("export") public void export(HttpServletRequest request, HttpServletResponse response,@RequestBody PlanApplyBean o) { try { - List list = service.getProPlanListByProId(o); + List list = planService.findByPage(o);; List export=new ArrayList<>(); if(StringUtils.isEmpty(list)){ list=new ArrayList<>(); diff --git a/src/main/java/com/bonus/gzgqj/business/plan/entity/PlanApplyBeanPlanExport.java b/src/main/java/com/bonus/gzgqj/business/plan/entity/PlanApplyBeanPlanExport.java index 8fb8b5f..83d4b76 100644 --- a/src/main/java/com/bonus/gzgqj/business/plan/entity/PlanApplyBeanPlanExport.java +++ b/src/main/java/com/bonus/gzgqj/business/plan/entity/PlanApplyBeanPlanExport.java @@ -74,10 +74,10 @@ public class PlanApplyBeanPlanExport { /** * 施工地点 */ - @Excel(name = "计划说明", width = 10.0,height = 20.0, orderNum = "8") + @Excel(name = "备注", width = 10.0,height = 20.0, orderNum = "8") private String remark; - + @Excel(name = "审核状态", width = 10.0,height = 20.0, orderNum = "9") private String statusName; /** @@ -112,6 +112,7 @@ public class PlanApplyBeanPlanExport { /** * 审核状态 */ + private String auditStatus; diff --git a/src/main/java/com/bonus/gzgqj/business/plan/entity/PlanDevBean.java b/src/main/java/com/bonus/gzgqj/business/plan/entity/PlanDevBean.java index d1747b5..c34765d 100644 --- a/src/main/java/com/bonus/gzgqj/business/plan/entity/PlanDevBean.java +++ b/src/main/java/com/bonus/gzgqj/business/plan/entity/PlanDevBean.java @@ -1,10 +1,13 @@ package com.bonus.gzgqj.business.plan.entity; +import lombok.Data; + import java.util.List; /** * 设备实体类 */ +@Data public class PlanDevBean { private String id; @@ -23,6 +26,12 @@ public class PlanDevBean { private String ppName; + + private int needNum; + + private String needTimes; + + private String remarks; /** * 子集合 */ diff --git a/src/main/resources/mappers/plan/PlanApplicationMapper.xml b/src/main/resources/mappers/plan/PlanApplicationMapper.xml index e4d3099..3305ad6 100644 --- a/src/main/resources/mappers/plan/PlanApplicationMapper.xml +++ b/src/main/resources/mappers/plan/PlanApplicationMapper.xml @@ -168,7 +168,7 @@