王子文 生产月报 Cracker Raw Material 趋势分析

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

@@ -48,11 +48,7 @@ public class TMonthlyProductionReport extends BaseEntity
 
     /** Cracker Raw Material C4 Raff3  fr bd and 2ph */
     @Excel(name = "Cracker Raw Material C4 Raff3  fr bd and 2ph")
-    private String raff3FrBd;
-
-    /** Cracker Raw Material C2 fr LDPE */
-    @Excel(name = "Cracker Raw Material C2 fr LDPE")
-    private String raffinate2pFr2ph;
+    private String raff3FrBdAnd2ph;
 
     /** Cracker Raw Material C3 fr OXO */
     @Excel(name = "Cracker Raw Material C3 fr OXO")
@@ -166,24 +162,15 @@ public class TMonthlyProductionReport extends BaseEntity
     {
         return lpgToFurnace;
     }
-    public void setRaff3FrBd(String raff3FrBd)
-    {
-        this.raff3FrBd = raff3FrBd;
-    }
 
-    public String getRaff3FrBd()
-    {
-        return raff3FrBd;
-    }
-    public void setRaffinate2pFr2ph(String raffinate2pFr2ph)
-    {
-        this.raffinate2pFr2ph = raffinate2pFr2ph;
+    public String getRaff3FrBdAnd2ph() {
+        return raff3FrBdAnd2ph;
     }
 
-    public String getRaffinate2pFr2ph()
-    {
-        return raffinate2pFr2ph;
+    public void setRaff3FrBdAnd2ph(String raff3FrBdAnd2ph) {
+        this.raff3FrBdAnd2ph = raff3FrBdAnd2ph;
     }
+
     public void setC2FrLdpe(String c2FrLdpe)
     {
         this.c2FrLdpe = c2FrLdpe;
@@ -286,8 +273,6 @@ public class TMonthlyProductionReport extends BaseEntity
             .append("c6C8Na", getC6C8Na())
             .append("wisonEthane", getWisonEthane())
             .append("lpgToFurnace", getLpgToFurnace())
-            .append("raff3FrBd", getRaff3FrBd())
-            .append("raffinate2pFr2ph", getRaffinate2pFr2ph())
             .append("c2FrLdpe", getC2FrLdpe())
             .append("c3FrOxo", getC3FrOxo())
             .append("mixedC3C4", getMixedC3C4())

master/src/main/java/com/ruoyi/project/production/service/impl/TMonthlyProductionReportServiceImpl.java

@@ -141,8 +141,7 @@ public class TMonthlyProductionReportServiceImpl implements ITMonthlyProductionR
             String c6C8Na = tMonthlyProductionReport.getC6C8Na();
             String wisonEthane = tMonthlyProductionReport.getWisonEthane();
             String lpgToFurnace = tMonthlyProductionReport.getLpgToFurnace();
-            String raff3FrBd = tMonthlyProductionReport.getRaff3FrBd();
-            String raffinate2pFr2ph = tMonthlyProductionReport.getRaffinate2pFr2ph();
+            String raff3FrBdAnd2ph = tMonthlyProductionReport.getRaff3FrBdAnd2ph();
             String c2FrLdpe = tMonthlyProductionReport.getC2FrLdpe();
             String c3FrOxo = tMonthlyProductionReport.getC3FrOxo();
             String mixedC3C4 = tMonthlyProductionReport.getMixedC3C4();
@@ -153,8 +152,6 @@ public class TMonthlyProductionReportServiceImpl implements ITMonthlyProductionR
             String hyC4FrR800 = tMonthlyProductionReport.getHyC4FrR800();
             String crackerRawInput = tMonthlyProductionReport.getCrackerRawInput();
             String crackerRawFeed = tMonthlyProductionReport.getCrackerRawFeed();
-            Long raff3FrBdAndRaffinate2pFr2ph = Long.parseLong(raff3FrBd) + Long.parseLong(raffinate2pFr2ph);
-            String raff3FrBdAndRaffinate2pFr2phStr = raff3FrBdAndRaffinate2pFr2ph.toString();
             // 前端数据集合的class
             Class clazz = null;
             // 当前元素调用的set方法
@@ -208,7 +205,7 @@ public class TMonthlyProductionReportServiceImpl implements ITMonthlyProductionR
                 method.invoke(crackerRawMaterialVOs.get(3), c6C8Na);
                 method.invoke(crackerRawMaterialVOs.get(4), wisonEthane);
                 method.invoke(crackerRawMaterialVOs.get(5), lpgToFurnace);
-                method.invoke(crackerRawMaterialVOs.get(6), raff3FrBdAndRaffinate2pFr2phStr);
+                method.invoke(crackerRawMaterialVOs.get(6), raff3FrBdAnd2ph);
                 method.invoke(crackerRawMaterialVOs.get(7), c2FrLdpe);
                 method.invoke(crackerRawMaterialVOs.get(8), c3FrOxo);
                 method.invoke(crackerRawMaterialVOs.get(9), mixedC3C4);
@@ -227,7 +224,7 @@ public class TMonthlyProductionReportServiceImpl implements ITMonthlyProductionR
                     crackerRawMaterialVOs.get(3).setCurrently(c6C8Na);
                     crackerRawMaterialVOs.get(4).setCurrently(wisonEthane);
                     crackerRawMaterialVOs.get(5).setCurrently(lpgToFurnace);
-                    crackerRawMaterialVOs.get(6).setCurrently(raff3FrBdAndRaffinate2pFr2phStr);
+                    crackerRawMaterialVOs.get(6).setCurrently(raff3FrBdAnd2ph);
                     crackerRawMaterialVOs.get(7).setCurrently(c2FrLdpe);
                     crackerRawMaterialVOs.get(8).setCurrently(c3FrOxo);
                     crackerRawMaterialVOs.get(9).setCurrently(mixedC3C4);

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

@@ -13,8 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="c6C8Na"               column="c6_c8_na"    />
         <result property="wisonEthane"          column="wison_ethane"    />
         <result property="lpgToFurnace"         column="lpg_to_furnace"    />
-        <result property="raff3FrBd"            column="raff3_fr_bd"    />
-        <result property="raffinate2pFr2ph"     column="raffinate2p_fr_2ph"    />
+        <result property="raff3FrBdAnd2ph"      column="raff3_fr_bd_and_2ph"    />
         <result property="c2FrLdpe"             column="c2_fr_ldpe"    />
         <result property="c3FrOxo"              column="c3_fr_oxo"    />
         <result property="mixedC3C4"            column="mixed_c3_c4"    />
@@ -28,139 +27,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deptName"             column="dept_name" />
     </resultMap>
 
-    <sql id="selectTMonthlyProductionReportVo">
-        select d.id, d.report_month, d.report_year, d.nap, d.c5, d.c6_c8_na, d.wison_ethane, d.lpg_to_furnace, d.raff3_fr_bd, d.raffinate2p_fr_2ph, d.c2_fr_ldpe, d.c3_fr_oxo, d.mixed_c3_c4, d.hy_c9, d.pgu_offgas, d.wash_oil, d.toluene, d.hy_c4_fr_r800, d.cracker_raw_input, d.cracker_raw_feed from t_monthly_production_report d
-    </sql>
-
     <select id="selectCrackerRawMaterialByYear" parameterType="Long" resultMap="TMonthlyProductionReportResult">
         select
           d.id, d.report_month, d.report_year, d.nap, d.c5, d.c6_c8_na, d.wison_ethane, d.lpg_to_furnace,
-          d.raff3_fr_bd, d.raffinate2p_fr_2ph, d.c2_fr_ldpe, d.c3_fr_oxo, d.mixed_c3_c4, d.hy_c9, d.pgu_offgas,
+          d.raff3_fr_bd_and_2ph, d.c2_fr_ldpe, d.c3_fr_oxo, d.mixed_c3_c4, d.hy_c9, d.pgu_offgas,
           d.wash_oil, d.toluene, d.hy_c4_fr_r800, d.cracker_raw_input, d.cracker_raw_feed
         from
           t_monthly_production_report d
         where d.report_year = #{year}
     </select>
 
-    <select id="selectTMonthlyProductionReportList" parameterType="TMonthlyProductionReport" resultMap="TMonthlyProductionReportResult">
-        <include refid="selectTMonthlyProductionReportVo"/>
-        <where>  
-            <if test="reportMonth != null "> and report_month = #{reportMonth}</if>
-            <if test="reportYear != null "> and report_year = #{reportYear}</if>
-            <if test="nap != null  and nap != ''"> and nap = #{nap}</if>
-            <if test="c5 != null  and c5 != ''"> and c5 = #{c5}</if>
-            <if test="c6C8Na != null  and c6C8Na != ''"> and c6_c8_na = #{c6C8Na}</if>
-            <if test="wisonEthane != null  and wisonEthane != ''"> and wison_ethane = #{wisonEthane}</if>
-            <if test="lpgToFurnace != null  and lpgToFurnace != ''"> and lpg_to_furnace = #{lpgToFurnace}</if>
-            <if test="raff3FrBd != null  and raff3FrBd != ''"> and raff3_fr_bd = #{raff3FrBd}</if>
-            <if test="raffinate2pFr2ph != null  and raffinate2pFr2ph != ''"> and raffinate2p_fr_2ph = #{raffinate2pFr2ph}</if>
-            <if test="c2FrLdpe != null  and c2FrLdpe != ''"> and c2_fr_ldpe = #{c2FrLdpe}</if>
-            <if test="c3FrOxo != null  and c3FrOxo != ''"> and c3_fr_oxo = #{c3FrOxo}</if>
-            <if test="mixedC3C4 != null  and mixedC3C4 != ''"> and mixed_c3_c4 = #{mixedC3C4}</if>
-            <if test="hyC9 != null  and hyC9 != ''"> and hy_c9 = #{hyC9}</if>
-            <if test="pguOffgas != null  and pguOffgas != ''"> and pgu_offgas = #{pguOffgas}</if>
-            <if test="washOil != null  and washOil != ''"> and wash_oil = #{washOil}</if>
-            <if test="toluene != null  and toluene != ''"> and toluene = #{toluene}</if>
-            <if test="hyC4FrR800 != null  and hyC4FrR800 != ''"> and hy_c4_fr_r800 = #{hyC4FrR800}</if>
-            <if test="crackerRawInput != null  and crackerRawInput != ''"> and cracker_raw_input = #{crackerRawInput}</if>
-            <if test="crackerRawFeed != null  and crackerRawFeed != ''"> and cracker_raw_feed = #{crackerRawFeed}</if>
-            and d.del_flag = 0
-        </where>
-        <!-- 数据范围过滤 -->
-        ${params.dataScope}
-    </select>
-    
-    <select id="selectTMonthlyProductionReportById" parameterType="Long" resultMap="TMonthlyProductionReportResult">
-        <include refid="selectTMonthlyProductionReportVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertTMonthlyProductionReport" parameterType="TMonthlyProductionReport">
-        <selectKey keyProperty="id" resultType="long" order="BEFORE">
-            SELECT SEQ_T_MONTHLY_REPORT.NEXTVAL as id FROM DUAL
-        </selectKey>
-        insert into t_monthly_production_report
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="reportMonth != null">report_month,</if>
-            <if test="reportYear != null">report_year,</if>
-            <if test="nap != null">nap,</if>
-            <if test="c5 != null">c5,</if>
-            <if test="c6C8Na != null">c6_c8_na,</if>
-            <if test="wisonEthane != null">wison_ethane,</if>
-            <if test="lpgToFurnace != null">lpg_to_furnace,</if>
-            <if test="raff3FrBd != null">raff3_fr_bd,</if>
-            <if test="raffinate2pFr2ph != null">raffinate2p_fr_2ph,</if>
-            <if test="c2FrLdpe != null">c2_fr_ldpe,</if>
-            <if test="c3FrOxo != null">c3_fr_oxo,</if>
-            <if test="mixedC3C4 != null">mixed_c3_c4,</if>
-            <if test="hyC9 != null">hy_c9,</if>
-            <if test="pguOffgas != null">pgu_offgas,</if>
-            <if test="washOil != null">wash_oil,</if>
-            <if test="toluene != null">toluene,</if>
-            <if test="hyC4FrR800 != null">hy_c4_fr_r800,</if>
-            <if test="crackerRawInput != null">cracker_raw_input,</if>
-            <if test="crackerRawFeed != null">cracker_raw_feed,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="reportMonth != null">#{reportMonth},</if>
-            <if test="reportYear != null">#{reportYear},</if>
-            <if test="nap != null">#{nap},</if>
-            <if test="c5 != null">#{c5},</if>
-            <if test="c6C8Na != null">#{c6C8Na},</if>
-            <if test="wisonEthane != null">#{wisonEthane},</if>
-            <if test="lpgToFurnace != null">#{lpgToFurnace},</if>
-            <if test="raff3FrBd != null">#{raff3FrBd},</if>
-            <if test="raffinate2pFr2ph != null">#{raffinate2pFr2ph},</if>
-            <if test="c2FrLdpe != null">#{c2FrLdpe},</if>
-            <if test="c3FrOxo != null">#{c3FrOxo},</if>
-            <if test="mixedC3C4 != null">#{mixedC3C4},</if>
-            <if test="hyC9 != null">#{hyC9},</if>
-            <if test="pguOffgas != null">#{pguOffgas},</if>
-            <if test="washOil != null">#{washOil},</if>
-            <if test="toluene != null">#{toluene},</if>
-            <if test="hyC4FrR800 != null">#{hyC4FrR800},</if>
-            <if test="crackerRawInput != null">#{crackerRawInput},</if>
-            <if test="crackerRawFeed != null">#{crackerRawFeed},</if>
-         </trim>
-    </insert>
-
-    <update id="updateTMonthlyProductionReport" parameterType="TMonthlyProductionReport">
-        update t_monthly_production_report
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="reportMonth != null">report_month = #{reportMonth},</if>
-            <if test="reportYear != null">report_year = #{reportYear},</if>
-            <if test="nap != null">nap = #{nap},</if>
-            <if test="c5 != null">c5 = #{c5},</if>
-            <if test="c6C8Na != null">c6_c8_na = #{c6C8Na},</if>
-            <if test="wisonEthane != null">wison_ethane = #{wisonEthane},</if>
-            <if test="lpgToFurnace != null">lpg_to_furnace = #{lpgToFurnace},</if>
-            <if test="raff3FrBd != null">raff3_fr_bd = #{raff3FrBd},</if>
-            <if test="raffinate2pFr2ph != null">raffinate2p_fr_2ph = #{raffinate2pFr2ph},</if>
-            <if test="c2FrLdpe != null">c2_fr_ldpe = #{c2FrLdpe},</if>
-            <if test="c3FrOxo != null">c3_fr_oxo = #{c3FrOxo},</if>
-            <if test="mixedC3C4 != null">mixed_c3_c4 = #{mixedC3C4},</if>
-            <if test="hyC9 != null">hy_c9 = #{hyC9},</if>
-            <if test="pguOffgas != null">pgu_offgas = #{pguOffgas},</if>
-            <if test="washOil != null">wash_oil = #{washOil},</if>
-            <if test="toluene != null">toluene = #{toluene},</if>
-            <if test="hyC4FrR800 != null">hy_c4_fr_r800 = #{hyC4FrR800},</if>
-            <if test="crackerRawInput != null">cracker_raw_input = #{crackerRawInput},</if>
-            <if test="crackerRawFeed != null">cracker_raw_feed = #{crackerRawFeed},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <update id="deleteTMonthlyProductionReportById" parameterType="Long">
-        update t_monthly_production_report set del_flag = 2 where id = #{id}
-    </update>
-
-    <update id="deleteTMonthlyProductionReportByIds" parameterType="String">
-        update t_monthly_production_report set del_flag = 2 where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </update>
-    
 </mapper>