质量月报

- 碳二反应器性能指标表格（部分）
- S3009、S3010、S3011、S3012新增字段甲基乙炔
- S3009、S3010、S3011、S3012查询和导入等功能相应修改
- S3009、S3010、S3011、S3012导入模板修改

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

@@ -5,6 +5,7 @@ import com.ruoyi.common.utils.StringUtils;
 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.controller.vo.C2ReactorTableVO;
 import com.ruoyi.project.production.controller.vo.C3ReactorAnalysisVO;
 import com.ruoyi.project.production.controller.vo.C3ReactorTableVO;
 import com.ruoyi.project.production.controller.vo.MonthlyQualityReportQueryVO;
@@ -117,6 +118,277 @@ public class TMonthlyQualityReportController extends BaseController
     @Autowired
     private ITMonthlyQualityReportZ404Service tMonthlyQualityReportZ404Service;
 
+    /**
+     * 碳二反应器性能指标表格
+     */
+    @PreAuthorize("@ss.hasPermi('production:quality:list')")
+    @GetMapping("/c2ReactorTable")
+    public AjaxResult c2ReactorTable(MonthlyQualityReportQueryVO vo)
+    {
+        Date startDate = vo.getStartDate();
+        Date endDate = vo.getEndDate();
+        //1st inlet
+        TMonthlyQualityReportS3009 tMonthlyQualityReportS3009 = new TMonthlyQualityReportS3009();
+        tMonthlyQualityReportS3009.setStartDate(startDate);
+        tMonthlyQualityReportS3009.setEndDate(endDate);
+        List<TMonthlyQualityReportS3009> tMonthlyQualityReportS3009s = tMonthlyQualityReportS3009Service.selectTMonthlyQualityReportS3009List(tMonthlyQualityReportS3009);
+        //3rd outlet
+        TMonthlyQualityReportS3010 tMonthlyQualityReportS3010 = new TMonthlyQualityReportS3010();
+        tMonthlyQualityReportS3010.setStartDate(startDate);
+        tMonthlyQualityReportS3010.setEndDate(endDate);
+        List<TMonthlyQualityReportS3010> tMonthlyQualityReportS3010s = tMonthlyQualityReportS3010Service.selectTMonthlyQualityReportS3010List(tMonthlyQualityReportS3010);
+        //2nd inlet
+        TMonthlyQualityReportS3011 tMonthlyQualityReportS3011 = new TMonthlyQualityReportS3011();
+        tMonthlyQualityReportS3011.setStartDate(startDate);
+        tMonthlyQualityReportS3011.setEndDate(endDate);
+        List<TMonthlyQualityReportS3011> tMonthlyQualityReportS3011s = tMonthlyQualityReportS3011Service.selectTMonthlyQualityReportS3011List(tMonthlyQualityReportS3011);
+        //3rd inlet
+        TMonthlyQualityReportS3012 tMonthlyQualityReportS3012 = new TMonthlyQualityReportS3012();
+        tMonthlyQualityReportS3012.setStartDate(startDate);
+        tMonthlyQualityReportS3012.setEndDate(endDate);
+        List<TMonthlyQualityReportS3012> tMonthlyQualityReportS3012s = tMonthlyQualityReportS3012Service.selectTMonthlyQualityReportS3012List(tMonthlyQualityReportS3012);
+        //avg
+        BigDecimal ethane1InAvg = new BigDecimal(BigInteger.ZERO);
+        BigDecimal ethylene1InAvg = new BigDecimal(BigInteger.ZERO);
+        BigDecimal acetylene1InAvg = new BigDecimal(BigInteger.ZERO);
+        BigDecimal propane1InAvg = new BigDecimal(BigInteger.ZERO);
+        BigDecimal propylene1InAvg = new BigDecimal(BigInteger.ZERO);
+        BigDecimal pd1InAvg = new BigDecimal(BigInteger.ZERO);
+        BigDecimal ma1InAvg = new BigDecimal(BigInteger.ZERO);
+        BigDecimal ethane3OutAvg = new BigDecimal(BigInteger.ZERO);
+        BigDecimal ethylene3OutAvg = new BigDecimal(BigInteger.ZERO);
+        BigDecimal acetylene3OutAvg = new BigDecimal(BigInteger.ZERO);
+        BigDecimal propane3OutAvg = new BigDecimal(BigInteger.ZERO);
+        BigDecimal propylene3OutAvg = new BigDecimal(BigInteger.ZERO);
+        BigDecimal pd3OutAvg = new BigDecimal(BigInteger.ZERO);
+        BigDecimal ma3OutAvg = new BigDecimal(BigInteger.ZERO);
+        BigDecimal ethane2InAvg = new BigDecimal(BigInteger.ZERO);
+        BigDecimal ethylene2InAvg = new BigDecimal(BigInteger.ZERO);
+        BigDecimal acetylene2InAvg = new BigDecimal(BigInteger.ZERO);
+        BigDecimal propane2InAvg = new BigDecimal(BigInteger.ZERO);
+        BigDecimal propylene2InAvg = new BigDecimal(BigInteger.ZERO);
+        BigDecimal pd2InAvg = new BigDecimal(BigInteger.ZERO);
+        BigDecimal ma2InAvg = new BigDecimal(BigInteger.ZERO);
+        BigDecimal ethane3InAvg = new BigDecimal(BigInteger.ZERO);
+        BigDecimal ethylene3InAvg = new BigDecimal(BigInteger.ZERO);
+        BigDecimal acetylene3InAvg = new BigDecimal(BigInteger.ZERO);
+        BigDecimal propane3InAvg = new BigDecimal(BigInteger.ZERO);
+        BigDecimal propylene3InAvg = new BigDecimal(BigInteger.ZERO);
+        BigDecimal pd3InAvg = new BigDecimal(BigInteger.ZERO);
+        BigDecimal ma3InAvg = new BigDecimal(BigInteger.ZERO);
+        //sum
+        BigDecimal ethane1InSum = new BigDecimal(BigInteger.ZERO);
+        BigDecimal ethylene1InSum = new BigDecimal(BigInteger.ZERO);
+        BigDecimal acetylene1InSum = new BigDecimal(BigInteger.ZERO);
+        BigDecimal propane1InSum = new BigDecimal(BigInteger.ZERO);
+        BigDecimal propylene1InSum = new BigDecimal(BigInteger.ZERO);
+        BigDecimal pd1InSum = new BigDecimal(BigInteger.ZERO);
+        BigDecimal ma1InSum = new BigDecimal(BigInteger.ZERO);
+        BigDecimal ethane3OutSum = new BigDecimal(BigInteger.ZERO);
+        BigDecimal ethylene3OutSum = new BigDecimal(BigInteger.ZERO);
+        BigDecimal acetylene3OutSum = new BigDecimal(BigInteger.ZERO);
+        BigDecimal propane3OutSum = new BigDecimal(BigInteger.ZERO);
+        BigDecimal propylene3OutSum = new BigDecimal(BigInteger.ZERO);
+        BigDecimal pd3OutSum = new BigDecimal(BigInteger.ZERO);
+        BigDecimal ma3OutSum = new BigDecimal(BigInteger.ZERO);
+        BigDecimal ethane2InSum = new BigDecimal(BigInteger.ZERO);
+        BigDecimal ethylene2InSum = new BigDecimal(BigInteger.ZERO);
+        BigDecimal acetylene2InSum = new BigDecimal(BigInteger.ZERO);
+        BigDecimal propane2InSum = new BigDecimal(BigInteger.ZERO);
+        BigDecimal propylene2InSum = new BigDecimal(BigInteger.ZERO);
+        BigDecimal pd2InSum = new BigDecimal(BigInteger.ZERO);
+        BigDecimal ma2InSum = new BigDecimal(BigInteger.ZERO);
+        BigDecimal ethane3InSum = new BigDecimal(BigInteger.ZERO);
+        BigDecimal ethylene3InSum = new BigDecimal(BigInteger.ZERO);
+        BigDecimal acetylene3InSum = new BigDecimal(BigInteger.ZERO);
+        BigDecimal propane3InSum = new BigDecimal(BigInteger.ZERO);
+        BigDecimal propylene3InSum = new BigDecimal(BigInteger.ZERO);
+        BigDecimal pd3InSum = new BigDecimal(BigInteger.ZERO);
+        BigDecimal ma3InSum = new BigDecimal(BigInteger.ZERO);
+        //list
+        ArrayList<BigDecimal> ethane1InList = new ArrayList<BigDecimal>();
+        ArrayList<BigDecimal> ethylene1InList = new ArrayList<BigDecimal>();
+        ArrayList<BigDecimal> acetylene1InList = new ArrayList<BigDecimal>();
+        ArrayList<BigDecimal> propane1InList = new ArrayList<BigDecimal>();
+        ArrayList<BigDecimal> propylene1InList = new ArrayList<BigDecimal>();
+        ArrayList<BigDecimal> pd1InList = new ArrayList<BigDecimal>();
+        ArrayList<BigDecimal> ma1InList = new ArrayList<BigDecimal>();
+        ArrayList<BigDecimal> ethane3OutList = new ArrayList<BigDecimal>();
+        ArrayList<BigDecimal> ethylene3OutList = new ArrayList<BigDecimal>();
+        ArrayList<BigDecimal> acetylene3OutList = new ArrayList<BigDecimal>();
+        ArrayList<BigDecimal> propane3OutList = new ArrayList<BigDecimal>();
+        ArrayList<BigDecimal> propylene3OutList = new ArrayList<BigDecimal>();
+        ArrayList<BigDecimal> pd3OutList = new ArrayList<BigDecimal>();
+        ArrayList<BigDecimal> ma3OutList = new ArrayList<BigDecimal>();
+        ArrayList<BigDecimal> ethane2InList = new ArrayList<BigDecimal>();
+        ArrayList<BigDecimal> ethylene2InList = new ArrayList<BigDecimal>();
+        ArrayList<BigDecimal> acetylene2InList = new ArrayList<BigDecimal>();
+        ArrayList<BigDecimal> propane2InList = new ArrayList<BigDecimal>();
+        ArrayList<BigDecimal> propylene2InList = new ArrayList<BigDecimal>();
+        ArrayList<BigDecimal> pd2InList = new ArrayList<BigDecimal>();
+        ArrayList<BigDecimal> ma2InList = new ArrayList<BigDecimal>();
+        ArrayList<BigDecimal> ethane3InList = new ArrayList<BigDecimal>();
+        ArrayList<BigDecimal> ethylene3InList = new ArrayList<BigDecimal>();
+        ArrayList<BigDecimal> acetylene3InList = new ArrayList<BigDecimal>();
+        ArrayList<BigDecimal> propane3InList = new ArrayList<BigDecimal>();
+        ArrayList<BigDecimal> propylene3InList = new ArrayList<BigDecimal>();
+        ArrayList<BigDecimal> pd3InList = new ArrayList<BigDecimal>();
+        ArrayList<BigDecimal> ma3InList = new ArrayList<BigDecimal>();
+        //放入list
+        for (TMonthlyQualityReportS3009 monthlyQualityReportS3009 : tMonthlyQualityReportS3009s) {
+            String ethane = monthlyQualityReportS3009.getEthane();
+            String ethylene = monthlyQualityReportS3009.getEthylene();
+            String acetylene = monthlyQualityReportS3009.getAcetylene();
+            String propane = monthlyQualityReportS3009.getPropane();
+            String propylene = monthlyQualityReportS3009.getPropylene();
+            String pd = monthlyQualityReportS3009.getPropadiene();
+            String ma = monthlyQualityReportS3009.getMethylacetylene();
+            if (StringUtils.isNotEmpty(ethane)) { ethane1InList.add(new BigDecimal(ethane)); }
+            if (StringUtils.isNotEmpty(ethylene)) { ethylene1InList.add(new BigDecimal(ethylene)); }
+            if (StringUtils.isNotEmpty(acetylene)) { acetylene1InList.add(new BigDecimal(acetylene)); }
+            if (StringUtils.isNotEmpty(propane)) { propane1InList.add(new BigDecimal(propane)); }
+            if (StringUtils.isNotEmpty(propylene)) { propylene1InList.add(new BigDecimal(propylene)); }
+            if (StringUtils.isNotEmpty(pd)) { pd1InList.add(new BigDecimal(pd)); }
+            if (StringUtils.isNotEmpty(ma)) { ma1InList.add(new BigDecimal(ma)); }
+        }
+        for (TMonthlyQualityReportS3010 monthlyQualityReportS3010 : tMonthlyQualityReportS3010s) {
+            String ethane = monthlyQualityReportS3010.getEthane();
+            String ethylene = monthlyQualityReportS3010.getEthylene();
+            String acetylene = monthlyQualityReportS3010.getAcetylene();
+            String propane = monthlyQualityReportS3010.getPropane();
+            String propylene = monthlyQualityReportS3010.getPropylene();
+            String pd = monthlyQualityReportS3010.getPropadiene();
+            String ma = monthlyQualityReportS3010.getMethylacetylene();
+            if (StringUtils.isNotEmpty(ethane)) { ethane3OutList.add(new BigDecimal(ethane)); }
+            if (StringUtils.isNotEmpty(ethylene)) { ethylene3OutList.add(new BigDecimal(ethylene)); }
+            if (StringUtils.isNotEmpty(acetylene)) { acetylene3OutList.add(new BigDecimal(acetylene)); }
+            if (StringUtils.isNotEmpty(propane)) { propane3OutList.add(new BigDecimal(propane)); }
+            if (StringUtils.isNotEmpty(propylene)) { propylene3OutList.add(new BigDecimal(propylene)); }
+            if (StringUtils.isNotEmpty(pd)) { pd3OutList.add(new BigDecimal(pd)); }
+            if (StringUtils.isNotEmpty(ma)) { ma3OutList.add(new BigDecimal(ma)); }
+        }
+        for (TMonthlyQualityReportS3011 monthlyQualityReportS3011 : tMonthlyQualityReportS3011s) {
+            String ethane = monthlyQualityReportS3011.getEthane();
+            String ethylene = monthlyQualityReportS3011.getEthylene();
+            String acetylene = monthlyQualityReportS3011.getAcetylene();
+            String propane = monthlyQualityReportS3011.getPropane();
+            String propylene = monthlyQualityReportS3011.getPropylene();
+            String pd = monthlyQualityReportS3011.getPropadiene();
+            String ma = monthlyQualityReportS3011.getMethylacetylene();
+            if (StringUtils.isNotEmpty(ethane)) { ethane2InList.add(new BigDecimal(ethane)); }
+            if (StringUtils.isNotEmpty(ethylene)) { ethylene2InList.add(new BigDecimal(ethylene)); }
+            if (StringUtils.isNotEmpty(acetylene)) { acetylene2InList.add(new BigDecimal(acetylene)); }
+            if (StringUtils.isNotEmpty(propane)) { propane2InList.add(new BigDecimal(propane)); }
+            if (StringUtils.isNotEmpty(propylene)) { propylene2InList.add(new BigDecimal(propylene)); }
+            if (StringUtils.isNotEmpty(pd)) { pd2InList.add(new BigDecimal(pd)); }
+            if (StringUtils.isNotEmpty(ma)) { ma2InList.add(new BigDecimal(ma)); }
+        }
+        for (TMonthlyQualityReportS3012 monthlyQualityReportS3012 : tMonthlyQualityReportS3012s) {
+            String ethane = monthlyQualityReportS3012.getEthane();
+            String ethylene = monthlyQualityReportS3012.getEthylene();
+            String acetylene = monthlyQualityReportS3012.getAcetylene();
+            String propane = monthlyQualityReportS3012.getPropane();
+            String propylene = monthlyQualityReportS3012.getPropylene();
+            String pd = monthlyQualityReportS3012.getPropadiene();
+            String ma = monthlyQualityReportS3012.getMethylacetylene();
+            if (StringUtils.isNotEmpty(ethane)) { ethane3InList.add(new BigDecimal(ethane)); }
+            if (StringUtils.isNotEmpty(ethylene)) { ethylene3InList.add(new BigDecimal(ethylene)); }
+            if (StringUtils.isNotEmpty(acetylene)) { acetylene3InList.add(new BigDecimal(acetylene)); }
+            if (StringUtils.isNotEmpty(propane)) { propane3InList.add(new BigDecimal(propane)); }
+            if (StringUtils.isNotEmpty(propylene)) { propylene3InList.add(new BigDecimal(propylene)); }
+            if (StringUtils.isNotEmpty(pd)) { pd3InList.add(new BigDecimal(pd)); }
+            if (StringUtils.isNotEmpty(ma)) { ma3InList.add(new BigDecimal(ma)); }
+        }
+        //计算sum
+        for (BigDecimal value : ethane1InList) { ethane1InSum = ethane1InSum.add(value); }
+        for (BigDecimal value : ethylene1InList) { ethylene1InSum = ethylene1InSum.add(value); }
+        for (BigDecimal value : acetylene1InList) { acetylene1InSum = acetylene1InSum.add(value); }
+        for (BigDecimal value : propane1InList) { propane1InSum = propane1InSum.add(value); }
+        for (BigDecimal value : propylene1InList) { propylene1InSum = propylene1InSum.add(value); }
+        for (BigDecimal value : pd1InList) { pd1InSum = pd1InSum.add(value); }
+        for (BigDecimal value : ma1InList) { ma1InSum = ma1InSum.add(value); }
+        for (BigDecimal value : ethane3OutList) { ethane3OutSum = ethane3OutSum.add(value); }
+        for (BigDecimal value : ethylene3OutList) { ethylene3OutSum = ethylene3OutSum.add(value); }
+        for (BigDecimal value : acetylene3OutList) { acetylene3OutSum = acetylene3OutSum.add(value); }
+        for (BigDecimal value : propane3OutList) { propane3OutSum = propane3OutSum.add(value); }
+        for (BigDecimal value : propylene3OutList) { propylene3OutSum = propylene3OutSum.add(value); }
+        for (BigDecimal value : pd3OutList) { pd3OutSum = pd3OutSum.add(value); }
+        for (BigDecimal value : ma3OutList) { ma3OutSum = ma3OutSum.add(value); }
+        for (BigDecimal value : ethane2InList) { ethane2InSum = ethane2InSum.add(value); }
+        for (BigDecimal value : ethylene2InList) { ethylene2InSum = ethylene2InSum.add(value); }
+        for (BigDecimal value : acetylene2InList) { acetylene2InSum = acetylene2InSum.add(value); }
+        for (BigDecimal value : propane2InList) { propane2InSum = propane2InSum.add(value); }
+        for (BigDecimal value : propylene2InList) { propylene2InSum = propylene2InSum.add(value); }
+        for (BigDecimal value : pd2InList) { pd2InSum = pd2InSum.add(value); }
+        for (BigDecimal value : ma2InList) { ma2InSum = ma2InSum.add(value); }
+        for (BigDecimal value : ethane3InList) { ethane3InSum = ethane3InSum.add(value); }
+        for (BigDecimal value : ethylene3InList) { ethylene3InSum = ethylene3InSum.add(value); }
+        for (BigDecimal value : acetylene3InList) { acetylene3InSum = acetylene3InSum.add(value); }
+        for (BigDecimal value : propane3InList) { propane3InSum = propane3InSum.add(value); }
+        for (BigDecimal value : propylene3InList) { propylene3InSum = propylene3InSum.add(value); }
+        for (BigDecimal value : pd3InList) { pd3InSum = pd3InSum.add(value); }
+        for (BigDecimal value : ma3InList) { ma3InSum = ma3InSum.add(value); }
+        //计算avg
+        if (ethane1InList.size() != 0) { ethane1InAvg = ethane1InSum.divide(new BigDecimal(ethane1InList.size()), 2, RoundingMode.HALF_UP); }
+        if (ethylene1InList.size() != 0) { ethylene1InAvg = ethylene1InSum.divide(new BigDecimal(ethylene1InList.size()), 2, RoundingMode.HALF_UP); }
+        if (acetylene1InList.size() != 0) { acetylene1InAvg = acetylene1InSum.divide(new BigDecimal(acetylene1InList.size()), 2, RoundingMode.HALF_UP); }
+        if (propane1InList.size() != 0) { propane1InAvg = propane1InSum.divide(new BigDecimal(propane1InList.size()), 2, RoundingMode.HALF_UP); }
+        if (propylene1InList.size() != 0) { propylene1InAvg = propylene1InSum.divide(new BigDecimal(propylene1InList.size()), 2, RoundingMode.HALF_UP); }
+        if (pd1InList.size() != 0) { pd1InAvg = pd1InSum.divide(new BigDecimal(pd1InList.size()), 2, RoundingMode.HALF_UP); }
+        if (ma1InList.size() != 0) { ma1InAvg = ma1InSum.divide(new BigDecimal(ma1InList.size()), 2, RoundingMode.HALF_UP); }
+        if (ethane3OutList.size() != 0) { ethane3OutAvg = ethane3OutSum.divide(new BigDecimal(ethane3OutList.size()), 2, RoundingMode.HALF_UP); }
+        if (ethylene3OutList.size() != 0) { ethylene3OutAvg = ethylene3OutSum.divide(new BigDecimal(ethylene3OutList.size()), 2, RoundingMode.HALF_UP); }
+        if (acetylene3OutList.size() != 0) { acetylene3OutAvg = acetylene3OutSum.divide(new BigDecimal(acetylene3OutList.size()), 2, RoundingMode.HALF_UP); }
+        if (propane3OutList.size() != 0) { propane3OutAvg = propane3OutSum.divide(new BigDecimal(propane3OutList.size()), 2, RoundingMode.HALF_UP); }
+        if (propylene3OutList.size() != 0) { propylene3OutAvg = propylene3OutSum.divide(new BigDecimal(propylene3OutList.size()), 2, RoundingMode.HALF_UP); }
+        if (pd3OutList.size() != 0) { pd3OutAvg = pd3OutSum.divide(new BigDecimal(pd3OutList.size()), 2, RoundingMode.HALF_UP); }
+        if (ma3OutList.size() != 0) { ma3OutAvg = ma3OutSum.divide(new BigDecimal(ma3OutList.size()), 2, RoundingMode.HALF_UP); }
+        if (ethane2InList.size() != 0) { ethane2InAvg = ethane2InSum.divide(new BigDecimal(ethane2InList.size()), 2, RoundingMode.HALF_UP); }
+        if (ethylene2InList.size() != 0) { ethylene2InAvg = ethylene2InSum.divide(new BigDecimal(ethylene2InList.size()), 2, RoundingMode.HALF_UP); }
+        if (acetylene2InList.size() != 0) { acetylene2InAvg = acetylene2InSum.divide(new BigDecimal(acetylene2InList.size()), 2, RoundingMode.HALF_UP); }
+        if (propane2InList.size() != 0) { propane2InAvg = propane2InSum.divide(new BigDecimal(propane2InList.size()), 2, RoundingMode.HALF_UP); }
+        if (propylene2InList.size() != 0) { propylene2InAvg = propylene2InSum.divide(new BigDecimal(propylene2InList.size()), 2, RoundingMode.HALF_UP); }
+        if (pd2InList.size() != 0) { pd2InAvg = pd2InSum.divide(new BigDecimal(pd2InList.size()), 2, RoundingMode.HALF_UP); }
+        if (ma2InList.size() != 0) { ma2InAvg = ma2InSum.divide(new BigDecimal(ma2InList.size()), 2, RoundingMode.HALF_UP); }
+        if (ethane3InList.size() != 0) { ethane3InAvg = ethane3InSum.divide(new BigDecimal(ethane3InList.size()), 2, RoundingMode.HALF_UP); }
+        if (ethylene3InList.size() != 0) { ethylene3InAvg = ethylene3InSum.divide(new BigDecimal(ethylene3InList.size()), 2, RoundingMode.HALF_UP); }
+        if (acetylene3InList.size() != 0) { acetylene3InAvg = acetylene3InSum.divide(new BigDecimal(acetylene3InList.size()), 2, RoundingMode.HALF_UP); }
+        if (propane3InList.size() != 0) { propane3InAvg = propane3InSum.divide(new BigDecimal(propane3InList.size()), 2, RoundingMode.HALF_UP); }
+        if (propylene3InList.size() != 0) { propylene3InAvg = propylene3InSum.divide(new BigDecimal(propylene3InList.size()), 2, RoundingMode.HALF_UP); }
+        if (pd3InList.size() != 0) { pd3InAvg = pd3InSum.divide(new BigDecimal(pd3InList.size()), 2, RoundingMode.HALF_UP); }
+        if (ma3InList.size() != 0) { ma3InAvg = ma3InSum.divide(new BigDecimal(ma3InList.size()), 2, RoundingMode.HALF_UP); }
+        C2ReactorTableVO tableVO = new C2ReactorTableVO();
+        tableVO.setEthane1InAvg(ethane1InAvg);
+        tableVO.setEthylene1InAvg(ethylene1InAvg);
+        tableVO.setAcetylene1InAvg(acetylene1InAvg);
+        tableVO.setPropane1InAvg(propane1InAvg);
+        tableVO.setPropylene1InAvg(propylene1InAvg);
+        tableVO.setPd1InAvg(pd1InAvg);
+        tableVO.setMa1InAvg(ma1InAvg);
+        tableVO.setEthane3OutAvg(ethane3OutAvg);
+        tableVO.setEthylene3OutAvg(ethylene3OutAvg);
+        tableVO.setAcetylene3OutAvg(acetylene3OutAvg);
+        tableVO.setPropane3OutAvg(propane3OutAvg);
+        tableVO.setPropylene3OutAvg(propylene3OutAvg);
+        tableVO.setPd3OutAvg(pd3OutAvg);
+        tableVO.setMa3OutAvg(ma3OutAvg);
+        tableVO.setEthane2InAvg(ethane2InAvg);
+        tableVO.setEthylene2InAvg(ethylene2InAvg);
+        tableVO.setAcetylene2InAvg(acetylene2InAvg);
+        tableVO.setPropane2InAvg(propane2InAvg);
+        tableVO.setPropylene2InAvg(propylene2InAvg);
+        tableVO.setPd2InAvg(pd2InAvg);
+        tableVO.setMa2InAvg(ma2InAvg);
+        tableVO.setEthane3InAvg(ethane3InAvg);
+        tableVO.setEthylene3InAvg(ethylene3InAvg);
+        tableVO.setAcetylene3InAvg(acetylene3InAvg);
+        tableVO.setPropane3InAvg(propane3InAvg);
+        tableVO.setPropylene3InAvg(propylene3InAvg);
+        tableVO.setPd3InAvg(pd3InAvg);
+        tableVO.setMa3InAvg(ma3InAvg);
+        return AjaxResult.success(tableVO);
+    }
+
     /**
      * 碳三反应器性能指标趋势图
      */
