Merge branch 'main' of http://10.10.14.176:3000/huanghai/ccZhiChengTouPiao

WebRoot/html/toupiao_login.html

@@ -5,13 +5,13 @@
     <meta charset="utf-8">
     <meta name="renderer" content="webkit|ie-comp|ie-stand">
     <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <title>长春市教育技术装备与信息中心职称评审系统</title>
+    <title>长春市教育技术装备与信息中心职称投票系统</title>
     <meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no"/>
     <!-- 手机端禁止缩放 -->
     <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport"/>
-    <meta name="keywords" content="长春市教育技术装备与信息中心职称评审系统">
+    <meta name="keywords" content="长春市教育技术装备与信息中心职称投票系统">
     <!--关键词,5个左右,单个8汉字以内-->
-    <meta name="description" content="长春市教育技术装备与信息中心职称评审系统">
+    <meta name="description" content="长春市教育技术装备与信息中心职称投票系统">
     <!--网站描述-->
     <!--自己的样式-->
     <link href="css/public.css" rel="stylesheet" type="text/css"/>
@@ -29,8 +29,8 @@
             <img src="img/left-img.png">
         </div>
         <div class="right-content clearfix">
-            <div class="content-name">
+            <div class="content-name" style="text-align: center">
-                <p style="font-size: 20px;font-weight: bolder">长春市教育技术装备与信息中心职称评审系统</p>
+                <p style="font-size: 24px;font-weight: bolder">长春市教育技术装备与信息中心<br>职称投票系统</p>
             </div>
             <form action="" method="post">
                 <div class="user-name">

pom.xml

@@ -33,7 +33,7 @@
         <dependency>
             <groupId>com.jfinal</groupId>
             <artifactId>jfinal</artifactId>
-            <version>5.0.6</version>
+            <version>5.0.7</version>
         </dependency>
         <dependency>
             <groupId>com.jfinal</groupId>

src/main/java/com/dsideal/FengHuang/TouPiao/Model/TouPiaoModel.java

@@ -111,5 +111,4 @@ public class TouPiaoModel {
         List<Record> list = Db.find(sq);
         return list;
     }
-
 }

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=1 and t1.houxuanren_tel=t2.houxuanren_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.toupiaoren_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

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=1 and t1.houxuanren_tel=t2.houxuanren_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.toupiaoren_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