定时投加碳源定时任务调整 获取碳源修改配置列表接口排序调整

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

@@ -896,7 +896,8 @@ public class RyTask
         BigDecimal jzxs = param.getJzxs();
 
         Integer jsLlType = param.getJsLlType();
-        BigDecimal jsLlOne = param.getJsLlOne();//两个池子的值是一样的
+        BigDecimal jsLlOne = param.getJsLlOne();
+        BigDecimal jsLlTwo = param.getJsLlTwo();
 
         BigDecimal slfpxs = param.getSlfpxs();
 
@@ -926,7 +927,7 @@ public class RyTask
             //计算1号池的值
             BigDecimal oneResult = this.getResultByDiff(hycXsyType, hycXsyOne, htfksd, qycAdType, qycAdOne, qycYxyType, qycYxyOne, xzxs, jzxs, jsLlType, jsLlOne, slfpxs, kzxs, jsCodType, jsCodOne, zhxs, tydl, "one", yymd, sxps);
             //计算二号池的值
-            BigDecimal twoResult = this.getResultByDiff(hycXsyType, hycXsyTwo, htfksd, qycAdType, qycAdTwo, qycYxyType, qycYxyTwo, xzxs, jzxs, jsLlType, jsLlOne, slfpxs, kzxs, jsCodType, jsCodTwo, zhxs, tydl, "two", yymd, sxps);
+            BigDecimal twoResult = this.getResultByDiff(hycXsyType, hycXsyTwo, htfksd, qycAdType, qycAdTwo, qycYxyType, qycYxyTwo, xzxs, jzxs, jsLlType, jsLlTwo, slfpxs, kzxs, jsCodType, jsCodTwo, zhxs, tydl, "two", yymd, sxps);
             //判断，返回值
             if(0 == type)
                 return oneResult.compareTo(twoResult) > 0 ? oneResult : twoResult;

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

@@ -251,6 +251,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="timeBegin != null  and timeBegin != ''"> and DATE_FORMAT(create_time, '%Y-%m-%d') &gt;= #{timeBegin}</if>
             <if test="timeEnd != null  and timeEnd != ''"> and DATE_FORMAT(create_time, '%Y-%m-%d') &lt;= #{timeEnd}</if>
         </where>
-        and del_flag = 0 order by id desc
+        and del_flag = 0 order by id asc
     </select>
 </mapper>