@@ -803,6 +1075,8 @@ public class TMonthlyQualityReportController extends BaseController
                         entity.setPropadiene(cellValue);
                     } else if (j == 12) {
                         entity.setAcetylene(cellValue);
+                    } else if (j == 15) {
+                        entity.setMethylacetylene(cellValue);
                     } else if (j == 21) {
                         entity.setHydrogen(cellValue);
                     }
@@ -851,6 +1125,8 @@ public class TMonthlyQualityReportController extends BaseController
                         entity.setPropylene(cellValue);
                     } else if (j == 12) {
                         entity.setPropadiene(cellValue);
+                    } else if (j == 16) {
+                        entity.setMethylacetylene(cellValue);
                     } else if (j == 22) {
                         entity.setHydrogen(cellValue);
                     }
@@ -899,6 +1175,8 @@ public class TMonthlyQualityReportController extends BaseController
                         entity.setPropadiene(cellValue);
                     } else if (j == 12) {
                         entity.setAcetylene(cellValue);
+                    } else if (j == 15) {
+                        entity.setMethylacetylene(cellValue);
                     } else if (j == 21) {
                         entity.setHydrogen(cellValue);
                     }
@@ -947,6 +1225,8 @@ public class TMonthlyQualityReportController extends BaseController
                         entity.setPropylene(cellValue);
                     } else if (j == 12) {
                         entity.setPropadiene(cellValue);
+                    } else if (j == 16) {
+                        entity.setMethylacetylene(cellValue);
                     } else if (j == 22) {
                         entity.setHydrogen(cellValue);
                     }

