|
@@ -1,36 +1,30 @@
|
|
|
package com.ruoyi.project.sems.controller;
|
|
|
|
|
|
-import java.io.FileOutputStream;
|
|
|
-import java.io.IOException;
|
|
|
-import java.io.OutputStream;
|
|
|
-import java.text.ParseException;
|
|
|
-import java.text.SimpleDateFormat;
|
|
|
-import java.util.*;
|
|
|
-import java.util.concurrent.CopyOnWriteArrayList;
|
|
|
-import java.util.concurrent.CountDownLatch;
|
|
|
-import java.util.concurrent.ExecutorService;
|
|
|
-import java.util.concurrent.Executors;
|
|
|
-
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.ruoyi.common.utils.DateUtils;
|
|
|
import com.ruoyi.common.utils.ServletUtils;
|
|
|
import com.ruoyi.common.utils.file.ExcelUtils;
|
|
|
+import com.ruoyi.common.utils.poi.ExcelUtil;
|
|
|
import com.ruoyi.common.utils.spring.SpringUtils;
|
|
|
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
|
|
|
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
|
|
|
import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
|
|
|
import com.ruoyi.framework.security.LoginUser;
|
|
|
import com.ruoyi.framework.security.service.TokenService;
|
|
|
+import com.ruoyi.framework.web.controller.BaseController;
|
|
|
+import com.ruoyi.framework.web.domain.AjaxResult;
|
|
|
+import com.ruoyi.framework.web.page.TableDataInfo;
|
|
|
import com.ruoyi.project.sems.domain.ParamData;
|
|
|
import com.ruoyi.project.sems.domain.TSpecCheck;
|
|
|
-import com.ruoyi.project.sems.domain.TSpecdevYlgd;
|
|
|
+import com.ruoyi.project.sems.domain.TSpecdevYlrq;
|
|
|
import com.ruoyi.project.sems.his.controller.TApproveSpecModifyController;
|
|
|
-import com.ruoyi.project.sems.his.controller.TSpechiYlgdController;
|
|
|
import com.ruoyi.project.sems.his.controller.TSpechiYlrqController;
|
|
|
import com.ruoyi.project.sems.his.domain.TApproveSpecModify;
|
|
|
import com.ruoyi.project.sems.his.service.ITApproveSpecModifyService;
|
|
|
-import com.ruoyi.project.sems.mapper.TSpecdevYlgdMapper;
|
|
|
import com.ruoyi.project.sems.mapper.TSpecdevYlrqMapper;
|
|
|
import com.ruoyi.project.sems.service.ITSpecCheckService;
|
|
|
+import com.ruoyi.project.sems.service.ITSpecdevYlrqService;
|
|
|
import com.ruoyi.project.system.domain.SysDept;
|
|
|
import com.ruoyi.project.system.domain.SysDictData;
|
|
|
import com.ruoyi.project.system.domain.SysPlant;
|
|
@@ -45,20 +39,22 @@ import org.activiti.engine.runtime.ProcessInstance;
|
|
|
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;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
|
|
|
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
|
|
|
-import com.ruoyi.project.sems.domain.TSpecdevYlrq;
|
|
|
-import com.ruoyi.project.sems.service.ITSpecdevYlrqService;
|
|
|
-import com.ruoyi.framework.web.controller.BaseController;
|
|
|
-import com.ruoyi.framework.web.domain.AjaxResult;
|
|
|
-import com.ruoyi.common.utils.poi.ExcelUtil;
|
|
|
-import com.ruoyi.framework.web.page.TableDataInfo;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
+import java.io.FileOutputStream;
|
|
|
+import java.io.IOException;
|
|
|
+import java.io.OutputStream;
|
|
|
+import java.text.ParseException;
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
+import java.util.*;
|
|
|
+import java.util.concurrent.CopyOnWriteArrayList;
|
|
|
+import java.util.concurrent.CountDownLatch;
|
|
|
+import java.util.concurrent.ExecutorService;
|
|
|
+import java.util.concurrent.Executors;
|
|
|
|
|
|
/**
|
|
|
* 特种设备压力容器台账Controller
|
|
@@ -408,6 +404,10 @@ public class TSpecdevYlrqController extends BaseController {
|
|
|
}
|
|
|
entity.setCreaterCode(userId);
|
|
|
logger.info("entity:" + entity);
|
|
|
+ if(entity.getPlantCode() == null) {
|
|
|
+ //未发现plant
|
|
|
+ throw new Exception("plant为空");
|
|
|
+ }
|
|
|
list.add(entity);
|
|
|
} catch (Exception e) {
|
|
|
failNumber++;
|