hj212 2005

src/main/java/com/cn/esermis/controller/DataAcquisitionInstrumentController.java

@@ -76,6 +76,7 @@ public class DataAcquisitionInstrumentController {
             wrapper.like("outlet_name", vo.getOutletName());
         }
         wrapper.orderByDesc("department_code");
+        wrapper.orderByAsc("outlet_code");
         IPage<DataAcquisitionInstrument> pageList = dataAcquisitionInstrumentService.page(page, wrapper);
         IPage<DataAcquisitionInstrumentVo> volits = new Page<>();
         if (!pageList.getRecords().isEmpty()) {
@@ -278,7 +279,7 @@ public class DataAcquisitionInstrumentController {
 
         ExcelReader excelReader = new ExcelReader();
         List<DataAllVo> data = excelReader.getData();
-        System.out.println(data);
+//        System.out.println(data);
         List<Department> departmentList =  dataAcquisitionInstrumentService.getDepartmentDit();
         // 添加公司编号
         for (DataAllVo datum : data) {

src/main/java/com/cn/esermis/dpld/entity/DataAcquisitionInstrument.java

@@ -44,8 +44,8 @@ public class DataAcquisitionInstrument {
      *建设投用日期
      */
     @TableField(value = "use_data")
-    @DateTimeFormat(pattern = "yyyy")
-    @JsonFormat(pattern = "yyyy",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date useData;
     /**
      * 是否完成验收备案(0否 1是)

src/main/java/com/cn/esermis/excelReader/ExcelReader.java

@@ -79,8 +79,8 @@ public class ExcelReader {
 //                instrumentVo.setDepartmentName();
 //                instrumentVo.setId();
                 instrumentVo.setOutletName(String.valueOf(x.get(6)!=null?x.get(6):""));
-                instrumentVo.setOutletCode(String.valueOf(x.get(6)!=null?x.get(6):""));
-                instrumentVo.setType(String.valueOf(x.get(6)!=null?x.get(6):"").equals("废气")?1:2);
+                instrumentVo.setOutletCode(String.valueOf(x.get(7)!=null?x.get(7):""));
+                instrumentVo.setType(String.valueOf(x.get(8)!=null?x.get(8):"").equals("废气")?1:2);
 //                instrumentVo.setUseData();
                 if (x.get(14)!=null
                         && !String.valueOf(x.get(14)).equals("是")){
@@ -120,18 +120,18 @@ public class ExcelReader {
                     instrumentVo.setCompanyCode(x.get(1)!=null? String.valueOf(x.get(1)) :"");
                 }
                 // 分析仪
-                instrumentVo.setBrand(x.get(20)!=null? String.valueOf(x.get(20)) :"");
-                instrumentVo.setModel(x.get(21)!=null? String.valueOf(x.get(21)) :"");
+                instrumentVo.setBrand(x.get(21)!=null? String.valueOf(x.get(21)) :"");
+                instrumentVo.setModel(x.get(22)!=null? String.valueOf(x.get(22)) :"");
                 instrumentVo.setName(x.get(20)!=null? String.valueOf(x.get(20)) :"");
 //                instrumentVo.setFactorInfor(x.get(22)!=null? String.valueOf(x.get(22)) :"");
 //                instrumentVo.setRange(x.get(23)!=null? String.valueOf(x.get(23)) :"");
 //                instrumentVo.setDataAcquisitionInstrumentId(x.get(24)!=null? String.valueOf(x.get(24)) :"");
-                instrumentVo.setReferenceOxygenContent(x.get(22)!=null? String.valueOf(x.get(22)) :"");
-                instrumentVo.setVelocityFieldCoefficient(x.get(23)!=null? String.valueOf(x.get(23)) :"");
-                instrumentVo.setPitotTubeCoefficient(x.get(24)!=null? String.valueOf(x.get(24)) :"");
-                instrumentVo.setKvalue(x.get(26)!=null? String.valueOf(x.get(26)) :"");
-                instrumentVo.setFlueArea(x.get(25)!=null? String.valueOf(x.get(25)) :"");
-                instrumentVo.setDilutionRatio(x.get(27)!=null? String.valueOf(x.get(27)) :"");
+                instrumentVo.setReferenceOxygenContent(x.get(23)!=null? String.valueOf(x.get(23)) :"");
+                instrumentVo.setVelocityFieldCoefficient(x.get(24)!=null? String.valueOf(x.get(24)) :"");
+                instrumentVo.setPitotTubeCoefficient(x.get(25)!=null? String.valueOf(x.get(25)) :"");
+                instrumentVo.setKvalue(x.get(27)!=null? String.valueOf(x.get(27)) :"");
+                instrumentVo.setFlueArea(x.get(26)!=null? String.valueOf(x.get(26)) :"");
+                instrumentVo.setDilutionRatio(x.get(28)!=null? String.valueOf(x.get(28)) :"");