From 873911878ab16a663c6e91d12626cb66dbb3580b Mon Sep 17 00:00:00 2001
From: liuwu <975499773@qq.com>
Date: Tue, 5 Sep 2023 17:12:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/controller/BigScreenController.java  |  2 +-
 .../TAmentPartyAffairsController.java         |  2 +-
 .../resources/templates/base/affairs/add.html |  6 ++---
 .../src/main/resources/templates/main.html    | 24 +++++++++----------
 .../mapper/base/TAmentAdvancedDeptMapper.xml  |  2 +-
 .../mapper/base/TAmentPartyAffairsMapper.xml  |  6 +++--
 6 files changed, 22 insertions(+), 20 deletions(-)

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 2ffcff3..489447e 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
@@ -93,7 +93,7 @@ public class BigScreenController extends BaseController {
     }
 
     /**
-     * 年度考核指标
+     * 季度考核指标
      * @param am
      * @return
      */
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 b3a1a60..73badea 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
@@ -189,7 +189,7 @@ public class TAmentPartyAffairsController extends BaseController
     }
 
     /**
-     * 年度考核指标
+     * 季度考核指标
      * @return
      */
     @RequiresPermissions("base:affairs:view")
diff --git a/cyx-admin/src/main/resources/templates/base/affairs/add.html b/cyx-admin/src/main/resources/templates/base/affairs/add.html
index b4757b8..a5fc094 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/add.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/add.html
@@ -16,7 +16,7 @@
                         <option value="党务及意识形态">党务及意识形态</option>
                         <option value="党风廉政建设">党风廉政建设</option>
                         <option value="日常考核指标">日常考核指标</option>
-                        <option value="年度考核指标">年度考核指标</option>
+                        <option value="季度考核指标">季度考核指标</option>
                     </select>
                 </div>
             </div>
@@ -202,7 +202,7 @@
                     detailed[0].innerHTML = '工作任务：'
                     score[0].innerHTML = '分值：'
                     break;
-                case "年度考核指标":
+                case "季度考核指标":
                     $("#dw").hide()
                     $(".dy").show()
                     target[0].innerHTML = '考核内容：'
@@ -228,7 +228,7 @@
                 case "日常考核指标":
                     method.val(method1.val())
                     break;
-                case "年度考核指标":
+                case "季度考核指标":
                     method.val(method1.val())
                     break;
             }
diff --git a/cyx-admin/src/main/resources/templates/main.html b/cyx-admin/src/main/resources/templates/main.html
index 83042a9..e980919 100644
--- a/cyx-admin/src/main/resources/templates/main.html
+++ b/cyx-admin/src/main/resources/templates/main.html
@@ -44,8 +44,8 @@
     </div>
     <div class="main_center">
         <div class="main_center_item">
-            <div class="data1" onclick="openTab(5,'年度考核完成情况')">
-                <span style="font-weight:900;font-size: 18px" >年度考核完成情况</span>
+            <div class="data1" onclick="openTab(5,'季度考核指标')">
+                <span style="font-weight:900;font-size: 18px" >季度考核完成情况</span>
                 <p class="all_num">日常考核总分：0分</p>
                 <p class="curr_num">当前分数：0分</p>
             </div>
@@ -59,7 +59,7 @@
                 <p class="all_num">日常考核总分：0分</p>
                 <p class="curr_num">当前分数：0分</p>
             </div>
-            <div class="data4" onclick="openTab(5,'日常考核完成情况')">
+            <div class="data4" onclick="openTab(5,'日常考核指标')">
                 <span style="font-weight:900;font-size: 18px" >日常考核完成情况</span>
                 <p class="all_num">日常考核总分：0分</p>
                 <p class="curr_num">当前分数：0分</p>
@@ -76,7 +76,7 @@
             <div class="cicle7"></div>
             <div class="cicle8">
                 <span class="circle_num">0%</span>
-                <p>年度考核完成情况</p>
+                <p>季度考核完成情况</p>
             </div>
             <div class="cicle9">
                 <span class="circle_num">0%</span>
@@ -117,7 +117,7 @@
             <div class="right_switch_btn">
                 <span class="btn_item">日常考核指标</span>
                 <span>|</span>
