计算表和大表相关（小时、天、月）维度 均增加进出水五大指标的超污染物限制 和 超污染物负荷 相关字段存储

slibra-system/src/main/java/com/slibra/business/domain/TXinyiBigTableDay.java

@@ -731,6 +731,66 @@ public class TXinyiBigTableDay extends BaseEntity
     @Excel(name = "计算表-反冲洗水量比例")
     private BigDecimal jsFcxslbl;
 
+    /** 计算-出水COD超污染物限制 */
+    @Excel(name = "计算-出水COD超污染物限制")
+    private BigDecimal jsCsCodCwrwxz;
+
+    /** 计算-出水SS超污染物限制 */
+    @Excel(name = "计算-出水SS超污染物限制")
+    private BigDecimal jsCsSsCwrwxz;
+
+    /** 计算-出水总氮超污染物限制 */
+    @Excel(name = "计算-出水总氮超污染物限制")
+    private BigDecimal jsCsZdCwrwxz;
+
+    /** 计算-出水总磷超污染物限制 */
+    @Excel(name = "计算-出水总磷超污染物限制")
+    private BigDecimal jsCsZlCwrwxz;
+
+    /** 计算-出水氨氮超污染物限制 */
+    @Excel(name = "计算-出水氨氮超污染物限制")
+    private BigDecimal jsCsAdCwrwxz;
+
+    /** 计算-进水COD超污染物负荷 */
+    @Excel(name = "计算-进水COD超污染物负荷")
+    private BigDecimal jsJsCodCwrwfh;
+
+    /** 计算-进水SS超污染物负荷 */
+    @Excel(name = "计算-进水SS超污染物负荷")
+    private BigDecimal jsJsSsCwrwfh;
+
+    /** 计算-进水总氮超污染物负荷 */
+    @Excel(name = "计算-进水总氮超污染物负荷")
+    private BigDecimal jsJsZdCwrwfh;
+
+    /** 计算-进水总磷超污染物负荷 */
+    @Excel(name = "计算-进水总磷超污染物负荷")
+    private BigDecimal jsJsZlCwrwfh;
+
+    /** 计算-进水氨氮超污染物负荷 */
+    @Excel(name = "计算-进水氨氮超污染物负荷")
+    private BigDecimal jsJsAdCwrwfh;
+
+    /** 计算-进水COD超污染物限制 */
+    @Excel(name = "计算-进水COD超污染物限制")
+    private BigDecimal jsJsCodCwrwxz;
+
+    /** 计算-进水SS超污染物限制 */
+    @Excel(name = "计算-进水SS超污染物限制")
+    private BigDecimal jsJsSsCwrwxz;
+
+    /** 计算-进水总氮超污染物限制 */
+    @Excel(name = "计算-进水总氮超污染物限制")
+    private BigDecimal jsJsZdCwrwxz;
+
+    /** 计算-进水总磷超污染物限制 */
+    @Excel(name = "计算-进水总磷超污染物限制")
+    private BigDecimal jsJsZlCwrwxz;
+
+    /** 计算-进水氨氮超污染物限制 */
+    @Excel(name = "计算-进水氨氮超污染物限制")
+    private BigDecimal jsJsAdCwrwxz;
+
     /** 删除标志（0代表存在 2代表删除） */
     private Long delFlag;
 

slibra-system/src/main/java/com/slibra/business/domain/TXinyiBigTableHour.java

@@ -737,6 +737,66 @@ public class TXinyiBigTableHour extends BaseEntity
     @Excel(name = "计算表-反冲洗水量比例")
     private BigDecimal jsFcxslbl;
 
