From d218e423a900e0366aa73d2216610eac4057dfc1 Mon Sep 17 00:00:00 2001
From: liuwu <975499773@qq.com>
Date: Thu, 24 Aug 2023 14:51:58 +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

---
 .../base/advanceddept/advanceddept.html       | 28 --------
 .../base/advancedparty/advancedparty.html     | 20 ------
 .../base/affairs/finishedstatic.html          | 71 ++++++-------------
 .../templates/base/branch/branch.html         | 20 ------
 .../templates/base/personnel/personnel.html   | 48 -------------
 .../mapper/base/TAmentPartyAffairsMapper.xml  | 16 +++--
 6 files changed, 31 insertions(+), 172 deletions(-)

diff --git a/cyx-admin/src/main/resources/templates/base/advanceddept/advanceddept.html b/cyx-admin/src/main/resources/templates/base/advanceddept/advanceddept.html
index b089bea..545e92c 100644
--- a/cyx-admin/src/main/resources/templates/base/advanceddept/advanceddept.html
+++ b/cyx-admin/src/main/resources/templates/base/advanceddept/advanceddept.html
@@ -22,34 +22,6 @@
                                 <label>评选人：</label>
                                 <input type="text" name="commit"/>
                             </li>
-                            <li>
-                                <label>评选时间：</label>
-                                <input type="text" class="time-input" placeholder="请选择评选时间" name="time"/>
-                            </li>
-                            <li>
-                                <label>审核人：</label>
-                                <input type="text" name="confirm"/>
-                            </li>
-                            <li>
-                                <label>是否显示：</label>
-                                <input type="text" name="show"/>
-                            </li>
-                            <li>
-                                <label>主要事迹附件上传：</label>
-                                <input type="text" name="events"/>
-                            </li>
-                            <li>
-                                <label>指标综合评分：</label>
-                                <input type="text" name="score"/>
-                            </li>
-                            <li>
-                                <label>完成进度：</label>
-                                <input type="text" name="process"/>
-                            </li>
-                            <li>
-                                <label>综合排名：</label>
-                                <input type="text" name="sort"/>
-                            </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-admin/src/main/resources/templates/base/advancedparty/advancedparty.html b/cyx-admin/src/main/resources/templates/base/advancedparty/advancedparty.html
index c046daa..a193c4f 100644
--- a/cyx-admin/src/main/resources/templates/base/advancedparty/advancedparty.html
+++ b/cyx-admin/src/main/resources/templates/base/advancedparty/advancedparty.html
@@ -18,26 +18,6 @@
                                 <label>姓名：</label>
                                 <input type="text" name="name"/>
                             </li>
-                            <li>
-                                <label>提交人：</label>
-                                <input type="text" name="commit"/>
-                            </li>
-                            <li>
-                                <label>提交时间：</label>
-                                <input type="text" class="time-input" placeholder="请选择提交时间" name="time"/>
-                            </li>
-                            <li>
-                                <label>审批人：</label>
-                                <input type="text" name="confirm"/>
-                            </li>
-                            <li>
-                                <label>是否显示：</label>
-                                <input type="text" name="show"/>
-                            </li>
-                            <li>
-                                <label>主要事迹附件上传：</label>
-                                <input type="text" name="events"/>
-                            </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-admin/src/main/resources/templates/base/affairs/finishedstatic.html b/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html
index f0829be..6204383 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html
@@ -97,80 +97,53 @@
                     title: '自增ID',
                     visible: false
                 },
-                // {
-                //     field: 'type',
-                //     title: '作用于附件'
-                // },
                 {
                     field: 'unit',
                     title: '单位名称'
                 },
+                {
+                    field: 'deptId',
+                    title: '部门'
+                },
                 {
                     field: 'type',
-                    title: '类型'
+                    title: '模块'
                 },
                 {
-                    field: 'target',
-                    title: '责任类别'
+                    field: 'shotName',
+                    title: '指标'
                 },
                 {
-                    field: 'demand',
-                    title: '目标要求',
-                    width:200,
-                    align: 'center',
-                    formatter: function(value, row, index) {
-                        return $.table.tooltip(value);
-                    }
-                },
-                {
-                    field: 'detailed',
-                    title: '指标明细',
-                    width:200,
-                    align: 'center',
-                    formatter: function(value, row, index) {
-                        return $.table.tooltip(value);
-                    }
+                    field: 'finishDate',
+                    title: '截止时间'
                 },
                 {
                     field: 'score',
                     title: '总分值'
                 },
                 {
-                    field: 'method',
-                    title: '考核要求',
-                    width:200,
-                    align: 'center',
-                    formatter: function(value, row, index) {
-                        return $.table.tooltip(value);
-                    }
+                    field: 'nowScore',
+                    title: '当前得分'
                 },
                 {
-                    field: 'head',
+                    field: 'percent',
+                    title: '完成度'
+                },
+                {
+                    field: 'per_id',
                     title: '负责人'
                 },