master/src/main/java/com/ruoyi/project/production/controller/vo/C2ReactorTableVO.java

@@ -0,0 +1,292 @@
+package com.ruoyi.project.production.controller.vo;
+
+import java.math.BigDecimal;
+
+/**
+ * 碳二反应器性能指标表格VO
+ *
+ * @author Wang Zi Wen
+ * @email wangggziwen@163.com
+ * @date 2023/11/27 15:34:57
+ */
+public class C2ReactorTableVO {
+    private BigDecimal ethane1InAvg;
+
+    private BigDecimal ethylene1InAvg;
+
+    private BigDecimal acetylene1InAvg;
+
+    private BigDecimal propane1InAvg;
+
+    private BigDecimal propylene1InAvg;
+
+    private BigDecimal pd1InAvg;
+
+    private BigDecimal ma1InAvg;
+
+    private BigDecimal ethane3OutAvg;
+
+    private BigDecimal ethylene3OutAvg;
+
+    private BigDecimal acetylene3OutAvg;
+
+    private BigDecimal propane3OutAvg;
+
+    private BigDecimal propylene3OutAvg;
+
+    private BigDecimal pd3OutAvg;
+
+    private BigDecimal ma3OutAvg;
+
+    private BigDecimal ethane2InAvg;
+
+    private BigDecimal ethylene2InAvg;
+
+    private BigDecimal acetylene2InAvg;
+
+    private BigDecimal propane2InAvg;
+
+    private BigDecimal propylene2InAvg;
+
+    private BigDecimal pd2InAvg;
+
+    private BigDecimal ma2InAvg;
+
+    private BigDecimal ethane3InAvg;
+
+    private BigDecimal ethylene3InAvg;
+
+    private BigDecimal acetylene3InAvg;
+
+    private BigDecimal propane3InAvg;
+
+    private BigDecimal propylene3InAvg;
+
+    private BigDecimal pd3InAvg;
+
+    private BigDecimal ma3InAvg;
+
+    public BigDecimal getEthane1InAvg() {
+        return ethane1InAvg;
+    }
+
+    public void setEthane1InAvg(BigDecimal ethane1InAvg) {
+        this.ethane1InAvg = ethane1InAvg;
+    }
+
+    public BigDecimal getEthylene1InAvg() {
+        return ethylene1InAvg;
+    }
+
+    public void setEthylene1InAvg(BigDecimal ethylene1InAvg) {
+        this.ethylene1InAvg = ethylene1InAvg;
+    }
+
+    public BigDecimal getAcetylene1InAvg() {
+        return acetylene1InAvg;
+    }
+
+    public void setAcetylene1InAvg(BigDecimal acetylene1InAvg) {
+        this.acetylene1InAvg = acetylene1InAvg;
+    }
+
+    public BigDecimal getPropane1InAvg() {
+        return propane1InAvg;
+    }
+
+    public void setPropane1InAvg(BigDecimal propane1InAvg) {
+        this.propane1InAvg = propane1InAvg;
+    }
+
+    public BigDecimal getPropylene1InAvg() {
+        return propylene1InAvg;
+    }
+
+    public void setPropylene1InAvg(BigDecimal propylene1InAvg) {
+        this.propylene1InAvg = propylene1InAvg;
+    }
+
+    public BigDecimal getPd1InAvg() {
+        return pd1InAvg;
+    }
+
+    public void setPd1InAvg(BigDecimal pd1InAvg) {
+        this.pd1InAvg = pd1InAvg;
+    }
+
+    public BigDecimal getMa1InAvg() {
+        return ma1InAvg;
+    }
+
+    public void setMa1InAvg(BigDecimal ma1InAvg) {
+        this.ma1InAvg = ma1InAvg;
+    }
+
+    public BigDecimal getEthane3OutAvg() {
+        return ethane3OutAvg;
+    }
+
+    public void setEthane3OutAvg(BigDecimal ethane3OutAvg) {
+        this.ethane3OutAvg = ethane3OutAvg;
+    }
+
+    public BigDecimal getEthylene3OutAvg() {
+        return ethylene3OutAvg;
+    }
+
+    public void setEthylene3OutAvg(BigDecimal ethylene3OutAvg) {
+        this.ethylene3OutAvg = ethylene3OutAvg;
+    }
+
+    public BigDecimal getAcetylene3OutAvg() {
+        return acetylene3OutAvg;
+    }
+
+    public void setAcetylene3OutAvg(BigDecimal acetylene3OutAvg) {
+        this.acetylene3OutAvg = acetylene3OutAvg;
+    }
+
+    public BigDecimal getPropane3OutAvg() {
+        return propane3OutAvg;
+    }
+
+    public void setPropane3OutAvg(BigDecimal propane3OutAvg) {
+        this.propane3OutAvg = propane3OutAvg;
+    }
+
+    public BigDecimal getPropylene3OutAvg() {
+        return propylene3OutAvg;
+    }
+
+    public void setPropylene3OutAvg(BigDecimal propylene3OutAvg) {
+        this.propylene3OutAvg = propylene3OutAvg;
+    }
+
+    public BigDecimal getPd3OutAvg() {
+        return pd3OutAvg;
+    }
+
+    public void setPd3OutAvg(BigDecimal pd3OutAvg) {
+        this.pd3OutAvg = pd3OutAvg;
+    }
+
+    public BigDecimal getMa3OutAvg() {
+        return ma3OutAvg;
+    }
+
+    public void setMa3OutAvg(BigDecimal ma3OutAvg) {
+        this.ma3OutAvg = ma3OutAvg;
+    }
+
+    public BigDecimal getEthane2InAvg() {
+        return ethane2InAvg;
+    }
+
+    public void setEthane2InAvg(BigDecimal ethane2InAvg) {
+        this.ethane2InAvg = ethane2InAvg;
+    }
+
+    public BigDecimal getEthylene2InAvg() {
+        return ethylene2InAvg;
+    }
+
+    public void setEthylene2InAvg(BigDecimal ethylene2InAvg) {
+        this.ethylene2InAvg = ethylene2InAvg;
+    }
+
+    public BigDecimal getAcetylene2InAvg() {
+        return acetylene2InAvg;
+    }
+
+    public void setAcetylene2InAvg(BigDecimal acetylene2InAvg) {
+        this.acetylene2InAvg = acetylene2InAvg;
+    }
+
+    public BigDecimal getPropane2InAvg() {
+        return propane2InAvg;
+    }
+
+    public void setPropane2InAvg(BigDecimal propane2InAvg) {
+        this.propane2InAvg = propane2InAvg;
+    }
+
+    public BigDecimal getPropylene2InAvg() {
+        return propylene2InAvg;
+    }
+
+    public void setPropylene2InAvg(BigDecimal propylene2InAvg) {
+        this.propylene2InAvg = propylene2InAvg;
+    }
+
+    public BigDecimal getPd2InAvg() {
+        return pd2InAvg;
+    }
+
+    public void setPd2InAvg(BigDecimal pd2InAvg) {
+        this.pd2InAvg = pd2InAvg;
+    }
+
+    public BigDecimal getMa2InAvg() {
+        return ma2InAvg;
+    }
+
+    public void setMa2InAvg(BigDecimal ma2InAvg) {
+        this.ma2InAvg = ma2InAvg;
+    }
+
+    public BigDecimal getEthane3InAvg() {
+        return ethane3InAvg;
+    }
+
+    public void setEthane3InAvg(BigDecimal ethane3InAvg) {
+        this.ethane3InAvg = ethane3InAvg;
+    }
+
+    public BigDecimal getEthylene3InAvg() {
+        return ethylene3InAvg;
+    }
+
+    public void setEthylene3InAvg(BigDecimal ethylene3InAvg) {
+        this.ethylene3InAvg = ethylene3InAvg;
+    }
+
+    public BigDecimal getAcetylene3InAvg() {
+        return acetylene3InAvg;
+    }
+
+    public void setAcetylene3InAvg(BigDecimal acetylene3InAvg) {
+        this.acetylene3InAvg = acetylene3InAvg;
+    }
+
+    public BigDecimal getPropane3InAvg() {
+        return propane3InAvg;
+    }
+
+    public void setPropane3InAvg(BigDecimal propane3InAvg) {
+        this.propane3InAvg = propane3InAvg;
+    }
+
+    public BigDecimal getPropylene3InAvg() {
+        return propylene3InAvg;
+    }
+
+    public void setPropylene3InAvg(BigDecimal propylene3InAvg) {
+        this.propylene3InAvg = propylene3InAvg;
+    }
+
+    public BigDecimal getPd3InAvg() {
+        return pd3InAvg;
+    }
+
+    public void setPd3InAvg(BigDecimal pd3InAvg) {
+        this.pd3InAvg = pd3InAvg;
+    }
+
+    public BigDecimal getMa3InAvg() {
+        return ma3InAvg;
+    }
+
+    public void setMa3InAvg(BigDecimal ma3InAvg) {
+        this.ma3InAvg = ma3InAvg;
+    }
+}

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

