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

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

@@ -20,6 +20,7 @@ import com.jfinal.plugin.activerecord.Record;
 import com.jfinal.plugin.activerecord.SqlPara;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
@@ -101,22 +102,26 @@ public class TouPiaoController extends Controller {
     }
 
     /*
-    应投票人数信息
-    http://10.10.11.124:9000/FengHuang/TouPiao/getYingTouPiaoRenSummary
+    投票人数信息
+    http://10.10.11.124:9000/FengHuang/TouPiao/getTouPiaoRenSummary
    */
-    public void getYingTouPiaoRenSummary() {
-        List<Record> list = tm.getTouPiaoRenSummary();
-        renderJson(CommonUtil.renderJsonForLayUI(list));
+    public void getTouPiaoRenSummary() {
+        List<Record> list1 = tm.getYingTouPiaoRenSummary();
+        List<Record> list2 = tm.getYiTouPiaoRenSummary();
+        List<Record> res = new ArrayList<>();
+        for (Record r1 : list1)
+            for (Record r2 : list2) {
+                if (r1.getInt("toupiaoren_type_id") == r2.getInt("toupiaoren_type_id")) {
+                    Record r3 = new Record();
+                    r3.set("toupiaoren_type_id", r1.getInt("toupiaoren_type_id"));
+                    r3.set("ying_count", r1.getInt("c"));
+                    r3.set("yi_count", r2.getInt("c"));
+                    res.add(r3);
+                }
+            }
+        renderJson(CommonUtil.renderJsonForLayUI(res));
     }
 
-    /*
-   已投票人数信息
-   http://10.10.11.124:9000/FengHuang/TouPiao/getYiTouPiaoRenSummary
-  */
-    public void getYiTouPiaoRenSummary() {
-        List<Record> list = tm.getYiTouPiaoRenSummary();
-        renderJson(CommonUtil.renderJsonForLayUI(list));
-    }
 
     /*
       导出excel

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

@@ -77,11 +77,20 @@ public class TouPiaoModel {
         return Db.findFirst(sql, toupiaoren_type_id).getInt("c");
     }
 
-    public List<Record> getTouPiaoRenSummary() {
+    public List<Record> getYingTouPiaoRenSummary() {
         String sql = "select toupiaoren_type_id,count(1) as c from t_toupiao_toupiaoren group by toupiaoren_type_id";
         return Db.find(sql);
     }
 
+    public List<Record> getYiTouPiaoRenSummary() {
+        String sql = "select ? as toupiaoren_type_id,count(distinct toupiaoren_tel) as c from t_toupiao_result where toupiaoren_type_id=?";
+        Record r1 = Db.findFirst(sql, 1, 1);
+        Record r2 = Db.findFirst(sql, 2, 2);
+        List<Record> res = new ArrayList<>();
+        res.add(r1);
+        res.add(r2);
+        return res;
+    }
     /*
       此程序占25分，这25分里面，有评委会的10分，有群众15分。
       评委会得分= 1.0 * 评委会投票人数/评委会总人数 *10
@@ -101,13 +110,4 @@ public class TouPiaoModel {
         return list;
     }
 
-    public List<Record> getYiTouPiaoRenSummary() {
-        String sql = "select ? as toupiaoren_type_id,count(1) as c from t_toupiao_result where toupiaoren_type_id=?";
-        Record r1 = Db.findFirst(sql, 1, 1);
-        Record r2 = Db.findFirst(sql, 2, 2);
-        List<Record> res = new ArrayList<>();
-        res.add(r1);
-        res.add(r2);
-        return res;
-    }
 }