+                {
+                    field: 'phone',
+                    title: '联系方式'
+                },
                 {
                     field: 'reviewed',
                     title: '审核人'
                 },
                 {
-                    field: 'finishDate',
-                    title: '完成截止时间'
-                },
-                {
-                    field: 'perId',
-                    title: '操作人员ID'
-                },
-                {
-                    field: 'deptId',
-                    title: '部门ID'
-                },
-                {
-                    field: 'branchId',
-                    title: '支部ID'
-                },
-                {
-                    field: 'remark',
-                    title: '备注'
+                    field: 'reviewedTime',
+                    title: '审核时间'
                 },
                 {
                     title: '操作',
diff --git a/cyx-admin/src/main/resources/templates/base/branch/branch.html b/cyx-admin/src/main/resources/templates/base/branch/branch.html
index d37f53d..e0db114 100644
--- a/cyx-admin/src/main/resources/templates/base/branch/branch.html
+++ b/cyx-admin/src/main/resources/templates/base/branch/branch.html
@@ -10,34 +10,14 @@
                 <form id="formId">
                     <div class="select-list">
                         <ul>
-                            <li>
-                                <label>父支部id：</label>
-                                <input type="text" name="parentId"/>
-                            </li>
-                            <li>
-                                <label>祖级列表：</label>
-                                <input type="text" name="ancestors"/>
-                            </li>
                             <li>
                                 <label>支部名称：</label>
                                 <input type="text" name="branchName"/>
                             </li>
-                            <li>
-                                <label>显示顺序：</label>
-                                <input type="text" name="orderNum"/>
-                            </li>
-                            <li>
-                                <label>负责人：</label>
-                                <input type="text" name="leader"/>
-                            </li>
                             <li>
                                 <label>联系电话：</label>
                                 <input type="text" name="phone"/>
                             </li>
-                            <li>
-                                <label>邮箱：</label>
-                                <input type="text" name="email"/>
-                            </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-admin/src/main/resources/templates/base/personnel/personnel.html b/cyx-admin/src/main/resources/templates/base/personnel/personnel.html
index 6c52d51..8d2ab0a 100644
--- a/cyx-admin/src/main/resources/templates/base/personnel/personnel.html
+++ b/cyx-admin/src/main/resources/templates/base/personnel/personnel.html
@@ -10,62 +10,14 @@
                 <form id="formId">
                     <div class="select-list">
                         <ul>
-                            <li>
-                                <label>单位名称：</label>
-                                <input type="text" name="unit"/>
-                            </li>
                             <li>
                                 <label>人员姓名：</label>
                                 <input type="text" name="name"/>
                             </li>
-                            <li>
-                                <label>民族：</label>
-                                <input type="text" name="nation"/>
-                            </li>
-                            <li>
-                                <label>部门ID：</label>
-                                <input type="text" name="deptId"/>
-                            </li>
                             <li>
                                 <label>手机号码：</label>
                                 <input type="text" name="mphone"/>
                             </li>
-                            <li>
-                                <label>邮箱：</label>
-                                <input type="text" name="email"/>
-                            </li>
-                            <li>
-                                <label>籍贯：</label>
-                                <input type="text" name="nativePlace"/>
-                            </li>
-                            <li>
-                                <label>岗位：</label>
-                                <input type="text" name="post"/>
-                            </li>
-                            <li>
-                                <label>职务：</label>
-                                <input type="text" name="duties"/>
-                            </li>
-                            <li>
-                                <label>职称：</label>
-                                <input type="text" name="title"/>
-                            </li>
-                            <li>
-                                <label>参加工作时间：</label>
-                                <input type="text" class="time-input" placeholder="请选择参加工作时间" name="workDate"/>
-                            </li>
-                            <li>
-                                <label>支部ID：</label>
-                                <input type="text" name="branchId"/>
-                            </li>
-                            <li>
-                                <label>入党时间：</label>
-                                <input type="text" class="time-input" placeholder="请选择入党时间" name="partyDate"/>
-                            </li>
-                            <li>
-                                <label>党内职务：</label>
-                                <input type="text" name="partyDuties"/>
-                            </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 5bbe5f4..148805d 100644
--- a/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml
+++ b/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml
@@ -105,16 +105,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="bmwcqk" resultType="map">
         SELECT
-            dept_id,
-            type,
-            SUM( score ) score,
-            IF( sum( now_score ), sum( now_score ), 0 ) nowScore
+            a.dept_id,
+            d.dept_name,
+            a.type,
+            SUM( a.score ) score,
+            IF( sum( a.now_score ), sum( a.now_score ), 0 ) nowScore
         FROM
-            t_ament_party_affairs
+            t_ament_party_affairs  a LEFT JOIN sys_dept d on a.dept_id = d.dept_id
         WHERE
-            type IN ( '日常考核指标', '年度考核指标' )
+            a.type IN ( '日常考核指标', '年度考核指标' )
         GROUP BY
-            dept_id,type
+            a.dept_id,
+            a.type
     </select>
 
     <select id="groupAll" resultType="map">