diff --git a/pom.xml b/pom.xml
index 4343050..c03ee5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
com.jfinal
jfinal
- 5.0.6
+ 5.0.7
com.jfinal
diff --git a/src/main/java/com/dsideal/FengHuang/TouPiao/Model/TouPiaoModel.java b/src/main/java/com/dsideal/FengHuang/TouPiao/Model/TouPiaoModel.java
index 991596b..aa504f8 100644
--- a/src/main/java/com/dsideal/FengHuang/TouPiao/Model/TouPiaoModel.java
+++ b/src/main/java/com/dsideal/FengHuang/TouPiao/Model/TouPiaoModel.java
@@ -111,5 +111,4 @@ public class TouPiaoModel {
List list = Db.find(sq);
return list;
}
-
}
\ No newline at end of file
diff --git a/src/main/resource/Sql/TouPiao.sql b/src/main/resource/Sql/TouPiao.sql
index 8dc5c2b..95a5ef7 100644
--- a/src/main/resource/Sql/TouPiao.sql
+++ b/src/main/resource/Sql/TouPiao.sql
@@ -3,8 +3,8 @@
#sql("TongJi")
select *,format(1.0 * ta.pingweihui_count /#(PingWeiHuiAllCount) *10 + 1.0*ta.qunzhong_count/#(QunZhongAllCount) *15,1) as score
from (select t1.houxuanren_tel,t1.houxuanren_name,t1.houxuanren_type_id,
- (select count(1) from t_toupiao_result as t2 where t2.toupiaoren_type_id=1 and t1.houxuanren_tel=t2.toupiaoren_tel) as pingweihui_count,
- (select count(1) from t_toupiao_result as t2 where t2.toupiaoren_type_id=2 and t1.houxuanren_tel=t2.toupiaoren_tel) as qunzhong_count
+ (select count(1) from t_toupiao_result as t2 where t2.houxuanren_type_id=1 and t1.houxuanren_tel=t2.houxuanren_tel) as pingweihui_count,
+ (select count(1) from t_toupiao_result as t2 where t2.houxuanren_type_id=2 and t1.houxuanren_tel=t2.houxuanren_tel) as qunzhong_count
from t_toupiao_houxuanren as t1) as ta where ta.houxuanren_type_id=#(houxuanren_type_id)
order by 1.0 * ta.pingweihui_count /#(PingWeiHuiAllCount) *10 + 1.0*ta.qunzhong_count/#(QunZhongAllCount) *15 desc
#end
diff --git a/target/classes/Sql/TouPiao.sql b/target/classes/Sql/TouPiao.sql
index 8dc5c2b..95a5ef7 100644
--- a/target/classes/Sql/TouPiao.sql
+++ b/target/classes/Sql/TouPiao.sql
@@ -3,8 +3,8 @@
#sql("TongJi")
select *,format(1.0 * ta.pingweihui_count /#(PingWeiHuiAllCount) *10 + 1.0*ta.qunzhong_count/#(QunZhongAllCount) *15,1) as score
from (select t1.houxuanren_tel,t1.houxuanren_name,t1.houxuanren_type_id,
- (select count(1) from t_toupiao_result as t2 where t2.toupiaoren_type_id=1 and t1.houxuanren_tel=t2.toupiaoren_tel) as pingweihui_count,
- (select count(1) from t_toupiao_result as t2 where t2.toupiaoren_type_id=2 and t1.houxuanren_tel=t2.toupiaoren_tel) as qunzhong_count
+ (select count(1) from t_toupiao_result as t2 where t2.houxuanren_type_id=1 and t1.houxuanren_tel=t2.houxuanren_tel) as pingweihui_count,
+ (select count(1) from t_toupiao_result as t2 where t2.houxuanren_type_id=2 and t1.houxuanren_tel=t2.houxuanren_tel) as qunzhong_count
from t_toupiao_houxuanren as t1) as ta where ta.houxuanren_type_id=#(houxuanren_type_id)
order by 1.0 * ta.pingweihui_count /#(PingWeiHuiAllCount) *10 + 1.0*ta.qunzhong_count/#(QunZhongAllCount) *15 desc
#end