|
|
@@ -472,18 +472,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<result property="pguWashoilProduced" column="pgu_washoil_produced" />
|
|
|
<result property="pguWashoilInventory" column="pgu_washoil_inventory" />
|
|
|
<result property="pguWashoilChange" column="pgu_washoil_change" />
|
|
|
- <result property="pguWashoilExport" column="pgu_washoil_export" />
|
|
|
<result property="pguWashoilToEu" column="pgu_washoil_to_eu" />
|
|
|
<result property="pguOffgasYeildPercentage" column="pgu_offgas_yeild_percentage" />
|
|
|
<result property="pguOffgasProduced" column="pgu_offgas_produced" />
|
|
|
<result property="pguOffgasInventory" column="pgu_offgas_inventory" />
|
|
|
<result property="pguOffgasChange" column="pgu_offgas_change" />
|
|
|
- <result property="pguOffgasExport" column="pgu_offgas_export" />
|
|
|
<result property="pguOffgasToEu" column="pgu_offgas_to_eu" />
|
|
|
<result property="pguC5YeildPercentage" column="pgu_c5_yeild_percentage" />
|
|
|
<result property="pguC5Produced" column="pgu_c5_produced" />
|
|
|
- <result property="pguC5Inventory" column="pgu_c5_inventory" />
|
|
|
- <result property="pguC5Change" column="pgu_c5_change" />
|
|
|
<result property="pguC5Export" column="pgu_c5_export" />
|
|
|
<result property="pguC5ToAeu" column="pgu_c5_to_aeu" />
|
|
|
<result property="pguC5ToEu" column="pgu_c5_to_eu" />
|
|
|
@@ -613,8 +609,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
d.pgu_to_rpg, d.rpg_to_pgu2, d.pgu_rpg_t_h, d.pgu_rpg1, d.pgu_rpg2, d.pgu_h2, d.pgu_total_feed, d.pgu_output, d.pgu_total_loss, d.pgu_loss_percentage,
|
|
|
d.pgu_feed_load_percentage, d.pgu_to_aeu, d.aeu_to_pgu, d.pgu_aeu_t_h, d.pgu_btx_yeild_percentage, d.pgu_btx_produced, d.pgu_btx_inventory,
|
|
|
d.pgu_btx_change, d.pgu_btx_export, d.pgu_btx_to_aeu, d.pgu_washoil_yeild_percentage, d.pgu_washoil_produced, d.pgu_washoil_inventory,
|
|
|
- d.pgu_washoil_change, d.pgu_washoil_export, d.pgu_washoil_to_eu, d.pgu_offgas_yeild_percentage, d.pgu_offgas_produced, d.pgu_offgas_inventory,
|
|
|
- d.pgu_offgas_change, d.pgu_offgas_export, d.pgu_offgas_to_eu, d.pgu_c5_yeild_percentage, d.pgu_c5_produced, d.pgu_c5_inventory, d.pgu_c5_change,
|
|
|
+ d.pgu_washoil_change, d.pgu_washoil_to_eu, d.pgu_offgas_yeild_percentage, d.pgu_offgas_produced, d.pgu_offgas_inventory,
|
|
|
+ d.pgu_offgas_change, d.pgu_offgas_to_eu, d.pgu_c5_yeild_percentage, d.pgu_c5_produced,
|
|
|
d.pgu_c5_export, d.pgu_c5_to_aeu, d.pgu_c5_to_eu, d.pgu_c5_to_yuanguan, d.pgu_c9_yeild_percentage, d.pgu_c9_produced, d.pgu_c9_inventory,
|
|
|
d.pgu_c9_change, d.pgu_c9_export, d.pgu_c9_to_aeu, d.pgu_c9_to_rttf, d.pgu_c9_to_ship, d.pgu_c9_to_yfcc, d.aeu_benzene_yeild_percentage,
|
|
|
d.aeu_benzene_produced, d.aeu_benzene_inventory, d.aeu_benzene_change, d.aeu_benzene_to_ship, d.aeu_benzene_fr_ship, d.aeu_benzene_to_ybs,
|
|
|
@@ -628,14 +624,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
from t_daily_production_report d
|
|
|
</sql>
|
|
|
|
|
|
- <!--<select id="selectAnalysisData"-->
|
|
|
- <!--resultType="com.ruoyi.project.production.controller.vo.AnalysisDataVO"-->
|
|
|
- <!--parameterType="com.ruoyi.project.production.controller.vo.AnalysisQueryVO">-->
|
|
|
- <!--select d.#{fieldName} as valueData, d.report_date as dateData-->
|
|
|
- <!--from t_daily_production_report d-->
|
|
|
- <!--where d.REPORT_DATE >= #{startDate} and d.REPORT_DATE <= #{endDate}-->
|
|
|
- <!--</select>-->
|
|
|
-
|
|
|
<!-- 查询日期最新的每日生产报告 -->
|
|
|
<select id="selectTDailyProductionReportByMaxDate" resultMap="TDailyProductionReportResult">
|
|
|
<include refid="selectTDailyProductionReportVo"/>
|
|
|
@@ -1107,19 +1095,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="pguWashoilProduced != null and pguWashoilProduced != ''"> and pgu_washoil_produced = #{pguWashoilProduced}</if>
|
|
|
<if test="pguWashoilInventory != null and pguWashoilInventory != ''"> and pgu_washoil_inventory = #{pguWashoilInventory}</if>
|
|
|
<if test="pguWashoilChange != null and pguWashoilChange != ''"> and pgu_washoil_change = #{pguWashoilChange}</if>
|
|
|
- <if test="pguWashoilExport != null and pguWashoilExport != ''"> and pgu_washoil_export = #{pguWashoilExport}</if>
|
|
|
<if test="pguWashoilToEu != null and pguWashoilToEu != ''"> and pgu_washoil_to_eu = #{pguWashoilToEu}</if>
|
|
|
<if test="pguOffgasYeildPercentage != null and pguOffgasYeildPercentage != ''"> and pgu_offgas_yeild_percentage = #{pguOffgasYeildPercentage}</if>
|
|
|
<if test="pguOffgasProduced != null and pguOffgasProduced != ''"> and pgu_offgas_produced = #{pguOffgasProduced}</if>
|
|
|
<if test="pguOffgasInventory != null and pguOffgasInventory != ''"> and pgu_offgas_inventory = #{pguOffgasInventory}</if>
|
|
|
<if test="pguOffgasChange != null and pguOffgasChange != ''"> and pgu_offgas_change = #{pguOffgasChange}</if>
|
|
|
- <if test="pguOffgasExport != null and pguOffgasExport != ''"> and pgu_offgas_export = #{pguOffgasExport}</if>
|
|
|
<if test="pguOffgasToEu != null and pguOffgasToEu != ''"> and pgu_offgas_to_eu = #{pguOffgasToEu}</if>
|
|
|
<if test="pguC5RaffInput != null and pguC5RaffInput != ''"> and pgu_c5_raff_input = #{pguC5RaffInput}</if>
|
|
|
<if test="pguC5YeildPercentage != null and pguC5YeildPercentage != ''"> and pgu_c5_yeild_percentage = #{pguC5YeildPercentage}</if>
|
|
|
<if test="pguC5Produced != null and pguC5Produced != ''"> and pgu_c5_produced = #{pguC5Produced}</if>
|
|
|
- <if test="pguC5Inventory != null and pguC5Inventory != ''"> and pgu_c5_inventory = #{pguC5Inventory}</if>
|
|
|
- <if test="pguC5Change != null and pguC5Change != ''"> and pgu_c5_change = #{pguC5Change}</if>
|
|
|
<if test="pguC5Export != null and pguC5Export != ''"> and pgu_c5_export = #{pguC5Export}</if>
|
|
|
<if test="pguC5ToAeu != null and pguC5ToAeu != ''"> and pgu_c5_to_aeu = #{pguC5ToAeu}</if>
|
|
|
<if test="pguC5ToEu != null and pguC5ToEu != ''"> and pgu_c5_to_eu = #{pguC5ToEu}</if>
|
|
|
@@ -1662,18 +1646,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="pguWashoilProduced != null">pgu_washoil_produced,</if>
|
|
|
<if test="pguWashoilInventory != null">pgu_washoil_inventory,</if>
|
|
|
<if test="pguWashoilChange != null">pgu_washoil_change,</if>
|
|
|
- <if test="pguWashoilExport != null">pgu_washoil_export,</if>
|
|
|
<if test="pguWashoilToEu != null">pgu_washoil_to_eu,</if>
|
|
|
<if test="pguOffgasYeildPercentage != null">pgu_offgas_yeild_percentage,</if>
|
|
|
<if test="pguOffgasProduced != null">pgu_offgas_produced,</if>
|
|
|
<if test="pguOffgasInventory != null">pgu_offgas_inventory,</if>
|
|
|
<if test="pguOffgasChange != null">pgu_offgas_change,</if>
|
|
|
- <if test="pguOffgasExport != null">pgu_offgas_export,</if>
|
|
|
<if test="pguOffgasToEu != null">pgu_offgas_to_eu,</if>
|
|
|
<if test="pguC5YeildPercentage != null">pgu_c5_yeild_percentage,</if>
|
|
|
<if test="pguC5Produced != null">pgu_c5_produced,</if>
|
|
|
- <if test="pguC5Inventory != null">pgu_c5_inventory,</if>
|
|
|
- <if test="pguC5Change != null">pgu_c5_change,</if>
|
|
|
<if test="pguC5Export != null">pgu_c5_export,</if>
|
|
|
<if test="pguC5ToAeu != null">pgu_c5_to_aeu,</if>
|
|
|
<if test="pguC5ToEu != null">pgu_c5_to_eu,</if>
|
|
|
@@ -2745,18 +2725,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="pguWashoilProduced != null">pgu_washoil_produced = #{pguWashoilProduced},</if>
|
|
|
<if test="pguWashoilInventory != null">pgu_washoil_inventory = #{pguWashoilInventory},</if>
|
|
|
<if test="pguWashoilChange != null">pgu_washoil_change = #{pguWashoilChange},</if>
|
|
|
- <if test="pguWashoilExport != null">pgu_washoil_export = #{pguWashoilExport},</if>
|
|
|
<if test="pguWashoilToEu != null">pgu_washoil_to_eu = #{pguWashoilToEu},</if>
|
|
|
<if test="pguOffgasYeildPercentage != null">pgu_offgas_yeild_percentage = #{pguOffgasYeildPercentage},</if>
|
|
|
<if test="pguOffgasProduced != null">pgu_offgas_produced = #{pguOffgasProduced},</if>
|
|
|
<if test="pguOffgasInventory != null">pgu_offgas_inventory = #{pguOffgasInventory},</if>
|
|
|
<if test="pguOffgasChange != null">pgu_offgas_change = #{pguOffgasChange},</if>
|
|
|
- <if test="pguOffgasExport != null">pgu_offgas_export = #{pguOffgasExport},</if>
|
|
|
<if test="pguOffgasToEu != null">pgu_offgas_to_eu = #{pguOffgasToEu},</if>
|
|
|
<if test="pguC5YeildPercentage != null">pgu_c5_yeild_percentage = #{pguC5YeildPercentage},</if>
|
|
|
<if test="pguC5Produced != null">pgu_c5_produced = #{pguC5Produced},</if>
|
|
|
- <if test="pguC5Inventory != null">pgu_c5_inventory = #{pguC5Inventory},</if>
|
|
|
- <if test="pguC5Change != null">pgu_c5_change = #{pguC5Change},</if>
|
|
|
<if test="pguC5Export != null">pgu_c5_export = #{pguC5Export},</if>
|
|
|
<if test="pguC5ToAeu != null">pgu_c5_to_aeu = #{pguC5ToAeu},</if>
|
|
|
<if test="pguC5ToEu != null">pgu_c5_to_eu = #{pguC5ToEu},</if>
|
|
|
@@ -3290,18 +3266,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="pguWashoilProduced != null">pgu_washoil_produced = #{pguWashoilProduced},</if>
|
|
|
<if test="pguWashoilInventory != null">pgu_washoil_inventory = #{pguWashoilInventory},</if>
|
|
|
<if test="pguWashoilChange != null">pgu_washoil_change = #{pguWashoilChange},</if>
|
|
|
- <if test="pguWashoilExport != null">pgu_washoil_export = #{pguWashoilExport},</if>
|
|
|
<if test="pguWashoilToEu != null">pgu_washoil_to_eu = #{pguWashoilToEu},</if>
|
|
|
<if test="pguOffgasYeildPercentage != null">pgu_offgas_yeild_percentage = #{pguOffgasYeildPercentage},</if>
|
|
|
<if test="pguOffgasProduced != null">pgu_offgas_produced = #{pguOffgasProduced},</if>
|
|
|
<if test="pguOffgasInventory != null">pgu_offgas_inventory = #{pguOffgasInventory},</if>
|
|
|
<if test="pguOffgasChange != null">pgu_offgas_change = #{pguOffgasChange},</if>
|
|
|
- <if test="pguOffgasExport != null">pgu_offgas_export = #{pguOffgasExport},</if>
|
|
|
<if test="pguOffgasToEu != null">pgu_offgas_to_eu = #{pguOffgasToEu},</if>
|
|
|
<if test="pguC5YeildPercentage != null">pgu_c5_yeild_percentage = #{pguC5YeildPercentage},</if>
|
|
|
<if test="pguC5Produced != null">pgu_c5_produced = #{pguC5Produced},</if>
|
|
|
- <if test="pguC5Inventory != null">pgu_c5_inventory = #{pguC5Inventory},</if>
|
|
|
- <if test="pguC5Change != null">pgu_c5_change = #{pguC5Change},</if>
|
|
|
<if test="pguC5Export != null">pgu_c5_export = #{pguC5Export},</if>
|
|
|
<if test="pguC5ToAeu != null">pgu_c5_to_aeu = #{pguC5ToAeu},</if>
|
|
|
<if test="pguC5ToEu != null">pgu_c5_to_eu = #{pguC5ToEu},</if>
|
wangggziwen