+    /** 计算-出水COD超污染物限制 */
+    @Excel(name = "计算-出水COD超污染物限制")
+    private BigDecimal jsCsCodCwrwxz;
+
+    /** 计算-出水SS超污染物限制 */
+    @Excel(name = "计算-出水SS超污染物限制")
+    private BigDecimal jsCsSsCwrwxz;
+
+    /** 计算-出水总氮超污染物限制 */
+    @Excel(name = "计算-出水总氮超污染物限制")
+    private BigDecimal jsCsZdCwrwxz;
+
+    /** 计算-出水总磷超污染物限制 */
+    @Excel(name = "计算-出水总磷超污染物限制")
+    private BigDecimal jsCsZlCwrwxz;
+
+    /** 计算-出水氨氮超污染物限制 */
+    @Excel(name = "计算-出水氨氮超污染物限制")
+    private BigDecimal jsCsAdCwrwxz;
+
+    /** 计算-进水COD超污染物负荷 */
+    @Excel(name = "计算-进水COD超污染物负荷")
+    private BigDecimal jsJsCodCwrwfh;
+
+    /** 计算-进水SS超污染物负荷 */
+    @Excel(name = "计算-进水SS超污染物负荷")
+    private BigDecimal jsJsSsCwrwfh;
+
+    /** 计算-进水总氮超污染物负荷 */
+    @Excel(name = "计算-进水总氮超污染物负荷")
+    private BigDecimal jsJsZdCwrwfh;
+
+    /** 计算-进水总磷超污染物负荷 */
+    @Excel(name = "计算-进水总磷超污染物负荷")
+    private BigDecimal jsJsZlCwrwfh;
+
+    /** 计算-进水氨氮超污染物负荷 */
+    @Excel(name = "计算-进水氨氮超污染物负荷")
+    private BigDecimal jsJsAdCwrwfh;
+
+    /** 计算-进水COD超污染物限制 */
+    @Excel(name = "计算-进水COD超污染物限制")
+    private BigDecimal jsJsCodCwrwxz;
+
+    /** 计算-进水SS超污染物限制 */
+    @Excel(name = "计算-进水SS超污染物限制")
+    private BigDecimal jsJsSsCwrwxz;
+
+    /** 计算-进水总氮超污染物限制 */
+    @Excel(name = "计算-进水总氮超污染物限制")
+    private BigDecimal jsJsZdCwrwxz;
+
+    /** 计算-进水总磷超污染物限制 */
+    @Excel(name = "计算-进水总磷超污染物限制")
+    private BigDecimal jsJsZlCwrwxz;
+
+    /** 计算-进水氨氮超污染物限制 */
+    @Excel(name = "计算-进水氨氮超污染物限制")
+    private BigDecimal jsJsAdCwrwxz;
+
     /** 删除标志（0代表存在 2代表删除） */
     private Long delFlag;
 

slibra-system/src/main/java/com/slibra/business/domain/TXinyiBigTableMonth.java

@@ -732,6 +732,66 @@ public class TXinyiBigTableMonth extends BaseEntity
     @Excel(name = "计算表-反冲洗水量比例")
     private BigDecimal jsFcxslbl;
 
+    /** 计算-出水COD超污染物限制 */
+    @Excel(name = "计算-出水COD超污染物限制")
+    private BigDecimal jsCsCodCwrwxz;
+
+    /** 计算-出水SS超污染物限制 */
+    @Excel(name = "计算-出水SS超污染物限制")
+    private BigDecimal jsCsSsCwrwxz;
+
+    /** 计算-出水总氮超污染物限制 */
+    @Excel(name = "计算-出水总氮超污染物限制")
+    private BigDecimal jsCsZdCwrwxz;
+
+    /** 计算-出水总磷超污染物限制 */
+    @Excel(name = "计算-出水总磷超污染物限制")
+    private BigDecimal jsCsZlCwrwxz;
+
+    /** 计算-出水氨氮超污染物限制 */
+    @Excel(name = "计算-出水氨氮超污染物限制")
+    private BigDecimal jsCsAdCwrwxz;
+
+    /** 计算-进水COD超污染物负荷 */
+    @Excel(name = "计算-进水COD超污染物负荷")
+    private BigDecimal jsJsCodCwrwfh;
+
+    /** 计算-进水SS超污染物负荷 */
+    @Excel(name = "计算-进水SS超污染物负荷")
+    private BigDecimal jsJsSsCwrwfh;
+
+    /** 计算-进水总氮超污染物负荷 */
+    @Excel(name = "计算-进水总氮超污染物负荷")
+    private BigDecimal jsJsZdCwrwfh;
+
+    /** 计算-进水总磷超污染物负荷 */
+    @Excel(name = "计算-进水总磷超污染物负荷")
+    private BigDecimal jsJsZlCwrwfh;
+
+    /** 计算-进水氨氮超污染物负荷 */
+    @Excel(name = "计算-进水氨氮超污染物负荷")
+    private BigDecimal jsJsAdCwrwfh;
+
+    /** 计算-进水COD超污染物限制 */
+    @Excel(name = "计算-进水COD超污染物限制")
+    private BigDecimal jsJsCodCwrwxz;
+
+    /** 计算-进水SS超污染物限制 */
+    @Excel(name = "计算-进水SS超污染物限制")
+    private BigDecimal jsJsSsCwrwxz;
+
+    /** 计算-进水总氮超污染物限制 */
+    @Excel(name = "计算-进水总氮超污染物限制")
+    private BigDecimal jsJsZdCwrwxz;
+
+    /** 计算-进水总磷超污染物限制 */
+    @Excel(name = "计算-进水总磷超污染物限制")
+    private BigDecimal jsJsZlCwrwxz;
+
+    /** 计算-进水氨氮超污染物限制 */
+    @Excel(name = "计算-进水氨氮超污染物限制")
+    private BigDecimal jsJsAdCwrwxz;
+
     /** 删除标志（0代表存在 2代表删除） */
     private Long delFlag;
 

