李扬

master/src/main/java/com/ruoyi/common/thread/SpecDevYlgdThread.java

@@ -2,17 +2,20 @@ package com.ruoyi.common.thread;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.project.sems.domain.TSpecdevYlgd;
 import com.ruoyi.project.sems.domain.TSpecdevYlrq;
 import com.ruoyi.project.sems.service.ITSpecdevYlgdService;
 import com.ruoyi.project.sems.service.ITSpecdevYlrqService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.List;
 
 public class SpecDevYlgdThread implements Runnable {
 
     private ITSpecdevYlgdService specdevYlgdService;
-
+    protected final Logger logger = LoggerFactory.getLogger(BaseController.class);
     public SpecDevYlgdThread(ITSpecdevYlgdService specdevYlgdService) {
         this.specdevYlgdService = specdevYlgdService;
     }
@@ -21,6 +24,7 @@ public class SpecDevYlgdThread implements Runnable {
     public void run() {
         List<TSpecdevYlgd> list = this.specdevYlgdService.list(new QueryWrapper<TSpecdevYlgd>()
                 .eq("del_flag", 0).eq("status", "1"));
+        logger.info("开始循环");
         for (TSpecdevYlgd tSpecdevYlgd : list) {
             for (TSpecdevYlgd specdevYlgd : list) {
                 if (tSpecdevYlgd.getId() == specdevYlgd.getId() || StringUtils.isEmpty(tSpecdevYlgd.getDevno())

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

@@ -244,6 +244,7 @@ public class TSpecdevYlgdController extends BaseController {
                     } else if (j == 32) {
                         entity.setSafeClass(cellValue);//安全状况等级
                     } else if (j == 33) {
+                        //年度检查报告编号
                         entity.setReportNo(cellValue);//报告编号
                     } else if (j == 34) {//下次检验日期
                         logger.info("日期格式：" + cellValue);
@@ -262,9 +263,7 @@ public class TSpecdevYlgdController extends BaseController {
                             entity.setYearNextWarnDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                         }
                     } else if (j == 38) {
-                        if (cellValue.length() > 3) {//年度检验报告
-                            entity.setYearNextWarnDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
-                        }
+                        entity.setYearReportNo(cellValue);
                     } else if (j == 39) {
                         entity.setRemarks(cellValue);//备注
                     } /*else if (j == 39) {