工业库溶解氧分为中段和末端

slibra-quartz/src/main/java/com/slibra/quartz/task/RyTask.java

@@ -269,12 +269,14 @@ public class RyTask
                     }
                     //2024年4月22日15:45:24  额外保存两个字段 数组
                     List<BigDecimal> extraList = new ArrayList<>();
-                    extraList.add(industry.getOneHyzdDo());
                     extraList.add(industry.getOneHymdDo());
-                    extraList.add(industry.getTwoHyzdDo());
                     extraList.add(industry.getTwoHymdDo());
                     industry.setHycRjyAll(JSON.toJSONString(extraList));
                     extraList.clear();
+                    extraList.add(industry.getOneHyzdDo());
+                    extraList.add(industry.getTwoHyzdDo());
+                    industry.setHycRjyZdAll(JSON.toJSONString(extraList));
+                    extraList.clear();
                     extraList.add(industry.getOneMlss());
                     extraList.add(industry.getTwoMlss());
                     industry.setHycWnndAll(JSON.toJSONString(extraList));

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

@@ -227,9 +227,13 @@ public class TXinyiIndustry
     private BigDecimal CLJYSSLL;
 
     /** 好氧池溶解氧集合 */
-    @Excel(name = "好氧池溶解氧集合")
+    @Excel(name = "好氧池末端溶解氧集合")
     private String hycRjyAll;
 
+    /** 好氧池中断溶解氧 */
+    @Excel(name = "好氧池中段溶解氧集合")
+    private String hycRjyZdAll;
+
     /** 好氧池污泥浓度集合 */
     @Excel(name = "好氧池污泥浓度集合")
     private String hycWnndAll;

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

@@ -58,12 +58,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="SJTYJLY"    column="SJTYJLY"    />
         <result property="CLJYSSLL"    column="CLJYSSLL"    />
         <result property="hycRjyAll"    column="HYC_RJY_ALL"    />
+        <result property="hycRjyZdAll"    column="HYC_RJY_ZD_ALL"    />
         <result property="hycWnndAll"    column="HYC_WNND_ALL"    />
         <result property="createdTime"    column="CREATED_TIME"    />
     </resultMap>
 
     <sql id="selectTXinyiIndustryVo">
-        select ID, TEST_DATE, TEST_HOUR, TEST_TIME, JS_COD, JS_PH, JS_SS, JS_TP, JS_TN, JS_NH3, JS_SW_PH, JS_BFYW, CS_SLQC, CS_COD, CS_PH, CS_SS, CS_TN, CS_TP, CS_NH3, ONE_HYZD_DO, ONE_HYMD_DO, TWO_HYZD_DO, TWO_HYMD_DO, ONE_MLSS, TWO_MLSS, JS_TDS, JS_SLQ, N_HLB_ONE_GP, N_HLB_TWO_GP, N_HLB_THREE_GP, N_HLB_FOUR_GP, NHL_B_FIVE_GP, N_HLB_SIX_GP, W_HLB_ONE_GP, W_HLB_TWO_GP, W_HLB_THREE_GP, W_HLB_FOUR_GP, W_HLB_FIVE_GP, FJ_ONE, FJ_TWO, FJ_THREE, FJ_FOUR, FJ_FIVE, FJ_SIX, KQLL_ONE, KQLL_TWO, KQLL_THREE, KQLL_FOUR, KQLL_FIVE, KQLL_SIX, SJTYJLY, CLJYSSLL, HYC_RJY_ALL, HYC_WNND_ALL, CREATED_TIME from t_xinyi_industry
+        select ID, TEST_DATE, TEST_HOUR, TEST_TIME, JS_COD, JS_PH, JS_SS, JS_TP, JS_TN, JS_NH3, JS_SW_PH, JS_BFYW, CS_SLQC, CS_COD, CS_PH, CS_SS, CS_TN, CS_TP, CS_NH3, ONE_HYZD_DO, ONE_HYMD_DO, TWO_HYZD_DO, TWO_HYMD_DO, ONE_MLSS, TWO_MLSS, JS_TDS, JS_SLQ, N_HLB_ONE_GP, N_HLB_TWO_GP, N_HLB_THREE_GP, N_HLB_FOUR_GP, NHL_B_FIVE_GP, N_HLB_SIX_GP, W_HLB_ONE_GP, W_HLB_TWO_GP, W_HLB_THREE_GP, W_HLB_FOUR_GP, W_HLB_FIVE_GP, FJ_ONE, FJ_TWO, FJ_THREE, FJ_FOUR, FJ_FIVE, FJ_SIX, KQLL_ONE, KQLL_TWO, KQLL_THREE, KQLL_FOUR, KQLL_FIVE, KQLL_SIX, SJTYJLY, CLJYSSLL, HYC_RJY_ALL, HYC_RJY_ZD_ALL, HYC_WNND_ALL, CREATED_TIME from t_xinyi_industry
     </sql>
 
     <select id="selectTXinyiIndustryList" parameterType="TXinyiIndustry" resultMap="TXinyiIndustryResult">
@@ -121,6 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="SJTYJLY != null "> and SJTYJLY = #{SJTYJLY}</if>
             <if test="CLJYSSLL != null "> and CLJYSSLL = #{CLJYSSLL}</if>
             <if test="hycRjyAll != null  and hycRjyAll != ''"> and HYC_RJY_ALL = #{hycRjyAll}</if>
+            <if test="hycRjyZdAll != null  and hycRjyZdAll != ''"> and HYC_RJY_ZD_ALL = #{hycRjyZdAll}</if>
             <if test="hycWnndAll != null  and hycWnndAll != ''"> and HYC_WNND_ALL = #{hycWnndAll}</if>
             <if test="createdTime != null "> and CREATED_TIME = #{createdTime}</if>
         </where>
@@ -186,6 +188,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="SJTYJLY != null">SJTYJLY,</if>
             <if test="CLJYSSLL != null">CLJYSSLL,</if>
             <if test="hycRjyAll != null">HYC_RJY_ALL,</if>
+            <if test="hycRjyZdAll != null">HYC_RJY_ZD_ALL,</if>
             <if test="hycWnndAll != null">HYC_WNND_ALL,</if>
             <if test="createdTime != null">CREATED_TIME,</if>
         </trim>
@@ -242,6 +245,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="SJTYJLY != null">#{SJTYJLY},</if>
             <if test="CLJYSSLL != null">#{CLJYSSLL},</if>
             <if test="hycRjyAll != null">#{hycRjyAll},</if>
+            <if test="hycRjyZdAll != null">#{hycRjyZdAll},</if>
             <if test="hycWnndAll != null">#{hycWnndAll},</if>
             <if test="createdTime != null">#{createdTime},</if>
         </trim>
@@ -302,6 +306,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="SJTYJLY != null">SJTYJLY = #{SJTYJLY},</if>
             <if test="CLJYSSLL != null">CLJYSSLL = #{CLJYSSLL},</if>
             <if test="hycRjyAll != null">HYC_RJY_ALL = #{hycRjyAll},</if>
+            <if test="hycRjyZdAll != null">HYC_RJY_ZD_ALL = #{hycRjyZdAll},</if>
             <if test="hycWnndAll != null">HYC_WNND_ALL = #{hycWnndAll},</if>
             <if test="createdTime != null">CREATED_TIME = #{createdTime},</if>
         </trim>