质量月报 - 批量导入

master/src/main/java/com/ruoyi/project/common/CommonController.java

@@ -309,6 +309,9 @@ public class CommonController extends BaseController
         }else if( type.equals("workcertificateCbps") ) {
             downloadname = "作业证书模板.xlsx";
             url = "static/template/training/workcertificateCbps.xlsx";
+        }else if( type.equals("quality") ) {
+            downloadname = "质量月报批量导入模板.xlsx";
+            url = "static/template/production/quality.xlsx";
         }
 
         InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(url);

master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportController.java

@@ -0,0 +1,1253 @@
+package com.ruoyi.project.production.controller;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.file.ExcelUtils;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.project.production.domain.*;
+import com.ruoyi.project.production.service.*;
+import com.ruoyi.project.system.service.ISysDeptService;
+import com.ruoyi.project.system.service.ISysDictTypeService;
+import com.ruoyi.project.system.service.ISysUserService;
+import org.apache.poi.ss.usermodel.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 质量月报Controller
+ *
+ * @author ruoyi
+ * @date 2023-10-27
+ */
+@RestController
+@RequestMapping("/production/quality")
+public class TMonthlyQualityReportController extends BaseController
+{
+    @Autowired
+    private ISysUserService userService;
+
+    @Autowired
+    private ISysDictTypeService iSysDictTypeService;
+
+    @Autowired
+    private ISysDeptService iSysDeptService;
+
+    @Autowired
+    private ITMonthlyQualityReportS0501Service tMonthlyQualityReportS0501Service;
+
+    @Autowired
+    private ITMonthlyQualityReportS1301Service tMonthlyQualityReportS1301Service;
+
+    @Autowired
+    private ITMonthlyQualityReportS2002Service tMonthlyQualityReportS2002Service;
+
+    @Autowired
+    private ITMonthlyQualityReportS2005Service tMonthlyQualityReportS2005Service;
+
+    @Autowired
+    private ITMonthlyQualityReportS2007Service tMonthlyQualityReportS2007Service;
+
+    @Autowired
+    private ITMonthlyQualityReportS2011Service tMonthlyQualityReportS2011Service;
+
+    @Autowired
+    private ITMonthlyQualityReportS2400Service tMonthlyQualityReportS2400Service;
+
+    @Autowired
+    private ITMonthlyQualityReportS3004Service tMonthlyQualityReportS3004Service;
+
+    @Autowired
+    private ITMonthlyQualityReportS3009Service tMonthlyQualityReportS3009Service;
+
+    @Autowired
+    private ITMonthlyQualityReportS3010Service tMonthlyQualityReportS3010Service;
+
+    @Autowired
+    private ITMonthlyQualityReportS3011Service tMonthlyQualityReportS3011Service;
+
+    @Autowired
+    private ITMonthlyQualityReportS3012Service tMonthlyQualityReportS3012Service;
+
+    @Autowired
+    private ITMonthlyQualityReportS3022Service tMonthlyQualityReportS3022Service;
+
+    @Autowired
+    private ITMonthlyQualityReportS4012Service tMonthlyQualityReportS4012Service;
+
+    @Autowired
+    private ITMonthlyQualityReportS4013Service tMonthlyQualityReportS4013Service;
+
+    @Autowired
+    private ITMonthlyQualityReportS4501Service tMonthlyQualityReportS4501Service;
+
+    @Autowired
+    private ITMonthlyQualityReportS5001Service tMonthlyQualityReportS5001Service;
+
+    @Autowired
+    private ITMonthlyQualityReportS5003Service tMonthlyQualityReportS5003Service;
+
+    @Autowired
+    private ITMonthlyQualityReportS5010Service tMonthlyQualityReportS5010Service;
+
+    @Autowired
+    private ITMonthlyQualityReportS5012Service tMonthlyQualityReportS5012Service;
+
+    @Autowired
+    private ITMonthlyQualityReportS6101Service tMonthlyQualityReportS6101Service;
+
+    @Autowired
+    private ITMonthlyQualityReportS6107Service tMonthlyQualityReportS6107Service;
+
+    @Autowired
+    private ITMonthlyQualityReportS6301Service tMonthlyQualityReportS6301Service;
+
+    @Autowired
+    private ITMonthlyQualityReportZ404Service tMonthlyQualityReportZ404Service;
+
+    /**
+     * 批量导入质量月报
+     */
+    @PreAuthorize("@ss.hasPermi('production:quality:add')")
+    @PostMapping("/importData")
+    public AjaxResult importData(@RequestParam("file") MultipartFile file) throws IOException
+    {
+        //获取操作人员ID
+        Long userId = getUserId();
+        Workbook workbook = ExcelUtils.getWorkBook(file);
+        Sheet sheet = workbook.getSheetAt(0);
+        List<Row> listS0501 = new ArrayList<Row>();
+        List<Row> listS1301 = new ArrayList<Row>();
+        List<Row> listS2002 = new ArrayList<Row>();
+        List<Row> listS2005 = new ArrayList<Row>();
+        List<Row> listS2007 = new ArrayList<Row>();
+        List<Row> listS2011 = new ArrayList<Row>();
+        List<Row> listS2400 = new ArrayList<Row>();
+        List<Row> listS3004 = new ArrayList<Row>();
+        List<Row> listS3009 = new ArrayList<Row>();
+        List<Row> listS3010 = new ArrayList<Row>();
+        List<Row> listS3011 = new ArrayList<Row>();
+        List<Row> listS3012 = new ArrayList<Row>();
+        List<Row> listS3022 = new ArrayList<Row>();
+        List<Row> listS4012 = new ArrayList<Row>();
+        List<Row> listS4013 = new ArrayList<Row>();
+        List<Row> listS4501 = new ArrayList<Row>();
+        List<Row> listS5001 = new ArrayList<Row>();
+        List<Row> listS5003 = new ArrayList<Row>();
+        List<Row> listS5010 = new ArrayList<Row>();
+        List<Row> listS5012 = new ArrayList<Row>();
+        List<Row> listS6101 = new ArrayList<Row>();
+        List<Row> listS6107 = new ArrayList<Row>();
+        List<Row> listS6301 = new ArrayList<Row>();
+        List<Row> listZ404 = new ArrayList<Row>();
+        int rowNum = sheet.getPhysicalNumberOfRows();
+        for (int i = 0; i <= rowNum + 100; i++) {
+            try {
+                Row row = sheet.getRow(i);
+                Cell cell = row.getCell(1);
+                cell.setCellType(CellType.STRING);
+                String cellValue = ExcelUtils.getCellValue(cell);
+                if ("S-0501".equals(cellValue)) {
+                    listS0501.add(row);
+                } else if ("S-2002".equals(cellValue)) {
+                    listS2002.add(row);
+                } else if ("S-2005".equals(cellValue)) {
+                    listS2005.add(row);
+                } else if ("S-2007".equals(cellValue)) {
+                    listS2007.add(row);
+                } else if ("S-2011".equals(cellValue)) {
+                    listS2011.add(row);
+                } else if ("S-2400".equals(cellValue)) {
+                    listS2400.add(row);
+                } else if ("S-3004".equals(cellValue)) {
+                    listS3004.add(row);
+                } else if ("S-3009".equals(cellValue)) {
+                    listS3009.add(row);
+                } else if ("S-3010".equals(cellValue)) {
+                    listS3010.add(row);
+                } else if ("S-3011".equals(cellValue)) {
+                    listS3011.add(row);
+                } else if ("S-3012".equals(cellValue)) {
+                    listS3012.add(row);
+                } else if ("S-3022".equals(cellValue)) {
+                    listS3022.add(row);
+                } else if ("S-4012".equals(cellValue)) {
+                    listS4012.add(row);
+                } else if ("S-4013".equals(cellValue)) {
+                    listS4013.add(row);
+                } else if ("S-5001".equals(cellValue)) {
+                    listS5001.add(row);
+                } else if ("S-5003".equals(cellValue)) {
+                    listS5003.add(row);
+                } else if ("S-5010".equals(cellValue)) {
+                    listS5010.add(row);
+                } else if ("S-5012".equals(cellValue)) {
+                    listS5012.add(row);
+                } else if ("S-6107".equals(cellValue)) {
+                    listS6107.add(row);
+                } else if ("S1301".equals(cellValue)) {
+                    listS1301.add(row);
+                } else if ("S4501".equals(cellValue)) {
+                    listS4501.add(row);
+                } else if ("S6101".equals(cellValue)) {
+                    listS6101.add(row);
+                } else if ("S6301".equals(cellValue)) {
+                    listS6301.add(row);
+                } else if ("Z-404".equals(cellValue)) {
+                    listZ404.add(row);
+                }
+            } catch (Exception e) {
+                logger.info("e:" + e);
+            }
+        }
+        int successNumber = 0;
+        for (Row row : listS0501) {
+            try {
+                int cellNum = row.getPhysicalNumberOfCells();
+                TMonthlyQualityReportS0501 entity = new TMonthlyQualityReportS0501();
+                entity.setDelFlag("0");
+                entity.setDeptId(userService.selectUserById(userId).getDeptId());
+                entity.setCreateBy(userId.toString());
+                for (int j = 0; j < cellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    String cellValue = ExcelUtils.getCellValue(cell);
+                    if (j == 0) {
+                        entity.setLocationName(cellValue);
+                    } else if (j == 1) {
+                        entity.setSamplePoint(cellValue);
+                    } else if (j == 2) {
+                        if (cellValue.length() > 3) {
+                            entity.setSampleDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
+                        }
+                    } else if (j == 3) {
+                        entity.setSampleName(cellValue);
+                    } else if (j == 51) {
+                        entity.setP(cellValue);
+                    } else if (j == 52) {
+                        entity.setI(cellValue);
+                    } else if (j == 53) {
+                        entity.setO(cellValue);
+                    } else if (j == 54) {
+                        entity.setN(cellValue);
+                    } else if (j == 55) {
+                        entity.setA(cellValue);
+                    } else if (j == 56) {
+                        entity.setPI(cellValue);
+                    } else if (j == 81) {
+                        entity.setDensity2(cellValue);
+                    } else if (j == 82) {
+                        entity.setIbp(cellValue);
+                    } else if (j == 83) {
+                        entity.setFive(cellValue);
+                    } else if (j == 84) {
+                        entity.setTen(cellValue);
+                    } else if (j == 85) {
+                        entity.setThrity(cellValue);
+                    } else if (j == 86) {
+                        entity.setFifty(cellValue);
+                    } else if (j == 87) {
+                        entity.setSeventy(cellValue);
+                    } else if (j == 88) {
+                        entity.setNinety(cellValue);
+                    } else if (j == 89) {
+                        entity.setNinetyFive(cellValue);
+                    } else if (j == 90) {
+                        entity.setFbp(cellValue);
+                    } else if (j == 92) {
+                        entity.setTotalSulfur(cellValue);
+                    }
+                }
+                tMonthlyQualityReportS0501Service.insertTMonthlyQualityReportS0501(entity);
+                successNumber++;
+            } catch (Exception e) {
+                logger.info("e:" + e);
+            }
+        }
+        for (Row row : listS1301) {
+            try {
+                int cellNum = row.getPhysicalNumberOfCells();
+                TMonthlyQualityReportS1301 entity = new TMonthlyQualityReportS1301();
+                entity.setDelFlag("0");
+                entity.setDeptId(userService.selectUserById(userId).getDeptId());
+                entity.setCreateBy(userId.toString());
+                for (int j = 0; j < cellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    String cellValue = ExcelUtils.getCellValue(cell);
+                    if (j == 0) {
+                        entity.setLocationName(cellValue);
+                    } else if (j == 1) {
+                        entity.setSamplePoint(cellValue);
+                    } else if (j == 2) {
+                        if (cellValue.length() > 3) {
+                            entity.setSampleDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
+                        }
+                    } else if (j == 3) {
+                        entity.setSampleName(cellValue);
+                    } else if (j == 4) {
+                        entity.setNa(cellValue);
+                    } else if (j == 5) {
+                        entity.setBenzene(cellValue);
+                    } else if (j == 6) {
+                        entity.setToluene(cellValue);
+                    } else if (j == 7) {
+                        entity.setEthylbenzene(cellValue);
+                    } else if (j == 8) {
+                        entity.setpXylene(cellValue);
+                    } else if (j == 9) {
+                        entity.setmXylene(cellValue);
+                    } else if (j == 10) {
+                        entity.setoXylene(cellValue);
+                    } else if (j == 11) {
+                        entity.setStyrene(cellValue);
+                    } else if (j == 12) {
+                        entity.setPhenylacetylene(cellValue);
+                    } else if (j == 15) {
+                        entity.setTotalAromatics(cellValue);
+                    } else if (j == 16) {
+                        entity.setBrNumber(cellValue);
+                    } else if (j == 27) {
+                        entity.setDieneValue(cellValue);
+                    } else if (j == 28) {
+                        entity.setTotalNitrogen(cellValue);
+                    }
+                }
+                tMonthlyQualityReportS1301Service.insertTMonthlyQualityReportS1301(entity);
+                successNumber++;
+            } catch (Exception e) {
+                logger.info("e:" + e);
+            }
+        }
+        for (Row row : listS2002) {
+            try {
+                int cellNum = row.getPhysicalNumberOfCells();
+                TMonthlyQualityReportS2002 entity = new TMonthlyQualityReportS2002();
+                entity.setDelFlag("0");
+                entity.setDeptId(userService.selectUserById(userId).getDeptId());
+                entity.setCreateBy(userId.toString());
+                for (int j = 0; j < cellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    String cellValue = ExcelUtils.getCellValue(cell);
+                    if (j == 0) {
+                        entity.setLocationName(cellValue);
+                    } else if (j == 1) {
+                        entity.setSamplePoint(cellValue);
+                    } else if (j == 2) {
+                        if (cellValue.length() > 3) {
+                            entity.setSampleDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
+                        }
+                    } else if (j == 3) {
+                        entity.setSampleName(cellValue);
+                    } else if (j == 4) {
+                        entity.setCod(cellValue);
+                    } else if (j == 5) {
+                        entity.setPh(cellValue);
+                    }
+                }
+                tMonthlyQualityReportS2002Service.insertTMonthlyQualityReportS2002(entity);
+                successNumber++;
+            } catch (Exception e) {
+                logger.info("e:" + e);
+            }
+        }
+        for (Row row : listS2005) {
+            try {
+                int cellNum = row.getPhysicalNumberOfCells();
+                TMonthlyQualityReportS2005 entity = new TMonthlyQualityReportS2005();
+                entity.setDelFlag("0");
+                entity.setDeptId(userService.selectUserById(userId).getDeptId());
+                entity.setCreateBy(userId.toString());
+                for (int j = 0; j < cellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    String cellValue = ExcelUtils.getCellValue(cell);
+                    if (j == 0) {
+                        entity.setLocationName(cellValue);
+                    } else if (j == 1) {
+                        entity.setSamplePoint(cellValue);
+                    } else if (j == 2) {
+                        if (cellValue.length() > 3) {
+                            entity.setSampleDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
+                        }
+                    } else if (j == 3) {
+                        entity.setSampleName(cellValue);
+                    } else if (j == 5) {
+                        entity.setPh(cellValue);
+                    } else if (j == 13) {
+                        entity.setOilRatio(cellValue);
+                    }
+                }
+                tMonthlyQualityReportS2005Service.insertTMonthlyQualityReportS2005(entity);
+                successNumber++;
+            } catch (Exception e) {
+                logger.info("e:" + e);
+            }
+        }
+        for (Row row : listS2007) {
+            try {
+                int cellNum = row.getPhysicalNumberOfCells();
+                TMonthlyQualityReportS2007 entity = new TMonthlyQualityReportS2007();
+                entity.setDelFlag("0");
+                entity.setDeptId(userService.selectUserById(userId).getDeptId());
+                entity.setCreateBy(userId.toString());
+                for (int j = 0; j < cellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    String cellValue = ExcelUtils.getCellValue(cell);
+                    if (j == 0) {
+                        entity.setLocationName(cellValue);
+                    } else if (j == 1) {
+                        entity.setSamplePoint(cellValue);
+                    } else if (j == 2) {
+                        if (cellValue.length() > 3) {
+                            entity.setSampleDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
+                        }
+                    } else if (j == 3) {
+                        entity.setSampleName(cellValue);
+                    } else if (j == 4) {
+                        entity.setViscosity(cellValue);
+                    }
+                }
+                tMonthlyQualityReportS2007Service.insertTMonthlyQualityReportS2007(entity);
+                successNumber++;
+            } catch (Exception e) {
+                logger.info("e:" + e);
+            }
+        }
+        for (Row row : listS2011) {
+            try {
+                int cellNum = row.getPhysicalNumberOfCells();
+                TMonthlyQualityReportS2011 entity = new TMonthlyQualityReportS2011();
+                entity.setDelFlag("0");
+                entity.setDeptId(userService.selectUserById(userId).getDeptId());
+                entity.setCreateBy(userId.toString());
+                for (int j = 0; j < cellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    String cellValue = ExcelUtils.getCellValue(cell);
+                    if (j == 0) {
+                        entity.setLocationName(cellValue);
+                    } else if (j == 1) {
+                        entity.setSamplePoint(cellValue);
+                    } else if (j == 2) {
+                        if (cellValue.length() > 3) {
+                            entity.setSampleDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
+                        }
+                    } else if (j == 3) {
+                        entity.setSampleName(cellValue);
+                    } else if (j == 4) {
+                        entity.setDensity1(cellValue);
+                    } else if (j == 5) {
+                        entity.setIbp(cellValue);
+                    } else if (j == 13) {
+                        entity.setFbp(cellValue);
+                    }
+                }
+                tMonthlyQualityReportS2011Service.insertTMonthlyQualityReportS2011(entity);
+                successNumber++;
+            } catch (Exception e) {
+                logger.info("e:" + e);
+            }
+        }
+        for (Row row : listS2400) {
+            try {
+                int cellNum = row.getPhysicalNumberOfCells();
+                TMonthlyQualityReportS2400 entity = new TMonthlyQualityReportS2400();
+                entity.setDelFlag("0");
+                entity.setDeptId(userService.selectUserById(userId).getDeptId());
+                entity.setCreateBy(userId.toString());
+                for (int j = 0; j < cellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    String cellValue = ExcelUtils.getCellValue(cell);
+                    if (j == 0) {
+                        entity.setLocationName(cellValue);
+                    } else if (j == 1) {
+                        entity.setSamplePoint(cellValue);
+                    } else if (j == 2) {
+                        if (cellValue.length() > 3) {
+                            entity.setSampleDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
+                        }
+                    } else if (j == 3) {
+                        entity.setSampleName(cellValue);
+                    } else if (j == 4) {
+                        entity.setCod(cellValue);
+                    } else if (j == 5) {
+                        entity.setPh(cellValue);
+                    }
+                }
+                tMonthlyQualityReportS2400Service.insertTMonthlyQualityReportS2400(entity);
+                successNumber++;
+            } catch (Exception e) {
+                logger.info("e:" + e);
+            }
+        }
+        for (Row row : listS3004) {
+            try {
+                int cellNum = row.getPhysicalNumberOfCells();
+                TMonthlyQualityReportS3004 entity = new TMonthlyQualityReportS3004();
+                entity.setDelFlag("0");
+                entity.setDeptId(userService.selectUserById(userId).getDeptId());
+                entity.setCreateBy(userId.toString());
+                for (int j = 0; j < cellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    String cellValue = ExcelUtils.getCellValue(cell);
+                    if (j == 0) {
+                        entity.setLocationName(cellValue);
+                    } else if (j == 1) {
+                        entity.setSamplePoint(cellValue);
+                    } else if (j == 2) {
+                        if (cellValue.length() > 3) {
+                            entity.setSampleDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
+                        }
+                    } else if (j == 3) {
+                        entity.setSampleName(cellValue);
+                    } else if (j == 4) {
+                        entity.setNaOh(cellValue);
+                    } else if (j == 5) {
+                        entity.setNa2Co3(cellValue);
+                    } else if (j == 6) {
+                        entity.setNa2S(cellValue);
+                    }
+                }
+                tMonthlyQualityReportS3004Service.insertTMonthlyQualityReportS3004(entity);
+                successNumber++;
+            } catch (Exception e) {
+                logger.info("e:" + e);
+            }
+        }
+        for (Row row : listS3009) {
+            try {
+                int cellNum = row.getPhysicalNumberOfCells();
+                TMonthlyQualityReportS3009 entity = new TMonthlyQualityReportS3009();
+                entity.setDelFlag("0");
+                entity.setDeptId(userService.selectUserById(userId).getDeptId());
+                entity.setCreateBy(userId.toString());
+                for (int j = 0; j < cellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    String cellValue = ExcelUtils.getCellValue(cell);
+                    if (j == 0) {
+                        entity.setLocationName(cellValue);
+                    } else if (j == 1) {
+                        entity.setSamplePoint(cellValue);
+                    } else if (j == 2) {
+                        if (cellValue.length() > 3) {
+                            entity.setSampleDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
+                        }
+                    } else if (j == 3) {
+                        entity.setSampleName(cellValue);
+                    } else if (j == 4) {
+                        entity.setCarbonMonoxide(cellValue);
+                    } else if (j == 5) {
+                        entity.setMethane(cellValue);
+                    } else if (j == 6) {
+                        entity.setEthane(cellValue);
+                    } else if (j == 7) {
+                        entity.setEthylene(cellValue);
+                    } else if (j == 8) {
+                        entity.setPropane(cellValue);
+                    } else if (j == 9) {
+                        entity.setCycPropane(cellValue);
+                    } else if (j == 10) {
+                        entity.setPropylene(cellValue);
+                    } else if (j == 11) {
+                        entity.setPropadiene(cellValue);
+                    } else if (j == 12) {
+                        entity.setAcetylene(cellValue);
+                    } else if (j == 21) {
+                        entity.setHydrogen(cellValue);
+                    }
+                }
+                tMonthlyQualityReportS3009Service.insertTMonthlyQualityReportS3009(entity);
+                successNumber++;
+            } catch (Exception e) {
+                logger.info("e:" + e);
+            }
+        }
+        for (Row row : listS3010) {
+            try {
+                int cellNum = row.getPhysicalNumberOfCells();
+                TMonthlyQualityReportS3010 entity = new TMonthlyQualityReportS3010();
+                entity.setDelFlag("0");
+                entity.setDeptId(userService.selectUserById(userId).getDeptId());
+                entity.setCreateBy(userId.toString());
+                for (int j = 0; j < cellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    String cellValue = ExcelUtils.getCellValue(cell);
+                    if (j == 0) {
+                        entity.setLocationName(cellValue);
+                    } else if (j == 1) {
+                        entity.setSamplePoint(cellValue);
+                    } else if (j == 2) {
+                        if (cellValue.length() > 3) {
+                            entity.setSampleDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
+                        }
+                    } else if (j == 3) {
+                        entity.setSampleName(cellValue);
+                    } else if (j == 4) {
+                        entity.setAcetylene(cellValue);
+                    }  else if (j == 5) {
+                        entity.setCarbonMonoxide(cellValue);
+                    } else if (j == 6) {
+                        entity.setMethane(cellValue);
+                    } else if (j == 7) {
+                        entity.setEthane(cellValue);
+                    } else if (j == 8) {
+                        entity.setEthylene(cellValue);
+                    } else if (j == 9) {
+                        entity.setPropane(cellValue);
+                    } else if (j == 10) {
+                        entity.setCycPropane(cellValue);
+                    } else if (j == 11) {
+                        entity.setPropylene(cellValue);
+                    } else if (j == 12) {
+                        entity.setPropadiene(cellValue);
+                    } else if (j == 22) {
+                        entity.setHydrogen(cellValue);
+                    }
+                }
+                tMonthlyQualityReportS3010Service.insertTMonthlyQualityReportS3010(entity);
+                successNumber++;
+            } catch (Exception e) {
+                logger.info("e:" + e);
+            }
+        }
+        for (Row row : listS3011) {
+            try {
+                int cellNum = row.getPhysicalNumberOfCells();
+                TMonthlyQualityReportS3011 entity = new TMonthlyQualityReportS3011();
+                entity.setDelFlag("0");
+                entity.setDeptId(userService.selectUserById(userId).getDeptId());
+                entity.setCreateBy(userId.toString());
+                for (int j = 0; j < cellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    String cellValue = ExcelUtils.getCellValue(cell);
+                    if (j == 0) {
+                        entity.setLocationName(cellValue);
+                    } else if (j == 1) {
+                        entity.setSamplePoint(cellValue);
+                    } else if (j == 2) {
+                        if (cellValue.length() > 3) {
+                            entity.setSampleDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
+                        }
+                    } else if (j == 3) {
+                        entity.setSampleName(cellValue);
+                    } else if (j == 4) {
+                        entity.setCarbonMonoxide(cellValue);
+                    } else if (j == 5) {
+                        entity.setMethane(cellValue);
+                    } else if (j == 6) {
+                        entity.setEthane(cellValue);
+                    } else if (j == 7) {
+                        entity.setEthylene(cellValue);
+                    } else if (j == 8) {
+                        entity.setPropane(cellValue);
+                    } else if (j == 9) {
+                        entity.setCycPropane(cellValue);
+                    } else if (j == 10) {
+                        entity.setPropylene(cellValue);
+                    } else if (j == 11) {
+                        entity.setPropadiene(cellValue);
+                    } else if (j == 12) {
+                        entity.setAcetylene(cellValue);
+                    } else if (j == 21) {
+                        entity.setHydrogen(cellValue);
+                    }
+                }
+                tMonthlyQualityReportS3011Service.insertTMonthlyQualityReportS3011(entity);
+                successNumber++;
+            } catch (Exception e) {
+                logger.info("e:" + e);
+            }
+        }
+        for (Row row : listS3012) {
+            try {
+                int cellNum = row.getPhysicalNumberOfCells();
+                TMonthlyQualityReportS3012 entity = new TMonthlyQualityReportS3012();
+                entity.setDelFlag("0");
+                entity.setDeptId(userService.selectUserById(userId).getDeptId());
+                entity.setCreateBy(userId.toString());
+                for (int j = 0; j < cellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    String cellValue = ExcelUtils.getCellValue(cell);
+                    if (j == 0) {
+                        entity.setLocationName(cellValue);
+                    } else if (j == 1) {
+                        entity.setSamplePoint(cellValue);
+                    } else if (j == 2) {
+                        if (cellValue.length() > 3) {
+                            entity.setSampleDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
+                        }
+                    } else if (j == 3) {
+                        entity.setSampleName(cellValue);
+                    } else if (j == 4) {
+                        entity.setAcetylene(cellValue);
+                    }  else if (j == 5) {
+                        entity.setCarbonMonoxide(cellValue);
+                    } else if (j == 6) {
+                        entity.setMethane(cellValue);
+                    } else if (j == 7) {
+                        entity.setEthane(cellValue);
+                    } else if (j == 8) {
+                        entity.setEthylene(cellValue);
+                    } else if (j == 9) {
+                        entity.setPropane(cellValue);
+                    } else if (j == 10) {
+                        entity.setCycPropane(cellValue);
+                    } else if (j == 11) {
+                        entity.setPropylene(cellValue);
+                    } else if (j == 12) {
+                        entity.setPropadiene(cellValue);
+                    } else if (j == 22) {
+                        entity.setHydrogen(cellValue);
+                    }
+                }
+                tMonthlyQualityReportS3012Service.insertTMonthlyQualityReportS3012(entity);
+                successNumber++;
+            } catch (Exception e) {
+                logger.info("e:" + e);
+            }
+        }
+        for (Row row : listS3022) {
+            try {
+                int cellNum = row.getPhysicalNumberOfCells();
+                TMonthlyQualityReportS3022 entity = new TMonthlyQualityReportS3022();
+                entity.setDelFlag("0");
+                entity.setDeptId(userService.selectUserById(userId).getDeptId());
+                entity.setCreateBy(userId.toString());
+                for (int j = 0; j < cellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    String cellValue = ExcelUtils.getCellValue(cell);
+                    if (j == 0) {
+                        entity.setLocationName(cellValue);
+                    } else if (j == 1) {
+                        entity.setSamplePoint(cellValue);
+                    } else if (j == 2) {
+                        if (cellValue.length() > 3) {
+                            entity.setSampleDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
+                        }
+                    } else if (j == 3) {
+                        entity.setSampleName(cellValue);
+                    } else if (j == 5) {
+                        entity.setNaoh(cellValue);
+                    } else if (j == 6) {
+                        entity.setNa2co3(cellValue);
+                    } else if (j == 7) {
+                        entity.setNa2s(cellValue);
+                    }
+                }
+                tMonthlyQualityReportS3022Service.insertTMonthlyQualityReportS3022(entity);
+                successNumber++;
+            } catch (Exception e) {
+                logger.info("e:" + e);
+            }
+        }
+        for (Row row : listS4012) {
+            try {
+                int cellNum = row.getPhysicalNumberOfCells();
+                TMonthlyQualityReportS4012 entity = new TMonthlyQualityReportS4012();
+                entity.setDelFlag("0");
+                entity.setDeptId(userService.selectUserById(userId).getDeptId());
+                entity.setCreateBy(userId.toString());
+                for (int j = 0; j < cellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    String cellValue = ExcelUtils.getCellValue(cell);
+                    if (j == 0) {
+                        entity.setLocationName(cellValue);
+                    } else if (j == 1) {
+                        entity.setSamplePoint(cellValue);
+                    } else if (j == 2) {
+                        if (cellValue.length() > 3) {
+                            entity.setSampleDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
+                        }
+                    } else if (j == 3) {
+                        entity.setSampleName(cellValue);
+                    } else if (j == 4) {
+                        entity.setMethane(cellValue);
+                    } else if (j == 5) {
+                        entity.setEthane(cellValue);
+                    } else if (j == 6) {
+                        entity.setEthylene(cellValue);
+                    } else if (j == 7) {
+                        entity.setPropane(cellValue);
+                    } else if (j == 8) {
+                        entity.setPropylene(cellValue);
+                    }
+                }
+                tMonthlyQualityReportS4012Service.insertTMonthlyQualityReportS4012(entity);
+                successNumber++;
+            } catch (Exception e) {
+                logger.info("e:" + e);
+            }
+        }
+        for (Row row : listS4013) {
+            try {
+                int cellNum = row.getPhysicalNumberOfCells();
+                TMonthlyQualityReportS4013 entity = new TMonthlyQualityReportS4013();
+                entity.setDelFlag("0");
+                entity.setDeptId(userService.selectUserById(userId).getDeptId());
+                entity.setCreateBy(userId.toString());
+                for (int j = 0; j < cellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    String cellValue = ExcelUtils.getCellValue(cell);
+                    if (j == 0) {
+                        entity.setLocationName(cellValue);
+                    } else if (j == 1) {
+                        entity.setSamplePoint(cellValue);
+                    } else if (j == 2) {
+                        if (cellValue.length() > 3) {
+                            entity.setSampleDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
+                        }
+                    } else if (j == 3) {
+                        entity.setSampleName(cellValue);
+                    } else if (j == 5) {
+                        entity.setEthane(cellValue);
+                    } else if (j == 8) {
+                        entity.setMethaneEthane(cellValue);
+                    } else if (j == 10) {
+                        entity.setEthylene(cellValue);
+                    } else if (j == 11) {
+                        entity.setAcetylene(cellValue);
+                    } else if (j == 12) {
+                        entity.setCarbonMonoxide(cellValue);
+                    } else if (j == 13) {
+                        entity.setCarbonDioxide(cellValue);
+                    }
+                }
+                tMonthlyQualityReportS4013Service.insertTMonthlyQualityReportS4013(entity);
+                successNumber++;
+            } catch (Exception e) {
+                logger.info("e:" + e);
+            }
+        }
+        for (Row row : listS4501) {
+            try {
+                int cellNum = row.getPhysicalNumberOfCells();
+                TMonthlyQualityReportS4501 entity = new TMonthlyQualityReportS4501();
+                entity.setDelFlag("0");
+                entity.setDeptId(userService.selectUserById(userId).getDeptId());
+                entity.setCreateBy(userId.toString());
+                for (int j = 0; j < cellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    String cellValue = ExcelUtils.getCellValue(cell);
+                    if (j == 0) {
+                        entity.setLocationName(cellValue);
+                    } else if (j == 1) {
+                        entity.setSamplePoint(cellValue);
+                    } else if (j == 2) {
+                        if (cellValue.length() > 3) {
+                            entity.setSampleDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
+                        }
+                    } else if (j == 3) {
+                        entity.setSampleName(cellValue);
+                    } else if (j == 4) {
+                        entity.setBenzene(cellValue);
+                    } else if (j == 5) {
+                        entity.setToluene(cellValue);
+                    } else if (j == 7) {
+                        entity.setEthylbenzene(cellValue);
+                    } else if (j == 8) {
+                        entity.setmXylene(cellValue);
+                    } else if (j == 9) {
+                        entity.setoXylene(cellValue);
+                    } else if (j == 10) {
+                        entity.setpXylene(cellValue);
+                    } else if (j == 13) {
+                        entity.setC5Na(cellValue);
+                    } else if (j == 14) {
+                        entity.setC6Na(cellValue);
+                    } else if (j == 15) {
+                        entity.setC7Na(cellValue);
+                    } else if (j == 16) {
+                        entity.setC8Na(cellValue);
+                    } else if (j == 17) {
+                        entity.setC9(cellValue);
+                    } else if (j == 18) {
+                        entity.setC8A(cellValue);
+                    } else if (j == 19) {
+                        entity.setC4C5Na(cellValue);
+                    } else if (j == 20) {
+                        entity.setC6C8Na(cellValue);
+                    } else if (j == 21) {
+                        entity.setC4C8Na(cellValue);
+                    } else if (j == 22) {
+                        entity.setBrIndex(cellValue);
+                    } else if (j == 24) {
+                        entity.setTotalSulfur(cellValue);
+                    } else if (j == 25) {
+                        entity.setTotalNitrogen(cellValue);
+                    }
+                }
+                tMonthlyQualityReportS4501Service.insertTMonthlyQualityReportS4501(entity);
+                successNumber++;
+            } catch (Exception e) {
+                logger.info("e:" + e);
+            }
+        }
+        for (Row row : listS5001) {
+            try {
+                int cellNum = row.getPhysicalNumberOfCells();
+                TMonthlyQualityReportS5001 entity = new TMonthlyQualityReportS5001();
+                entity.setDelFlag("0");
+                entity.setDeptId(userService.selectUserById(userId).getDeptId());
+                entity.setCreateBy(userId.toString());
+                for (int j = 0; j < cellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    String cellValue = ExcelUtils.getCellValue(cell);
+                    if (j == 0) {
+                        entity.setLocationName(cellValue);
+                    } else if (j == 1) {
+                        entity.setSamplePoint(cellValue);
+                    } else if (j == 2) {
+                        if (cellValue.length() > 3) {
+                            entity.setSampleDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
+                        }
+                    } else if (j == 3) {
+                        entity.setSampleName(cellValue);
+                    } else if (j == 7) {
+                        entity.setPropane(cellValue);
+                    } else if (j == 8) {
+                        entity.setCycPropane(cellValue);
+                    } else if (j == 9) {
+                        entity.setPropylene(cellValue);
+                    } else if (j == 10) {
+                        entity.setPropadiene(cellValue);
+                    } else if (j == 14) {
+                        entity.setMethylacetylene(cellValue);
+                    }
+                }
+                tMonthlyQualityReportS5001Service.insertTMonthlyQualityReportS5001(entity);
+                successNumber++;
+            } catch (Exception e) {
+                logger.info("e:" + e);
+            }
+        }
+        for (Row row : listS5003) {
+            try {
+                int cellNum = row.getPhysicalNumberOfCells();
+                TMonthlyQualityReportS5003 entity = new TMonthlyQualityReportS5003();
+                entity.setDelFlag("0");
+                entity.setDeptId(userService.selectUserById(userId).getDeptId());
+                entity.setCreateBy(userId.toString());
+                for (int j = 0; j < cellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    String cellValue = ExcelUtils.getCellValue(cell);
+                    if (j == 0) {
+                        entity.setLocationName(cellValue);
+                    } else if (j == 1) {
+                        entity.setSamplePoint(cellValue);
+                    } else if (j == 2) {
+                        if (cellValue.length() > 3) {
+                            entity.setSampleDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
+                        }
+                    } else if (j == 3) {
+                        entity.setSampleName(cellValue);
+                    } else if (j == 4) {
+                        entity.setMethane(cellValue);
+                    } else if (j == 5) {
+                        entity.setEthane(cellValue);
+                    } else if (j == 6) {
+                        entity.setEthylene(cellValue);
+                    } else if (j == 7) {
+                        entity.setPropane(cellValue);
+                    } else if (j == 8) {
+                        entity.setPropadiene(cellValue);
+                    } else if (j == 11) {
+                        entity.setMethylacetylene(cellValue);
+                    } else if (j == 15) {
+                        entity.setButeneButadiene(cellValue);
+                    } else if (j == 16) {
+                        entity.setPropadieneMethylacetylene(cellValue);
+                    } else if (j == 17) {
+                        entity.setTotals(cellValue);
+                    } else if (j == 18) {
+                        entity.setParaffine(cellValue);
+                    } else if (j == 19) {
+                        entity.setPropylene(cellValue);
+                    } else if (j == 20) {
+                        entity.setMethanol(cellValue);
+                    }
+                }
+                tMonthlyQualityReportS5003Service.insertTMonthlyQualityReportS5003(entity);
+                successNumber++;
+            } catch (Exception e) {
+                logger.info("e:" + e);
+            }
+        }
+        for (Row row : listS5010) {
+            try {
+                int cellNum = row.getPhysicalNumberOfCells();
+                TMonthlyQualityReportS5010 entity = new TMonthlyQualityReportS5010();
+                entity.setDelFlag("0");
+                entity.setDeptId(userService.selectUserById(userId).getDeptId());
+                entity.setCreateBy(userId.toString());
+                for (int j = 0; j < cellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    String cellValue = ExcelUtils.getCellValue(cell);
+                    if (j == 0) {
+                        entity.setLocationName(cellValue);
+                    } else if (j == 1) {
+                        entity.setSamplePoint(cellValue);
+                    } else if (j == 2) {
+                        if (cellValue.length() > 3) {
+                            entity.setSampleDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
+                        }
+                    } else if (j == 3) {
+                        entity.setSampleName(cellValue);
+                    } else if (j == 9) {
+                        entity.setPropylene(cellValue);
+                    } else if (j == 10) {
+                        entity.setPropadiene(cellValue);
+                    } else if (j == 11) {
+                        entity.setAcetylene(cellValue);
+                    } else if (j == 12) {
+                        entity.setButadiene12(cellValue);
+                    } else if (j == 13) {
+                        entity.setButadiene13(cellValue);
+                    } else if (j == 14) {
+                        entity.setMethylacetylene(cellValue);
+                    }
+                }
+                tMonthlyQualityReportS5010Service.insertTMonthlyQualityReportS5010(entity);
+                successNumber++;
+            } catch (Exception e) {
+                logger.info("e:" + e);
+            }
+        }
+        for (Row row : listS5012) {
+            try {
+                int cellNum = row.getPhysicalNumberOfCells();
+                TMonthlyQualityReportS5012 entity = new TMonthlyQualityReportS5012();
+                entity.setDelFlag("0");
+                entity.setDeptId(userService.selectUserById(userId).getDeptId());
+                entity.setCreateBy(userId.toString());
+                for (int j = 0; j < cellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    String cellValue = ExcelUtils.getCellValue(cell);
+                    if (j == 0) {
+                        entity.setLocationName(cellValue);
+                    } else if (j == 1) {
+                        entity.setSamplePoint(cellValue);
+                    } else if (j == 2) {
+                        if (cellValue.length() > 3) {
+                            entity.setSampleDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
+                        }
+                    } else if (j == 3) {
+                        entity.setSampleName(cellValue);
+                    } else if (j == 3) {
+                        entity.setSampleName(cellValue);
+                    } else if (j == 9) {
+                        entity.setPropylene(cellValue);
+                    } else if (j == 10) {
+                        entity.setPropadiene(cellValue);
+                    } else if (j == 11) {
+                        entity.setAcetylene(cellValue);
+                    } else if (j == 12) {
+                        entity.setButadiene12(cellValue);
+                    } else if (j == 13) {
+                        entity.setButadiene13(cellValue);
+                    } else if (j == 14) {
+                        entity.setMethylacetylene(cellValue);
+                    }
+                }
+                tMonthlyQualityReportS5012Service.insertTMonthlyQualityReportS5012(entity);
+                successNumber++;
+            } catch (Exception e) {
+                logger.info("e:" + e);
+            }
+        }
+        for (Row row : listS6101) {
+            try {
+                int cellNum = row.getPhysicalNumberOfCells();
+                TMonthlyQualityReportS6101 entity = new TMonthlyQualityReportS6101();
+                entity.setDelFlag("0");
+                entity.setDeptId(userService.selectUserById(userId).getDeptId());
+                entity.setCreateBy(userId.toString());
+                for (int j = 0; j < cellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    String cellValue = ExcelUtils.getCellValue(cell);
+                    if (j == 0) {
+                        entity.setLocationName(cellValue);
+                    } else if (j == 1) {
+                        entity.setSamplePoint(cellValue);
+                    } else if (j == 2) {
+                        if (cellValue.length() > 3) {
+                            entity.setSampleDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
+                        }
+                    } else if (j == 3) {
+                        entity.setSampleName(cellValue);
+                    } else if (j == 4) {
+                        entity.setBenzene(cellValue);
+                    } else if (j == 5) {
+                        entity.setToluene(cellValue);
+                    } else if (j == 6) {
+                        entity.setDcpd(cellValue);
+                    } else if (j == 7) {
+                        entity.setEthylbenzene(cellValue);
+                    } else if (j == 8) {
+                        entity.setmXylene(cellValue);
+                    } else if (j == 9) {
+                        entity.setoXylene(cellValue);
+                    } else if (j == 10) {
+                        entity.setpXylene(cellValue);
+                    } else if (j == 11) {
+                        entity.setStyrene(cellValue);
+                    } else if (j == 13) {
+                        entity.setC5Na(cellValue);
+                    } else if (j == 14) {
+                        entity.setC6Na(cellValue);
+                    } else if (j == 15) {
+                        entity.setC7Na(cellValue);
+                    } else if (j == 16) {
+                        entity.setC8Na(cellValue);
+                    } else if (j == 17) {
+                        entity.setC9(cellValue);
+                    } else if (j == 18) {
+                        entity.setC8A(cellValue);
+                    } else if (j == 19) {
+                        entity.setC4C5Na(cellValue);
+                    } else if (j == 20) {
+                        entity.setC6C8Na(cellValue);
+                    } else if (j == 21) {
+                        entity.setC4C8Na(cellValue);
+                    } else if (j == 22) {
+                        entity.setDensity1(cellValue);
+                    } else if (j == 23) {
+                        entity.setBrNumber(cellValue);
+                    } else if (j == 35) {
+                        entity.setTotalSulfur(cellValue);
+                    } else if (j == 36) {
+                        entity.setTotalNitrogen(cellValue);
+                    }
+                }
+                tMonthlyQualityReportS6101Service.insertTMonthlyQualityReportS6101(entity);
+                successNumber++;
+            } catch (Exception e) {
+                logger.info("e:" + e);
+            }
+        }
+        for (Row row : listS6107) {
+            try {
+                int cellNum = row.getPhysicalNumberOfCells();
+                TMonthlyQualityReportS6107 entity = new TMonthlyQualityReportS6107();
+                entity.setDelFlag("0");
+                entity.setDeptId(userService.selectUserById(userId).getDeptId());
+                entity.setCreateBy(userId.toString());
+                for (int j = 0; j < cellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    String cellValue = ExcelUtils.getCellValue(cell);
+                    if (j == 0) {
+                        entity.setLocationName(cellValue);
+                    } else if (j == 1) {
+                        entity.setSamplePoint(cellValue);
+                    } else if (j == 2) {
+                        if (cellValue.length() > 3) {
+                            entity.setSampleDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
+                        }
+                    } else if (j == 3) {
+                        entity.setSampleName(cellValue);
+                    } else if (j == 4) {
+                        entity.setCod(cellValue);
+                    } else if (j == 5) {
+                        entity.setPh(cellValue);
+                    }
+                }
+                tMonthlyQualityReportS6107Service.insertTMonthlyQualityReportS6107(entity);
+                successNumber++;
+            } catch (Exception e) {
+                logger.info("e:" + e);
+            }
+        }
+        for (Row row : listS6301) {
+            try {
+                int cellNum = row.getPhysicalNumberOfCells();
+                TMonthlyQualityReportS6301 entity = new TMonthlyQualityReportS6301();
+                entity.setDelFlag("0");
+                entity.setDeptId(userService.selectUserById(userId).getDeptId());
+                entity.setCreateBy(userId.toString());
+                for (int j = 0; j < cellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    String cellValue = ExcelUtils.getCellValue(cell);
+                    if (j == 0) {
+                        entity.setLocationName(cellValue);
+                    } else if (j == 1) {
+                        entity.setSamplePoint(cellValue);
+                    } else if (j == 2) {
+                        if (cellValue.length() > 3) {
+                            entity.setSampleDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
+                        }
+                    } else if (j == 3) {
+                        entity.setSampleName(cellValue);
+                    } else if (j == 7) {
+                        entity.setIc5(cellValue);
+                    } else if (j == 8) {
+                        entity.setDcpd(cellValue);
+                    } else if (j == 9) {
+                        entity.setC5(cellValue);
+                    } else if (j == 10) {
+                        entity.setC5ConjugatedDienesDcpd30(cellValue);
+                    } else if (j == 11) {
+                        entity.setPentadieneCycc5(cellValue);
+                    } else if (j == 14) {
+                        entity.setC5ConjugatedDienesDcpd40(cellValue);
+                    } else if (j == 17) {
+                        entity.setTotalSulfur(cellValue);
+                    } else if (j == 18) {
+                        entity.setTotalSulfur150(cellValue);
+                    } else if (j == 19) {
+                        entity.setSilicon(cellValue);
+                    }
+                }
+                tMonthlyQualityReportS6301Service.insertTMonthlyQualityReportS6301(entity);
+                successNumber++;
+            } catch (Exception e) {
+                logger.info("e:" + e);
+            }
+        }
+        for (Row row : listZ404) {
+            try {
+                int cellNum = row.getPhysicalNumberOfCells();
+                TMonthlyQualityReportZ404 entity = new TMonthlyQualityReportZ404();
+                entity.setDelFlag("0");
+                entity.setDeptId(userService.selectUserById(userId).getDeptId());
+                entity.setCreateBy(userId.toString());
+                for (int j = 0; j < cellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    String cellValue = ExcelUtils.getCellValue(cell);
+                    if (j == 0) {
+                        entity.setLocationName(cellValue);
+                    } else if (j == 1) {
+                        entity.setSamplePoint(cellValue);
+                    } else if (j == 2) {
+                        if (cellValue.length() > 3) {
+                            entity.setSampleDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
+                        }
+                    } else if (j == 3) {
+                        entity.setSampleName(cellValue);
+                    } else if (j == 4) {
+                        entity.setMethane(cellValue);
+                    } else if (j == 5) {
+                        entity.setEthane(cellValue);
+                    } else if (j == 6) {
+                        entity.setEthylene(cellValue);
+                    } else if (j == 7) {
+                        entity.setPropane(cellValue);
+                    } else if (j == 8) {
+                        entity.setPropylene(cellValue);
+                    } else if (j == 9) {
+                        entity.setUnknown(cellValue);
+                    } else if (j == 10) {
+                        entity.setHydrogen(cellValue);
+                    }
+                }
+                tMonthlyQualityReportZ404Service.insertTMonthlyQualityReportZ404(entity);
+                successNumber++;
+            } catch (Exception e) {
+                logger.info("e:" + e);
+            }
+        }
+        logger.info("successNumber:" +String.valueOf(successNumber));
+        return AjaxResult.success(String.valueOf(successNumber));
+    }
+}

