新增机理模型预测配置表 预测比对表新增机理模型预测相关字段

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

@@ -0,0 +1,182 @@
+package com.slibra.business.domain;
+
+import java.math.BigDecimal;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.slibra.common.annotation.Excel;
+import com.slibra.common.core.domain.BaseEntity;
+
+/**
+ * 机理模型预测配置对象 t_predict_conf
+ * 
+ * @author slibra
+ * @date 2025-02-11
+ */
+public class TPredictConf extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 预测类型（0出水COD 1出水氨氮 2出水总氮 3出水正磷盐 4缺氧氨氮 5缺氧硝酸盐 ） */
+    @Excel(name = "预测类型", readConverterExp = "0=出水COD,1=出水氨氮,2=出水总氮,3=出水正磷盐,4=缺氧氨氮,5=缺氧硝酸盐")
+    private Long type;
+
+    /** Y1 可选择时间起始小时-最小值 */
+    @Excel(name = "Y1 可选择时间起始小时-最小值")
+    private Long y1Min;
+
+    /** Y1 可选择时间起始小时-最大值 */
+    @Excel(name = "Y1 可选择时间起始小时-最大值")
+    private Long y1Max;
+
+    /** X 可选择时间起始小时时间-最小值 */
+    @Excel(name = "X 可选择时间起始小时时间-最小值")
+    private Long xMin;
+
+    /** X 可选择时间起始小时时间-最大值 */
+    @Excel(name = "X 可选择时间起始小时时间-最大值")
+    private Long xMax;
+
+    /** 进水COD限定值或者其他业务变量限定值 */
+    @Excel(name = "进水COD限定值或者其他业务变量限定值")
+    private BigDecimal x1;
+
+    /** 变动系统 */
+    @Excel(name = "变动系统")
+    private BigDecimal a;
+
+    /** 符合变动范围 */
+    @Excel(name = "符合变动范围")
+    private BigDecimal b;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private Long delFlag;
+
+    /** 乐观锁 */
+    @Excel(name = "乐观锁")
+    private Long revision;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setType(Long type) 
+    {
+        this.type = type;
+    }
+
+    public Long getType() 
+    {
+        return type;
+    }
+    public void setY1Min(Long y1Min) 
+    {
+        this.y1Min = y1Min;
+    }
+
+    public Long getY1Min() 
+    {
+        return y1Min;
+    }
+    public void setY1Max(Long y1Max) 
+    {
+        this.y1Max = y1Max;
+    }
+
+    public Long getY1Max() 
+    {
+        return y1Max;
+    }
+    public void setxMin(Long xMin) 
+    {
+        this.xMin = xMin;
+    }
+
+    public Long getxMin() 
+    {
+        return xMin;
+    }
+    public void setxMax(Long xMax) 
+    {
+        this.xMax = xMax;
+    }
+
+    public Long getxMax() 
+    {
+        return xMax;
+    }
+    public void setX1(BigDecimal x1) 
+    {
+        this.x1 = x1;
+    }
+
+    public BigDecimal getX1() 
+    {
+        return x1;
+    }
+    public void setA(BigDecimal a) 
+    {
+        this.a = a;
+    }
+
+    public BigDecimal getA() 
+    {
+        return a;
+    }
+    public void setB(BigDecimal b) 
+    {
+        this.b = b;
+    }
+
+    public BigDecimal getB() 
+    {
+        return b;
+    }
+    public void setDelFlag(Long delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag() 
+    {
+        return delFlag;
+    }
+    public void setRevision(Long revision) 
+    {
+        this.revision = revision;
+    }
+
+    public Long getRevision() 
+    {
+        return revision;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("type", getType())
+            .append("y1Min", getY1Min())
+            .append("y1Max", getY1Max())
+            .append("xMin", getxMin())
+            .append("xMax", getxMax())
+            .append("x1", getX1())
+            .append("a", getA())
+            .append("b", getB())
+            .append("delFlag", getDelFlag())
+            .append("revision", getRevision())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

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

@@ -34,127 +34,147 @@ public class TXinyiForecastComparison extends BaseEntity
     /** 主键 */
     private Long id;
 
-    /** 时间 */
-    @Excel(name = "时间")
-    private String remark;
-
     /** 预测类型 */
     @Excel(name = "预测类型")
     private String category;
 
     /** 预测时间1 */
-    @Excel(name = "预测1时间")
+    @Excel(name = "预测时间1")
     private String forecastTimeOne;
 
     /** 实际值1 */
-    @Excel(name = "实际1小时值")
+    @Excel(name = "实际值1")
     private BigDecimal realOne;
 
     /** 红杉预测值1 */
-    @Excel(name = "TFT预测1小时值")
+    @Excel(name = "红杉预测值1")
     private BigDecimal hsForecastOne;
 
     /** 红杉值1误差率 */
+    @Excel(name = "红杉值1误差率")
     private BigDecimal hsErrorRateOne;
 
     /** 红杉预测1差值 */
-    @Excel(name = "TFT预测1小时误差值")
+    @Excel(name = "红杉预测1差值")
     private BigDecimal hsOneSubtract;
 
-    @Excel(name = "TFT预测1小时百分比误差")
-    private String hsErrorRateOneStr;
-
     /** 跃渊预测值1 */
-    @Excel(name = "LSTM预测1小时值")
+    @Excel(name = "跃渊预测值1")
     private BigDecimal yyForecastOne;
 
     /** 跃渊值1误差率 */
+    @Excel(name = "跃渊值1误差率")
     private BigDecimal yyErrorRateOne;
 
     /** 跃渊预测1差值 */
-    @Excel(name = "LSTM预测1小时误差值")
+    @Excel(name = "跃渊预测1差值")
     private BigDecimal yyOneSubtract;
 
-    @Excel(name = "LSTM预测1小时百分比误差")
-    private String yyErrorRateOneStr;
+    /** 机理模型预测值1 */
+    @Excel(name = "机理模型预测值1")
+    private BigDecimal jlForecastOne;
+
+    /** 机理模型预测值1误差率 */
+    @Excel(name = "机理模型预测值1误差率")
+    private BigDecimal jlErrorRateOne;
+
+    /** 机理模型预测值1差值 */
+    @Excel(name = "机理模型预测值1差值")
+    private BigDecimal jlOneSubtract;
 
     /** 预测时间2 */
-    @Excel(name = "预测2时间")
+    @Excel(name = "预测时间2")
     private String forecastTimeTwo;
 
     /** 实际值2 */
-    @Excel(name = "实际2小时值")
+    @Excel(name = "实际值2")
     private BigDecimal realTwo;
 
     /** 红杉预测值2 */
-    @Excel(name = "TFT预测2小时值")
+    @Excel(name = "红杉预测值2")
     private BigDecimal hsForecastTwo;
 
     /** 红杉值2误差率 */
+    @Excel(name = "红杉值2误差率")
     private BigDecimal hsErrorRateTwo;
 
     /** 红杉预测2差值 */
-    @Excel(name = "TFT预测2小时误差值")
+    @Excel(name = "红杉预测2差值")
     private BigDecimal hsTwoSubtract;
 
-    @Excel(name = "TFT预测2小时百分比误差")
-    private String hsErrorRateTwoStr;
-
     /** 跃渊预测值2 */
-    @Excel(name = "LSTM预测2小时值")
+    @Excel(name = "跃渊预测值2")
     private BigDecimal yyForecastTwo;
 
     /** 跃渊值2误差率 */
+    @Excel(name = "跃渊值2误差率")
     private BigDecimal yyErrorRateTwo;
 
     /** 跃渊预测2差值 */
-    @Excel(name = "LSTM预测2小时误差值")
+    @Excel(name = "跃渊预测2差值")
     private BigDecimal yyTwoSubtract;
 
-    @Excel(name = "LSTM预测2小时百分比误差")
-    private String yyErrorRateTwoStr;
+    /** 机理模型预测值1 */
+    @Excel(name = "机理模型预测值1")
+    private BigDecimal jlForecastTwo;
+
+    /** 机理模型预测值1误差率 */
+    @Excel(name = "机理模型预测值1误差率")
+    private BigDecimal jlErrorRateTwo;
+
+    /** 机理模型预测值1差值 */
+    @Excel(name = "机理模型预测值1差值")
+    private BigDecimal jlTwoSubtract;
 
     /** 预测时间3 */
-    @Excel(name = "预测3时间")
+    @Excel(name = "预测时间3")
     private String forecastTimeThree;
 
     /** 实际值3 */
-    @Excel(name = "实际3小时值")
+    @Excel(name = "实际值3")
     private BigDecimal realThree;
 
     /** 红杉预测值3 */
-    @Excel(name = "TFT预测3小时值")
+    @Excel(name = "红杉预测值3")
     private BigDecimal hsForecastThree;
 
     /** 红杉值3误差率 */
+    @Excel(name = "红杉值3误差率")
     private BigDecimal hsErrorRateThree;
 
     /** 红杉预测3差值 */
-    @Excel(name = "TFT预测3小时误差值")
+    @Excel(name = "红杉预测3差值")
     private BigDecimal hsThreeSubtract;
 
-    @Excel(name = "TFT预测3小时百分比误差")
-    private String hsErrorRateThreeStr;
-
     /** 跃渊预测值3 */
-    @Excel(name = "LSTM预测3小时值")
+    @Excel(name = "跃渊预测值3")
     private BigDecimal yyForecastThree;
 
     /** 跃渊值3误差率 */
+    @Excel(name = "跃渊值3误差率")
     private BigDecimal yyErrorRateThree;
 
     /** 跃渊预测3差值 */
-    @Excel(name = "LSTM预测3小时误差值")
+    @Excel(name = "跃渊预测3差值")
     private BigDecimal yyThreeSubtract;
 
-    @Excel(name = "LSTM预测3小时百分比误差")
-    private String yyErrorRateThreeStr;
+    /** 机理模型预测值1 */
+    @Excel(name = "机理模型预测值1")
+    private BigDecimal jlForecastThree;
+
+    /** 机理模型预测值1误差率 */
+    @Excel(name = "机理模型预测值1误差率")
+    private BigDecimal jlErrorRateThree;
+
+    /** 机理模型预测值1差值 */
+    @Excel(name = "机理模型预测值1差值")
+    private BigDecimal jlThreeSubtract;
 
     /** 删除标志（0代表存在 2代表删除） */
     private Long delFlag;
 
     /** 乐观锁 */
-//    @Excel(name = "乐观锁")
+    @Excel(name = "乐观锁")
     private Long revision;
 
 

slibra-system/src/main/java/com/slibra/business/mapper/TPredictConfMapper.java

@@ -0,0 +1,61 @@
+package com.slibra.business.mapper;
+
+import java.util.List;
+import com.slibra.business.domain.TPredictConf;
+
+/**
+ * 机理模型预测配置Mapper接口
+ * 
+ * @author slibra
+ * @date 2025-02-11
+ */
+public interface TPredictConfMapper 
+{
+    /**
+     * 查询机理模型预测配置
+     * 
+     * @param id 机理模型预测配置主键
+     * @return 机理模型预测配置
+     */
+    public TPredictConf selectTPredictConfById(Long id);
+
+    /**
+     * 查询机理模型预测配置列表
+     * 
+     * @param tPredictConf 机理模型预测配置
+     * @return 机理模型预测配置集合
+     */
+    public List<TPredictConf> selectTPredictConfList(TPredictConf tPredictConf);
+
+    /**
+     * 新增机理模型预测配置
+     * 
+     * @param tPredictConf 机理模型预测配置
+     * @return 结果
+     */
+    public int insertTPredictConf(TPredictConf tPredictConf);
+
+    /**
+     * 修改机理模型预测配置
+     * 
+     * @param tPredictConf 机理模型预测配置
+     * @return 结果
+     */
+    public int updateTPredictConf(TPredictConf tPredictConf);
+
+    /**
+     * 删除机理模型预测配置
+     * 
+     * @param id 机理模型预测配置主键
+     * @return 结果
+     */
+    public int deleteTPredictConfById(Long id);
+
+    /**
+     * 批量删除机理模型预测配置
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTPredictConfByIds(Long[] ids);
+}

slibra-system/src/main/java/com/slibra/business/service/ITPredictConfService.java

@@ -0,0 +1,61 @@
+package com.slibra.business.service;
+
+import java.util.List;
+import com.slibra.business.domain.TPredictConf;
+
+/**
+ * 机理模型预测配置Service接口
+ * 
+ * @author slibra
+ * @date 2025-02-11
+ */
+public interface ITPredictConfService 
+{
+    /**
+     * 查询机理模型预测配置
+     * 
+     * @param id 机理模型预测配置主键
+     * @return 机理模型预测配置
+     */
+    public TPredictConf selectTPredictConfById(Long id);
+
+    /**
+     * 查询机理模型预测配置列表
+     * 
+     * @param tPredictConf 机理模型预测配置
+     * @return 机理模型预测配置集合
+     */
+    public List<TPredictConf> selectTPredictConfList(TPredictConf tPredictConf);
+
+    /**
+     * 新增机理模型预测配置
+     * 
+     * @param tPredictConf 机理模型预测配置
+     * @return 结果
+     */
+    public int insertTPredictConf(TPredictConf tPredictConf);
+
+    /**
+     * 修改机理模型预测配置
+     * 
+     * @param tPredictConf 机理模型预测配置
+     * @return 结果
+     */
+    public int updateTPredictConf(TPredictConf tPredictConf);
+
+    /**
+     * 批量删除机理模型预测配置
+     * 
+     * @param ids 需要删除的机理模型预测配置主键集合
+     * @return 结果
+     */
+    public int deleteTPredictConfByIds(Long[] ids);
+
+    /**
+     * 删除机理模型预测配置信息
+     * 
+     * @param id 机理模型预测配置主键
+     * @return 结果
+     */
+    public int deleteTPredictConfById(Long id);
+}

slibra-system/src/main/java/com/slibra/business/service/impl/TPredictConfServiceImpl.java

@@ -0,0 +1,96 @@
+package com.slibra.business.service.impl;
+
+import java.util.List;
+import com.slibra.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.slibra.business.mapper.TPredictConfMapper;
+import com.slibra.business.domain.TPredictConf;
+import com.slibra.business.service.ITPredictConfService;
+
+/**
+ * 机理模型预测配置Service业务层处理
+ * 
+ * @author slibra
+ * @date 2025-02-11
+ */
+@Service
+public class TPredictConfServiceImpl implements ITPredictConfService 
+{
+    @Autowired
+    private TPredictConfMapper tPredictConfMapper;
+
+    /**
+     * 查询机理模型预测配置
+     * 
+     * @param id 机理模型预测配置主键
+     * @return 机理模型预测配置
+     */
+    @Override
+    public TPredictConf selectTPredictConfById(Long id)
+    {
+        return tPredictConfMapper.selectTPredictConfById(id);
+    }
+
+    /**
+     * 查询机理模型预测配置列表
+     * 
+     * @param tPredictConf 机理模型预测配置
+     * @return 机理模型预测配置
+     */
+    @Override
+    public List<TPredictConf> selectTPredictConfList(TPredictConf tPredictConf)
+    {
+        return tPredictConfMapper.selectTPredictConfList(tPredictConf);
+    }
+
+    /**
+     * 新增机理模型预测配置
+     * 
+     * @param tPredictConf 机理模型预测配置
+     * @return 结果
+     */
+    @Override
+    public int insertTPredictConf(TPredictConf tPredictConf)
+    {
+        tPredictConf.setCreateTime(DateUtils.getNowDate());
+        return tPredictConfMapper.insertTPredictConf(tPredictConf);
+    }
+
+    /**
+     * 修改机理模型预测配置
+     * 
+     * @param tPredictConf 机理模型预测配置
+     * @return 结果
+     */
+    @Override
+    public int updateTPredictConf(TPredictConf tPredictConf)
+    {
+        tPredictConf.setUpdateTime(DateUtils.getNowDate());
+        return tPredictConfMapper.updateTPredictConf(tPredictConf);
+    }
+
+    /**
+     * 批量删除机理模型预测配置
+     * 
+     * @param ids 需要删除的机理模型预测配置主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTPredictConfByIds(Long[] ids)
+    {
+        return tPredictConfMapper.deleteTPredictConfByIds(ids);
+    }
+
+    /**
+     * 删除机理模型预测配置信息
+     * 
+     * @param id 机理模型预测配置主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTPredictConfById(Long id)
+    {
+        return tPredictConfMapper.deleteTPredictConfById(id);
+    }
+}

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

@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.slibra.business.mapper.TPredictConfMapper">
+    
+    <resultMap type="TPredictConf" id="TPredictConfResult">
+        <result property="id"    column="id"    />
+        <result property="type"    column="type"    />
+        <result property="y1Min"    column="y1_min"    />
+        <result property="y1Max"    column="y1_max"    />
+        <result property="xMin"    column="x_min"    />
+        <result property="xMax"    column="x_max"    />
+        <result property="x1"    column="x1"    />
+        <result property="a"    column="a"    />
+        <result property="b"    column="b"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="revision"    column="revision"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectTPredictConfVo">
+        select id, type, y1_min, y1_max, x_min, x_max, x1, a, b, del_flag, revision, create_by, create_time, update_by, update_time, remark from t_predict_conf
+    </sql>
+
+    <select id="selectTPredictConfList" parameterType="TPredictConf" resultMap="TPredictConfResult">
+        <include refid="selectTPredictConfVo"/>
+        <where>
+            1 = 1
+            <if test="type != null "> and type = #{type}</if>
+            <if test="y1Min != null "> and y1_min = #{y1Min}</if>
+            <if test="y1Max != null "> and y1_max = #{y1Max}</if>
+            <if test="xMin != null "> and x_min = #{xMin}</if>
+            <if test="xMax != null "> and x_max = #{xMax}</if>
+            <if test="x1 != null "> and x1 = #{x1}</if>
+            <if test="a != null "> and a = #{a}</if>
+            <if test="b != null "> and b = #{b}</if>
+            <if test="revision != null "> and revision = #{revision}</if>
+        </where>
+        and del_flag = 0 order by id desc
+    </select>
+    
+    <select id="selectTPredictConfById" parameterType="Long" resultMap="TPredictConfResult">
+        <include refid="selectTPredictConfVo"/>
+        where id = #{id} and del_flag = 0
+    </select>
+        
+    <insert id="insertTPredictConf" parameterType="TPredictConf" useGeneratedKeys="true" keyProperty="id">
+        insert into t_predict_conf
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="type != null">type,</if>
+            <if test="y1Min != null">y1_min,</if>
+            <if test="y1Max != null">y1_max,</if>
+            <if test="xMin != null">x_min,</if>
+            <if test="xMax != null">x_max,</if>
+            <if test="x1 != null">x1,</if>
+            <if test="a != null">a,</if>
+            <if test="b != null">b,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="revision != null">revision,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="type != null">#{type},</if>
+            <if test="y1Min != null">#{y1Min},</if>
+            <if test="y1Max != null">#{y1Max},</if>
+            <if test="xMin != null">#{xMin},</if>
+            <if test="xMax != null">#{xMax},</if>
+            <if test="x1 != null">#{x1},</if>
+            <if test="a != null">#{a},</if>
+            <if test="b != null">#{b},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="revision != null">#{revision},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTPredictConf" parameterType="TPredictConf">
+        update t_predict_conf
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="type != null">type = #{type},</if>
+            <if test="y1Min != null">y1_min = #{y1Min},</if>
+            <if test="y1Max != null">y1_max = #{y1Max},</if>
+            <if test="xMin != null">x_min = #{xMin},</if>
+            <if test="xMax != null">x_max = #{xMax},</if>
+            <if test="x1 != null">x1 = #{x1},</if>
+            <if test="a != null">a = #{a},</if>
+            <if test="b != null">b = #{b},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="revision != null">revision = #{revision},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        ,revision = revision + 1
+        where id = #{id}
+    </update>
+
+    
+
+    <delete id="deleteTPredictConfById" parameterType="Long">
+        update t_predict_conf set del_flag = 2,revision = revision + 1 where del_flag = 0 and id = #{id}
+    </delete>
+
+    <delete id="deleteTPredictConfByIds" parameterType="String">
+        update t_predict_conf set del_flag = 2,revision = revision + 1 where del_flag = 0 and id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -15,6 +15,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="yyForecastOne"    column="yy_forecast_one"    />
         <result property="yyErrorRateOne"    column="yy_error_rate_one"    />
         <result property="yyOneSubtract"    column="yy_one_subtract"    />
+        <result property="jlForecastOne"    column="jl_forecast_one"    />
+        <result property="jlErrorRateOne"    column="jl_error_rate_one"    />
+        <result property="jlOneSubtract"    column="jl_one_subtract"    />
         <result property="forecastTimeTwo"    column="forecast_time_two"    />
         <result property="realTwo"    column="real_two"    />
         <result property="hsForecastTwo"    column="hs_forecast_two"    />
@@ -23,6 +26,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="yyForecastTwo"    column="yy_forecast_two"    />
         <result property="yyErrorRateTwo"    column="yy_error_rate_two"    />
         <result property="yyTwoSubtract"    column="yy_two_subtract"    />
+        <result property="jlForecastTwo"    column="jl_forecast_two"    />
+        <result property="jlErrorRateTwo"    column="jl_error_rate_two"    />
+        <result property="jlTwoSubtract"    column="jl_two_subtract"    />
         <result property="forecastTimeThree"    column="forecast_time_three"    />
         <result property="realThree"    column="real_three"    />
         <result property="hsForecastThree"    column="hs_forecast_three"    />
@@ -31,6 +37,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="yyForecastThree"    column="yy_forecast_three"    />
         <result property="yyErrorRateThree"    column="yy_error_rate_three"    />
         <result property="yyThreeSubtract"    column="yy_three_subtract"    />
+        <result property="jlForecastThree"    column="jl_forecast_three"    />
+        <result property="jlErrorRateThree"    column="jl_error_rate_three"    />
+        <result property="jlThreeSubtract"    column="jl_three_subtract"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="revision"    column="revision"    />
         <result property="createBy"    column="create_by"    />
@@ -41,11 +50,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTXinyiForecastComparisonVo">
-        select id, category, forecast_time_one, real_one, hs_forecast_one, hs_error_rate_one, hs_one_subtract, yy_forecast_one, yy_error_rate_one, yy_one_subtract, forecast_time_two, real_two, hs_forecast_two, hs_error_rate_two, hs_two_subtract, yy_forecast_two, yy_error_rate_two, yy_two_subtract, forecast_time_three, real_three, hs_forecast_three, hs_error_rate_three, hs_three_subtract, yy_forecast_three, yy_error_rate_three, yy_three_subtract, del_flag, revision, create_by, create_time, update_by, update_time, remark from t_xinyi_forecast_comparison
+        select id, category, forecast_time_one, real_one, hs_forecast_one, hs_error_rate_one, hs_one_subtract, yy_forecast_one, yy_error_rate_one, yy_one_subtract, jl_forecast_one, jl_error_rate_one, jl_one_subtract, forecast_time_two, real_two, hs_forecast_two, hs_error_rate_two, hs_two_subtract, yy_forecast_two, yy_error_rate_two, yy_two_subtract, jl_forecast_two, jl_error_rate_two, jl_two_subtract, forecast_time_three, real_three, hs_forecast_three, hs_error_rate_three, hs_three_subtract, yy_forecast_three, yy_error_rate_three, yy_three_subtract, jl_forecast_three, jl_error_rate_three, jl_three_subtract, del_flag, revision, create_by, create_time, update_by, update_time, remark from t_xinyi_forecast_comparison
     </sql>
 
 
-    
+
     <select id="selectTXinyiForecastComparisonById" parameterType="Long" resultMap="TXinyiForecastComparisonResult">
         <include refid="selectTXinyiForecastComparisonVo"/>
         where id = #{id} and del_flag = 0
@@ -63,6 +72,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="yyForecastOne != null">yy_forecast_one,</if>
             <if test="yyErrorRateOne != null">yy_error_rate_one,</if>
             <if test="yyOneSubtract != null">yy_one_subtract,</if>
+            <if test="jlForecastOne != null">jl_forecast_one,</if>
+            <if test="jlErrorRateOne != null">jl_error_rate_one,</if>
+            <if test="jlOneSubtract != null">jl_one_subtract,</if>
             <if test="forecastTimeTwo != null">forecast_time_two,</if>
             <if test="realTwo != null">real_two,</if>
             <if test="hsForecastTwo != null">hs_forecast_two,</if>
@@ -71,6 +83,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="yyForecastTwo != null">yy_forecast_two,</if>
             <if test="yyErrorRateTwo != null">yy_error_rate_two,</if>
             <if test="yyTwoSubtract != null">yy_two_subtract,</if>
+            <if test="jlForecastTwo != null">jl_forecast_two,</if>
+            <if test="jlErrorRateTwo != null">jl_error_rate_two,</if>
+            <if test="jlTwoSubtract != null">jl_two_subtract,</if>
             <if test="forecastTimeThree != null">forecast_time_three,</if>
             <if test="realThree != null">real_three,</if>
             <if test="hsForecastThree != null">hs_forecast_three,</if>
@@ -79,6 +94,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="yyForecastThree != null">yy_forecast_three,</if>
             <if test="yyErrorRateThree != null">yy_error_rate_three,</if>
             <if test="yyThreeSubtract != null">yy_three_subtract,</if>
+            <if test="jlForecastThree != null">jl_forecast_three,</if>
+            <if test="jlErrorRateThree != null">jl_error_rate_three,</if>
+            <if test="jlThreeSubtract != null">jl_three_subtract,</if>
             <if test="delFlag != null">del_flag,</if>
             <if test="revision != null">revision,</if>
             <if test="createBy != null">create_by,</if>
@@ -97,6 +115,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="yyForecastOne != null">#{yyForecastOne},</if>
             <if test="yyErrorRateOne != null">#{yyErrorRateOne},</if>
             <if test="yyOneSubtract != null">#{yyOneSubtract},</if>
+            <if test="jlForecastOne != null">#{jlForecastOne},</if>
+            <if test="jlErrorRateOne != null">#{jlErrorRateOne},</if>
+            <if test="jlOneSubtract != null">#{jlOneSubtract},</if>
             <if test="forecastTimeTwo != null">#{forecastTimeTwo},</if>
             <if test="realTwo != null">#{realTwo},</if>
             <if test="hsForecastTwo != null">#{hsForecastTwo},</if>
@@ -105,6 +126,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="yyForecastTwo != null">#{yyForecastTwo},</if>
             <if test="yyErrorRateTwo != null">#{yyErrorRateTwo},</if>
             <if test="yyTwoSubtract != null">#{yyTwoSubtract},</if>
+            <if test="jlForecastTwo != null">#{jlForecastTwo},</if>
+            <if test="jlErrorRateTwo != null">#{jlErrorRateTwo},</if>
+            <if test="jlTwoSubtract != null">#{jlTwoSubtract},</if>
             <if test="forecastTimeThree != null">#{forecastTimeThree},</if>
             <if test="realThree != null">#{realThree},</if>
             <if test="hsForecastThree != null">#{hsForecastThree},</if>
@@ -113,6 +137,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="yyForecastThree != null">#{yyForecastThree},</if>
             <if test="yyErrorRateThree != null">#{yyErrorRateThree},</if>
             <if test="yyThreeSubtract != null">#{yyThreeSubtract},</if>
+            <if test="jlForecastThree != null">#{jlForecastThree},</if>
+            <if test="jlErrorRateThree != null">#{jlErrorRateThree},</if>
+            <if test="jlThreeSubtract != null">#{jlThreeSubtract},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="revision != null">#{revision},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -135,6 +162,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="yyForecastOne != null">yy_forecast_one = #{yyForecastOne},</if>
             <if test="yyErrorRateOne != null">yy_error_rate_one = #{yyErrorRateOne},</if>
             <if test="yyOneSubtract != null">yy_one_subtract = #{yyOneSubtract},</if>
+            <if test="jlForecastOne != null">jl_forecast_one = #{jlForecastOne},</if>
+            <if test="jlErrorRateOne != null">jl_error_rate_one = #{jlErrorRateOne},</if>
+            <if test="jlOneSubtract != null">jl_one_subtract = #{jlOneSubtract},</if>
             <if test="forecastTimeTwo != null">forecast_time_two = #{forecastTimeTwo},</if>
             <if test="realTwo != null">real_two = #{realTwo},</if>
             <if test="hsForecastTwo != null">hs_forecast_two = #{hsForecastTwo},</if>
@@ -143,6 +173,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="yyForecastTwo != null">yy_forecast_two = #{yyForecastTwo},</if>
             <if test="yyErrorRateTwo != null">yy_error_rate_two = #{yyErrorRateTwo},</if>
             <if test="yyTwoSubtract != null">yy_two_subtract = #{yyTwoSubtract},</if>
+            <if test="jlForecastTwo != null">jl_forecast_two = #{jlForecastTwo},</if>
+            <if test="jlErrorRateTwo != null">jl_error_rate_two = #{jlErrorRateTwo},</if>
+            <if test="jlTwoSubtract != null">jl_two_subtract = #{jlTwoSubtract},</if>
             <if test="forecastTimeThree != null">forecast_time_three = #{forecastTimeThree},</if>
             <if test="realThree != null">real_three = #{realThree},</if>
             <if test="hsForecastThree != null">hs_forecast_three = #{hsForecastThree},</if>
@@ -151,6 +184,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="yyForecastThree != null">yy_forecast_three = #{yyForecastThree},</if>
             <if test="yyErrorRateThree != null">yy_error_rate_three = #{yyErrorRateThree},</if>
             <if test="yyThreeSubtract != null">yy_three_subtract = #{yyThreeSubtract},</if>
+            <if test="jlForecastThree != null">jl_forecast_three = #{jlForecastThree},</if>
+            <if test="jlErrorRateThree != null">jl_error_rate_three = #{jlErrorRateThree},</if>
+            <if test="jlThreeSubtract != null">jl_three_subtract = #{jlThreeSubtract},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="revision != null">revision = #{revision},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
@@ -190,6 +226,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="yyForecastOne != null "> and yy_forecast_one = #{yyForecastOne}</if>
             <if test="yyErrorRateOne != null "> and yy_error_rate_one = #{yyErrorRateOne}</if>
             <if test="yyOneSubtract != null "> and yy_one_subtract = #{yyOneSubtract}</if>
+            <if test="jlForecastOne != null "> and jl_forecast_one = #{jlForecastOne}</if>
+            <if test="jlErrorRateOne != null "> and jl_error_rate_one = #{jlErrorRateOne}</if>
+            <if test="jlOneSubtract != null "> and jl_one_subtract = #{jlOneSubtract}</if>
             <if test="forecastTimeTwo != null  and forecastTimeTwo != ''"> and forecast_time_two = #{forecastTimeTwo}</if>
             <if test="realTwo != null "> and real_two = #{realTwo}</if>
             <if test="hsForecastTwo != null "> and hs_forecast_two = #{hsForecastTwo}</if>
@@ -198,6 +237,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="yyForecastTwo != null "> and yy_forecast_two = #{yyForecastTwo}</if>
             <if test="yyErrorRateTwo != null "> and yy_error_rate_two = #{yyErrorRateTwo}</if>
             <if test="yyTwoSubtract != null "> and yy_two_subtract = #{yyTwoSubtract}</if>
+            <if test="jlForecastTwo != null "> and jl_forecast_two = #{jlForecastTwo}</if>
+            <if test="jlErrorRateTwo != null "> and jl_error_rate_two = #{jlErrorRateTwo}</if>
+            <if test="jlTwoSubtract != null "> and jl_two_subtract = #{jlTwoSubtract}</if>
             <if test="forecastTimeThree != null  and forecastTimeThree != ''"> and forecast_time_three = #{forecastTimeThree}</if>
             <if test="realThree != null "> and real_three = #{realThree}</if>
             <if test="hsForecastThree != null "> and hs_forecast_three = #{hsForecastThree}</if>
@@ -206,6 +248,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="yyForecastThree != null "> and yy_forecast_three = #{yyForecastThree}</if>
             <if test="yyErrorRateThree != null "> and yy_error_rate_three = #{yyErrorRateThree}</if>
             <if test="yyThreeSubtract != null "> and yy_three_subtract = #{yyThreeSubtract}</if>
+            <if test="jlForecastThree != null "> and jl_forecast_three = #{jlForecastThree}</if>
+            <if test="jlErrorRateThree != null "> and jl_error_rate_three = #{jlErrorRateThree}</if>
+            <if test="jlThreeSubtract != null "> and jl_three_subtract = #{jlThreeSubtract}</if>
             <if test="revision != null "> and revision = #{revision}</if>
             <if test="remark != null "> and remark = #{remark}</if>
             <if test="timeBegin != null  and timeBegin != ''"> and remark &gt;= #{timeBegin}</if>