LY sems bugfix

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevCcController.java

@@ -21,6 +21,7 @@ import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysDictData;
 import com.ruoyi.project.system.service.ISysDeptService;
 import com.ruoyi.project.system.service.ISysDictTypeService;
+import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.formula.functions.T;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
@@ -44,8 +45,7 @@ import org.springframework.web.multipart.MultipartFile;
  */
 @RestController
 @RequestMapping("/sems/specCc")
-public class TSpecdevCcController extends BaseController
-{
+public class TSpecdevCcController extends BaseController {
     @Autowired
     private ITSpecdevCcService tSpecdevCcService;
     @Autowired
@@ -54,13 +54,13 @@ public class TSpecdevCcController extends BaseController
     private ISysDeptService iSysDeptService;
     @Autowired
     private ISysDictTypeService iSysDictTypeService;
+
     /**
      * 查询特种设备叉车台账列表
      */
     @PreAuthorize("@ss.hasPermi('sems:specCc:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TSpecdevCc tSpecdevCc)
-    {
+    public TableDataInfo list(TSpecdevCc tSpecdevCc) {
         startPage();
         List<TSpecdevCc> list = tSpecdevCcService.selectTSpecdevCcList(tSpecdevCc);
         return getDataTable(list);
@@ -72,8 +72,7 @@ public class TSpecdevCcController extends BaseController
     @PreAuthorize("@ss.hasPermi('sems:specCc:export')")
     @Log(title = "特种设备叉车台账", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TSpecdevCc tSpecdevCc)
-    {
+    public AjaxResult export(TSpecdevCc tSpecdevCc) {
         List<TSpecdevCc> list = tSpecdevCcService.selectTSpecdevCcList(tSpecdevCc);
         ExcelUtil<TSpecdevCc> util = new ExcelUtil<TSpecdevCc>(TSpecdevCc.class);
         return util.exportExcel(list, "specCc");
@@ -84,8 +83,7 @@ public class TSpecdevCcController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('sems:specCc:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tSpecdevCcService.selectTSpecdevCcById(id));
     }
 
@@ -95,8 +93,7 @@ public class TSpecdevCcController extends BaseController
     @PreAuthorize("@ss.hasPermi('sems:specCc:add')")
     @Log(title = "特种设备叉车台账", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TSpecdevCc tSpecdevCc)
-    {
+    public AjaxResult add(@RequestBody TSpecdevCc tSpecdevCc) {
         return toAjax(tSpecdevCcService.insertTSpecdevCc(tSpecdevCc));
     }
 
@@ -106,10 +103,9 @@ public class TSpecdevCcController extends BaseController
     @PreAuthorize("@ss.hasPermi('sems:specCc:edit')")
     @Log(title = "特种设备叉车台账", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TSpecdevCc tSpecdevCc)
-    {
+    public AjaxResult edit(@RequestBody TSpecdevCc tSpecdevCc) {
         TSpecdevCc old = tSpecdevCcService.selectTSpecdevCcById(tSpecdevCc.getId());
-        if (!old.getReportNo().equals(tSpecdevCc.getReportNo())) {
+        if (StringUtils.isNotEmpty(tSpecdevCc.getReportNo()) && !tSpecdevCc.getReportNo().equals(old.getReportNo())) {
             TSpecCheck tc = new TSpecCheck();
             tc.setDevType(6l);
             tc.setCheckUnit(tSpecdevCc.getCheckUnit());
@@ -128,9 +124,8 @@ public class TSpecdevCcController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('sems:specCc:remove')")
     @Log(title = "特种设备叉车台账", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tSpecdevCcService.deleteTSpecdevCcByIds(ids));
     }
 
@@ -140,8 +135,7 @@ public class TSpecdevCcController extends BaseController
     @PreAuthorize("@ss.hasPermi('sems:plant:remove')")
     @Log(title = "特种设备叉车台账去重", businessType = BusinessType.OTHER)
     @GetMapping("/duplicate")
-    public AjaxResult duplicate()
-    {
+    public AjaxResult duplicate() {
         tSpecdevCcService.duplicateTSpecdevCc();
         return AjaxResult.success();
     }
@@ -152,12 +146,11 @@ public class TSpecdevCcController extends BaseController
     @PreAuthorize("@ss.hasPermi('sems:specCc:add')")
     @Log(title = "特种设备批量导入", businessType = BusinessType.INSERT)
     @PostMapping("/importData")
-    public AjaxResult importData(@RequestParam("file") MultipartFile file) throws IOException
-    {
+    public AjaxResult importData(@RequestParam("file") MultipartFile file) throws IOException {
         //获取操作人员ID
         Long userId = getUserId();
         //报错行数统计
-        List<Integer> failRow =new ArrayList<Integer>();
+        List<Integer> failRow = new ArrayList<Integer>();
         Workbook workbook = ExcelUtils.getWorkBook(file);
         Sheet sheet = workbook.getSheetAt(0);
         List<TSpecdevCc> list = new ArrayList<TSpecdevCc>();
@@ -187,11 +180,11 @@ public class TSpecdevCcController extends BaseController
                         entity.setPlantCode(cellValue);//装置名称
                     } else if (j == 2) {
                         entity.setUnit(cellValue);//使用部门
-                    }else if (j == 3) {
+                    } else if (j == 3) {
                         entity.setUseDept(cellValue);//使用部门
                     } else if (j == 4) {
                         entity.setPlantMaint(cellValue);//装置维护组
-                    }else if (j == 5) {
+                    } else if (j == 5) {
                         entity.setEngineer(cellValue);//装置维护人员
                     } else if (j == 6) {
                         entity.setCarNo(cellValue);//车牌号
@@ -211,9 +204,9 @@ public class TSpecdevCcController extends BaseController
                         entity.setEngineType(cellValue);//动力形式
                     } else if (j == 14) {
                         entity.setModel(cellValue);//型号
-                    }  else if (j == 15) {
+                    } else if (j == 15) {
                         entity.setFrameNo(cellValue);//车架号
-                    }  else if (j == 16) {
+                    } else if (j == 16) {
                         entity.setProductNo(cellValue);//产品编号
                     } else if (j == 17) {
                         entity.setCreateUnit(cellValue);//生产厂家
@@ -237,11 +230,11 @@ public class TSpecdevCcController extends BaseController
                         }
                     } else if (j == 24) {
                         entity.setReportNo(cellValue);//报告编号
-                    }else if (j == 25) {
+                    } else if (j == 25) {
                         entity.setAssetOwner(cellValue);//资产形式
                     } else if (j == 26) {
                         entity.setPerTestConclusion(cellValue);
-                    }else if (j == 27) {
+                    } else if (j == 27) {
                         entity.setRemarks(cellValue);//备注
                     }/*else if (j == 25) {
                         for (SysDept d : dept) {
@@ -254,7 +247,7 @@ public class TSpecdevCcController extends BaseController
                 entity.setCreaterCode(userId);
                 logger.info("entity:" + entity);
                 list.add(entity);
-            }catch (Exception e){
+            } catch (Exception e) {
                 failNumber++;
                 logger.info("e:" + JSON.toJSONString(e));
                 failRow.add(i + 1);
@@ -268,21 +261,20 @@ public class TSpecdevCcController extends BaseController
             try {
                 tSpecdevCcService.insertTSpecdevCc(t);
                 successNumber++;
-            }catch (Exception e){
+            } catch (Exception e) {
                 failNumber++;
                 logger.info("e:" + e);
                 failRow.add(failNum + 1);
             }
         }
         logger.info("list:" + JSON.toJSONString(list));
-        logger.info("successNumber:" +String.valueOf(successNumber));
-        logger.info("failNumber:" +String.valueOf(failNumber));
-        logger.info("failRow:" +String.valueOf(failRow));
+        logger.info("successNumber:" + String.valueOf(successNumber));
+        logger.info("failNumber:" + String.valueOf(failNumber));
+        logger.info("failRow:" + String.valueOf(failRow));
         return AjaxResult.success(String.valueOf(successNumber), failRow);
     }
 
 
-
     /**
      * 批量导入
      * 检验更新中的批量导入
@@ -290,11 +282,11 @@ public class TSpecdevCcController extends BaseController
     @PreAuthorize("@ss.hasPermi('sems:specCc:add')")
     @Log(title = "特种设备批量导入", businessType = BusinessType.INSERT)
     @PostMapping("/updateData")
-    public AjaxResult updateData(@RequestParam("file") MultipartFile file)throws IOException{
+    public AjaxResult updateData(@RequestParam("file") MultipartFile file) throws IOException {
         //获取操作人员ID
         Long userId = getUserId();
         //报错行数统计
-        List<Integer> failRow =new ArrayList<Integer>();
+        List<Integer> failRow = new ArrayList<Integer>();
         Workbook workbook = ExcelUtils.getWorkBook(file);
         Sheet sheet = workbook.getSheetAt(0);
         List<TSpecdevCc> list = new ArrayList<TSpecdevCc>();
@@ -343,8 +335,7 @@ public class TSpecdevCcController extends BaseController
                         }
                     } else if (j == 6) {
                         entity.setReportNo(cellValue);
-                    }
-                    else if (j == 7) {
+                    } else if (j == 7) {
                         entity.setPerTestConclusion(cellValue);
                     }
                 }
@@ -352,7 +343,7 @@ public class TSpecdevCcController extends BaseController
                 list.add(entity);
                 oldEntity = entity;
                 oldList.add(oldEntity);
-            }catch (Exception e){
+            } catch (Exception e) {
                 failNumber++;
                 logger.info("e:" + JSON.toJSONString(e));
                 failRow.add(i + 1);
@@ -371,14 +362,14 @@ public class TSpecdevCcController extends BaseController
                                         .eq("PLANT_CODE", t.getPlantCode())
                         );
                 successNumber++;
-            }catch (Exception e){
+            } catch (Exception e) {
                 failNumber++;
                 logger.info("e:" + e);
                 failRow.add(failNum + 1);
                 e.printStackTrace();
             }
         }
-        for (TSpecdevCc t: oldList) {
+        for (TSpecdevCc t : oldList) {
             TSpecCheck tc = new TSpecCheck();
             tc.setDevType(6l);
             tc.setCheckUnit(t.getCheckUnit());
@@ -390,10 +381,10 @@ public class TSpecdevCcController extends BaseController
             tSpecCheckService.insertTSpecCheck(tc);
         }
         logger.info("list:" + JSON.toJSONString(list));
-        logger.info("successNumber:" +String.valueOf(successNumber));
-        logger.info("failNumber:" +String.valueOf(failNumber));
-        logger.info("failRow:" +String.valueOf(failRow));
-        return AjaxResult.success(String.valueOf(successNumber),failRow);
+        logger.info("successNumber:" + String.valueOf(successNumber));
+        logger.info("failNumber:" + String.valueOf(failNumber));
+        logger.info("failRow:" + String.valueOf(failRow));
+        return AjaxResult.success(String.valueOf(successNumber), failRow);
     }
 
 
@@ -404,25 +395,25 @@ public class TSpecdevCcController extends BaseController
         String[] ids = id.split(",");
         List<TSpecdevCc> list = new ArrayList<>();
         for (String i : ids
-                ) {
-                    TSpecdevCc ccEntity = tSpecdevCcService.getById(i);
-                    list.add(ccEntity);
-                }
+        ) {
+            TSpecdevCc ccEntity = tSpecdevCcService.getById(i);
+            list.add(ccEntity);
+        }
         SXSSFWorkbook wb = new SXSSFWorkbook(1000);
         CellStyle wrapStyle = wb.createCellStyle();
         wrapStyle.setWrapText(true);    //设置自动换行
         //创建sheet页
         Sheet sheet = wb.createSheet("sheet1");
         //设置列的宽度，第一个参数为列的序号，从0开始，第二参数为列宽，单位1/256个字节
-        sheet.setColumnWidth(0, 12*256);
-        sheet.setColumnWidth(1, 26*256);
-        sheet.setColumnWidth(2, 26*256);
-        sheet.setColumnWidth(3, 26*256);
-        sheet.setColumnWidth(4, 26*256);
-        sheet.setColumnWidth(5, 26*256);
-        sheet.setColumnWidth(6, 26*256);
-        sheet.setColumnWidth(7, 26*256);
-        sheet.setColumnWidth(8, 40*256);
+        sheet.setColumnWidth(0, 12 * 256);
+        sheet.setColumnWidth(1, 26 * 256);
+        sheet.setColumnWidth(2, 26 * 256);
+        sheet.setColumnWidth(3, 26 * 256);
+        sheet.setColumnWidth(4, 26 * 256);
+        sheet.setColumnWidth(5, 26 * 256);
+        sheet.setColumnWidth(6, 26 * 256);
+        sheet.setColumnWidth(7, 26 * 256);
+        sheet.setColumnWidth(8, 40 * 256);
         //设置开始行和开始列
 
         Row row0 = sheet.createRow(0);
@@ -440,24 +431,28 @@ public class TSpecdevCcController extends BaseController
         row0.createCell(1).setCellValue("装置");
         row0.createCell(2).setCellValue("车牌号");
         row0.createCell(3).setCellValue("档案号");
-        row0.createCell(4).setCellValue("检验日期");row0.getCell(4).setCellStyle(style);
-        row0.createCell(5).setCellValue("下次检验日期");row0.getCell(5).setCellStyle(style);
-        row0.createCell(6).setCellValue("报告编号");row0.getCell(6).setCellStyle(style);
-        row0.createCell(7).setCellValue("定期检验结论");row0.getCell(7).setCellStyle(style);
+        row0.createCell(4).setCellValue("检验日期");
+        row0.getCell(4).setCellStyle(style);
+        row0.createCell(5).setCellValue("下次检验日期");
+        row0.getCell(5).setCellStyle(style);
+        row0.createCell(6).setCellValue("报告编号");
+        row0.getCell(6).setCellStyle(style);
+        row0.createCell(7).setCellValue("定期检验结论");
+        row0.getCell(7).setCellStyle(style);
         //填充数据
         int rowIndex = 1;
         int columnIndex = 1;
-        for (TSpecdevCc t: list
-             ) {
+        for (TSpecdevCc t : list
+        ) {
             Row row = sheet.createRow(rowIndex);
             row.createCell(0).setCellValue(t.getId());
             row.createCell(1).setCellValue(t.getPlantCode());
             row.createCell(2).setCellValue(t.getCarNo());
             row.createCell(3).setCellValue(t.getDocno());
-            if (t.getWarnDate()!= null){
+            if (t.getWarnDate() != null) {
                 row.createCell(4).setCellValue(new SimpleDateFormat("yyyy-MM-dd").format(t.getWarnDate()));
             }
-            if (t.getNextWarnDate()!= null){
+            if (t.getNextWarnDate() != null) {
                 row.createCell(5).setCellValue(new SimpleDateFormat("yyyy-MM-dd").format(t.getNextWarnDate()));
             }
             row.createCell(6).setCellValue(t.getReportNo());

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevDtController.java

@@ -17,6 +17,7 @@ import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysDictData;
 import com.ruoyi.project.system.service.ISysDeptService;
 import com.ruoyi.project.system.service.ISysDictTypeService;
+import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -40,8 +41,7 @@ import org.springframework.web.multipart.MultipartFile;
  */
 @RestController
 @RequestMapping("/sems/specDt")
-public class TSpecdevDtController extends BaseController
-{
+public class TSpecdevDtController extends BaseController {
     @Autowired
     private ITSpecdevDtService tSpecdevDtService;
     @Autowired
@@ -56,8 +56,7 @@ public class TSpecdevDtController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('sems:specDt:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TSpecdevDt tSpecdevDt)
-    {
+    public TableDataInfo list(TSpecdevDt tSpecdevDt) {
         startPage();
         List<TSpecdevDt> list = tSpecdevDtService.selectTSpecdevDtList(tSpecdevDt);
         return getDataTable(list);
@@ -69,8 +68,7 @@ public class TSpecdevDtController extends BaseController
     @PreAuthorize("@ss.hasPermi('sems:specDt:export')")
     @Log(title = "特种设备电梯台账", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TSpecdevDt tSpecdevDt)
-    {
+    public AjaxResult export(TSpecdevDt tSpecdevDt) {
         List<TSpecdevDt> list = tSpecdevDtService.selectTSpecdevDtList(tSpecdevDt);
         ExcelUtil<TSpecdevDt> util = new ExcelUtil<TSpecdevDt>(TSpecdevDt.class);
         return util.exportExcel(list, "specDt");
@@ -81,8 +79,7 @@ public class TSpecdevDtController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('sems:specDt:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tSpecdevDtService.selectTSpecdevDtById(id));
     }
 
@@ -92,8 +89,7 @@ public class TSpecdevDtController extends BaseController
     @PreAuthorize("@ss.hasPermi('sems:specDt:add')")
     @Log(title = "特种设备电梯台账", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TSpecdevDt tSpecdevDt)
-    {
+    public AjaxResult add(@RequestBody TSpecdevDt tSpecdevDt) {
         return toAjax(tSpecdevDtService.insertTSpecdevDt(tSpecdevDt));
     }
 
@@ -103,10 +99,9 @@ public class TSpecdevDtController extends BaseController
     @PreAuthorize("@ss.hasPermi('sems:specDt:edit')")
     @Log(title = "特种设备电梯台账", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TSpecdevDt tSpecdevDt)
-    {
+    public AjaxResult edit(@RequestBody TSpecdevDt tSpecdevDt) {
         TSpecdevDt old = tSpecdevDtService.selectTSpecdevDtById(tSpecdevDt.getId());
-        if (!old.getReportNo().equals(tSpecdevDt.getReportNo())) {
+        if (StringUtils.isNotEmpty(tSpecdevDt.getReportNo()) && !tSpecdevDt.getReportNo().equals(old.getReportNo())) {
             TSpecCheck tc = new TSpecCheck();
             tc.setDevType(5l);
             tc.setCheckUnit(tSpecdevDt.getCheckUnit());
@@ -125,9 +120,8 @@ public class TSpecdevDtController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('sems:specDt:remove')")
     @Log(title = "特种设备电梯台账", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tSpecdevDtService.deleteTSpecdevDtByIds(ids));
     }
 
@@ -137,8 +131,7 @@ public class TSpecdevDtController extends BaseController
     @PreAuthorize("@ss.hasPermi('sems:plant:remove')")
     @Log(title = "特种设备电梯台账去重", businessType = BusinessType.OTHER)
     @GetMapping("/duplicate")
-    public AjaxResult duplicate()
-    {
+    public AjaxResult duplicate() {
         tSpecdevDtService.duplicateTSpecdevDt();
         return AjaxResult.success();
     }
@@ -149,12 +142,11 @@ public class TSpecdevDtController extends BaseController
     @PreAuthorize("@ss.hasPermi('sems:specDt:add')")
     @Log(title = "特种设备批量导入", businessType = BusinessType.INSERT)
     @PostMapping("/importData")
-    public AjaxResult importData(@RequestParam("file") MultipartFile file) throws IOException
-    {
+    public AjaxResult importData(@RequestParam("file") MultipartFile file) throws IOException {
         //获取操作人员ID
         Long userId = getUserId();
         //报错行数统计
-        List<Integer> failRow =new ArrayList<Integer>();
+        List<Integer> failRow = new ArrayList<Integer>();
         Workbook workbook = ExcelUtils.getWorkBook(file);
         Sheet sheet = workbook.getSheetAt(0);
         List<TSpecdevDt> list = new ArrayList<TSpecdevDt>();
@@ -184,13 +176,13 @@ public class TSpecdevDtController extends BaseController
                         entity.setPlantCode(cellValue);//装置名称
                     } else if (j == 2) {
                         entity.setUnit(cellValue);//单元
-                    }else if (j == 3) {
+                    } else if (j == 3) {
                         entity.setDocno(cellValue);//档案号
                     } else if (j == 4) {
                         entity.setUseDept(cellValue);// 使用部门
-                    }else if (j == 5) {
+                    } else if (j == 5) {
                         entity.setPlantMaint(cellValue);// 装置维修组
-                    }else if (j == 6) {
+                    } else if (j == 6) {
                         entity.setDevname(cellValue);//名称
                     } else if (j == 7) {
                         entity.setRegno(cellValue);//设备注册编号
@@ -220,7 +212,7 @@ public class TSpecdevDtController extends BaseController
                         if (cellValue.length() > 3) {//下次年检日期
                             entity.setNextWarnDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                         }
-                    }  else if (j == 18) {
+                    } else if (j == 18) {
                         entity.setPerTestConclusion(cellValue);//备注
                     } else if (j == 19) {
                         entity.setRemarks(cellValue);//备注
@@ -236,7 +228,7 @@ public class TSpecdevDtController extends BaseController
                 entity.setCreaterCode(userId);
                 logger.info("entity:" + entity);
                 list.add(entity);
-            }catch (Exception e){
+            } catch (Exception e) {
                 failNumber++;
                 logger.info("e:" + JSON.toJSONString(e));
                 failRow.add(i + 1);
@@ -250,16 +242,16 @@ public class TSpecdevDtController extends BaseController
             try {
                 tSpecdevDtService.insertTSpecdevDt(t);
                 successNumber++;
-            }catch (Exception e){
+            } catch (Exception e) {
                 failNumber++;
                 logger.info("e:" + e);
                 failRow.add(failNum + 1);
             }
         }
         logger.info("list:" + JSON.toJSONString(list));
-        logger.info("successNumber:" +String.valueOf(successNumber));
-        logger.info("failNumber:" +String.valueOf(failNumber));
-        logger.info("failRow:" +String.valueOf(failRow));
+        logger.info("successNumber:" + String.valueOf(successNumber));
+        logger.info("failNumber:" + String.valueOf(failNumber));
+        logger.info("failRow:" + String.valueOf(failRow));
         return AjaxResult.success(String.valueOf(successNumber), failRow);
     }
 
@@ -270,11 +262,11 @@ public class TSpecdevDtController extends BaseController
     @PreAuthorize("@ss.hasPermi('sems:specDt:add')")
     @Log(title = "特种设备批量导入", businessType = BusinessType.INSERT)
     @PostMapping("/updateData")
-    public AjaxResult updateData(@RequestParam("file") MultipartFile file)throws IOException{
+    public AjaxResult updateData(@RequestParam("file") MultipartFile file) throws IOException {
         //获取操作人员ID
         Long userId = getUserId();
         //报错行数统计
-        List<Integer> failRow =new ArrayList<Integer>();
+        List<Integer> failRow = new ArrayList<Integer>();
         Workbook workbook = ExcelUtils.getWorkBook(file);
         Sheet sheet = workbook.getSheetAt(0);
         List<TSpecdevDt> list = new ArrayList<TSpecdevDt>();
@@ -335,7 +327,7 @@ public class TSpecdevDtController extends BaseController
                 list.add(entity);
                 oldEntity = entity;
                 oldList.add(oldEntity);
-            }catch (Exception e){
+            } catch (Exception e) {
                 failNumber++;
                 logger.info("e:" + JSON.toJSONString(e));
                 failRow.add(i + 1);
@@ -353,14 +345,14 @@ public class TSpecdevDtController extends BaseController
                                         .eq("PLANT_CODE", t.getPlantCode())
                         );
                 successNumber++;
-            }catch (Exception e){
+            } catch (Exception e) {
                 failNumber++;
                 logger.info("e:" + e);
                 failRow.add(failNum + 1);
                 e.printStackTrace();
             }
         }
-        for (TSpecdevDt t :oldList) {
+        for (TSpecdevDt t : oldList) {
             TSpecCheck tc = new TSpecCheck();
             tc.setDevType(5l);
             tc.setCheckUnit(t.getCheckUnit());
@@ -372,10 +364,10 @@ public class TSpecdevDtController extends BaseController
             tSpecCheckService.insertTSpecCheck(tc);
         }
         logger.info("list:" + JSON.toJSONString(list));
-        logger.info("successNumber:" +String.valueOf(successNumber));
-        logger.info("failNumber:" +String.valueOf(failNumber));
-        logger.info("failRow:" +String.valueOf(failRow));
-        return AjaxResult.success(String.valueOf(successNumber),failRow);
+        logger.info("successNumber:" + String.valueOf(successNumber));
+        logger.info("failNumber:" + String.valueOf(failNumber));
+        logger.info("failRow:" + String.valueOf(failRow));
+        return AjaxResult.success(String.valueOf(successNumber), failRow);
     }
 
     @GetMapping("/exportDevList")
@@ -395,16 +387,16 @@ public class TSpecdevDtController extends BaseController
         //创建sheet页
         Sheet sheet = wb.createSheet("sheet1");
         //设置列的宽度，第一个参数为列的序号，从0开始，第二参数为列宽，单位1/256个字节
-        sheet.setColumnWidth(0, 12*256);
-        sheet.setColumnWidth(1, 26*256);
-        sheet.setColumnWidth(2, 26*256);
-        sheet.setColumnWidth(3, 26*256);
-        sheet.setColumnWidth(4, 26*256);
-        sheet.setColumnWidth(5, 26*256);
-        sheet.setColumnWidth(6, 26*256);
-        sheet.setColumnWidth(7, 26*256);
-        sheet.setColumnWidth(8, 40*256);
-        sheet.setColumnWidth(9, 40*256);
+        sheet.setColumnWidth(0, 12 * 256);
+        sheet.setColumnWidth(1, 26 * 256);
+        sheet.setColumnWidth(2, 26 * 256);
+        sheet.setColumnWidth(3, 26 * 256);
+        sheet.setColumnWidth(4, 26 * 256);
+        sheet.setColumnWidth(5, 26 * 256);
+        sheet.setColumnWidth(6, 26 * 256);
+        sheet.setColumnWidth(7, 26 * 256);
+        sheet.setColumnWidth(8, 40 * 256);
+        sheet.setColumnWidth(9, 40 * 256);
         //设置开始行和开始列
 
         Row row0 = sheet.createRow(0);
@@ -423,15 +415,20 @@ public class TSpecdevDtController extends BaseController
         row0.createCell(2).setCellValue("档案号");
         row0.createCell(3).setCellValue("型号");
         row0.createCell(4).setCellValue("使用地点");
-        row0.createCell(5).setCellValue("检验日期");row0.getCell(5).setCellStyle(style);
-        row0.createCell(6).setCellValue("检验单位");row0.getCell(6).setCellStyle(style);
-        row0.createCell(7).setCellValue("报告编号");row0.getCell(7).setCellStyle(style);
-        row0.createCell(8).setCellValue("下次检验日期");row0.getCell(8).setCellStyle(style);
-        row0.createCell(9).setCellValue("定期检验结论");row0.getCell(9).setCellStyle(style);
+        row0.createCell(5).setCellValue("检验日期");
+        row0.getCell(5).setCellStyle(style);
+        row0.createCell(6).setCellValue("检验单位");
+        row0.getCell(6).setCellStyle(style);
+        row0.createCell(7).setCellValue("报告编号");
+        row0.getCell(7).setCellStyle(style);
+        row0.createCell(8).setCellValue("下次检验日期");
+        row0.getCell(8).setCellStyle(style);
+        row0.createCell(9).setCellValue("定期检验结论");
+        row0.getCell(9).setCellStyle(style);
         //填充数据
         int rowIndex = 1;
         int columnIndex = 1;
-        for (TSpecdevDt t: list
+        for (TSpecdevDt t : list
         ) {
             Row row = sheet.createRow(rowIndex);
             row.createCell(0).setCellValue(t.getId());
@@ -439,12 +436,12 @@ public class TSpecdevDtController extends BaseController
             row.createCell(2).setCellValue(t.getDocno());
             row.createCell(3).setCellValue(t.getModel());
             row.createCell(4).setCellValue(t.getLocation());
-            if (t.getWarnDate()!= null){
+            if (t.getWarnDate() != null) {
                 row.createCell(5).setCellValue(new SimpleDateFormat("yyyy-MM-dd").format(t.getWarnDate()));
             }
             row.createCell(6).setCellValue(t.getCheckUnit());
             row.createCell(7).setCellValue(t.getReportNo());
-            if (t.getNextWarnDate()!= null){
+            if (t.getNextWarnDate() != null) {
                 row.createCell(8).setCellValue(new SimpleDateFormat("yyyy-MM-dd").format(t.getNextWarnDate()));
             }
             row.createCell(9).setCellValue(t.getPerTestConclusion());

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevDzsbController.java

@@ -19,6 +19,7 @@ import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysDictData;
 import com.ruoyi.project.system.service.ISysDeptService;
 import com.ruoyi.project.system.service.ISysDictTypeService;
+import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -41,8 +42,7 @@ import org.springframework.web.multipart.MultipartFile;
  */
 @RestController
 @RequestMapping("/sems/specDzsb")
-public class TSpecdevDzsbController extends BaseController
-{
+public class TSpecdevDzsbController extends BaseController {
     @Autowired
     private ITSpecdevDzsbService tSpecdevDzsbService;
     @Autowired
@@ -51,13 +51,13 @@ public class TSpecdevDzsbController extends BaseController
     private ISysDeptService iSysDeptService;
     @Autowired
     private ISysDictTypeService iSysDictTypeService;
+
     /**
      * 查询特种设备吊装设备台账列表
      */
     @PreAuthorize("@ss.hasPermi('sems:specDzsb:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TSpecdevDzsb tSpecdevDzsb)
-    {
+    public TableDataInfo list(TSpecdevDzsb tSpecdevDzsb) {
         startPage();
         List<TSpecdevDzsb> list = tSpecdevDzsbService.selectTSpecdevDzsbList(tSpecdevDzsb);
         return getDataTable(list);
@@ -69,8 +69,7 @@ public class TSpecdevDzsbController extends BaseController
     @PreAuthorize("@ss.hasPermi('sems:specDzsb:export')")
     @Log(title = "特种设备吊装设备台账", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TSpecdevDzsb tSpecdevDzsb)
-    {
+    public AjaxResult export(TSpecdevDzsb tSpecdevDzsb) {
         List<TSpecdevDzsb> list = tSpecdevDzsbService.selectTSpecdevDzsbList(tSpecdevDzsb);
         ExcelUtil<TSpecdevDzsb> util = new ExcelUtil<TSpecdevDzsb>(TSpecdevDzsb.class);
         return util.exportExcel(list, "specDzsb");
@@ -81,8 +80,7 @@ public class TSpecdevDzsbController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('sems:specDzsb:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tSpecdevDzsbService.selectTSpecdevDzsbById(id));
     }
 
@@ -92,8 +90,7 @@ public class TSpecdevDzsbController extends BaseController
     @PreAuthorize("@ss.hasPermi('sems:specDzsb:add')")
     @Log(title = "特种设备吊装设备台账", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TSpecdevDzsb tSpecdevDzsb)
-    {
+    public AjaxResult add(@RequestBody TSpecdevDzsb tSpecdevDzsb) {
 
         return toAjax(tSpecdevDzsbService.insertTSpecdevDzsb(tSpecdevDzsb));
     }
@@ -104,10 +101,9 @@ public class TSpecdevDzsbController extends BaseController
     @PreAuthorize("@ss.hasPermi('sems:specDzsb:edit')")
     @Log(title = "特种设备吊装设备台账", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TSpecdevDzsb tSpecdevDzsb)
-    {
+    public AjaxResult edit(@RequestBody TSpecdevDzsb tSpecdevDzsb) {
         TSpecdevDzsb old = tSpecdevDzsbService.selectTSpecdevDzsbById(tSpecdevDzsb.getId());
-        if (!old.getReportNo().equals(tSpecdevDzsb.getReportNo())) {
+        if (StringUtils.isNotEmpty(tSpecdevDzsb.getReportNo()) && !tSpecdevDzsb.getReportNo().equals(old.getReportNo())) {
             TSpecCheck tc = new TSpecCheck();
             tc.setDevType(3l);
             tc.setCheckUnit(tSpecdevDzsb.getCheckUnit());
@@ -126,9 +122,8 @@ public class TSpecdevDzsbController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('sems:specDzsb:remove')")
     @Log(title = "特种设备吊装设备台账", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tSpecdevDzsbService.deleteTSpecdevDzsbByIds(ids));
     }
 
@@ -138,8 +133,7 @@ public class TSpecdevDzsbController extends BaseController
     @PreAuthorize("@ss.hasPermi('sems:plant:remove')")
     @Log(title = "特种设备起重机械台账去重", businessType = BusinessType.OTHER)
     @GetMapping("/duplicate")
-    public AjaxResult duplicate()
-    {
+    public AjaxResult duplicate() {
         tSpecdevDzsbService.duplicateTSpecdevDzsb();
         return AjaxResult.success();
     }
@@ -150,12 +144,11 @@ public class TSpecdevDzsbController extends BaseController
     @PreAuthorize("@ss.hasPermi('sems:specDzsb:add')")
     @Log(title = "特种设备批量导入", businessType = BusinessType.INSERT)
     @PostMapping("/importData")
-    public AjaxResult importData(@RequestParam("file") MultipartFile file) throws IOException
-    {
+    public AjaxResult importData(@RequestParam("file") MultipartFile file) throws IOException {
         //获取操作人员ID
         Long userId = getUserId();
         //报错行数统计
-        List<Integer> failRow =new ArrayList<Integer>();
+        List<Integer> failRow = new ArrayList<Integer>();
         Workbook workbook = ExcelUtils.getWorkBook(file);
         Sheet sheet = workbook.getSheetAt(0);
         List<TSpecdevDzsb> list = new ArrayList<TSpecdevDzsb>();
@@ -187,19 +180,19 @@ public class TSpecdevDzsbController extends BaseController
                         entity.setPlantCode(cellValue);//装置
                     } else if (j == 2) {
                         entity.setUnit(cellValue);//装置维修组
-                    }else if (j == 3) {
+                    } else if (j == 3) {
                         entity.setPlantMaint(cellValue);//装置维修组
                     } else if (j == 4) {
                         entity.setEngineer(cellValue);//装置维修工程师
                     } else if (j == 5) {
                         entity.setDevname(cellValue);//设备名称
-                    }else if (j == 6) {
+                    } else if (j == 6) {
                         entity.setDevno(cellValue);//设备位号
-                    }else if (j == 7) {
+                    } else if (j == 7) {
                         entity.setDocno(cellValue);//档案号
                     } else if (j == 8) {
                         entity.setFactoryNo(cellValue);//出厂编号
-                    }else if (j == 9) {
+                    } else if (j == 9) {
                         entity.setModel(cellValue);//设备型号
                     } else if (j == 10) {
                         entity.setCapacity(cellValue);//起吊重量
@@ -207,7 +200,7 @@ public class TSpecdevDzsbController extends BaseController
                         entity.setLocation(cellValue);//设备使用地点
                     } else if (j == 12) {
                         entity.setRegno(cellValue);//设备注册编号
-                    }else if (j == 13) {
+                    } else if (j == 13) {
                         entity.setDevCode(cellValue);//设备代码
                     } else if (j == 14) {
                         if (cellValue.length() > 3) {//投用日期
@@ -215,7 +208,7 @@ public class TSpecdevDzsbController extends BaseController
                         }
                     } else if (j == 15) {
                         entity.setCreateUnit(cellValue);//制造单位
-                    }else if (j == 16) {
+                    } else if (j == 16) {
                         entity.setIsEx(cellValue);//是否防爆
                     } else if (j == 17) {
                         entity.setCheckStrategy(cellValue);//检验策略
@@ -233,7 +226,7 @@ public class TSpecdevDzsbController extends BaseController
                         }
                     } else if (j == 22) {    //检验结论
                         entity.setPerTestConclusion(cellValue);
-                    }else if (j == 23) {
+                    } else if (j == 23) {
                         entity.setRemarks(cellValue);//备注
                     }/*else if (j == 20) {
                         for (SysDept d : dept) {
@@ -247,7 +240,7 @@ public class TSpecdevDzsbController extends BaseController
                 entity.setCreaterCode(userId);
                 logger.info("entity:" + JSON.toJSONString(entity));
                 list.add(entity);
-            }catch (Exception e){
+            } catch (Exception e) {
                 failNumber++;
                 logger.error("e:" + JSON.toJSONString(e));
                 failRow.add(i + 1);
@@ -261,16 +254,16 @@ public class TSpecdevDzsbController extends BaseController
             try {
                 tSpecdevDzsbService.insertTSpecdevDzsb(t);
                 successNumber++;
-            }catch (Exception e){
+            } catch (Exception e) {
                 failNumber++;
                 logger.error("e:" + e);
                 failRow.add(failNum + 1);
             }
         }
         logger.info("list:" + JSON.toJSONString(list));
-        logger.info("successNumber:" +String.valueOf(successNumber));
-        logger.info("failNumber:" +String.valueOf(failNumber));
-        logger.info("failRow:" +String.valueOf(failRow));
+        logger.info("successNumber:" + String.valueOf(successNumber));
+        logger.info("failNumber:" + String.valueOf(failNumber));
+        logger.info("failRow:" + String.valueOf(failRow));
         return AjaxResult.success(String.valueOf(successNumber), failRow);
     }
 
@@ -285,7 +278,7 @@ public class TSpecdevDzsbController extends BaseController
         //获取操作人员ID
         Long userId = getUserId();
         //报错行数统计
-        List<Integer> failRow =new ArrayList<Integer>();
+        List<Integer> failRow = new ArrayList<Integer>();
         Workbook workbook = ExcelUtils.getWorkBook(file);
         Sheet sheet = workbook.getSheetAt(0);
         List<TSpecdevDzsb> list = new ArrayList<TSpecdevDzsb>();
@@ -299,53 +292,53 @@ public class TSpecdevDzsbController extends BaseController
         int failNumber = 0;
         for (int i = 1; i < rowNum; i++) {
 //            try {
-                logger.info("读取行数：" + i);
-                Row row = sheet.getRow(i);
-                int cellNum = row.getLastCellNum();
-                TSpecdevDzsb entity = new TSpecdevDzsb();
-                for (int j = 0; j < cellNum; j++) {
-                    Cell cell = row.getCell(j);
-                    if (cell == null) {
-                        continue;
-                    }
-                    String cellValue = ExcelUtils.getCellValue(cell);
-                    logger.info("cellValue:" + cellValue);
+            logger.info("读取行数：" + i);
+            Row row = sheet.getRow(i);
+            int cellNum = row.getLastCellNum();
+            TSpecdevDzsb entity = new TSpecdevDzsb();
+            for (int j = 0; j < cellNum; j++) {
+                Cell cell = row.getCell(j);
+                if (cell == null) {
+                    continue;
+                }
+                String cellValue = ExcelUtils.getCellValue(cell);
+                logger.info("cellValue:" + cellValue);
 
-                    if (j == 0) {
-                        //序号
-                        Double d = Double.parseDouble(cellValue);
-                        long s = new Double(d).longValue();
-                        entity.setId(s);
-                    } else if (j == 1) {    //装置
-                        entity.setPlantCode(cellValue);
-                    } else if (j == 3) {    //设备位号
-                        entity.setDevno(cellValue);
-                    } else if (j == 4) {    //档案号
-                        entity.setDocno(cellValue);
-                    } else if (j == 2) {    //设备名称
-                        entity.setDevname(cellValue);
-                    } else if (j == 5) {    //检验单位
-                        entity.setCheckUnit(cellValue);
-                    } else if (j == 6) {    //检验日期
-                        logger.info("日期格式：" + cellValue);
-                        if (cellValue.length() > 3) {
-                            entity.setWarnDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
-                        }
-                    } else if (j == 7) {    //报告编号
-                        entity.setReportNo(cellValue);
-                    } else if (j == 8) {    //下次检验日期
-                        logger.info("日期格式：" + cellValue);
-                        if (cellValue.length() > 3) {
-                            entity.setNextWarnDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
-                        }
-                    } else if (j == 9) {    //
-                        entity.setPerTestConclusion(cellValue);
+                if (j == 0) {
+                    //序号
+                    Double d = Double.parseDouble(cellValue);
+                    long s = new Double(d).longValue();
+                    entity.setId(s);
+                } else if (j == 1) {    //装置
+                    entity.setPlantCode(cellValue);
+                } else if (j == 3) {    //设备位号
+                    entity.setDevno(cellValue);
+                } else if (j == 4) {    //档案号
+                    entity.setDocno(cellValue);
+                } else if (j == 2) {    //设备名称
+                    entity.setDevname(cellValue);
+                } else if (j == 5) {    //检验单位
+                    entity.setCheckUnit(cellValue);
+                } else if (j == 6) {    //检验日期
+                    logger.info("日期格式：" + cellValue);
+                    if (cellValue.length() > 3) {
+                        entity.setWarnDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                     }
+                } else if (j == 7) {    //报告编号
+                    entity.setReportNo(cellValue);
+                } else if (j == 8) {    //下次检验日期
+                    logger.info("日期格式：" + cellValue);
+                    if (cellValue.length() > 3) {
+                        entity.setNextWarnDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
+                    }
+                } else if (j == 9) {    //
+                    entity.setPerTestConclusion(cellValue);
                 }
-                logger.info("entity:" + JSON.toJSONString(entity));
-                list.add(entity);
-                oldEntity = entity;
-                oldList.add(oldEntity);
+            }
+            logger.info("entity:" + JSON.toJSONString(entity));
+            list.add(entity);
+            oldEntity = entity;
+            oldList.add(oldEntity);
 //            }catch (Exception e){
 //                failNumber++;
 //                logger.info("e:" + JSON.toJSONString(e));
@@ -364,14 +357,14 @@ public class TSpecdevDzsbController extends BaseController
                                         .eq("PLANT_CODE", t.getPlantCode())
                         );
                 successNumber++;
-            }catch (Exception e){
+            } catch (Exception e) {
                 failNumber++;
                 logger.error("e:" + e);
                 failRow.add(failNum + 1);
                 e.printStackTrace();
             }
         }
-        for (TSpecdevDzsb t:oldList) {
+        for (TSpecdevDzsb t : oldList) {
             TSpecCheck tc = new TSpecCheck();
             tc.setDevType(3l);
             tc.setCheckUnit(t.getCheckUnit());
@@ -383,10 +376,10 @@ public class TSpecdevDzsbController extends BaseController
             tSpecCheckService.insertTSpecCheck(tc);
         }
         logger.info("list:" + JSON.toJSONString(list));
-        logger.info("successNumber:" +String.valueOf(successNumber));
-        logger.info("failNumber:" +String.valueOf(failNumber));
-        logger.info("failRow:" +String.valueOf(failRow));
-        return AjaxResult.success(String.valueOf(successNumber),failRow);
+        logger.info("successNumber:" + String.valueOf(successNumber));
+        logger.info("failNumber:" + String.valueOf(failNumber));
+        logger.info("failRow:" + String.valueOf(failRow));
+        return AjaxResult.success(String.valueOf(successNumber), failRow);
     }
 
     @GetMapping("/exportDevList")
@@ -406,16 +399,16 @@ public class TSpecdevDzsbController extends BaseController
         //创建sheet页
         Sheet sheet = wb.createSheet("sheet1");
         //设置列的宽度，第一个参数为列的序号，从0开始，第二参数为列宽，单位1/256个字节
-        sheet.setColumnWidth(0, 12*256);
-        sheet.setColumnWidth(1, 26*256);
-        sheet.setColumnWidth(2, 26*256);
-        sheet.setColumnWidth(3, 26*256);
-        sheet.setColumnWidth(4, 26*256);
-        sheet.setColumnWidth(5, 26*256);
-        sheet.setColumnWidth(6, 26*256);
-        sheet.setColumnWidth(7, 26*256);
-        sheet.setColumnWidth(8, 40*256);
-        sheet.setColumnWidth(9, 40*256);
+        sheet.setColumnWidth(0, 12 * 256);
+        sheet.setColumnWidth(1, 26 * 256);
+        sheet.setColumnWidth(2, 26 * 256);
+        sheet.setColumnWidth(3, 26 * 256);
+        sheet.setColumnWidth(4, 26 * 256);
+        sheet.setColumnWidth(5, 26 * 256);
+        sheet.setColumnWidth(6, 26 * 256);
+        sheet.setColumnWidth(7, 26 * 256);
+        sheet.setColumnWidth(8, 40 * 256);
+        sheet.setColumnWidth(9, 40 * 256);
         //设置开始行和开始列
 
         Row row0 = sheet.createRow(0);
@@ -434,15 +427,20 @@ public class TSpecdevDzsbController extends BaseController
         row0.createCell(2).setCellValue("设备位号");
         row0.createCell(3).setCellValue("档案号");
         row0.createCell(4).setCellValue("设备名称");
-        row0.createCell(5).setCellValue("检验单位");row0.getCell(5).setCellStyle(style);
-        row0.createCell(6).setCellValue("检验日期");row0.getCell(6).setCellStyle(style);
-        row0.createCell(7).setCellValue("报告编号");row0.getCell(7).setCellStyle(style);
-        row0.createCell(8).setCellValue("下次检验日期");row0.getCell(8).setCellStyle(style);
-        row0.createCell(9).setCellValue("定期检验结论");row0.getCell(9).setCellStyle(style);
+        row0.createCell(5).setCellValue("检验单位");
+        row0.getCell(5).setCellStyle(style);
+        row0.createCell(6).setCellValue("检验日期");
+        row0.getCell(6).setCellStyle(style);
+        row0.createCell(7).setCellValue("报告编号");
+        row0.getCell(7).setCellStyle(style);
+        row0.createCell(8).setCellValue("下次检验日期");
+        row0.getCell(8).setCellStyle(style);
+        row0.createCell(9).setCellValue("定期检验结论");
+        row0.getCell(9).setCellStyle(style);
         //填充数据
         int rowIndex = 1;
         int columnIndex = 1;
-        for (TSpecdevDzsb t: list
+        for (TSpecdevDzsb t : list
         ) {
             Row row = sheet.createRow(rowIndex);
             row.createCell(0).setCellValue(t.getId());
@@ -451,11 +449,11 @@ public class TSpecdevDzsbController extends BaseController
             row.createCell(3).setCellValue(t.getDocno());
             row.createCell(4).setCellValue(t.getDevname());
             row.createCell(5).setCellValue(t.getCheckUnit());
-            if (t.getWarnDate()!= null){
+            if (t.getWarnDate() != null) {
                 row.createCell(6).setCellValue(new SimpleDateFormat("yyyy-MM-dd").format(t.getWarnDate()));
             }
             row.createCell(7).setCellValue(t.getReportNo());
-            if (t.getNextWarnDate()!= null){
+            if (t.getNextWarnDate() != null) {
                 row.createCell(8).setCellValue(new SimpleDateFormat("yyyy-MM-dd").format(t.getNextWarnDate()));
             }
             row.createCell(9).setCellValue(t.getPerTestConclusion());

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevGlController.java

@@ -17,6 +17,7 @@ import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysDictData;
 import com.ruoyi.project.system.service.ISysDeptService;
 import com.ruoyi.project.system.service.ISysDictTypeService;
+import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -104,7 +105,7 @@ public class TSpecdevGlController extends BaseController
     public AjaxResult edit(@RequestBody TSpecdevGl tSpecdevGl)
     {
         TSpecdevGl old = tSpecdevGlService.selectTSpecdevGlById(tSpecdevGl.getId());
-        if (!old.getReportNo().equals(tSpecdevGl.getReportNo())) {
+        if (StringUtils.isNotEmpty(tSpecdevGl.getReportNo()) && !tSpecdevGl.getReportNo().equals(old.getReportNo())) {
             TSpecCheck tc = new TSpecCheck();
             tc.setDevType(4l);
             tc.setCheckUnit(tSpecdevGl.getCheckUnit());

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevYlgdController.java

@@ -23,6 +23,7 @@ import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysDictData;
 import com.ruoyi.project.system.service.ISysDeptService;
 import com.ruoyi.project.system.service.ISysDictTypeService;
+import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -105,7 +106,7 @@ public class TSpecdevYlgdController extends BaseController {
     @PutMapping
     public AjaxResult edit(@RequestBody TSpecdevYlgd tSpecdevYlgd) {
         TSpecdevYlgd old = tSpecdevYlgdService.selectTSpecdevYlgdById(tSpecdevYlgd.getId());
-        if (!old.getReportNo().equals(tSpecdevYlgd.getReportNo())) {
+        if (StringUtils.isNotEmpty(tSpecdevYlgd.getReportNo()) && !tSpecdevYlgd.getReportNo().equals(old.getReportNo())) {
             TSpecCheck tc = new TSpecCheck();
             tc.setDevType(2l);
             tc.setCheckUnit(tSpecdevYlgd.getCheckUnit());
@@ -140,8 +141,7 @@ public class TSpecdevYlgdController extends BaseController {
     @PreAuthorize("@ss.hasPermi('sems:plant:remove')")
     @Log(title = "特种设备压力管道台账去重", businessType = BusinessType.OTHER)
     @GetMapping("/duplicate")
-    public AjaxResult duplicate()
-    {
+    public AjaxResult duplicate() {
         tSpecdevYlgdService.duplicateTSpecdevYlgd();
         return AjaxResult.success();
     }
@@ -311,7 +311,7 @@ public class TSpecdevYlgdController extends BaseController {
                     failNumber.getAndIncrement();
                     logger.info("e:" + e);
                     failRow.add(failNum.get() + 1);
-                }finally {
+                } finally {
                     latch.countDown(); //线程计数
                 }
             });
@@ -431,7 +431,7 @@ public class TSpecdevYlgdController extends BaseController {
                                 new QueryWrapper<TSpecdevYlgd>()
                                         .eq("USENO", t.getUseno())
                                         .eq("PLANT_CODE", t.getPlantCode())
-                                        .eq("DEVNO" , t.getDevno())
+                                        .eq("DEVNO", t.getDevno())
                         );
                 successNumber++;
             } catch (Exception e) {
@@ -481,7 +481,7 @@ public class TSpecdevYlgdController extends BaseController {
                     list.add(t);
                 } catch (Exception e) {
                     logger.info("e:" + e);
-                }finally {
+                } finally {
                     latch.countDown(); //线程计数
                 }
             });
@@ -498,20 +498,20 @@ public class TSpecdevYlgdController extends BaseController {
         //创建sheet页
         Sheet sheet = wb.createSheet("sheet1");
         //设置列的宽度，第一个参数为列的序号，从0开始，第二参数为列宽，单位1/256个字节
-        sheet.setColumnWidth(0, 12*256);
-        sheet.setColumnWidth(1, 26*256);
-        sheet.setColumnWidth(2, 26*256);
-        sheet.setColumnWidth(3, 26*256);
-        sheet.setColumnWidth(4, 26*256);
-        sheet.setColumnWidth(5, 26*256);
-        sheet.setColumnWidth(6, 26*256);
-        sheet.setColumnWidth(7, 26*256);
-        sheet.setColumnWidth(8, 40*256);
-        sheet.setColumnWidth(9, 40*256);
-        sheet.setColumnWidth(10, 26*256);
-        sheet.setColumnWidth(11, 26*256);
-        sheet.setColumnWidth(12, 40*256);
-        sheet.setColumnWidth(13, 40*256);
+        sheet.setColumnWidth(0, 12 * 256);
+        sheet.setColumnWidth(1, 26 * 256);
+        sheet.setColumnWidth(2, 26 * 256);
+        sheet.setColumnWidth(3, 26 * 256);
+        sheet.setColumnWidth(4, 26 * 256);
+        sheet.setColumnWidth(5, 26 * 256);
+        sheet.setColumnWidth(6, 26 * 256);
+        sheet.setColumnWidth(7, 26 * 256);
+        sheet.setColumnWidth(8, 40 * 256);
+        sheet.setColumnWidth(9, 40 * 256);
+        sheet.setColumnWidth(10, 26 * 256);
+        sheet.setColumnWidth(11, 26 * 256);
+        sheet.setColumnWidth(12, 40 * 256);
+        sheet.setColumnWidth(13, 40 * 256);
         //设置开始行和开始列
 
         Row row0 = sheet.createRow(0);
@@ -530,21 +530,30 @@ public class TSpecdevYlgdController extends BaseController {
         row0.createCell(2).setCellValue("管道名称");
         row0.createCell(3).setCellValue("管道编号");
         row0.createCell(4).setCellValue("使用登记表编号");
-        row0.createCell(5).setCellValue("检验单位");row0.getCell(5).setCellStyle(style);
-        row0.createCell(6).setCellValue("定期检验日期");row0.getCell(6).setCellStyle(style);
-        row0.createCell(7).setCellValue("安全状况等级");row0.getCell(7).setCellStyle(style);
-        row0.createCell(8).setCellValue("定期检验报告编号");row0.getCell(8).setCellStyle(style);
-        row0.createCell(9).setCellValue("下次定期检验日期");row0.getCell(9).setCellStyle(style);
+        row0.createCell(5).setCellValue("检验单位");
+        row0.getCell(5).setCellStyle(style);
+        row0.createCell(6).setCellValue("定期检验日期");
+        row0.getCell(6).setCellStyle(style);
+        row0.createCell(7).setCellValue("安全状况等级");
+        row0.getCell(7).setCellStyle(style);
+        row0.createCell(8).setCellValue("定期检验报告编号");
+        row0.getCell(8).setCellStyle(style);
+        row0.createCell(9).setCellValue("下次定期检验日期");
+        row0.getCell(9).setCellStyle(style);
 
-        row0.createCell(10).setCellValue("年度检查日期");row0.getCell(10).setCellStyle(style);
-        row0.createCell(11).setCellValue("年度检查结论");row0.getCell(11).setCellStyle(style);
-        row0.createCell(12).setCellValue("下次年度检查日期");row0.getCell(12).setCellStyle(style);
-        row0.createCell(13).setCellValue("年度检查报告编号");row0.getCell(13).setCellStyle(style);
+        row0.createCell(10).setCellValue("年度检查日期");
+        row0.getCell(10).setCellStyle(style);
+        row0.createCell(11).setCellValue("年度检查结论");
+        row0.getCell(11).setCellStyle(style);
+        row0.createCell(12).setCellValue("下次年度检查日期");
+        row0.getCell(12).setCellStyle(style);
+        row0.createCell(13).setCellValue("年度检查报告编号");
+        row0.getCell(13).setCellStyle(style);
 
         //填充数据
         int rowIndex = 1;
         int columnIndex = 1;
-        for (TSpecdevYlgd t: list
+        for (TSpecdevYlgd t : list
         ) {
             Row row = sheet.createRow(rowIndex);
             row.createCell(0).setCellValue(t.getId());
@@ -553,19 +562,19 @@ public class TSpecdevYlgdController extends BaseController {
             row.createCell(3).setCellValue(t.getDevno());
             row.createCell(4).setCellValue(t.getUseno());
             row.createCell(5).setCellValue(t.getCheckUnit());
-            if (t.getWarnDate()!= null){
+            if (t.getWarnDate() != null) {
                 row.createCell(6).setCellValue(new SimpleDateFormat("yyyy-MM-dd").format(t.getWarnDate()));
             }
             row.createCell(7).setCellValue(t.getSafeClass());
             row.createCell(8).setCellValue(t.getReportNo());
-            if (t.getNextWarnDate()!= null){
+            if (t.getNextWarnDate() != null) {
                 row.createCell(9).setCellValue(new SimpleDateFormat("yyyy-MM-dd").format(t.getNextWarnDate()));
             }
-            if (t.getYearWarnDate()!= null){
+            if (t.getYearWarnDate() != null) {
                 row.createCell(10).setCellValue(new SimpleDateFormat("yyyy-MM-dd").format(t.getYearWarnDate()));
             }
             row.createCell(11).setCellValue(t.getCheckConclusion());
-            if (t.getYearNextWarnDate()!= null){
+            if (t.getYearNextWarnDate() != null) {
                 row.createCell(12).setCellValue(new SimpleDateFormat("yyyy-MM-dd").format(t.getYearNextWarnDate()));
             }
             row.createCell(13).setCellValue(t.getYearReportNo());

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevYlrqController.java

@@ -49,8 +49,7 @@ import org.springframework.web.multipart.MultipartFile;
  */
 @RestController
 @RequestMapping("/sems/specYlrq")
-public class TSpecdevYlrqController extends BaseController
-{
+public class TSpecdevYlrqController extends BaseController {
     @Autowired
     private ITSpecdevYlrqService tSpecdevYlrqService;
     @Autowired
@@ -59,13 +58,13 @@ public class TSpecdevYlrqController extends BaseController
     private ISysDeptService iSysDeptService;
     @Autowired
     private ISysDictTypeService iSysDictTypeService;
+
     /**
      * 查询特种设备压力容器台账列表
      */
     @PreAuthorize("@ss.hasPermi('sems:specYlrq:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TSpecdevYlrq tSpecdevYlrq)
-    {
+    public TableDataInfo list(TSpecdevYlrq tSpecdevYlrq) {
         startPage();
         List<TSpecdevYlrq> list = tSpecdevYlrqService.selectTSpecdevYlrqList(tSpecdevYlrq);
         //
@@ -85,8 +84,7 @@ public class TSpecdevYlrqController extends BaseController
     @PreAuthorize("@ss.hasPermi('sems:specYlrq:export')")
     @Log(title = "特种设备压力容器台账", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TSpecdevYlrq tSpecdevYlrq)
-    {
+    public AjaxResult export(TSpecdevYlrq tSpecdevYlrq) {
         List<TSpecdevYlrq> list = tSpecdevYlrqService.selectTSpecdevYlrqList(tSpecdevYlrq);
         ExcelUtil<TSpecdevYlrq> util = new ExcelUtil<TSpecdevYlrq>(TSpecdevYlrq.class);
         return util.exportExcel(list, "specYlrq");
@@ -97,8 +95,7 @@ public class TSpecdevYlrqController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('sems:specYlrq:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tSpecdevYlrqService.selectTSpecdevYlrqById(id));
     }
 
@@ -108,8 +105,7 @@ public class TSpecdevYlrqController extends BaseController
     @PreAuthorize("@ss.hasPermi('sems:specYlrq:add')")
     @Log(title = "特种设备压力容器台账", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TSpecdevYlrq tSpecdevYlrq)
-    {
+    public AjaxResult add(@RequestBody TSpecdevYlrq tSpecdevYlrq) {
         return toAjax(tSpecdevYlrqService.insertTSpecdevYlrq(tSpecdevYlrq));
     }
 
@@ -119,10 +115,9 @@ public class TSpecdevYlrqController extends BaseController
     @PreAuthorize("@ss.hasPermi('sems:specYlrq:edit')")
     @Log(title = "特种设备压力容器台账", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TSpecdevYlrq tSpecdevYlrq)
-    {
+    public AjaxResult edit(@RequestBody TSpecdevYlrq tSpecdevYlrq) {
         TSpecdevYlrq old = tSpecdevYlrqService.selectTSpecdevYlrqById(tSpecdevYlrq.getId());
-        if (!old.getReportNo().equals(tSpecdevYlrq.getReportNo())) {
+        if (StringUtils.isNotEmpty(tSpecdevYlrq.getReportNo()) && !tSpecdevYlrq.getReportNo().equals(old.getReportNo())) {
             TSpecCheck tc = new TSpecCheck();
             tc.setDevType(1l);
             tc.setCheckUnit(tSpecdevYlrq.getCheckUnit());
@@ -146,8 +141,7 @@ public class TSpecdevYlrqController extends BaseController
     @PreAuthorize("@ss.hasPermi('sems:specYlrq:edit')")
     @Log(title = "特种设备压力容器台账", businessType = BusinessType.UPDATE)
     @PutMapping("/pre")
-    public AjaxResult editPre(@RequestBody TSpecdevYlrq tSpecdevYlrq)
-    {
+    public AjaxResult editPre(@RequestBody TSpecdevYlrq tSpecdevYlrq) {
         return toAjax(tSpecdevYlrqService.updateTSpecdevYlrq(tSpecdevYlrq));
     }
 
@@ -156,9 +150,8 @@ public class TSpecdevYlrqController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('sems:specYlrq:remove')")
     @Log(title = "特种设备压力容器台账", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tSpecdevYlrqService.deleteTSpecdevYlrqByIds(ids));
     }
 
@@ -168,8 +161,7 @@ public class TSpecdevYlrqController extends BaseController
     @PreAuthorize("@ss.hasPermi('sems:plant:remove')")
     @Log(title = "特种设备压力容器台账去重", businessType = BusinessType.OTHER)
     @GetMapping("/duplicate")
-    public AjaxResult duplicate()
-    {
+    public AjaxResult duplicate() {
         tSpecdevYlrqService.duplicateTSpecdevYlrq();
         return AjaxResult.success();
     }
@@ -184,7 +176,7 @@ public class TSpecdevYlrqController extends BaseController
         //获取操作人员ID
         Long userId = getUserId();
         //报错行数统计
-        List<Integer> failRow =new ArrayList<Integer>();
+        List<Integer> failRow = new ArrayList<Integer>();
         Workbook workbook = ExcelUtils.getWorkBook(file);
         Sheet sheet = workbook.getSheetAt(0);
         List<TSpecdevYlrq> list = new ArrayList<TSpecdevYlrq>();
@@ -208,7 +200,7 @@ public class TSpecdevYlrqController extends BaseController
                     }
                     cell.getCellType();
                     String cellValue = ExcelUtils.getCellValue(cell);
-                    if (StringUtils.trim(cellValue) == ""){
+                    if (StringUtils.trim(cellValue) == "") {
                         continue;
                     }
                     logger.info("cellValue:" + cellValue);
@@ -228,7 +220,7 @@ public class TSpecdevYlrqController extends BaseController
                         entity.setDevname(cellValue);//设备名称
                     } else if (j == 7) {
                         entity.setFactoryNo(cellValue);//出厂编号
-                    }else if (j == 8) {
+                    } else if (j == 8) {
                         entity.setUseno(cellValue);//使用证编号
                     } else if (j == 9) {
                         entity.setRegno(cellValue);//注册编号
@@ -259,13 +251,13 @@ public class TSpecdevYlrqController extends BaseController
                         }
                     } else if (j == 21) {
                         //是否涉危化品
-                            entity.setIsDanger(cellValue);
-                    }  else if (j == 22) {
+                        entity.setIsDanger(cellValue);
+                    } else if (j == 22) {
                         //是否涉危化品
                         entity.setDesYear(cellValue);
                     } else if (j == 23) {
                         //是否超设计使用寿命
-                            entity.setIsOverlife(cellValue);
+                        entity.setIsOverlife(cellValue);
                     } else if (j == 24) {
                         entity.setCheckUnit(cellValue);//检验单位
                     } else if (j == 25) {
@@ -306,7 +298,7 @@ public class TSpecdevYlrqController extends BaseController
                 entity.setCreaterCode(userId);
                 logger.info("entity:" + entity);
                 list.add(entity);
-            }catch (Exception e){
+            } catch (Exception e) {
                 failNumber++;
                 logger.info("e:" + JSON.toJSONString(e));
                 failRow.add(i + 1);
@@ -320,16 +312,16 @@ public class TSpecdevYlrqController extends BaseController
             try {
                 tSpecdevYlrqService.insertTSpecdevYlrq(t);
                 successNumber++;
-            }catch (Exception e){
+            } catch (Exception e) {
                 failNumber++;
                 logger.info("e:" + e);
                 failRow.add(failNum + 1);
             }
         }
         logger.info("list:" + JSON.toJSONString(list));
-        logger.info("successNumber:" +String.valueOf(successNumber));
-        logger.info("failNumber:" +String.valueOf(failNumber));
-        logger.info("failRow:" +String.valueOf(failRow));
+        logger.info("successNumber:" + String.valueOf(successNumber));
+        logger.info("failNumber:" + String.valueOf(failNumber));
+        logger.info("failRow:" + String.valueOf(failRow));
         return AjaxResult.success(String.valueOf(successNumber), failRow);
     }
 
@@ -340,12 +332,11 @@ public class TSpecdevYlrqController extends BaseController
     @PreAuthorize("@ss.hasPermi('sems:specYlrq:add')")
     @Log(title = "特种设备批量导入", businessType = BusinessType.INSERT)
     @PostMapping("/updateData")
-    public AjaxResult updateData(@RequestParam("file") MultipartFile file) throws IOException
-    {
+    public AjaxResult updateData(@RequestParam("file") MultipartFile file) throws IOException {
         //获取操作人员ID
         Long userId = getUserId();
         //报错行数统计
-        List<Integer> failRow =new ArrayList<Integer>();
+        List<Integer> failRow = new ArrayList<Integer>();
         Workbook workbook = ExcelUtils.getWorkBook(file);
         Sheet sheet = workbook.getSheetAt(0);
         List<TSpecdevYlrq> list = new ArrayList<TSpecdevYlrq>();
@@ -402,14 +393,14 @@ public class TSpecdevYlrqController extends BaseController
                         }
                     } else if (j == 9) {
                         entity.setReportNo(cellValue);//报告编号
-                    } else if (j == 10){ //年度检查日期
+                    } else if (j == 10) { //年度检查日期
                         logger.info("日期格式：" + cellValue);
                         if (cellValue.length() > 3) {
                             entity.setYearWarnDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                         }
-                    } else if (j == 11){//年度检查结论
+                    } else if (j == 11) {//年度检查结论
                         entity.setCheckConclusion(cellValue);
-                    } else  if (j == 12){//下次年度检查日期
+                    } else if (j == 12) {//下次年度检查日期
                         logger.info("日期格式：" + cellValue);
                         if (cellValue.length() > 3) {
                             entity.setYearNextWarnDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
@@ -425,7 +416,7 @@ public class TSpecdevYlrqController extends BaseController
                 /*for (TSpecdevYlrq e :list){
                     e.setId(null);
                 }*/
-            }catch (Exception e){
+            } catch (Exception e) {
                 failNumber++;
                 e.printStackTrace();
                 logger.info("e:" + JSON.toJSONString(e));
@@ -440,10 +431,10 @@ public class TSpecdevYlrqController extends BaseController
             try {
                 tSpecdevYlrqService.update(t,
                         new QueryWrapper<TSpecdevYlrq>().eq("USENO", t.getUseno())
-                                                        .eq("PLANT_CODE", t.getPlantCode())
-                                .eq("DEVNO" , t.getDevno()));
+                                .eq("PLANT_CODE", t.getPlantCode())
+                                .eq("DEVNO", t.getDevno()));
                 successNumber++;
-            }catch (Exception e){
+            } catch (Exception e) {
                 e.printStackTrace();
                 failNumber++;
                 logger.info("e:" + e);
@@ -453,25 +444,25 @@ public class TSpecdevYlrqController extends BaseController
         for (TSpecdevYlrq t : oldList) {
 //            TSpecdevYlrq old = tSpecdevYlrqService.selectTSpecdevYlrqById(t.getId());
 //            if (!old.getReportNo().equals(t.getReportNo())) {
-                TSpecCheck tc = new TSpecCheck();
-                tc.setDevType(1l);
-                tc.setCheckUnit(t.getCheckUnit());
-                tc.setDevId(t.getId());
-                tc.setNextWarnDate(t.getNextWarnDate());
-                tc.setReportNo(t.getReportNo());
-                tc.setWarnDate(t.getWarnDate());
-                tc.setYearNextWarnDate(t.getYearNextWarnDate());
-                tc.setYearWarnDate(t.getYearWarnDate());
-                tc.setYearReportNo(t.getReportNo());
-                tc.setSafeClass(t.getSafeClass());
-                tc.setCheckConclusion(t.getCheckConclusion());
-                tSpecCheckService.insertTSpecCheck(tc);
+            TSpecCheck tc = new TSpecCheck();
+            tc.setDevType(1l);
+            tc.setCheckUnit(t.getCheckUnit());
+            tc.setDevId(t.getId());
+            tc.setNextWarnDate(t.getNextWarnDate());
+            tc.setReportNo(t.getReportNo());
+            tc.setWarnDate(t.getWarnDate());
+            tc.setYearNextWarnDate(t.getYearNextWarnDate());
+            tc.setYearWarnDate(t.getYearWarnDate());
+            tc.setYearReportNo(t.getReportNo());
+            tc.setSafeClass(t.getSafeClass());
+            tc.setCheckConclusion(t.getCheckConclusion());
+            tSpecCheckService.insertTSpecCheck(tc);
 //            }
         }
         logger.info("list:" + JSON.toJSONString(list));
-        logger.info("successNumber:" +String.valueOf(successNumber));
-        logger.info("failNumber:" +String.valueOf(failNumber));
-        logger.info("failRow:" +String.valueOf(failRow));
+        logger.info("successNumber:" + String.valueOf(successNumber));
+        logger.info("failNumber:" + String.valueOf(failNumber));
+        logger.info("failRow:" + String.valueOf(failRow));
         return AjaxResult.success(String.valueOf(successNumber), failRow);
     }
 
@@ -494,7 +485,7 @@ public class TSpecdevYlrqController extends BaseController
                     list.add(t);
                 } catch (Exception e) {
                     logger.info("e:" + e);
-                }finally {
+                } finally {
                     latch.countDown(); //线程计数
                 }
             });
@@ -511,20 +502,20 @@ public class TSpecdevYlrqController extends BaseController
         //创建sheet页
         Sheet sheet = wb.createSheet("sheet1");
         //设置列的宽度，第一个参数为列的序号，从0开始，第二参数为列宽，单位1/256个字节
-        sheet.setColumnWidth(0, 12*256);
-        sheet.setColumnWidth(1, 26*256);
-        sheet.setColumnWidth(2, 26*256);
-        sheet.setColumnWidth(3, 26*256);
-        sheet.setColumnWidth(4, 26*256);
-        sheet.setColumnWidth(5, 26*256);
-        sheet.setColumnWidth(6, 26*256);
-        sheet.setColumnWidth(7, 26*256);
-        sheet.setColumnWidth(8, 40*256);
-        sheet.setColumnWidth(9, 40*256);
-        sheet.setColumnWidth(10, 26*256);
-        sheet.setColumnWidth(11, 26*256);
-        sheet.setColumnWidth(12, 40*256);
-        sheet.setColumnWidth(13, 40*256);
+        sheet.setColumnWidth(0, 12 * 256);
+        sheet.setColumnWidth(1, 26 * 256);
+        sheet.setColumnWidth(2, 26 * 256);
+        sheet.setColumnWidth(3, 26 * 256);
+        sheet.setColumnWidth(4, 26 * 256);
+        sheet.setColumnWidth(5, 26 * 256);
+        sheet.setColumnWidth(6, 26 * 256);
+        sheet.setColumnWidth(7, 26 * 256);
+        sheet.setColumnWidth(8, 40 * 256);
+        sheet.setColumnWidth(9, 40 * 256);
+        sheet.setColumnWidth(10, 26 * 256);
+        sheet.setColumnWidth(11, 26 * 256);
+        sheet.setColumnWidth(12, 40 * 256);
+        sheet.setColumnWidth(13, 40 * 256);
         //设置开始行和开始列
 
         Row row0 = sheet.createRow(0);
@@ -543,21 +534,30 @@ public class TSpecdevYlrqController extends BaseController
         row0.createCell(2).setCellValue("位号");
         row0.createCell(3).setCellValue("设备名称");
         row0.createCell(4).setCellValue("使用证号码");
-        row0.createCell(5).setCellValue("检验单位");row0.getCell(5).setCellStyle(style);
-        row0.createCell(6).setCellValue("定期检验日期");row0.getCell(6).setCellStyle(style);
-        row0.createCell(7).setCellValue("安全状况等级");row0.getCell(7).setCellStyle(style);
-        row0.createCell(8).setCellValue("下次定期检验日期");row0.getCell(8).setCellStyle(style);
-        row0.createCell(9).setCellValue("定期检验报告编号");row0.getCell(9).setCellStyle(style);
+        row0.createCell(5).setCellValue("检验单位");
+        row0.getCell(5).setCellStyle(style);
+        row0.createCell(6).setCellValue("定期检验日期");
+        row0.getCell(6).setCellStyle(style);
+        row0.createCell(7).setCellValue("安全状况等级");
+        row0.getCell(7).setCellStyle(style);
+        row0.createCell(8).setCellValue("下次定期检验日期");
+        row0.getCell(8).setCellStyle(style);
+        row0.createCell(9).setCellValue("定期检验报告编号");
+        row0.getCell(9).setCellStyle(style);
 
-        row0.createCell(10).setCellValue("年度检查日期");row0.getCell(10).setCellStyle(style);
-        row0.createCell(11).setCellValue("年度检查结论");row0.getCell(11).setCellStyle(style);
-        row0.createCell(12).setCellValue("下次年度检查日期");row0.getCell(12).setCellStyle(style);
-        row0.createCell(13).setCellValue("年度检查报告编号");row0.getCell(13).setCellStyle(style);
+        row0.createCell(10).setCellValue("年度检查日期");
+        row0.getCell(10).setCellStyle(style);
+        row0.createCell(11).setCellValue("年度检查结论");
+        row0.getCell(11).setCellStyle(style);
+        row0.createCell(12).setCellValue("下次年度检查日期");
+        row0.getCell(12).setCellStyle(style);
+        row0.createCell(13).setCellValue("年度检查报告编号");
+        row0.getCell(13).setCellStyle(style);
 
         //填充数据
         int rowIndex = 1;
         int columnIndex = 1;
-        for (TSpecdevYlrq t: list
+        for (TSpecdevYlrq t : list
         ) {
             Row row = sheet.createRow(rowIndex);
             row.createCell(0).setCellValue(t.getId());
@@ -566,19 +566,19 @@ public class TSpecdevYlrqController extends BaseController
             row.createCell(3).setCellValue(t.getDevname());
             row.createCell(4).setCellValue(t.getUseno());
             row.createCell(5).setCellValue(t.getCheckUnit());
-            if (t.getWarnDate()!= null){
+            if (t.getWarnDate() != null) {
                 row.createCell(6).setCellValue(new SimpleDateFormat("yyyy-MM-dd").format(t.getWarnDate()));
             }
             row.createCell(7).setCellValue(t.getSafeClass());
-            if (t.getNextWarnDate()!= null){
+            if (t.getNextWarnDate() != null) {
                 row.createCell(8).setCellValue(new SimpleDateFormat("yyyy-MM-dd").format(t.getNextWarnDate()));
             }
             row.createCell(9).setCellValue(t.getReportNo());
-            if (t.getYearWarnDate()!= null){
+            if (t.getYearWarnDate() != null) {
                 row.createCell(10).setCellValue(new SimpleDateFormat("yyyy-MM-dd").format(t.getYearWarnDate()));
             }
             row.createCell(11).setCellValue(t.getCheckConclusion());
-            if (t.getYearNextWarnDate()!= null){
+            if (t.getYearNextWarnDate() != null) {
                 row.createCell(12).setCellValue(new SimpleDateFormat("yyyy-MM-dd").format(t.getYearNextWarnDate()));
             }
             row.createCell(13).setCellValue(t.getYearReportNo());