@@ -94,6 +94,17 @@ public class TMonthlyQualityReportS3009 extends BaseEntity
 
     private String deptName;
 
+    /** 甲基乙炔 */
+    private String methylacetylene;
+
+    public String getMethylacetylene() {
+        return methylacetylene;
+    }
+
+    public void setMethylacetylene(String methylacetylene) {
+        this.methylacetylene = methylacetylene;
+    }
+
     public String getDeptName() {
         return deptName;
     }

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

@@ -94,6 +94,17 @@ public class TMonthlyQualityReportS3010 extends BaseEntity
 
     private String deptName;
 
+    /** 甲基乙炔 */
+    private String methylacetylene;
+
+    public String getMethylacetylene() {
+        return methylacetylene;
+    }
+
+    public void setMethylacetylene(String methylacetylene) {
+        this.methylacetylene = methylacetylene;
+    }
+
     public String getDeptName() {
         return deptName;
     }

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

@@ -94,6 +94,17 @@ public class TMonthlyQualityReportS3011 extends BaseEntity
 
     private String deptName;
 
+    /** 甲基乙炔 */
+    private String methylacetylene;
+
+    public String getMethylacetylene() {
+        return methylacetylene;
+    }
+
+    public void setMethylacetylene(String methylacetylene) {
+        this.methylacetylene = methylacetylene;
+    }
+
     public String getDeptName() {
         return deptName;
     }

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

