From d30a6799415eca452db4cb30d26890e35d7b73bf Mon Sep 17 00:00:00 2001
From: liuwu <975499773@qq.com>
Date: Thu, 24 Aug 2023 18:26:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A7=E5=B1=8F=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TAmentPartyAffairsController.java           | 11 +++++++++++
 .../base/mapper/TAmentPartyAffairsMapper.java   |  2 ++
 .../service/ITAmentPartyAffairsService.java     |  2 ++
 .../impl/TAmentPartyAffairsServiceImpl.java     |  5 +++++
 .../templates/base/affairs/finishedstatic.html  |  4 ++--
 .../mapper/base/TAmentPartyAffairsMapper.xml    | 17 ++++++++++++++++-
 6 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java b/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java
index ecca480..f05ffe9 100644
--- a/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java
+++ b/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java
@@ -1,6 +1,7 @@
 package com.cyx.web.base.controller;
 
 import java.util.List;
+import java.util.Map;
 
 import com.cyx.common.annotation.Log;
 import com.cyx.common.core.controller.BaseController;
@@ -90,6 +91,16 @@ public class TAmentPartyAffairsController extends BaseController
         return prefix + "/finishedstatic";
     }
 
+    @RequiresPermissions("base:affairs:list")
+    @PostMapping("/finishedstaticList")
+    @ResponseBody
+    public TableDataInfo finishedstaticList(TAmentPartyAffairs tAmentPartyAffairs)
+    {
+        startPage();
+        List<Map<String,Object>> list = tAmentPartyAffairsService.finishedstaticList(tAmentPartyAffairs);
+        return getDataTable(list);
+    }
+
     /**
      * 查询党务列表
      */
diff --git a/cyx-admin/src/main/java/com/cyx/web/base/mapper/TAmentPartyAffairsMapper.java b/cyx-admin/src/main/java/com/cyx/web/base/mapper/TAmentPartyAffairsMapper.java
index 7329616..467e88e 100644
--- a/cyx-admin/src/main/java/com/cyx/web/base/mapper/TAmentPartyAffairsMapper.java
+++ b/cyx-admin/src/main/java/com/cyx/web/base/mapper/TAmentPartyAffairsMapper.java
@@ -72,4 +72,6 @@ public interface TAmentPartyAffairsMapper
     List<Map<String, Object>> bmwcqk(TAmentPartyAffairs am);
 
     List<Map<String, Object>> groupAll(TAmentPartyAffairs am);
+
+    List<Map<String,Object>>  finishedstaticList(TAmentPartyAffairs tAmentPartyAffairs);
 }
diff --git a/cyx-admin/src/main/java/com/cyx/web/base/service/ITAmentPartyAffairsService.java b/cyx-admin/src/main/java/com/cyx/web/base/service/ITAmentPartyAffairsService.java
index be4a29a..52a51b1 100644
--- a/cyx-admin/src/main/java/com/cyx/web/base/service/ITAmentPartyAffairsService.java
+++ b/cyx-admin/src/main/java/com/cyx/web/base/service/ITAmentPartyAffairsService.java
@@ -72,4 +72,6 @@ public interface ITAmentPartyAffairsService
     List<Map<String, Object>> bmwcqk(TAmentPartyAffairs am);
 
     List<Map<String, Object>> groupAll(TAmentPartyAffairs am);
+
+    List<Map<String,Object>>  finishedstaticList(TAmentPartyAffairs tAmentPartyAffairs);
 }
diff --git a/cyx-admin/src/main/java/com/cyx/web/base/service/impl/TAmentPartyAffairsServiceImpl.java b/cyx-admin/src/main/java/com/cyx/web/base/service/impl/TAmentPartyAffairsServiceImpl.java
index 82c0b26..e7263d1 100644
--- a/cyx-admin/src/main/java/com/cyx/web/base/service/impl/TAmentPartyAffairsServiceImpl.java
+++ b/cyx-admin/src/main/java/com/cyx/web/base/service/impl/TAmentPartyAffairsServiceImpl.java
@@ -121,4 +121,9 @@ public class TAmentPartyAffairsServiceImpl implements ITAmentPartyAffairsService
     public List<Map<String, Object>> groupAll(TAmentPartyAffairs am){
         return tAmentPartyAffairsMapper.groupAll(am);
     }
+
+    @Override
+    public List<Map<String,Object>> finishedstaticList(TAmentPartyAffairs tAmentPartyAffairs){
+        return tAmentPartyAffairsMapper.finishedstaticList(tAmentPartyAffairs);
+    }
 }
diff --git a/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html b/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html
index 6204383..4d9886f 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html
@@ -83,7 +83,7 @@
 
         $(function() {
             var options = {
-                url: prefix + "/list",
+                url: prefix + "/finishedstaticList",
                 createUrl: prefix + "/add",
                 updateUrl: prefix + "/edit/{id}",
                 removeUrl: prefix + "/remove",
@@ -102,7 +102,7 @@
                     title: '单位名称'
                 },
                 {
-                    field: 'deptId',
+                    field: 'deptName',
                     title: '部门'
                 },
                 {
diff --git a/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml b/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml
index 0a0cb73..3fc14d9 100644
--- a/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml
+++ b/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml
@@ -125,12 +125,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             type,
             SUM( score ) score,
             IF( SUM( now_score ), SUM( now_score ), 0 ) nowScore,
-            ROUND(IF( SUM( now_score ), SUM( now_score ), 0 )/ SUM( score )) percent
+            ROUND(IF( SUM( now_score ), SUM( now_score ), 0 )/ SUM( score )*100) percent
         FROM
             t_ament_party_affairs
         GROUP BY
             type
     </select>
+
+    <select id="finishedstaticList" resultType="map">
+        SELECT
+            a.*,
+            ROUND( a.now_score / a.score ) percent,
+            d.dept_name deptName,
+            a.shot_name shotName,
+            a.now_score nowScore
+        FROM
+            t_ament_party_affairs a
+                LEFT JOIN sys_dept d ON a.dept_id = d.dept_id
+        GROUP BY
+            a.type,
+            a.shot_name
+    </select>
         
     <insert id="insertTAmentPartyAffairs" parameterType="TAmentPartyAffairs" useGeneratedKeys="true" keyProperty="id">
         insert into t_ament_party_affairs