diff --git a/cyx-admin/src/main/java/com/cyx/web/base/controller/BigScreenController.java b/cyx-admin/src/main/java/com/cyx/web/base/controller/BigScreenController.java
index 34c4df0..8887404 100644
--- a/cyx-admin/src/main/java/com/cyx/web/base/controller/BigScreenController.java
+++ b/cyx-admin/src/main/java/com/cyx/web/base/controller/BigScreenController.java
@@ -164,6 +164,7 @@ public class BigScreenController extends BaseController {
             object1.put("name", entry.getKey());
             JSONArray array1 = new JSONArray();
             // 三个大分类
+            JSONObject obj1 = new JSONObject();
             for (int i = 0; i < list.size(); i++) {
                 String month1 = list.get(i).get("month").toString();
                 if (!month1.equals(month)){
@@ -182,8 +183,11 @@ public class BigScreenController extends BaseController {
                 monthCount += count.get();
                 monthMoney += trade.get();
                 array1.add(trade.get());
+
+                obj1.put(list.get(i).get("type").toString(),count.get());
             }
             object1.put("array", array1);
+            object1.put("obj1", obj1);
             dataArray.add(object1);
         }
         object.put("monthCount", monthCount);
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 4a7effb..76694ca 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
@@ -277,8 +277,10 @@ public class TAmentPartyAffairsController extends BaseController
      */
     @RequiresPermissions("base:affairs:view")
     @GetMapping("finishedstatic")
-    public String finishedstatic()
+    public String finishedstatic(ModelMap mmap)
     {
+        mmap.put("deptList",deptService.selectDeptList(new SysDept()));
+        mmap.put("shotList",tAmentPartyAffairsService.shotList(new TAmentPartyAffairs()));
         return prefix + "/finishedstatic";
     }
 
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 259e00e..3c13db5 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
@@ -87,4 +87,6 @@ public interface TAmentPartyAffairsMapper
     List<Map<String,Object>> labelTotal(TAmentPartyAffairs tAmentPartyAffairs);
 
     List<Map<String, Object>> zhiwuTree(TAmentPartyAffairs tAmentPartyAffairs);
+
+    List<Map<String, Object>> shotList(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 bc590aa..60e7e8f 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
@@ -1,10 +1,10 @@
 package com.cyx.web.base.service;
 
+import com.cyx.web.base.domain.TAmentPartyAffairs;
+
 import java.util.List;
 import java.util.Map;
 
-import com.cyx.web.base.domain.TAmentPartyAffairs;
-
 /**
  * 党务Service接口
  * 
@@ -87,4 +87,6 @@ public interface ITAmentPartyAffairsService
     List<Map<String,Object>> labelTotal(TAmentPartyAffairs tAmentPartyAffairs);
 
     List<Map<String, Object>> zhiwuTree(TAmentPartyAffairs tAmentPartyAffairs);
+
+    List<Map<String, Object>> shotList(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 d5ff747..7214827 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
@@ -1,15 +1,15 @@
 package com.cyx.web.base.service.impl;
 
-import java.util.List;
-import java.util.Map;
-
 import com.cyx.common.core.text.Convert;
 import com.cyx.common.utils.DateUtils;
+import com.cyx.web.base.domain.TAmentPartyAffairs;
+import com.cyx.web.base.mapper.TAmentPartyAffairsMapper;
+import com.cyx.web.base.service.ITAmentPartyAffairsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.cyx.web.base.mapper.TAmentPartyAffairsMapper;
-import com.cyx.web.base.domain.TAmentPartyAffairs;
-import com.cyx.web.base.service.ITAmentPartyAffairsService;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 党务Service业务层处理
@@ -160,4 +160,9 @@ public class TAmentPartyAffairsServiceImpl implements ITAmentPartyAffairsService
     public List<Map<String,Object>> finishedstaticList(TAmentPartyAffairs tAmentPartyAffairs){
         return tAmentPartyAffairsMapper.finishedstaticList(tAmentPartyAffairs);
     }
+
+    @Override
+    public List<Map<String, Object>> shotList(TAmentPartyAffairs tAmentPartyAffairs){
+        return tAmentPartyAffairsMapper.shotList(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 d2274f4..4efe178 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html
@@ -23,6 +23,20 @@
                                 </select>
 
                             </li>
+                            <li>
+                                <label>部门：</label>
+                                <select name="deptId" id="deptId">
+                                    <option value="">请选择</option>
+                                    <option th:each="item : ${deptList}" th:text="${item.deptName}" th:value="${item.deptId}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <label>指标：</label>
+                                <select name="shotName" id="shotName">
+                                    <option value="">请选择</option>
+                                    <option th:each="item : ${shotList}" th:text="${item.shotName}" th:value="${item.shotName}"></option>
+                                </select>
+                            </li>
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                 <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
diff --git a/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml b/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml
index 51bc0f4..ae1e273 100644
--- a/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml
+++ b/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml
@@ -185,6 +185,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             f.type
     </select>
 
+    <select id="shotList" parameterType="TAmentPartyAffairs" resultType="map">
+        select shot_name shotName from t_ament_party_affairs group by shot_name
+    </select>
+
     <select id="labelTotal" parameterType="TAmentPartyAffairs" resultType="map">
         SELECT
             ROUND( sum(a.now_score) / sum(a.score) * 100 ) percent,
@@ -349,6 +353,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where
             1=1
         <if test="type != null  and type != ''"> and a.type = #{type}</if>
+        <if test="deptId != null and deptId != ''"> and a.dept_id = #{deptId}</if>
+        <if test="shotName != null and shotName != ''"> and a.shot_name = #{shotName}</if>
         GROUP BY
             a.type,
             a.shot_name