@@ -94,6 +94,17 @@ public class TMonthlyQualityReportS3012 extends BaseEntity
 
     private String deptName;
 
+    /** 甲基乙炔 */
+    private String methylacetylene;
+
+    public String getMethylacetylene() {
+        return methylacetylene;
+    }
+
+    public void setMethylacetylene(String methylacetylene) {
+        this.methylacetylene = methylacetylene;
+    }
+
     public String getDeptName() {
         return deptName;
     }

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

@@ -29,10 +29,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="methylacetylene" column="methylacetylene" />
     </resultMap>
 
     <sql id="selectTMonthlyQualityReportS3009Vo">
-        select d.id, d.location_name, d.sample_point, d.sample_date, d.sample_name, d.carbon_monoxide, d.methane, d.ethane, d.ethylene, d.propane, d.cyc_propane, d.propylene, d.propadiene, d.acetylene, d.hydrogen, 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_s3009 d
+        select d.id, d.methylacetylene, d.location_name, d.sample_point, d.sample_date, d.sample_name, d.carbon_monoxide, d.methane, d.ethane, d.ethylene, d.propane, d.cyc_propane, d.propylene, d.propadiene, d.acetylene, d.hydrogen, 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_s3009 d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -56,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="acetylene != null  and acetylene != ''"> and acetylene = #{acetylene}</if>
             <if test="hydrogen != null  and hydrogen != ''"> and hydrogen = #{hydrogen}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="methylacetylene != null "> and methylacetylene = #{methylacetylene}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -94,6 +96,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="methylacetylene != null">methylacetylene,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -117,6 +120,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="methylacetylene != null">#{methylacetylene},</if>
          </trim>
     </insert>
 
