查询排序

src/main/java/com/jeeplus/modules/sg/annualmaterialreport/web/NewMaterialProjectController.java

@@ -13,6 +13,7 @@ import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.act.service.ActProcessService;
 import com.jeeplus.modules.act.service.ActTaskService;
+import com.jeeplus.modules.sg.annualmaterialreport.entity.ExportDetails;
 import com.jeeplus.modules.sg.annualmaterialreport.entity.NewMaterialReport;
 import com.jeeplus.modules.sg.annualmaterialreport.entity.ReportDetails;
 import com.jeeplus.modules.sg.annualmaterialreport.service.NewMaterialReportService;
@@ -226,7 +227,7 @@ public class NewMaterialProjectController extends BaseController {
                 ReportDetails reportDetails = map.get(r);
                 returnList.add(reportDetails);
             }
-            new ExportExcel(null, ReportDetails.class).setDataList(returnList).write(response, fileName).dispose();
+            new ExportExcel(null, ExportDetails.class).setDataList(returnList).write(response, fileName).dispose();
             j.setSuccess(true);
             j.setMsg("导出成功！");
             return j;

src/main/webapp/webpage/modules/sg/annualMaterialReport/newMaterialProjectList.js

@@ -178,16 +178,16 @@ $(document).ready(function() {
 		
 		
 	 $("#export").click(function(){//导出Excel文件物料
-         let reserveProjectName  = $("reserveProjectName").val();
-         let reserveCode  = $("reserveCode").val();
-         let projectType  = $("projectType").val();
-         let batchPlan  = $("batchPlan").val();
-         let issuePlan  = $("issuePlan").val();
-         let monthPlan  = $("monthPlan").val();
-         let hasPlan  = $("hasPlan").val();
-         let halfPlan  = $("halfPlan").val();
-         let projectId  = $("projectId").val();
-         let projectName  = $("projectName").val();
+         let reserveProjectName  = $("#reserveProjectName").val();
+         let reserveCode  = $("#reserveCode").val();
+         let projectType  = $("#projectType").val();
+         let batchPlan  = $("#batchPlan").val();
+         let issuePlan  = $("#issuePlan").val();
+         let monthPlan  = $("#monthPlan").val();
+         let hasPlan  = $("#hasPlan").val();
+         let halfPlan  = $("#halfPlan").val();
+         let projectId  = $("#projectId").val();
+         let projectName  = $("#projectName").val();
 			jp.downloadFile('${ctx}/new/materialProject/export?reserveProjectName='+reserveProjectName
                 +'&reserveCode='+reserveCode
                 +'&projectType='+projectType
@@ -200,16 +200,16 @@ $(document).ready(function() {
                 +'&projectName='+projectName);
 	  });
     $("#exportpro").click(function(){//导出Excel文件
-        let reserveProjectName  = $("reserveProjectName").val();
-        let reserveCode  = $("reserveCode").val();
-        let projectType  = $("projectType").val();
-        let batchPlan  = $("batchPlan").val();
-        let issuePlan  = $("issuePlan").val();
-        let monthPlan  = $("monthPlan").val();
-        let hasPlan  = $("hasPlan").val();
-        let halfPlan  = $("halfPlan").val();
-        let projectId  = $("projectId").val();
-        let projectName  = $("projectName").val();
+        let reserveProjectName  = $("#reserveProjectName").val();
+        let reserveCode  = $("#reserveCode").val();
+        let projectType  = $("#projectType").val();
+        let batchPlan  = $("#batchPlan").val();
+        let issuePlan  = $("#issuePlan").val();
+        let monthPlan  = $("#monthPlan").val();
+        let hasPlan  = $("#hasPlan").val();
+        let halfPlan  = $("#halfPlan").val();
+        let projectId  = $("#projectId").val();
+        let projectName  = $("#projectName").val();
          jp.downloadFile('${ctx}/new/materialProject/exportPro?reserveProjectName='+reserveProjectName
              +'&reserveCode='+reserveCode
              +'&projectType='+projectType