slibra-system/src/main/java/com/slibra/business/domain/TXinyiCalculate.java

@@ -152,6 +152,66 @@ public class TXinyiCalculate extends BaseEntity
     @Excel(name = "反冲洗水量比例")
     private BigDecimal FCXSLBL;
 
+    /** 出水COD超污染物限制 */
+    @Excel(name = "出水COD超污染物限制")
+    private BigDecimal csCodCwrwxz;
+
+    /** 出水SS超污染物限制 */
+    @Excel(name = "出水SS超污染物限制")
+    private BigDecimal csSsCwrwxz;
+
+    /** 出水总氮超污染物限制 */
+    @Excel(name = "出水总氮超污染物限制")
+    private BigDecimal csZdCwrwxz;
+
+    /** 出水总磷超污染物限制 */
+    @Excel(name = "出水总磷超污染物限制")
+    private BigDecimal csZlCwrwxz;
+
+    /** 出水氨氮超污染物限制 */
+    @Excel(name = "出水氨氮超污染物限制")
+    private BigDecimal csAdCwrwxz;
+
+    /** 进水COD超污染物负荷 */
+    @Excel(name = "进水COD超污染物负荷")
+    private BigDecimal jsCodCwrwfh;
+
+    /** 进水SS超污染物负荷 */
+    @Excel(name = "进水SS超污染物负荷")
+    private BigDecimal jsSsCwrwfh;
+
+    /** 进水总氮超污染物负荷 */
+    @Excel(name = "进水总氮超污染物负荷")
+    private BigDecimal jsZdCwrwfh;
+
+    /** 进水总磷超污染物负荷 */
+    @Excel(name = "进水总磷超污染物负荷")
+    private BigDecimal jsZlCwrwfh;
+
+    /** 进水氨氮超污染物负荷 */
+    @Excel(name = "进水氨氮超污染物负荷")
+    private BigDecimal jsAdCwrwfh;
+
+    /** 进水COD超污染物限制 */
+    @Excel(name = "进水COD超污染物限制")
+    private BigDecimal jsCodCwrwxz;
+
+    /** 进水SS超污染物限制 */
+    @Excel(name = "进水SS超污染物限制")
+    private BigDecimal jsSsCwrwxz;
+
+    /** 进水总氮超污染物限制 */
+    @Excel(name = "进水总氮超污染物限制")
+    private BigDecimal jsZdCwrwxz;
+
+    /** 进水总磷超污染物限制 */
+    @Excel(name = "进水总磷超污染物限制")
+    private BigDecimal jsZlCwrwxz;
+
+    /** 进水氨氮超污染物限制 */
+    @Excel(name = "进水氨氮超污染物限制")
+    private BigDecimal jsAdCwrwxz;
+
     /** 删除标志（0代表存在 2代表删除） */
     private Long delFlag;
 

slibra-system/src/main/resources/mapper/business/TXinyiCalculateMapper.xml

@@ -37,6 +37,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="QSB"    column="QSB"    />
         <result property="FCXSL"    column="FCXSL"    />
         <result property="FCXSLBL"    column="FCXSLBL"    />