@@ -143,6 +147,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="methylacetylene != null">methylacetylene = #{methylacetylene},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -29,10 +29,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="methylacetylene" column="methylacetylene" />
     </resultMap>
 
     <sql id="selectTMonthlyQualityReportS3010Vo">
-        select d.id, d.location_name, d.sample_point, d.sample_date, d.sample_name, d.acetylene, d.carbon_monoxide, d.methane, d.ethane, d.ethylene, d.propane, d.cyc_propane, d.propylene, d.propadiene, d.hydrogen, 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_s3010 d
+        select d.id, d.methylacetylene, d.location_name, d.sample_point, d.sample_date, d.sample_name, d.acetylene, d.carbon_monoxide, d.methane, d.ethane, d.ethylene, d.propane, d.cyc_propane, d.propylene, d.propadiene, d.hydrogen, 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_s3010 d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -56,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="propadiene != null  and propadiene != ''"> and propadiene = #{propadiene}</if>
             <if test="hydrogen != null  and hydrogen != ''"> and hydrogen = #{hydrogen}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="methylacetylene != null "> and methylacetylene = #{methylacetylene}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -94,6 +96,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="methylacetylene != null">methylacetylene,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -117,6 +120,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="methylacetylene != null">#{methylacetylene},</if>
          </trim>
     </insert>
 
