计算指标计算逻辑调整 新增计算参数

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

@@ -522,13 +522,17 @@ public class AsyncTask {
             tXinyiCalculate.setXgcdcQsqSsls(jsSlq.multiply(XGCDCQSQSSLS_LAST));
             //2024年6月29日15:18:01 增加几个新的计算指标
             if(!Objects.isNull(nhlbqdsl) && !Objects.isNull(nhlbdsjll) && !Objects.isNull(nhlbgzxl))
-                tXinyiCalculate.setNHLB(nhlbqdsl.multiply(nhlbdsjll).multiply(nhlbgzxl).divide(jsSlq, 4, RoundingMode.HALF_UP));
+                tXinyiCalculate.setNHLB(nhlbqdsl.multiply(nhlbdsjll).multiply(nhlbgzxl).multiply(BigDecimal_100).divide(jsSlq, 4, RoundingMode.HALF_UP));
             if(!Objects.isNull(whlbqdsl) && !Objects.isNull(whlbdsjll) && !Objects.isNull(whlbgzxl))
-                tXinyiCalculate.setWHLB(whlbqdsl.multiply(whlbdsjll).multiply(whlbgzxl).divide(jsSlq, 4, RoundingMode.HALF_UP));
+                tXinyiCalculate.setWHLB(whlbqdsl.multiply(whlbdsjll).multiply(whlbgzxl).multiply(BigDecimal_100).divide(jsSlq, 4, RoundingMode.HALF_UP));
             if(!Objects.isNull(gfjgzts) && !Objects.isNull(gfjckll))
                 tXinyiCalculate.setQSB(gfjgzts.multiply(gfjckll).divide(jsSlq, NUMBER_SCALE_4, RoundingMode.HALF_UP));
-            if(!Objects.isNull(fcxbsjll) && !Objects.isNull(fclbsl) && !Objects.isNull(fcxbgzxl))
-                tXinyiCalculate.setFCXSL(fcxbsjll.multiply(fclbsl).multiply(fcxbgzxl));
+            if(!Objects.isNull(fcxbsjll) && !Objects.isNull(fclbsl) && !Objects.isNull(fcxbgzxl)){
+                BigDecimal fcxsl = fcxbsjll.multiply(fclbsl).multiply(fcxbgzxl);
+                tXinyiCalculate.setFCXSL(fcxsl);
+                //2024年7月3日10:54:28 额外再增加一个字段
+                tXinyiCalculate.setFCXSLBL(fcxsl.divide(jsSlq, NUMBER_SCALE_4, RoundingMode.HALF_UP).multiply(BigDecimal_100));
+            }
 
         }
         return tXinyiCalculate;

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

@@ -145,6 +145,10 @@ public class TXinyiCalculate extends BaseEntity
     @Excel(name = "反冲洗水量")
     private BigDecimal FCXSL;
 
+    /** 反冲洗水量比例 */
+    @Excel(name = "反冲洗水量比例")
+    private BigDecimal FCXSLBL;
+
     /** 删除标志（0代表存在 2代表删除） */
     private Long delFlag;
 

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

@@ -35,6 +35,7 @@
         <result property="WDSCNL"    column="WDSCNL"    />
         <result property="QSB"    column="QSB"    />
         <result property="FCXSL"    column="FCXSL"    />
+        <result property="FCXSLBL"    column="FCXSLBL"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="revision"    column="revision"    />
         <result property="createBy"    column="create_by"    />
@@ -45,7 +46,7 @@
     </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, NHLB, WDSCNL, QSB, FCXSL, 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, NHLB, WDSCNL, QSB, FCXSL, FCXSLBL, del_flag, revision, create_by, create_time, update_by, update_time, remark from t_xinyi_calculate
     </sql>
 
     <select id="selectTXinyiCalculateList" parameterType="TXinyiCalculate" resultMap="TXinyiCalculateResult">
@@ -81,6 +82,7 @@
             <if test="WDSCNL != null "> and WDSCNL = #{WDSCNL}</if>
             <if test="QSB != null "> and QSB = #{QSB}</if>
             <if test="FCXSL != null "> and FCXSL = #{FCXSL}</if>
+            <if test="FCXSLBL != null "> and FCXSLBL = #{FCXSLBL}</if>
             <if test="revision != null "> and revision = #{revision}</if>
         </where>
         and del_flag = 0 order by id desc
@@ -123,6 +125,7 @@
             <if test="WDSCNL != null">WDSCNL,</if>
             <if test="QSB != null">QSB,</if>
             <if test="FCXSL != null">FCXSL,</if>
+            <if test="FCXSLBL != null">FCXSLBL,</if>
             <if test="delFlag != null">del_flag,</if>
             <if test="revision != null">revision,</if>
             <if test="createBy != null">create_by,</if>
@@ -161,6 +164,7 @@
             <if test="WDSCNL != null">#{WDSCNL},</if>
             <if test="QSB != null">#{QSB},</if>
             <if test="FCXSL != null">#{FCXSL},</if>
+            <if test="FCXSLBL != null">#{FCXSLBL},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="revision != null">#{revision},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -203,6 +207,7 @@
             <if test="WDSCNL != null">WDSCNL = #{WDSCNL},</if>
             <if test="QSB != null">QSB = #{QSB},</if>
             <if test="FCXSL != null">FCXSL = #{FCXSL},</if>
+            <if test="FCXSLBL != null">FCXSLBL = #{FCXSLBL},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="revision != null">revision = #{revision},</if>
             <if test="createBy != null">create_by = #{createBy},</if>