退料

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<PlanApplyBean> list = service.getProPlanListByProId(o);
+            List<PlanApplyBean> list = planService.findByPage(o);;
             List<PlanApplyBeanPlanExport> export=new ArrayList<>();
             if(StringUtils.isEmpty(list)){
                 list=new ArrayList<>();

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;
 
 	

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;
 	/**
 	 * 子集合
 	 */

src/main/resources/mappers/plan/PlanApplicationMapper.xml

@@ -168,7 +168,7 @@
 	</select>
     <select id="getTypeList" resultType="com.bonus.gzgqj.business.plan.entity.PlanDevBean">
 		SELECT mt.ID id ,mt.PARENT_ID pId,mt.`LEVEL` level,mt.UNIT unit,mt.NUM num ,mt.`NAME`  name ,mt1.`NAME` pName ,
-			   mt2.`NAME` ppName
+			   mt2.`NAME` ppName,"" needNum,"" needTimes,"" remarks
 		from mm_type  mt
 				 LEFT JOIN mm_type mt1 on mt.PARENT_ID=mt1.id   and mt1.IS_ACTIVE=1
 				 LEFT JOIN mm_type mt2 on mt1.PARENT_ID=mt2.id  and mt2.IS_ACTIVE=1