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

WebRoot/html/toupiao_login.html

@@ -53,7 +53,6 @@
                              alt="点击图片刷新校验码" style="cursor:pointer" onclick="javascript:refreshCaptcha()"/>
                     </div>
                 </div>
-
                 <input id="loginBtn" class="input-button" type="button" value="登&nbsp;&nbsp;&nbsp;录">
             </form>
         </div>

src/main/java/com/dsideal/FengHuang/TouPiao/Controller/TouPiaoController.java

@@ -87,7 +87,7 @@ public class TouPiaoController extends Controller {
             renderJson(kv);
             return;
         }
-        tm.save(toupiaoren_tel, gaojiArray, zhongjiArray,ip);
+        tm.save(toupiaoren_tel, gaojiArray, zhongjiArray, ip);
         Kv kv = Kv.create();
         kv.set("success", true);
         kv.set("message", "投票成功 !");
@@ -169,4 +169,13 @@ public class TouPiaoController extends Controller {
         String filename = "投票结果.xls";
         renderFile(new File(file3), filename);
     }
+
+    /*
+     查看人员投票情况
+     http://10.10.11.124:9000/FengHuang/TouPiao/getTouPiaoInfo
+    */
+    public void getTouPiaoInfo() {
+        List<Record> list = tm.getTouPiaoInfo();
+        renderJson(CommonUtil.renderJsonForLayUI(list));
+    }
 }

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

@@ -34,11 +34,11 @@ public class TouPiaoModel {
 
     public boolean haveFinishTouPiao(String toupiaoren_tel) {
         String sql = "select count(1) as c from t_toupiao_result where toupiaoren_tel=?";
-        int cnt=Db.findFirst(sql, toupiaoren_tel).getInt("c");
+        int cnt = Db.findFirst(sql, toupiaoren_tel).getInt("c");
         return cnt > 0;
     }
 
-    public void save(String toupiaoren_tel, String[] gaojiArray, String[] zhongjiArray,String ip) {
+    public void save(String toupiaoren_tel, String[] gaojiArray, String[] zhongjiArray, String ip) {
         Record r = getTouPiaoRenInfo(toupiaoren_tel);
         int toupiaoren_type_id = r.getInt("toupiaoren_type_id");
         String sql = "delete from t_toupiao_result where toupiaoren_tel=?";
@@ -56,7 +56,7 @@ public class TouPiaoModel {
             record.set("toupiaoren_tel", toupiaoren_tel);
             record.set("toupiaoren_name", _map.get(toupiaoren_tel).getStr("toupiaoren_name"));
             record.set("toupiaoren_type_id", toupiaoren_type_id);
-            record.set("ip",ip);
+            record.set("ip", ip);
             saveList.add(record);
         }
         for (String s : zhongjiArray) {
@@ -68,7 +68,7 @@ public class TouPiaoModel {
             record.set("toupiaoren_tel", toupiaoren_tel);
             record.set("toupiaoren_name", _map.get(toupiaoren_tel).getStr("toupiaoren_name"));
             record.set("toupiaoren_type_id", toupiaoren_type_id);
-            record.set("ip",ip);
+            record.set("ip", ip);
             saveList.add(record);
         }
         Db.batchSave("t_toupiao_result", saveList, 100);
@@ -93,6 +93,7 @@ public class TouPiaoModel {
         res.add(r2);
         return res;
     }
+
     /*
       此程序占25分，这25分里面，有评委会的10分，有群众15分。
       评委会得分= 1.0 * 评委会投票人数/评委会总人数 *10
@@ -111,4 +112,10 @@ public class TouPiaoModel {
         List<Record> list = Db.find(sq);
         return list;
     }
+
+    public List<Record> getTouPiaoInfo() {
+        SqlPara sq = Db.getSqlPara("TouPiao.getTouPiaoInfo");
+        List<Record> list = Db.find(sq);
+        return list;
+    }
 }

src/main/resource/Sql/TouPiao.sql

@@ -8,4 +8,10 @@
               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
+
+   #sql("getTouPiaoInfo")
+        select toupiaoren_tel,toupiaoren_name,toupiaoren_type_id,(
+            select count(1) as c from t_toupiao_result as t2 where t2.toupiaoren_tel=t1.toupiaoren_tel
+        ) as c from t_toupiao_toupiaoren as t1 order by toupiaoren_type_id,c desc
+    #end
 #end

target/classes/Sql/TouPiao.sql

@@ -8,4 +8,10 @@
               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
+
+   #sql("getTouPiaoInfo")
+        select toupiaoren_tel,toupiaoren_name,toupiaoren_type_id,(
+            select count(1) as c from t_toupiao_result as t2 where t2.toupiaoren_tel=t1.toupiaoren_tel
+        ) as c from t_toupiao_toupiaoren as t1 order by toupiaoren_type_id,c desc
+    #end
 #end