From 46d4d48921282a696b901f8ae888996fdb7a5f5d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 29 Oct 2022 20:50:15 +0800
Subject: [PATCH] 20221021
---
src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java | 1 -
src/main/resources/mapper/dapp/DataDictionaryCustomMapper.xml | 1 -
src/main/resources/mapper/dapp/IgtOnHookPlanOrderDao.xml | 4 ++--
src/main/java/cc/mrbird/febs/dapp/mapper/DataDictionaryCustomMapper.java | 2 +-
src/test/java/cc/mrbird/febs/JunitTest.java | 1 -
5 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/mapper/DataDictionaryCustomMapper.java b/src/main/java/cc/mrbird/febs/dapp/mapper/DataDictionaryCustomMapper.java
index 730a4fa..7a625b6 100644
--- a/src/main/java/cc/mrbird/febs/dapp/mapper/DataDictionaryCustomMapper.java
+++ b/src/main/java/cc/mrbird/febs/dapp/mapper/DataDictionaryCustomMapper.java
@@ -18,5 +18,5 @@
int updateDicValueByTypeAndCode(@Param("type") String type, @Param("code") String code, @Param("value") String value);
- DataDictionaryCustom selectDicDataByTypeAndCodeAndDesc(@Param("type") String type, @Param("code") String code, @Param("description") String plan);
+ DataDictionaryCustom selectDicDataByTypeAndCodeAndDesc(@Param("type") String type, @Param("description") String plan);
}
diff --git a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
index ce541e4..9f257c3 100644
--- a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
+++ b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
@@ -203,7 +203,6 @@
//获取挂机方案
DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCodeAndDesc(
DataDictionaryEnum.PLAN_A.getType(),
- DataDictionaryEnum.PLAN_A.getCode(),
Integer.toString(Integer.parseInt(plan)+1));
String dataDictionaryCustomValue = dataDictionaryCustom.getValue();
JSONObject levelMemberValueParse = JSONUtil.parseObj(dataDictionaryCustomValue);
diff --git a/src/main/resources/mapper/dapp/DataDictionaryCustomMapper.xml b/src/main/resources/mapper/dapp/DataDictionaryCustomMapper.xml
index 8b237c3..7894e43 100644
--- a/src/main/resources/mapper/dapp/DataDictionaryCustomMapper.xml
+++ b/src/main/resources/mapper/dapp/DataDictionaryCustomMapper.xml
@@ -37,7 +37,6 @@
<select id="selectDicDataByTypeAndCodeAndDesc" resultType="cc.mrbird.febs.dapp.entity.DataDictionaryCustom">
select * from data_dictionary_custom a
where a.type=#{type}
- and a.code=#{code}
and a.description=#{description}
</select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/dapp/IgtOnHookPlanOrderDao.xml b/src/main/resources/mapper/dapp/IgtOnHookPlanOrderDao.xml
index 489b31e..b72f002 100644
--- a/src/main/resources/mapper/dapp/IgtOnHookPlanOrderDao.xml
+++ b/src/main/resources/mapper/dapp/IgtOnHookPlanOrderDao.xml
@@ -12,7 +12,7 @@
<update id="updateAvaAmountById">
update igt_on_hook_plan_order
set
- ava_amount = ava_amount - #{amount},
+ ava_amount = ava_amount - #{amount}
where
id = #{id}
and ava_amount - #{amount} <![CDATA[ >= ]]> 0
@@ -21,7 +21,7 @@
<update id="addAvaAmountById">
update igt_on_hook_plan_order
set
- ava_amount = ava_amount + #{amount},
+ ava_amount = ava_amount + #{amount}
where
id = #{id}
</update>
diff --git a/src/test/java/cc/mrbird/febs/JunitTest.java b/src/test/java/cc/mrbird/febs/JunitTest.java
index 88ac034..a727c4a 100644
--- a/src/test/java/cc/mrbird/febs/JunitTest.java
+++ b/src/test/java/cc/mrbird/febs/JunitTest.java
@@ -384,7 +384,6 @@
//获取挂机方案
DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCodeAndDesc(
DataDictionaryEnum.PLAN_A.getType(),
- DataDictionaryEnum.PLAN_A.getCode(),
Integer.toString(Integer.parseInt(plan)+1));
String dataDictionaryCustomValue = dataDictionaryCustom.getValue();
JSONObject levelMemberValueParse = JSONUtil.parseObj(dataDictionaryCustomValue);
--
Gitblit v1.9.1