From 74c5b319b3f887e17dd945d8d128e17a4b5b9785 Mon Sep 17 00:00:00 2001
From: liuwu <975499773@qq.com>
Date: Tue, 12 Sep 2023 10:03:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E5=92=8C?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../web/base/domain/TAmentPartyAffairs.java | 10 ++++++
.../resources/templates/base/affairs/add.html | 7 ++++
.../templates/base/affairs/affairs.html | 33 ++++++++++++++++---
.../resources/templates/base/affairs/day.html | 33 ++++++++++++++++---
.../templates/base/affairs/edit.html | 13 ++++++++
.../base/affairs/finishedstatic.html | 7 +++-
.../templates/base/affairs/partystyle.html | 28 +++++++++++++---
.../templates/base/affairs/warn.html | 7 +++-
.../templates/base/affairs/year.html | 33 ++++++++++++++++---
.../resources/templates/base/his/his.html | 7 +++-
.../mapper/base/TAmentPartyAffairsMapper.xml | 8 +++--
11 files changed, 161 insertions(+), 25 deletions(-)
diff --git a/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentPartyAffairs.java b/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentPartyAffairs.java
index 7e0068f..0349086 100644
--- a/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentPartyAffairs.java
+++ b/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentPartyAffairs.java
@@ -50,6 +50,16 @@ public class TAmentPartyAffairs extends BaseEntity
@Excel(name = "评分细则")
private String detailed;
+ private String degree;
+
+ public String getDegree() {
+ return degree;
+ }
+
+ public void setDegree(String degree) {
+ this.degree = degree;
+ }
+
/** 达标分 */
@Excel(name = "达标分")
private String score;
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 9ef404b..d54aeb5 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/add.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/add.html
@@ -50,6 +50,13 @@
+
diff --git a/cyx-admin/src/main/resources/templates/base/affairs/affairs.html b/cyx-admin/src/main/resources/templates/base/affairs/affairs.html
index 5069613..3f75e9a 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/affairs.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/affairs.html
@@ -109,16 +109,26 @@
},
{
field: 'target',
- title: '目标项'
+ title: '目标项',
+ width:150,
+ align: 'center',
+ formatter: function(value, row, index) {
+ return $.table.tooltip(value);
+ }
},
{
field: 'shotName',
- title: '简写'
+ title: '简写',
+ width:100,
+ align: 'center',
+ formatter: function(value, row, index) {
+ return $.table.tooltip(value);
+ }
},
{
field: 'demand',
title: '目标要求',
- width:200,
+ width:180,
align: 'center',
formatter: function(value, row, index) {
return $.table.tooltip(value);
@@ -127,7 +137,7 @@
{
field: 'detailed',
title: '工作任务',
- width:200,
+ width:180,
align: 'center',
formatter: function(value, row, index) {
return $.table.tooltip(value);
@@ -144,7 +154,7 @@
{
field: 'method',
title: '考核方式',
- width:200,
+ width:180,
align: 'center',
formatter: function(value, row, index) {
return $.table.tooltip(value);
@@ -166,6 +176,19 @@
field: 'remark',
title: '备注'
},
+ {
+ field: 'degree',
+ title: '',
+ width:50,
+ align: 'center',
+ formatter: function(value, row, index) {
+ if (row.degree === '0'){
+ return ''
+ }else {
+ return '重点'
+ }
+ }
+ },
{
title: '操作',
align: 'center',
diff --git a/cyx-admin/src/main/resources/templates/base/affairs/day.html b/cyx-admin/src/main/resources/templates/base/affairs/day.html
index d593706..083836a 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/day.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/day.html
@@ -161,16 +161,26 @@
},
{
field: 'target',
- title: '考核内容'
+ title: '考核内容',
+ width:150,
+ align: 'center',
+ formatter: function(value, row, index) {
+ return $.table.tooltip(value);
+ }
},
{
field: 'shotName',
- title: '简写'
+ title: '简写',
+ width:100,
+ align: 'center',
+ formatter: function(value, row, index) {
+ return $.table.tooltip(value);
+ }
},
{
field: 'demand',
title: '考核目标',
- width:200,
+ width:180,
align: 'center',
formatter: function(value, row, index) {
return $.table.tooltip(value);
@@ -179,7 +189,7 @@
{
field: 'method',
title: '标准要求',
- width:200,
+ width:180,
align: 'center',
formatter: function(value, row, index) {
return $.table.tooltip(value);
@@ -188,7 +198,7 @@
{
field: 'detailed',
title: '工作任务',
- width:200,
+ width:180,
align: 'center',
formatter: function(value, row, index) {
return $.table.tooltip(value);
@@ -226,6 +236,19 @@
field: 'remark',
title: '备注'
},
+ {
+ field: 'degree',
+ title: '',
+ width:50,
+ align: 'center',
+ formatter: function(value, row, index) {
+ if (row.degree === '0'){
+ return ''
+ }else {
+ return '重点'
+ }
+ }
+ },
{
title: '操作',
align: 'center',
diff --git a/cyx-admin/src/main/resources/templates/base/affairs/edit.html b/cyx-admin/src/main/resources/templates/base/affairs/edit.html
index 630ce88..8880fff 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/edit.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/edit.html
@@ -51,6 +51,19 @@
+
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 e3ae9cc..6671442 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html
@@ -91,7 +91,12 @@
},
{
field: 'shotName',
- title: '指标'
+ title: '指标',
+ width:100,
+ align: 'center',
+ formatter: function(value, row, index) {
+ return $.table.tooltip(value);
+ }
},
{
field: 'finish_date',
diff --git a/cyx-admin/src/main/resources/templates/base/affairs/partystyle.html b/cyx-admin/src/main/resources/templates/base/affairs/partystyle.html
index 5e8fbd2..b749a17 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/partystyle.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/partystyle.html
@@ -105,7 +105,7 @@
{
field: 'target',
title: '责任类别',
- width:200,
+ width:150,
align: 'center',
formatter: function(value, row, index) {
return $.table.tooltip(value);
@@ -113,12 +113,17 @@
},
{
field: 'shotName',
- title: '简写'
+ title: '简写',
+ width:100,
+ align: 'center',
+ formatter: function(value, row, index) {
+ return $.table.tooltip(value);
+ }
},
{
field: 'demand',
title: '目标要求',
- width:200,
+ width:180,
align: 'center',
formatter: function(value, row, index) {
return $.table.tooltip(value);
@@ -127,7 +132,7 @@
{
field: 'detailed',
title: '工作任务',
- width:200,
+ width:180,
align: 'center',
formatter: function(value, row, index) {
return $.table.tooltip(value);
@@ -144,7 +149,7 @@
{
field: 'method',
title: '考核方式',
- width:200,
+ width:180,
align: 'center',
formatter: function(value, row, index) {
return $.table.tooltip(value);
@@ -166,6 +171,19 @@
field: 'remark',
title: '备注'
},
+ {
+ field: 'degree',
+ title: '',
+ width:50,
+ align: 'center',
+ formatter: function(value, row, index) {
+ if (row.degree === '0'){
+ return ''
+ }else {
+ return '重点'
+ }
+ }
+ },
{
title: '操作',
align: 'center',
diff --git a/cyx-admin/src/main/resources/templates/base/affairs/warn.html b/cyx-admin/src/main/resources/templates/base/affairs/warn.html
index 575c024..2e56310 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/warn.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/warn.html
@@ -120,7 +120,12 @@
},
{
field: 'target',
- title: '指标'
+ title: '指标',
+ width:150,
+ align: 'center',
+ formatter: function(value, row, index) {
+ return $.table.tooltip(value);
+ }
},
{
field: 'commitTime',
diff --git a/cyx-admin/src/main/resources/templates/base/affairs/year.html b/cyx-admin/src/main/resources/templates/base/affairs/year.html
index f43a1e2..dac95cf 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/year.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/year.html
@@ -155,16 +155,26 @@
},
{
field: 'target',
- title: '考核内容'
+ title: '考核内容',
+ width:150,
+ align: 'center',
+ formatter: function(value, row, index) {
+ return $.table.tooltip(value);
+ }
},
{
field: 'shotName',
- title: '简写'
+ title: '简写',
+ width:100,
+ align: 'center',
+ formatter: function(value, row, index) {
+ return $.table.tooltip(value);
+ }
},
{
field: 'demand',
title: '考核目标',
- width:200,
+ width:180,
align: 'center',
formatter: function(value, row, index) {
return $.table.tooltip(value);
@@ -173,7 +183,7 @@
{
field: 'method',
title: '标准要求',
- width:200,
+ width:180,
align: 'center',
formatter: function(value, row, index) {
return $.table.tooltip(value);
@@ -182,7 +192,7 @@
{
field: 'detailed',
title: '评分办法',
- width:200,
+ width:180,
align: 'center',
formatter: function(value, row, index) {
return $.table.tooltip(value);
@@ -220,6 +230,19 @@
field: 'remark',
title: '备注'
},
+ {
+ field: 'degree',
+ title: '',
+ width:50,
+ align: 'center',
+ formatter: function(value, row, index) {
+ if (row.degree === '0'){
+ return ''
+ }else {
+ return '重点'
+ }
+ }
+ },
{
title: '操作',
align: 'center',
diff --git a/cyx-admin/src/main/resources/templates/base/his/his.html b/cyx-admin/src/main/resources/templates/base/his/his.html
index a70482d..93110a4 100644
--- a/cyx-admin/src/main/resources/templates/base/his/his.html
+++ b/cyx-admin/src/main/resources/templates/base/his/his.html
@@ -94,7 +94,12 @@
},
{
field: 'target',
- title: '指标'
+ title: '指标',
+ width:150,
+ align: 'center',
+ formatter: function(value, row, index) {
+ return $.table.tooltip(value);
+ }
},
{
field: 'remark',
diff --git a/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml b/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml
index 501548f..702c25f 100644
--- a/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml
+++ b/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml
@@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -31,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select id, type,shot_name ,files, unit, target, status, demand, detailed, score,now_score, method, head, reviewed, finish_date, per_id, dept_id, branch_id, create_by, create_time, update_by, update_time, remark from t_ament_party_affairs
+ select id, type,shot_name ,files, unit, target, status, demand, detailed, degree, score,now_score, method, head, reviewed, finish_date, per_id, dept_id, branch_id, create_by, create_time, update_by, update_time, remark from t_ament_party_affairs
@@ -335,6 +336,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
shot_name,
demand,
detailed,
+ degree,
score,
method,
head,
@@ -357,6 +359,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{shotName},
#{demand},
#{detailed},
+ #{degree},
#{score},
#{method},
#{head},
@@ -382,6 +385,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
target = #{target},
demand = #{demand},
detailed = #{detailed},
+ degree = #{degree},
score = #{score},
now_score = #{nowScore},
method = #{method},