@@ -143,6 +147,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="methylacetylene != null">methylacetylene = #{methylacetylene},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -29,10 +29,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="methylacetylene" column="methylacetylene" />
     </resultMap>
 
     <sql id="selectTMonthlyQualityReportS3011Vo">
-        select d.id, d.location_name, d.sample_point, d.sample_date, d.sample_name, d.carbon_monoxide, d.methane, d.ethane, d.ethylene, d.propane, d.cyc_propane, d.propylene, d.propadiene, d.acetylene, d.hydrogen, 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_s3011 d
+        select d.id, d.methylacetylene, d.location_name, d.sample_point, d.sample_date, d.sample_name, d.carbon_monoxide, d.methane, d.ethane, d.ethylene, d.propane, d.cyc_propane, d.propylene, d.propadiene, d.acetylene, d.hydrogen, 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_s3011 d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -56,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="acetylene != null  and acetylene != ''"> and acetylene = #{acetylene}</if>
             <if test="hydrogen != null  and hydrogen != ''"> and hydrogen = #{hydrogen}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="methylacetylene != null "> and dept_id = #{methylacetylene}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -94,6 +96,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="methylacetylene != null">methylacetylene,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -117,6 +120,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="methylacetylene != null">#{methylacetylene},</if>
          </trim>
     </insert>
 
@@ -143,6 +147,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="methylacetylene != null">methylacetylene = #{methylacetylene},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -29,10 +29,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="methylacetylene" column="methylacetylene" />
     </resultMap>
 
     <sql id="selectTMonthlyQualityReportS3012Vo">
-        select d.id, d.location_name, d.sample_point, d.sample_date, d.sample_name, d.acetylene, d.carbon_monoxide, d.methane, d.ethane, d.ethylene, d.propane, d.cyc_propane, d.propylene, d.propadiene, d.hydrogen, 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_s3012 d
+        select d.id, d.methylacetylene, d.location_name, d.sample_point, d.sample_date, d.sample_name, d.acetylene, d.carbon_monoxide, d.methane, d.ethane, d.ethylene, d.propane, d.cyc_propane, d.propylene, d.propadiene, d.hydrogen, 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_s3012 d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -56,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="propadiene != null  and propadiene != ''"> and propadiene = #{propadiene}</if>
             <if test="hydrogen != null  and hydrogen != ''"> and hydrogen = #{hydrogen}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="methylacetylene != null "> and dept_id = #{methylacetylene}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -94,6 +96,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="methylacetylene != null">methylacetylene,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -117,6 +120,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="methylacetylene != null">#{methylacetylene},</if>
          </trim>
     </insert>
 
@@ -143,6 +147,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="methylacetylene != null">methylacetylene = #{methylacetylene},</if>
         </trim>
         where id = #{id}
     </update>

ui/src/api/production/quality.js

@@ -1,5 +1,14 @@
 import request from '@/utils/request'
 