-                <span class="btn_item">年度考核指标</span>
+                <span class="btn_item">季度考核指标</span>
             </div>
             <div class="echarts_title">
                 <span></span>
@@ -128,7 +128,7 @@
         <div class="main_footer">
             <div class="echarts_title">
                 <span></span>
-                <span onclick="openTab(4)">年度考核指标</span>
+                <span onclick="openTab(4)">季度考核指标</span>
             </div>
             <div class="echarts_footer_wrap" id="bottom_right_echarts"></div>
         </div>
@@ -158,7 +158,7 @@
                 $.modal.openTab("日常考核指标", prefix + '/day',true);
                 break;
             case 4:
-                $.modal.openTab("年度考核指标", prefix + '/year',true);
+                $.modal.openTab("季度考核指标", prefix + '/year',true);
                 break;
             case 5:
                 window.parent._tab_name = name;
@@ -344,7 +344,7 @@
                         }
                     },
                     legend: {
-                        data: ['日常考核指标', '年度考核指标'],
+                        data: ['日常考核指标', '季度考核指标'],
                         textStyle: {
                             color: "#ffffff"
                         },
@@ -386,7 +386,7 @@
                             data: sData1
                         },
                         {
-                            name: '年度考核指标',
+                            name: '季度考核指标',
                             type: 'bar',
                             tooltip: {
                                 valueFormatter: function (value) {
@@ -511,7 +511,7 @@
                             data: [
                                 {
                                     value: _sData,
-                                    name: '年度考核指标'
+                                    name: '季度考核指标'
                                 },
                             ],
                             symbol: 'none',
@@ -650,7 +650,7 @@
                 let _data = res.data;
                 _data.forEach(item => {
                     switch (item.type) {
-                        case "年度考核指标":
+                        case "季度考核指标":
                             $(".data1").find('.all_num').text("日常考核总分："+item.score+"分");
                             $(".data1").find('.curr_num').text("当前分数："+item.nowScore+"分");
                             $(".cicle8").find('.circle_num').text(item.percent+"%");
@@ -714,7 +714,7 @@
                     let _json = JSON.parse(item.json);
                     _strHtml += '<div class="item_inline">' +
                         '<p>党建及意识形态：'+_json['日常考核指标']+'</p>' +
-                        '<p>目前完成度：'+_json['年度考核指标']+'</p>' +
+                        '<p>目前完成度：'+_json['季度考核指标']+'</p>' +
                         '</div>';
                 });
                 $('#center_footer_two').append(_strHtml);
diff --git a/cyx-system/src/main/resources/mapper/base/TAmentAdvancedDeptMapper.xml b/cyx-system/src/main/resources/mapper/base/TAmentAdvancedDeptMapper.xml
index ae7d87f..dd7ceb9 100644
--- a/cyx-system/src/main/resources/mapper/base/TAmentAdvancedDeptMapper.xml
+++ b/cyx-system/src/main/resources/mapper/base/TAmentAdvancedDeptMapper.xml
@@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                         LEFT JOIN sys_dept b ON a.dept = b.dept_id
                         LEFT JOIN t_ament_party_affairs c ON a.dept = c.dept_id
                 WHERE
-                    c.type IN ( '日常考核指标', '年度考核指标' )
+                    c.type IN ( '日常考核指标', '季度考核指标' )
                 GROUP BY
                     c.type
             ) f
diff --git a/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml b/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml
index 0666207..f526b3d 100644
--- a/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml
+++ b/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml
@@ -146,6 +146,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 FROM
                     t_ament_party_affairs a
                         LEFT JOIN sys_dept b ON a.dept_id = b.dept_id
+                where 1=1
+                <if test="type != null  and type != ''"> and a.type = #{type}</if>
                 GROUP BY
                     a.type,
                     a.dept_id
@@ -243,7 +245,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             t_ament_party_affairs
         WHERE
-            type = '年度考核指标'
+            type = '季度考核指标'
         GROUP BY
             shot_name
     </select>
@@ -257,7 +259,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             t_ament_party_affairs  a LEFT JOIN sys_dept d on a.dept_id = d.dept_id
         WHERE
-            a.type IN ( '日常考核指标', '年度考核指标' )
+            a.type IN ( '日常考核指标', '季度考核指标' )
         GROUP BY
             a.dept_id,
             a.type