master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS5010Controller.java

@@ -27,7 +27,7 @@ import com.ruoyi.framework.web.page.TableDataInfo;
  * @date 2023-10-27
  */
 @RestController
-@RequestMapping("/production/s0510")
+@RequestMapping("/production/s5010")
 public class TMonthlyQualityReportS5010Controller extends BaseController
 {
     @Autowired

master/src/main/java/com/ruoyi/project/production/domain/TMonthlyQualityReportS0501.java

@@ -120,6 +120,16 @@ public class TMonthlyQualityReportS0501 extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date endDate;
 
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
     public Date getStartDate() {
         return startDate;
     }

master/src/main/java/com/ruoyi/project/production/domain/TMonthlyQualityReportS1301.java

@@ -104,6 +104,16 @@ public class TMonthlyQualityReportS1301 extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date endDate;
 
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
     public Date getStartDate() {
         return startDate;
     }

master/src/main/java/com/ruoyi/project/production/domain/TMonthlyQualityReportS2002.java

@@ -60,6 +60,16 @@ public class TMonthlyQualityReportS2002 extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date endDate;
 
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
     public Date getStartDate() {
         return startDate;
     }

master/src/main/java/com/ruoyi/project/production/domain/TMonthlyQualityReportS2005.java

@@ -60,6 +60,16 @@ public class TMonthlyQualityReportS2005 extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date endDate;
 
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
     public Date getStartDate() {
         return startDate;
     }

master/src/main/java/com/ruoyi/project/production/domain/TMonthlyQualityReportS2007.java

@@ -56,6 +56,16 @@ public class TMonthlyQualityReportS2007 extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date endDate;
 
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
     public Date getStartDate() {
         return startDate;
     }

master/src/main/java/com/ruoyi/project/production/domain/TMonthlyQualityReportS2011.java

@@ -64,6 +64,16 @@ public class TMonthlyQualityReportS2011 extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date endDate;
 
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
     public Date getStartDate() {
         return startDate;
     }

master/src/main/java/com/ruoyi/project/production/domain/TMonthlyQualityReportS2400.java

@@ -60,6 +60,16 @@ public class TMonthlyQualityReportS2400 extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date endDate;
 
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
     public Date getStartDate() {
         return startDate;
     }

master/src/main/java/com/ruoyi/project/production/domain/TMonthlyQualityReportS3004.java

@@ -64,6 +64,16 @@ public class TMonthlyQualityReportS3004 extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date endDate;
 
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
     public Date getStartDate() {
         return startDate;
     }

master/src/main/java/com/ruoyi/project/production/domain/TMonthlyQualityReportS3009.java

@@ -92,6 +92,16 @@ public class TMonthlyQualityReportS3009 extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date endDate;
 
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
     public Date getStartDate() {
         return startDate;
     }

master/src/main/java/com/ruoyi/project/production/domain/TMonthlyQualityReportS3010.java

@@ -92,6 +92,16 @@ public class TMonthlyQualityReportS3010 extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date endDate;
 
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
     public Date getStartDate() {
         return startDate;
     }

master/src/main/java/com/ruoyi/project/production/domain/TMonthlyQualityReportS3011.java

@@ -92,6 +92,16 @@ public class TMonthlyQualityReportS3011 extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date endDate;
 
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
     public Date getStartDate() {
         return startDate;
     }

master/src/main/java/com/ruoyi/project/production/domain/TMonthlyQualityReportS3012.java

@@ -92,6 +92,16 @@ public class TMonthlyQualityReportS3012 extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date endDate;
 
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
     public Date getStartDate() {
         return startDate;
     }

master/src/main/java/com/ruoyi/project/production/domain/TMonthlyQualityReportS3022.java

@@ -64,6 +64,16 @@ public class TMonthlyQualityReportS3022 extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date endDate;
 
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
     public Date getStartDate() {
         return startDate;
     }

master/src/main/java/com/ruoyi/project/production/domain/TMonthlyQualityReportS4012.java

@@ -72,6 +72,16 @@ public class TMonthlyQualityReportS4012 extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date endDate;
 
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
     public Date getStartDate() {
         return startDate;
     }

master/src/main/java/com/ruoyi/project/production/domain/TMonthlyQualityReportS4013.java

@@ -76,6 +76,16 @@ public class TMonthlyQualityReportS4013 extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date endDate;
 
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
     public Date getStartDate() {
         return startDate;
     }

master/src/main/java/com/ruoyi/project/production/domain/TMonthlyQualityReportS4501.java

@@ -112,6 +112,52 @@ public class TMonthlyQualityReportS4501 extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date endDate;
 
+    private String deptName;
+
+    /** 溴指数 */
+    @Excel(name = "溴指数")
+    private String brIndex;
+
+    /** 总硫 */
+    @Excel(name = "总硫")
+    private String totalSulfur;
+
+    /** 总氮 */
+    @Excel(name = "总氮")
+    private String totalNitrogen;
+
+    public String getBrIndex() {
+        return brIndex;
+    }
+
+    public void setBrIndex(String brIndex) {
+        this.brIndex = brIndex;
+    }
+
+    public String getTotalSulfur() {
+        return totalSulfur;
+    }
+
+    public void setTotalSulfur(String totalSulfur) {
+        this.totalSulfur = totalSulfur;
+    }
+
+    public String getTotalNitrogen() {
+        return totalNitrogen;
+    }
+
+    public void setTotalNitrogen(String totalNitrogen) {
+        this.totalNitrogen = totalNitrogen;
+    }
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
     public Date getStartDate() {
         return startDate;
     }

master/src/main/java/com/ruoyi/project/production/domain/TMonthlyQualityReportS5001.java

@@ -72,6 +72,16 @@ public class TMonthlyQualityReportS5001 extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date endDate;
 
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
     public Date getStartDate() {
         return startDate;
     }

master/src/main/java/com/ruoyi/project/production/domain/TMonthlyQualityReportS5003.java

@@ -100,6 +100,16 @@ public class TMonthlyQualityReportS5003 extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date endDate;
 
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
     public Date getStartDate() {
         return startDate;
     }

master/src/main/java/com/ruoyi/project/production/domain/TMonthlyQualityReportS5010.java

@@ -76,6 +76,16 @@ public class TMonthlyQualityReportS5010 extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date endDate;
 
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
     public Date getStartDate() {
         return startDate;
     }

master/src/main/java/com/ruoyi/project/production/domain/TMonthlyQualityReportS5012.java

@@ -76,6 +76,16 @@ public class TMonthlyQualityReportS5012 extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date endDate;
 
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
     public Date getStartDate() {
         return startDate;
     }

master/src/main/java/com/ruoyi/project/production/domain/TMonthlyQualityReportS6101.java

@@ -136,6 +136,16 @@ public class TMonthlyQualityReportS6101 extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date endDate;
 
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
     public Date getStartDate() {
         return startDate;
     }

master/src/main/java/com/ruoyi/project/production/domain/TMonthlyQualityReportS6107.java

@@ -60,6 +60,16 @@ public class TMonthlyQualityReportS6107 extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date endDate;
 
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
     public Date getStartDate() {
         return startDate;
     }

master/src/main/java/com/ruoyi/project/production/domain/TMonthlyQualityReportS6301.java

@@ -84,6 +84,27 @@ public class TMonthlyQualityReportS6301 extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date endDate;
 
+    private String deptName;
+
+    /** 总硫<=150 */
+    private String totalSulfur150;
+
+    public String getTotalSulfur150() {
+        return totalSulfur150;
+    }
+
+    public void setTotalSulfur150(String totalSulfur150) {
+        this.totalSulfur150 = totalSulfur150;
+    }
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
     public Date getStartDate() {
         return startDate;
     }

master/src/main/java/com/ruoyi/project/production/domain/TMonthlyQualityReportZ404.java

@@ -80,6 +80,16 @@ public class TMonthlyQualityReportZ404 extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date endDate;
 
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
     public Date getStartDate() {
         return startDate;
     }

master/src/main/resources/mybatis/production/TMonthlyQualityReportS0501Mapper.xml

@@ -82,6 +82,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertTMonthlyQualityReportS0501" parameterType="TMonthlyQualityReportS0501">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_quality_report_s0501.NEXTVAL as id FROM DUAL
+        </selectKey>
         insert into t_monthly_quality_report_s0501
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>

master/src/main/resources/mybatis/production/TMonthlyQualityReportS1301Mapper.xml

@@ -74,6 +74,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertTMonthlyQualityReportS1301" parameterType="TMonthlyQualityReportS1301">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_quality_report_s1301.NEXTVAL as id FROM DUAL
+        </selectKey>
         insert into t_monthly_quality_report_s1301
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>

master/src/main/resources/mybatis/production/TMonthlyQualityReportS2002Mapper.xml

@@ -52,6 +52,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertTMonthlyQualityReportS2002" parameterType="TMonthlyQualityReportS2002">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_quality_report_s2002.NEXTVAL as id FROM DUAL
+        </selectKey>
         insert into t_monthly_quality_report_s2002
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>

master/src/main/resources/mybatis/production/TMonthlyQualityReportS2005Mapper.xml

@@ -52,6 +52,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertTMonthlyQualityReportS2005" parameterType="TMonthlyQualityReportS2005">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_quality_report_s2005.NEXTVAL as id FROM DUAL
+        </selectKey>
         insert into t_monthly_quality_report_s2005
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>

master/src/main/resources/mybatis/production/TMonthlyQualityReportS2007Mapper.xml

@@ -50,6 +50,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertTMonthlyQualityReportS2007" parameterType="TMonthlyQualityReportS2007">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_quality_report_s2007.NEXTVAL as id FROM DUAL
+        </selectKey>
         insert into t_monthly_quality_report_s2007
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>

master/src/main/resources/mybatis/production/TMonthlyQualityReportS2011Mapper.xml

@@ -54,6 +54,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertTMonthlyQualityReportS2011" parameterType="TMonthlyQualityReportS2011">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_quality_report_s2011.NEXTVAL as id FROM DUAL
+        </selectKey>
         insert into t_monthly_quality_report_s2011
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>

master/src/main/resources/mybatis/production/TMonthlyQualityReportS2400Mapper.xml

@@ -52,6 +52,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertTMonthlyQualityReportS2400" parameterType="TMonthlyQualityReportS2400">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_quality_report_s2400.NEXTVAL as id FROM DUAL
+        </selectKey>
         insert into t_monthly_quality_report_s2400
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>

master/src/main/resources/mybatis/production/TMonthlyQualityReportS3004Mapper.xml

@@ -54,6 +54,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertTMonthlyQualityReportS3004" parameterType="TMonthlyQualityReportS3004">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_quality_report_s3004.NEXTVAL as id FROM DUAL
+        </selectKey>
         insert into t_monthly_quality_report_s3004
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>

master/src/main/resources/mybatis/production/TMonthlyQualityReportS3009Mapper.xml

@@ -68,6 +68,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertTMonthlyQualityReportS3009" parameterType="TMonthlyQualityReportS3009">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_quality_report_s3009.NEXTVAL as id FROM DUAL
+        </selectKey>
         insert into t_monthly_quality_report_s3009
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>

master/src/main/resources/mybatis/production/TMonthlyQualityReportS3010Mapper.xml

@@ -68,6 +68,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertTMonthlyQualityReportS3010" parameterType="TMonthlyQualityReportS3010">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_quality_report_s3010.NEXTVAL as id FROM DUAL
+        </selectKey>
         insert into t_monthly_quality_report_s3010
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>

master/src/main/resources/mybatis/production/TMonthlyQualityReportS3011Mapper.xml

@@ -68,6 +68,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertTMonthlyQualityReportS3011" parameterType="TMonthlyQualityReportS3011">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_quality_report_s3011.NEXTVAL as id FROM DUAL
+        </selectKey>
         insert into t_monthly_quality_report_s3011
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>

master/src/main/resources/mybatis/production/TMonthlyQualityReportS3012Mapper.xml

@@ -68,6 +68,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertTMonthlyQualityReportS3012" parameterType="TMonthlyQualityReportS3012">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_quality_report_s3012.NEXTVAL as id FROM DUAL
+        </selectKey>
         insert into t_monthly_quality_report_s3012
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>

master/src/main/resources/mybatis/production/TMonthlyQualityReportS3022Mapper.xml

@@ -54,6 +54,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertTMonthlyQualityReportS3022" parameterType="TMonthlyQualityReportS3022">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_quality_report_s3022.NEXTVAL as id FROM DUAL
+        </selectKey>
         insert into t_monthly_quality_report_s3022
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>

master/src/main/resources/mybatis/production/TMonthlyQualityReportS4012Mapper.xml

@@ -58,6 +58,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertTMonthlyQualityReportS4012" parameterType="TMonthlyQualityReportS4012">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_quality_report_s4012.NEXTVAL as id FROM DUAL
+        </selectKey>
         insert into t_monthly_quality_report_s4012
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>

master/src/main/resources/mybatis/production/TMonthlyQualityReportS4013Mapper.xml

@@ -60,6 +60,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertTMonthlyQualityReportS4013" parameterType="TMonthlyQualityReportS4013">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_quality_report_s4013.NEXTVAL as id FROM DUAL
+        </selectKey>
         insert into t_monthly_quality_report_s4013
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>

master/src/main/resources/mybatis/production/TMonthlyQualityReportS4501Mapper.xml

@@ -34,10 +34,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deptName" column="dept_name" />
         <result property="startDate" column="start_date" />
         <result property="endDate" column="end_date" />
+        <result property="brIndex" column="br_index" />
+        <result property="totalSulfur" column="total_sulfur" />
+        <result property="totalNitrogen" column="total_nitrogen" />
     </resultMap>
 
     <sql id="selectTMonthlyQualityReportS4501Vo">
-        select d.id, d.location_name, d.sample_point, d.sample_date, d.sample_name, d.benzene, d.toluene, d.ethylbenzene, d.m_xylene, d.o_xylene, d.p_xylene, d.c5_na, d.c6_na, d.c7_na, d.c8_na, d.c9, d.c8_a, d.c4_c5_na, d.c6_c8_na, d.c4_c8_na, d.dept_id, d.del_flag, d.create_by, d.create_time, d.update_by, d.update_time ,s.dept_name from t_monthly_quality_report_s4501 d
+        select d.id, d.br_index, d.total_sulfur, d.total_nitrogen, d.location_name, d.sample_point, d.sample_date, d.sample_name, d.benzene, d.toluene, d.ethylbenzene, d.m_xylene, d.o_xylene, d.p_xylene, d.c5_na, d.c6_na, d.c7_na, d.c8_na, d.c9, d.c8_a, d.c4_c5_na, d.c6_c8_na, d.c4_c8_na, d.dept_id, d.del_flag, d.create_by, d.create_time, d.update_by, d.update_time ,s.dept_name from t_monthly_quality_report_s4501 d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -66,6 +69,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="c6C8Na != null  and c6C8Na != ''"> and c6_c8_na = #{c6C8Na}</if>
             <if test="c4C8Na != null  and c4C8Na != ''"> and c4_c8_na = #{c4C8Na}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="brIndex != null "> and br_index = #{brIndex}</if>
+            <if test="totalSulfur != null "> and total_sulfur = #{totalSulfur}</if>
+            <if test="totalNitrogen != null "> and total_nitrogen = #{totalNitrogen}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -78,6 +84,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertTMonthlyQualityReportS4501" parameterType="TMonthlyQualityReportS4501">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_quality_report_s4501.NEXTVAL as id FROM DUAL
+        </selectKey>
         insert into t_monthly_quality_report_s4501
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
@@ -106,6 +115,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="brIndex != null">br_index,</if>
+            <if test="totalSulfur != null">total_sulfur,</if>
+            <if test="totalNitrogen != null">total_nitrogen,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -134,6 +146,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="brIndex != null">#{brIndex},</if>
+            <if test="totalSulfur != null">#{totalSulfur},</if>
+            <if test="totalNitrogen != null">#{totalNitrogen},</if>
          </trim>
     </insert>
 
@@ -165,6 +180,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="brIndex != null">br_index = #{brIndex},</if>
+            <if test="totalSulfur != null">total_sulfur = #{totalSulfur},</if>
+            <if test="totalNitrogen != null">total_nitrogen = #{totalNitrogen},</if>
         </trim>
         where id = #{id}
     </update>

master/src/main/resources/mybatis/production/TMonthlyQualityReportS5001Mapper.xml

@@ -58,6 +58,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertTMonthlyQualityReportS5001" parameterType="TMonthlyQualityReportS5001">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_quality_report_s5001.NEXTVAL as id FROM DUAL
+        </selectKey>
         insert into t_monthly_quality_report_s5001
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>

master/src/main/resources/mybatis/production/TMonthlyQualityReportS5003Mapper.xml

@@ -72,6 +72,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertTMonthlyQualityReportS5003" parameterType="TMonthlyQualityReportS5003">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_quality_report_s5003.NEXTVAL as id FROM DUAL
+        </selectKey>
         insert into t_monthly_quality_report_s5003
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>

master/src/main/resources/mybatis/production/TMonthlyQualityReportS5010Mapper.xml

@@ -60,6 +60,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertTMonthlyQualityReportS5010" parameterType="TMonthlyQualityReportS5010">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_quality_report_s5010.NEXTVAL as id FROM DUAL
+        </selectKey>
         insert into t_monthly_quality_report_s5010
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>

master/src/main/resources/mybatis/production/TMonthlyQualityReportS5012Mapper.xml

@@ -60,6 +60,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertTMonthlyQualityReportS5012" parameterType="TMonthlyQualityReportS5012">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_quality_report_s5012.NEXTVAL as id FROM DUAL
+        </selectKey>
         insert into t_monthly_quality_report_s5012
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>

master/src/main/resources/mybatis/production/TMonthlyQualityReportS6101Mapper.xml

@@ -90,6 +90,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertTMonthlyQualityReportS6101" parameterType="TMonthlyQualityReportS6101">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_quality_report_s6101.NEXTVAL as id FROM DUAL
+        </selectKey>
         insert into t_monthly_quality_report_s6101
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>

master/src/main/resources/mybatis/production/TMonthlyQualityReportS6107Mapper.xml

@@ -52,6 +52,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertTMonthlyQualityReportS6107" parameterType="TMonthlyQualityReportS6107">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_quality_report_s6107.NEXTVAL as id FROM DUAL
+        </selectKey>
         insert into t_monthly_quality_report_s6107
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>

master/src/main/resources/mybatis/production/TMonthlyQualityReportS6301Mapper.xml

@@ -27,10 +27,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deptName" column="dept_name" />
         <result property="startDate" column="start_date" />
         <result property="endDate" column="end_date" />
+        <result property="totalSulfur150" column="total_sulfur150" />
     </resultMap>
 
     <sql id="selectTMonthlyQualityReportS6301Vo">
-        select d.id, d.location_name, d.sample_point, d.sample_date, d.sample_name, d.ic5, d.dcpd, d.c5, d.c5_conjugated_dienes_dcpd_30, d.pentadiene_cycc5, d.c5_conjugated_dienes_dcpd_40, d.total_sulfur, d.silicon, d.dept_id, d.del_flag, d.create_by, d.create_time, d.update_by, d.update_time ,s.dept_name from t_monthly_quality_report_s6301 d
+        select d.id, d.total_sulfur150, d.location_name, d.sample_point, d.sample_date, d.sample_name, d.ic5, d.dcpd, d.c5, d.c5_conjugated_dienes_dcpd_30, d.pentadiene_cycc5, d.c5_conjugated_dienes_dcpd_40, d.total_sulfur, d.silicon, d.dept_id, d.del_flag, d.create_by, d.create_time, d.update_by, d.update_time ,s.dept_name from t_monthly_quality_report_s6301 d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -52,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="totalSulfur != null  and totalSulfur != ''"> and total_sulfur = #{totalSulfur}</if>
             <if test="silicon != null  and silicon != ''"> and silicon = #{silicon}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="totalSulfur150 != null "> and total_sulfur150 = #{totalSulfur150}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -64,6 +66,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertTMonthlyQualityReportS6301" parameterType="TMonthlyQualityReportS6301">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_quality_report_s6301.NEXTVAL as id FROM DUAL
+        </selectKey>
         insert into t_monthly_quality_report_s6301
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
@@ -85,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="totalSulfur150 != null">total_sulfur150,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -106,6 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="totalSulfur150 != null">#{totalSulfur150},</if>
          </trim>
     </insert>
 
@@ -130,6 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="totalSulfur150 != null">total_sulfur150 = #{totalSulfur150},</if>
         </trim>
         where id = #{id}
     </update>

master/src/main/resources/mybatis/production/TMonthlyQualityReportZ404Mapper.xml

@@ -62,6 +62,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertTMonthlyQualityReportZ404" parameterType="TMonthlyQualityReportZ404">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_quality_report_z404.NEXTVAL as id FROM DUAL
+        </selectKey>
         insert into t_monthly_quality_report_z404
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>

ui/src/views/production/quality/index.vue

@@ -24,7 +24,7 @@
                     icon="el-icon-upload2"
                     size="mini"
                     @click="handleImport"
-                    v-hasPermi="['production:quality:edit']"
+                    v-hasPermi="['production:quality:add']"
             >批量导入</el-button>
         </el-col>
       <el-col :span="1.5">
@@ -53,7 +53,7 @@
       <el-table-column label="烯烃" align="center" prop="o" :show-overflow-tooltip="true"/>
       <el-table-column label="环烷烃" align="center" prop="n" :show-overflow-tooltip="true"/>
       <el-table-column label="芳烃" align="center" prop="a" :show-overflow-tooltip="true"/>
-      <el-table-column label="正构烷烃+异构烷烃" align="center" prop="pI" :show-overflow-tooltip="true"/>
+      <el-table-column label="正构烷烃+异构烷烃" align="center" prop="pi" :show-overflow-tooltip="true"/>
       <el-table-column label="密度" align="center" prop="density2" :show-overflow-tooltip="true"/>
       <el-table-column label="初馏点" align="center" prop="ibp" :show-overflow-tooltip="true"/>
       <el-table-column label="5%" align="center" prop="five" :show-overflow-tooltip="true"/>
@@ -580,6 +580,9 @@
       <el-table-column label="C4 -C5 非芳烃" align="center" prop="c4C5Na" :show-overflow-tooltip="true"/>
       <el-table-column label="C6 -C8 非芳烃" align="center" prop="c6C8Na" :show-overflow-tooltip="true"/>
       <el-table-column label="C4-C8非芳烃" align="center" prop="c4C8Na" :show-overflow-tooltip="true"/>
+      <el-table-column label="溴指数" align="center" prop="brIndex" :show-overflow-tooltip="true"/>
+      <el-table-column label="总硫" align="center" prop="totalSulfur" :show-overflow-tooltip="true"/>
+      <el-table-column label="总氮" align="center" prop="totalNitrogen" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -835,6 +838,7 @@
       <el-table-column label="间戊二烯+环戊二烯" align="center" prop="pentadieneCycc5" :show-overflow-tooltip="true"/>
       <el-table-column label="碳五共轭双烯烃+双环戊二烯>=40" align="center" prop="c5ConjugatedDienesDcpd40" :show-overflow-tooltip="true"/>
       <el-table-column label="总硫" align="center" prop="totalSulfur" :show-overflow-tooltip="true"/>
+      <el-table-column label="总硫<=150" align="center" prop="totalSulfur150" :show-overflow-tooltip="true"/>
       <el-table-column label="硅" align="center" prop="silicon" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -2145,9 +2149,11 @@
                   <em>点击上传</em>
               </div>
               <div class="el-upload__tip" slot="tip">
-                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
                   <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
               </div>
+              <form ref="downloadFileForm" :action="upload.downloadAction" target="FORMSUBMIT">
+                <input name="type" :value="upload.type" hidden />
+              </form>
               <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
           </el-upload>
           <div slot="footer" class="dialog-footer">
@@ -2276,6 +2282,10 @@ export default {
       openZ404: false,
       // 用户导入参数
       upload: {
+          //下载模板请求地址
+          downloadAction: process.env.VUE_APP_BASE_API + '/common/template',
+          //下载模板类型
+          type: 'quality',
           // 是否显示弹出层（用户导入）
           open: false,
           // 弹出层标题（用户导入）
@@ -2287,7 +2297,7 @@ export default {
           // 设置上传的请求头部
           headers: { Authorization: "Bearer " + getToken() },
           // 上传的地址
-          url: process.env.VUE_APP_BASE_API + "/production/s0501/importData"
+          url: process.env.VUE_APP_BASE_API + "/production/quality/importData"
       },
       // 查询参数
       queryParams: {
@@ -3779,15 +3789,12 @@ export default {
     },
     /** 导入按钮操作 */
     handleImport() {
-      alert("功能开发中")
-        // this.upload.title = "用户导入";
-        // this.upload.open = true;
+        this.upload.title = "批量导入质量月报";
+        this.upload.open = true;
     },
     /** 下载模板操作 */
     importTemplate() {
-        importTemplate().then(response => {
-            this.download(response.msg);
-        });
+      this.$refs['downloadFileForm'].submit()
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {