Merge remote-tracking branch 'origin/master'

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;

cyx-admin/src/main/resources/templates/base/affairs/add.html

@@ -50,6 +50,13 @@
                     <textarea required name="detailed" class="form-control"></textarea>
                 </div>
             </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label" id="degree">重点工作：</label>
+                <div class="col-sm-8">
+                    <label class="radio-box"> <input type="radio" name="degree" value="0" th:checked="true"/>非重点工作</label>
+                    <label class="radio-box"> <input type="radio" name="degree" value="1" />重点工作</label>
+                </div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label" id="score">达标分：</label>
                 <div class="col-sm-8">

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 '<font style="color: red">重点</font>'
+                            }
+                        }
+                    },
                 {
                     title: '操作',
                     align: 'center',

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 '<font style="color: red">重点</font>'
+                            }
+                        }
+                    },
                 {
                     title: '操作',
                     align: 'center',

cyx-admin/src/main/resources/templates/base/affairs/edit.html

@@ -51,6 +51,19 @@
                     <textarea name="detailed" readonly="true" class="form-control">[[*{detailed}]]</textarea>
                 </div>
             </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">重点工作：</label>
+                <div class="col-sm-8">
+                    <div class="radio-box">
+                        <input type="radio" id="radio1" th:field="*{degree}" name="degree" value="0">
+                        <label for="radio1">非重点工作</label>
+                    </div>
+                    <div class="radio-box">
+                        <input type="radio" id="radio2" th:field="*{degree}" name="degree" value="1">
+                        <label for="radio2">重点工作</label>
+                    </div>
+                </div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">达标分：</label>
                 <div class="col-sm-8">

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',

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 '<font style="color: red">重点</font>'
+                            }
+                        }
+                    },
                 {
                     title: '操作',
                     align: 'center',

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',

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 '<font style="color: red">重点</font>'
+                        }
+                    }
+                },
                 {
                     title: '操作',
                     align: 'center',

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',

cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml

@@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="status"    column="status"    />
         <result property="demand"    column="demand"    />
         <result property="detailed"    column="detailed"    />
+        <result property="degree"    column="degree"    />
         <result property="score"    column="score"    />
         <result property="nowScore"    column="now_score"    />
         <result property="method"    column="method"    />
@@ -31,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTAmentPartyAffairsVo">
-        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
     </sql>
 
     <select id="selectTAmentPartyAffairsList" parameterType="TAmentPartyAffairs" resultMap="TAmentPartyAffairsResult">
@@ -174,7 +175,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.type
         FROM
         t_ament_party_affairs a
-        where a.type in ('党风廉政建设','党务意识形态')
+        where a.degree = 1
         group by a.type,a.shot_name
     </select>
 
@@ -335,6 +336,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="shotName != null">shot_name,</if>
             <if test="demand != null">demand,</if>
             <if test="detailed != null">detailed,</if>
+            <if test="degree != null">degree,</if>
             <if test="score != null">score,</if>
             <if test="method != null">method,</if>
             <if test="head != null">head,</if>
@@ -357,6 +359,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="shotName != null">#{shotName},</if>
             <if test="demand != null">#{demand},</if>
             <if test="detailed != null">#{detailed},</if>
+            <if test="degree != null">#{degree},</if>
             <if test="score != null">#{score},</if>
             <if test="method != null">#{method},</if>
             <if test="head != null">#{head},</if>
@@ -382,6 +385,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="target != null">target = #{target},</if>
             <if test="demand != null">demand = #{demand},</if>
             <if test="detailed != null">detailed = #{detailed},</if>
+            <if test="degree != null">degree = #{degree},</if>
             <if test="score != null">score = #{score},</if>
             <if test="nowScore != null">now_score = #{nowScore},</if>
             <if test="method != null">method = #{method},</if>