预测对比相关接口 增加查询条件 保存的时候，额外记录备注方便查询

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

@@ -1313,6 +1313,9 @@ public class RyTask
         tXinyiForecastComparison.setHsForecastOne(new BigDecimal(split[0]));
         tXinyiForecastComparison.setHsForecastTwo(new BigDecimal(split[1]));
         tXinyiForecastComparison.setHsForecastThree(new BigDecimal(split[2]));
+        //2024年6月20日14:28:31  增加字段，方便查询
+        tXinyiForecastComparison.setRemark(DateUtil.format(DateUtils.getNowDate(), DateUtils.YYYYMMDDHH_TS));
+
         //获取配置表
         List<TXinyiNormConfig> tXinyiNormConfigs = this.xinyiNormConfigMapper.selectTXinyiNormConfigList(null);
         if(CollectionUtils.isEmpty(tXinyiNormConfigs)) {

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

@@ -109,7 +109,15 @@ public class TXinyiForecastComparison extends BaseEntity
     private Long delFlag;
 
     /** 乐观锁 */
-    @Excel(name = "乐观锁")
+//    @Excel(name = "乐观锁")
     private Long revision;
 
+
+    //2024年6月20日14:15:09 新增查询条件
+    /**  开始时间  2024/06/18 13 格式的*/
+    private String timeBegin;
+
+    /** 截止时间 2024/06/18 13 格式的*/
+    private String timeEnd;
+
 }

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

@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTXinyiForecastComparisonList" parameterType="TXinyiForecastComparison" resultMap="TXinyiForecastComparisonResult">
         <include refid="selectTXinyiForecastComparisonVo"/>
         <where>
-            1 = 1
+            1 = 1 and category != 'xsy1' and category != 'xsy2'
             <if test="category != null  and category != ''"> and category = #{category}</if>
             <if test="forecastTimeOne != null  and forecastTimeOne != ''"> and forecast_time_one = #{forecastTimeOne}</if>
             <if test="realOne != null "> and real_one = #{realOne}</if>
@@ -62,6 +62,8 @@ 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="revision != null "> and revision = #{revision}</if>
+            <if test="timeBegin != null  and timeBegin != ''"> and remark &gt;= #{timeBegin}</if>
+            <if test="timeEnd != null  and timeEnd != ''"> and remark &lt;= #{timeEnd}</if>
         </where>
         and del_flag = 0 order by id desc
     </select>