anderx 5 years ago
parent
commit
90847b64a7

+ 2 - 1
src/main/java/com/goafanti/common/model/TOrderTask.java

@@ -97,7 +97,8 @@ public class TOrderTask {
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.project_status
 	 * @mbg.generated  Thu Jun 11 09:59:01 CST 2020
 	 */
-	@Excel(name = "项目状态",readConverterExp = "0=项目待提交,1=项目已提交,2=项目评审,3=项目立项,4=项目公示,5=项目抽查,6=项目备案,7=项目下证,8=项目验收,9=项目拨款",sort = 13)
+	@Excel(name = "项目状态",readConverterExp = "0=项目待提交,1=项目已提交,2=项目评审,"
+			+ "3=项目立项,4=项目公示,5=项目抽查,6=项目备案,7=项目下证,8=项目验收,9=项目拨款",sort = 13)
 	private Integer projectStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.accept_time

+ 10 - 3
src/main/java/com/goafanti/common/utils/Excel/NewExcelUtil.java

@@ -152,16 +152,23 @@ public class NewExcelUtil<T> {
 	}
 	
 	/**
-	 * 导出CXCEL表
+	 * 	直接导出CXCEL表
 	 * @param list 导出数据集合
 	 * @param sheetName 工作表的名称
 	 * @param response
 	 */
-	public void exportExcel(List<T> list, String sheetName, HttpServletResponse response) {
+	public Result exportExcel(List<T> list, String sheetName, HttpServletResponse response) {
 		this.init(list, sheetName);
+		//直接导出
 		exportExcel(response);
+		return new Result().data(1);
 	}
-	
+	/**
+	 * 	导出CXCEL到指定目录下
+	 * @param list 导出数据集合
+	 * @param sheetName 工作表的名称
+	 * @param response
+	 */
 	public Result exportExcel(List<T> list, String sheetName, String uploadPath) {
 		this.init(list, sheetName);
 		this.downloadPath=uploadPath;

+ 0 - 1
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -25,7 +25,6 @@ import com.goafanti.common.model.TOrderRefundWithBLOBs;
 import com.goafanti.common.model.TOrderTask;
 import com.goafanti.common.utils.Excel.NewExcelUtil;
 import com.goafanti.order.bo.InputArrearsDunListBo;
-import com.goafanti.order.bo.OrderListBo;
 import com.goafanti.order.bo.TOrderTaskBo;
 import com.goafanti.order.enums.ApprovalNewState;
 import com.goafanti.order.enums.OrderNewState;