+        <result property="csCodCwrwxz"    column="CS_COD_CWRWXZ"    />
+        <result property="csSsCwrwxz"    column="CS_SS_CWRWXZ"    />
+        <result property="csZdCwrwxz"    column="CS_ZD_CWRWXZ"    />
+        <result property="csZlCwrwxz"    column="CS_ZL_CWRWXZ"    />
+        <result property="csAdCwrwxz"    column="CS_AD_CWRWXZ"    />
+        <result property="jsCodCwrwfh"    column="JS_COD_CWRWFH"    />
+        <result property="jsSsCwrwfh"    column="JS_SS_CWRWFH"    />
+        <result property="jsZdCwrwfh"    column="JS_ZD_CWRWFH"    />
+        <result property="jsZlCwrwfh"    column="JS_ZL_CWRWFH"    />
+        <result property="jsAdCwrwfh"    column="JS_AD_CWRWFH"    />
+        <result property="jsCodCwrwxz"    column="JS_COD_CWRWXZ"    />
+        <result property="jsSsCwrwxz"    column="JS_SS_CWRWXZ"    />
+        <result property="jsZdCwrwxz"    column="JS_ZD_CWRWXZ"    />
+        <result property="jsZlCwrwxz"    column="JS_ZL_CWRWXZ"    />
+        <result property="jsAdCwrwxz"    column="JS_AD_CWRWXZ"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="revision"    column="revision"    />
         <result property="createBy"    column="create_by"    />
@@ -47,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTXinyiCalculateVo">
-        select id, TEST_DATE, TEST_HOUR, TEST_TIME, JS_TDB, JS_TLB, JS_BOD_B_COD, YYQ_HRT, QYQ_HRT, HYQ_HRT, HFXWNNDZB, F_M, GSLS, GSLS_ONE, GSLS_TWO, XGS_GSLS, XLCSC_BMFH, XLCSC_HRT, CCCDC_BMFH, CCCDC_HRT, ECC_BMFH, ECC_HRT, ECC_GTFH, CLSN_JCSJ, XGCDC_QSQ_SSLS, WHLB, WHL_R_N, NHLB, WDSCNL, QSB, FCXSL, FCXSLBL, del_flag, revision, create_by, create_time, update_by, update_time, remark from t_xinyi_calculate
+        select id, TEST_DATE, TEST_HOUR, TEST_TIME, JS_TDB, JS_TLB, JS_BOD_B_COD, YYQ_HRT, QYQ_HRT, HYQ_HRT, HFXWNNDZB, F_M, GSLS, GSLS_ONE, GSLS_TWO, XGS_GSLS, XLCSC_BMFH, XLCSC_HRT, CCCDC_BMFH, CCCDC_HRT, ECC_BMFH, ECC_HRT, ECC_GTFH, CLSN_JCSJ, XGCDC_QSQ_SSLS, WHLB, WHL_R_N, NHLB, WDSCNL, QSB, FCXSL, FCXSLBL, CS_COD_CWRWXZ, CS_SS_CWRWXZ, CS_ZD_CWRWXZ, CS_ZL_CWRWXZ, CS_AD_CWRWXZ, JS_COD_CWRWFH, JS_SS_CWRWFH, JS_ZD_CWRWFH, JS_ZL_CWRWFH, JS_AD_CWRWFH, JS_COD_CWRWXZ, JS_SS_CWRWXZ, JS_ZD_CWRWXZ, JS_ZL_CWRWXZ, JS_AD_CWRWXZ, del_flag, revision, create_by, create_time, update_by, update_time, remark from t_xinyi_calculate
     </sql>
 
     <select id="selectTXinyiCalculateById" parameterType="Long" resultMap="TXinyiCalculateResult">
@@ -89,6 +104,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="QSB != null">QSB,</if>
             <if test="FCXSL != null">FCXSL,</if>
             <if test="FCXSLBL != null">FCXSLBL,</if>
+            <if test="csCodCwrwxz != null">CS_COD_CWRWXZ,</if>
+            <if test="csSsCwrwxz != null">CS_SS_CWRWXZ,</if>
+            <if test="csZdCwrwxz != null">CS_ZD_CWRWXZ,</if>
+            <if test="csZlCwrwxz != null">CS_ZL_CWRWXZ,</if>
+            <if test="csAdCwrwxz != null">CS_AD_CWRWXZ,</if>
+            <if test="jsCodCwrwfh != null">JS_COD_CWRWFH,</if>
+            <if test="jsSsCwrwfh != null">JS_SS_CWRWFH,</if>
+            <if test="jsZdCwrwfh != null">JS_ZD_CWRWFH,</if>
+            <if test="jsZlCwrwfh != null">JS_ZL_CWRWFH,</if>
+            <if test="jsAdCwrwfh != null">JS_AD_CWRWFH,</if>
+            <if test="jsCodCwrwxz != null">JS_COD_CWRWXZ,</if>
+            <if test="jsSsCwrwxz != null">JS_SS_CWRWXZ,</if>
+            <if test="jsZdCwrwxz != null">JS_ZD_CWRWXZ,</if>
+            <if test="jsZlCwrwxz != null">JS_ZL_CWRWXZ,</if>
+            <if test="jsAdCwrwxz != null">JS_AD_CWRWXZ,</if>
             <if test="delFlag != null">del_flag,</if>
             <if test="revision != null">revision,</if>
             <if test="createBy != null">create_by,</if>
