项目编号，项目名称排序替换

src/main/java/com/jeeplus/modules/sg/financial/settlement/service/DonorMaterialService.java

@@ -148,6 +148,9 @@ public class DonorMaterialService extends CrudService<DonorMaterialMapper, Donor
                     donorMaterial.setMaterialType(cellOne);
                     donorMaterial.setMaterialCode(cellTwo);
                     String cellThree = this.getCellValue(row.getCell(3));
+                    if ("0".equals(cellTwo)) {
+                        cellTwo = "";
+                    }
                     if ("0".equals(cellThree)) {
                         cellThree = "";
                     }
@@ -355,4 +358,6 @@ public class DonorMaterialService extends CrudService<DonorMaterialMapper, Donor
     public void updateStatus(List<String> list) {
         donorMaterialMapper.updateStatus(list);
     }
+
+
 }

src/main/java/com/jeeplus/modules/sg/financial/settlement/util/MyExportUtil.java

@@ -140,8 +140,8 @@ public class MyExportUtil {
                     Cell cell20 = crateCell(workbook,row,20); //典设费率
                     Cell cell21 = crateCell(workbook,row,21); //合同费率
                     ProjectBudget view = list.get(i);
-                    cell0.setCellValue(getString(view.getProjectId()));
-                    cell1.setCellValue(getString(view.getProjectName()));
+                    cell0.setCellValue(getString(view.getProjectName()));
+                    cell1.setCellValue(getString(view.getProjectId()));
                     cell2.setCellValue(getString(view.getDesignUnit()));
                     cell3.setCellValue(getString(view.getConstructionUnit()));
                     cell4.setCellValue(getString(view.getBuildingAddress()));

src/main/webapp/webpage/modules/sg/financial/settlement/financeBudgetList.js

@@ -81,6 +81,9 @@
             columns: [
                 {
                 checkbox: true
+                },{
+                    field: 'projectName',
+                    title: '项目名称'
                 }
                 ,{
                     field: 'projectId',
@@ -91,10 +94,6 @@
                     }
                 }
                 ,{
-                    field: 'projectName',
-                    title: '项目名称'
-                }
-                ,{
                     field: 'designUnit',
                     title: '设计单位'
                 }