+// 碳二反应器性能指标表格
+export function c2ReactorTable(query) {
+  return request({
+    url: '/production/quality/c2ReactorTable',
+    method: 'get',
+    params: query
+  })
+}
+
 // 碳三反应器性能指标趋势图
 export function c3ReactorAnalysis(query) {
   return request({

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

@@ -329,6 +329,7 @@
       <el-table-column label="丙二烯" align="center" prop="propadiene" :show-overflow-tooltip="true"/>
       <el-table-column label="乙炔" align="center" prop="acetylene" :show-overflow-tooltip="true"/>
       <el-table-column label="氢气" align="center" prop="hydrogen" :show-overflow-tooltip="true"/>
+      <el-table-column label="甲基乙炔" align="center" prop="methylacetylene" :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
@@ -367,6 +368,7 @@
       <el-table-column label="丙烯	" align="center" prop="propylene" :show-overflow-tooltip="true"/>
       <el-table-column label="丙二烯	" align="center" prop="propadiene" :show-overflow-tooltip="true"/>
       <el-table-column label="氢气" align="center" prop="hydrogen" :show-overflow-tooltip="true"/>
+      <el-table-column label="甲基乙炔" align="center" prop="methylacetylene" :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
@@ -405,6 +407,7 @@
       <el-table-column label="丙二烯	" align="center" prop="propadiene" :show-overflow-tooltip="true"/>
       <el-table-column label="乙炔" align="center" prop="acetylene" :show-overflow-tooltip="true"/>
       <el-table-column label="氢气" align="center" prop="hydrogen" :show-overflow-tooltip="true"/>
+      <el-table-column label="甲基乙炔" align="center" prop="methylacetylene" :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
@@ -443,6 +446,7 @@
       <el-table-column label="丙烯" align="center" prop="propylene" :show-overflow-tooltip="true"/>
       <el-table-column label="丙二烯" align="center" prop="propadiene" :show-overflow-tooltip="true"/>
       <el-table-column label="氢气" align="center" prop="hydrogen" :show-overflow-tooltip="true"/>
+      <el-table-column label="甲基乙炔" align="center" prop="methylacetylene" :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
@@ -2203,6 +2207,102 @@
         </el-form-item>
       </el-form>
       <div id="chart" :style="{width:width,height:height}"></div>
+      <table v-if="showC2Table">
+        <tr>
+          <td colspan="5" class="td-transparent">BYC performance of C2 reactor</td>
+        </tr>
+        <tr>
+          <td class="td-transparent"></td>
+          <td class="td-transparent">1st inlet</td>
+          <td class="td-transparent">2nd inlet</td>
+          <td class="td-transparent">3rd inlet</td>
+          <td class="td-transparent">4th inlet</td>
+        </tr>
+        <tr>
+          <td class="td-dark-blue">ethane</td>
+          <td class="td-dark-blue">{{c2ReactorTableData.ethane1InAvg}}</td>
+          <td class="td-dark-blue">{{c2ReactorTableData.ethane1InAvg}}</td>
+          <td class="td-dark-blue">{{c2ReactorTableData.ethane2InAvg}}</td>
+          <td class="td-dark-blue">{{c2ReactorTableData.ethane3OutAvg}}</td>
+        </tr>
+        <tr>
+          <td class="td-dark-blue">ethylene</td>
+          <td class="td-dark-blue">{{c2ReactorTableData.ethylene1InAvg}}</td>
+          <td class="td-dark-blue">{{c2ReactorTableData.ethylene2InAvg}}</td>
+          <td class="td-dark-blue">{{c2ReactorTableData.ethylene3InAvg}}</td>
+          <td class="td-dark-blue">{{c2ReactorTableData.ethylene3OutAvg}}</td>
+        </tr>
+        <tr>
+          <td class="td-dark-blue">acetylene</td>
+          <td class="td-dark-blue">{{c2ReactorTableData.acetylene1InAvg}}</td>
+          <td class="td-dark-blue">{{c2ReactorTableData.acetylene2InAvg}}</td>
+          <td class="td-dark-blue">{{c2ReactorTableData.acetylene3InAvg}}</td>
+          <td class="td-dark-blue">{{c2ReactorTableData.acetylene3OutAvg}}</td>
+        </tr>
+        <tr>
+          <td class="td-dark-blue">propane</td>
+          <td class="td-dark-blue">{{c2ReactorTableData.propane1InAvg}}</td>
+          <td class="td-dark-blue">{{c2ReactorTableData.propane2InAvg}}</td>
+          <td class="td-dark-blue">{{c2ReactorTableData.propane3InAvg}}</td>
+          <td class="td-dark-blue">{{c2ReactorTableData.propane3OutAvg}}</td>
+        </tr>
+        <tr>
+          <td class="td-dark-blue">propylene</td>
+          <td class="td-dark-blue">{{c2ReactorTableData.propylene1InAvg}}</td>
+          <td class="td-dark-blue">{{c2ReactorTableData.propylene2InAvg}}</td>
+          <td class="td-dark-blue">{{c2ReactorTableData.propylene3InAvg}}</td>
+          <td class="td-dark-blue">{{c2ReactorTableData.propylene3OutAvg}}</td>
+        </tr>
+        <tr>
+          <td class="td-dark-blue">PD</td>
+          <td class="td-dark-blue">{{c2ReactorTableData.pd1InAvg}}</td>
+          <td class="td-dark-blue">{{c2ReactorTableData.pd2InAvg}}</td>
+          <td class="td-dark-blue">{{c2ReactorTableData.pd3InAvg}}</td>
+          <td class="td-dark-blue">{{c2ReactorTableData.pd3OutAvg}}</td>
+        </tr>
+        <tr>
+          <td class="td-dark-blue">MA</td>
+          <td class="td-dark-blue">{{c2ReactorTableData.ma1InAvg}}</td>
+          <td class="td-dark-blue">{{c2ReactorTableData.ma2InAvg}}</td>
+          <td class="td-dark-blue">{{c2ReactorTableData.ma3InAvg}}</td>
+          <td class="td-dark-blue">{{c2ReactorTableData.ma3OutAvg}}</td>
+        </tr>
+        <tr>
+          <td class="td-dark-green">acetylene Conversion</td>
+          <td class="td-transparent"></td>
+          <td class="td-transparent"></td>
+          <td class="td-transparent"></td>
+          <td class="td-dark-green"></td>
+        </tr>
+        <tr>
+          <td class="td-dark-green">Conversion load%</td>
+          <td class="td-transparent"></td>
+          <td class="td-transparent"></td>
+          <td class="td-transparent"></td>
+          <td class="td-dark-green"></td>
+        </tr>
+        <tr>
+          <td class="td-dark-green">Ethylene Selectivity</td>
+          <td class="td-transparent"></td>
+          <td class="td-transparent"></td>
+          <td class="td-transparent"></td>
+          <td class="td-dark-green"></td>
+        </tr>
+        <tr>
+          <td class="td-dark-green">MAPD Conversion</td>
+          <td class="td-transparent"></td>
+          <td class="td-transparent"></td>
+          <td class="td-transparent"></td>
+          <td class="td-yellow"></td>
+        </tr>
+        <tr>
+          <td class="td-dark-green">Propylene Selectivity</td>
+          <td class="td-transparent"></td>
+          <td class="td-transparent"></td>
+          <td class="td-transparent"></td>
+          <td class="td-yellow"></td>
+        </tr>
+      </table>
       <table v-if="showC3Table">
         <tr>
           <td colspan="2" class="td-transparent">BYC performance of C3 reactor </td>
@@ -2273,7 +2373,7 @@ import { listS6101, getS6101, delS6101, addS6101, updateS6101, exportS6101 } fro
 import { listS6107, getS6107, delS6107, addS6107, updateS6107, exportS6107 } from "@/api/production/s6107";
 import { listS6301, getS6301, delS6301, addS6301, updateS6301, exportS6301 } from "@/api/production/s6301";
 import { listZ404, getZ404, delZ404, addZ404, updateZ404, exportZ404 } from "@/api/production/z404";
-import { exportQuality, c3ReactorTable, c3ReactorAnalysis } from "@/api/production/quality";
+import { exportQuality, c3ReactorTable, c3ReactorAnalysis, c2ReactorTable } from "@/api/production/quality";
 import { treeselect } from "@/api/system/dept";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
@@ -2295,7 +2395,9 @@ export default {
   data() {
     return {
       c3ReactorTableData: {},
+      c2ReactorTableData: {},
       showC3Table: false,
+      showC2Table: false,
       chart: null,
       chartData : [],
       analysisOptions: [],
@@ -2468,6 +2570,7 @@ export default {
     /** 销毁趋势图 */
     disposeChart() {
       this.showC3Table = false;
+      this.showC2Table = false;
       if(this.chart != null) {
         this.echarts.dispose(this.chart);
       }
@@ -4122,21 +4225,13 @@ export default {
           });
           break;
         case "10":
-          listS3009(this.analysisQueryParams).then(response => {
-            let data = response.data;
-            console.log(data)
-          });
-          listS3010(this.analysisQueryParams).then(response => {
-            let data = response.data;
-            console.log(data)
-          });
-          listS3011(this.analysisQueryParams).then(response => {
-            let data = response.data;
-            console.log(data)
-          });
-          listS3012(this.analysisQueryParams).then(response => {
+          c2ReactorTable({
+            "startDate": this.analysisSampleDate[0],
+            "endDate": this.analysisSampleDate[1]
+          }).then(response => {
             let data = response.data;
-            console.log(data)
+            this.c2ReactorTableData = data;
+            this.showC2Table = true;
           });
           break;
         case "11":
@@ -4207,7 +4302,6 @@ export default {
             this.chart = this.echarts.init(document.getElementById('chart'));
             this.chart.setOption(option);
           });
-
           c3ReactorTable({
             "startDate": this.analysisSampleDate[0],
             "endDate": this.analysisSampleDate[1]
@@ -5237,6 +5331,24 @@ export default {
     border: 1px solid;
     padding: 5px;
   }
+  .td-yellow{
+     background-color: #FFFF00;
+     color: black;
+     border: 1px solid;
+     padding: 5px;
+   }
+  .td-dark-green{
+    background-color: #92D050;
+    color: black;
+    border: 1px solid;
+    padding: 5px;
+  }
+  .td-dark-blue{
+    background-color: #00B0F0;
+    color: black;
+    border: 1px solid;
+    padding: 5px;
+  }
   .td-transparent{
      background-color: transparent;
     color: black;