@@ -129,6 +159,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="QSB != null">#{QSB},</if>
             <if test="FCXSL != null">#{FCXSL},</if>
             <if test="FCXSLBL != null">#{FCXSLBL},</if>
+            <if test="csCodCwrwxz != null">#{csCodCwrwxz},</if>
+            <if test="csSsCwrwxz != null">#{csSsCwrwxz},</if>
+            <if test="csZdCwrwxz != null">#{csZdCwrwxz},</if>
+            <if test="csZlCwrwxz != null">#{csZlCwrwxz},</if>
+            <if test="csAdCwrwxz != null">#{csAdCwrwxz},</if>
+            <if test="jsCodCwrwfh != null">#{jsCodCwrwfh},</if>
+            <if test="jsSsCwrwfh != null">#{jsSsCwrwfh},</if>
+            <if test="jsZdCwrwfh != null">#{jsZdCwrwfh},</if>
+            <if test="jsZlCwrwfh != null">#{jsZlCwrwfh},</if>
+            <if test="jsAdCwrwfh != null">#{jsAdCwrwfh},</if>
+            <if test="jsCodCwrwxz != null">#{jsCodCwrwxz},</if>
+            <if test="jsSsCwrwxz != null">#{jsSsCwrwxz},</if>
+            <if test="jsZdCwrwxz != null">#{jsZdCwrwxz},</if>
+            <if test="jsZlCwrwxz != null">#{jsZlCwrwxz},</if>
+            <if test="jsAdCwrwxz != null">#{jsAdCwrwxz},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="revision != null">#{revision},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -173,6 +218,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="QSB != null">QSB = #{QSB},</if>
             <if test="FCXSL != null">FCXSL = #{FCXSL},</if>
             <if test="FCXSLBL != null">FCXSLBL = #{FCXSLBL},</if>
+            <if test="csCodCwrwxz != null">CS_COD_CWRWXZ = #{csCodCwrwxz},</if>
+            <if test="csSsCwrwxz != null">CS_SS_CWRWXZ = #{csSsCwrwxz},</if>
+            <if test="csZdCwrwxz != null">CS_ZD_CWRWXZ = #{csZdCwrwxz},</if>
+            <if test="csZlCwrwxz != null">CS_ZL_CWRWXZ = #{csZlCwrwxz},</if>
+            <if test="csAdCwrwxz != null">CS_AD_CWRWXZ = #{csAdCwrwxz},</if>
+            <if test="jsCodCwrwfh != null">JS_COD_CWRWFH = #{jsCodCwrwfh},</if>
+            <if test="jsSsCwrwfh != null">JS_SS_CWRWFH = #{jsSsCwrwfh},</if>
+            <if test="jsZdCwrwfh != null">JS_ZD_CWRWFH = #{jsZdCwrwfh},</if>
+            <if test="jsZlCwrwfh != null">JS_ZL_CWRWFH = #{jsZlCwrwfh},</if>
+            <if test="jsAdCwrwfh != null">JS_AD_CWRWFH = #{jsAdCwrwfh},</if>
+            <if test="jsCodCwrwxz != null">JS_COD_CWRWXZ = #{jsCodCwrwxz},</if>
+            <if test="jsSsCwrwxz != null">JS_SS_CWRWXZ = #{jsSsCwrwxz},</if>
+            <if test="jsZdCwrwxz != null">JS_ZD_CWRWXZ = #{jsZdCwrwxz},</if>
+            <if test="jsZlCwrwxz != null">JS_ZL_CWRWXZ = #{jsZlCwrwxz},</if>
+            <if test="jsAdCwrwxz != null">JS_AD_CWRWXZ = #{jsAdCwrwxz},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="revision != null">revision = #{revision},</if>
             <if test="createBy != null">create_by = #{createBy},</if>