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 b2f8d79..b8595b4 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
@@ -22,6 +22,16 @@ public class TAmentPartyAffairs extends BaseEntity
     private Long id;
 
     private String start;
+    private String year;
+
+    public String getYear() {
+        return year;
+    }
+
+    public void setYear(String year) {
+        this.year = year;
+    }
+
     private String end;
 
     public String getStart() {
diff --git a/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentTrade.java b/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentTrade.java
index 5d12627..1f83669 100644
--- a/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentTrade.java
+++ b/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentTrade.java
@@ -28,6 +28,16 @@ public class TAmentTrade extends BaseEntity
 
     private String tradeType;
 
+    private String year;
+
+    public String getYear() {
+        return year;
+    }
+
+    public void setYear(String year) {
+        this.year = year;
+    }
+
     public String getTradeType() {
         return tradeType;
     }
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 4baccae..23acbf3 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/affairs.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/affairs.html
@@ -35,11 +35,12 @@
                                 <input type="hidden" id="zhiwu" name="zhiwu">
                                 <li>
                                     <label>年份：</label>
-                                    <select name="year" id="year">
-                                        <option>2023</option>
-                                        <option selected>2024</option>
-                                        <option>2025</option>
-                                    </select>
+                                    <input type="text" readonly  name="year" id="year" placeholder="yyyy">
+<!--                                    <select name="year" id="year">-->
+<!--                                        <option>2023</option>-->
+<!--                                        <option selected>2024</option>-->
+<!--                                        <option>2025</option>-->
+<!--                                    </select>-->
                                 </li>
                                 <li>
                                     <label>简写：</label>
@@ -89,6 +90,16 @@
         var editFlag = [[${@permission.hasPermi('base:affairs:edit')}]];
         var removeFlag = [[${@permission.hasPermi('base:affairs:remove')}]];
         var prefix = ctx + "base/affairs";
+        var year = new Date().getFullYear();
+        $('#year').val(year)
+        layui.use('laydate', function() {
+            var laydate = layui.laydate;
+            laydate.render({
+                elem: '#year',
+                type: 'year',
+                // value: new Date()
+            });
+        })
 
         if(window.parent.parent){
             $("#shotName").val(window.parent.parent._shotName)
@@ -153,7 +164,7 @@
                 {
                     field: 'target',
                     title: '目标项',
-                    width:150,
+                    width:120,
                     align: 'center',
                     formatter: function(value, row, index) {
                         return $.table.tooltip(value);
@@ -171,7 +182,7 @@
                 {
                     field: 'demand',
                     title: '目标要求',
-                    width:180,
+                    width:150,
                     align: 'center',
                     formatter: function(value, row, index) {
                         return $.table.tooltip(value);
@@ -180,7 +191,7 @@
                 {
                     field: 'detailed',
                     title: '工作任务',
-                    width:180,
+                    width:150,
                     align: 'center',
                     formatter: function(value, row, index) {
                         return $.table.tooltip(value);
@@ -197,7 +208,7 @@
                 {
                     field: 'method',
                     title: '考核方式',
-                    width:180,
+                    width:150,
                     align: 'center',
                     formatter: function(value, row, index) {
                         return $.table.tooltip(value);
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 9c32a84..717e303 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/day.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/day.html
@@ -34,11 +34,12 @@
                                 <input type="hidden" name="type" value="日常考核指标"/>
                                 <li>
                                     <label>年份：</label>
-                                    <select name="year" id="year">
-                                        <option>2023</option>
-                                        <option selected>2024</option>
-                                        <option>2025</option>
-                                    </select>
+                                    <input type="text" readonly  name="year" id="year" placeholder="yyyy">
+<!--                                    <select name="year" id="year">-->
+<!--                                        <option>2023</option>-->
+<!--                                        <option selected>2024</option>-->
+<!--                                        <option>2025</option>-->
+<!--                                    </select>-->
                                 </li>
                                 <li>
                                     <label>简写：</label>
@@ -94,6 +95,16 @@
         var removeFlag = [[${@permission.hasPermi('base:affairs:remove')}]];
         var prefix = ctx + "base/affairs";
 
+        var year = new Date().getFullYear();
+        $('#year').val(year)
+        layui.use('laydate', function() {
+            var laydate = layui.laydate;
+            laydate.render({
+                elem: '#year',
+                type: 'year',
+                // value: new Date()
+            });
+        })
         if(window.parent.parent){
             $("#shotName").val(window.parent.parent._shotName)
         }else {
@@ -170,7 +181,7 @@
                 {
                     field: 'target',
                     title: '考核内容',
-                    width:150,
+                    width:120,
                     align: 'center',
                     formatter: function(value, row, index) {
                         return $.table.tooltip(value);
@@ -188,7 +199,7 @@
                 {
                     field: 'demand',
                     title: '考核目标',
-                    width:180,
+                    width:150,
                     align: 'center',
                     formatter: function(value, row, index) {
                         return $.table.tooltip(value);
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 36257ef..b9e83bd 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html
@@ -80,6 +80,10 @@
             $("#type0831").val('')
         }
 
+        var year = new Date().getFullYear();
+        var str = year+'-01-01'+' - '+year+'-12-31'
+        $('#laydate-demo-4').val(str)
+
         layui.use('laydate', function() {
             var laydate = layui.laydate;
             laydate.render({
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 c7e71a8..018e4ce 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/partystyle.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/partystyle.html
@@ -35,11 +35,12 @@
                                 <input type="hidden" name="type" value="党风廉政建设"/>
                                 <li>
                                     <label>年份：</label>
-                                    <select name="year" id="year">
-                                        <option>2023</option>
-                                        <option selected>2024</option>
-                                        <option>2025</option>
-                                    </select>
+                                    <input type="text" readonly  name="year" id="year" placeholder="yyyy">
+<!--                                    <select name="year" id="year">-->
+<!--                                        <option>2023</option>-->
+<!--                                        <option selected>2024</option>-->
+<!--                                        <option>2025</option>-->
+<!--                                    </select>-->
                                 </li>
                                 <li>
                                     <label>简写：</label>
@@ -89,6 +90,16 @@
         var editFlag = [[${@permission.hasPermi('base:affairs:edit')}]];
         var removeFlag = [[${@permission.hasPermi('base:affairs:remove')}]];
         var prefix = ctx + "base/affairs";
+        var year = new Date().getFullYear();
+        $('#year').val(year)
+        layui.use('laydate', function() {
+            var laydate = layui.laydate;
+            laydate.render({
+                elem: '#year',
+                type: 'year',
+                // value: new Date()
+            });
+        })
 
         $(document).ready(function () {
             $.ajax({
@@ -147,7 +158,7 @@
                 {
                     field: 'target',
                     title: '责任类别',
-                    width:150,
+                    width:120,
                     align: 'center',
                     formatter: function(value, row, index) {
                         return $.table.tooltip(value);
@@ -165,7 +176,7 @@
                     {
                         field: 'demand',
                         title: '目标要求',
-                        width:180,
+                        width:150,
                         align: 'center',
                         formatter: function(value, row, index) {
                             return $.table.tooltip(value);
@@ -174,7 +185,7 @@
                     {
                         field: 'detailed',
                         title: '工作任务',
-                        width:180,
+                        width:150,
                         align: 'center',
                         formatter: function(value, row, index) {
                             return $.table.tooltip(value);
@@ -191,7 +202,7 @@
                 {
                     field: 'method',
                     title: '考核方式',
-                    width:180,
+                    width:150,
                     align: 'center',
                     formatter: function(value, row, index) {
                         return $.table.tooltip(value);
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 f37696b..e019070 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/warn.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/warn.html
@@ -12,11 +12,12 @@
                         <ul>
                             <li>
                                 <label>年份：</label>
-                                <select name="year" id="year">
-                                    <option>2023</option>
-                                    <option selected>2024</option>
-                                    <option>2025</option>
-                                </select>
+                                <input type="text" readonly  name="year" id="year" placeholder="yyyy">
+<!--                                <select name="year" id="year">-->
+<!--                                    <option>2023</option>-->
+<!--                                    <option selected>2024</option>-->
+<!--                                    <option>2025</option>-->
+<!--                                </select>-->
                             </li>
                             <li>
                                 <label>考核类型：</label>
@@ -72,6 +73,16 @@
         var removeFlag = [[${@permission.hasPermi('base:affairs:remove')}]];
         var prefix = ctx + "base/affairs";
 
+        var year = new Date().getFullYear();
+        $('#year').val(year)
+        layui.use('laydate', function() {
+            var laydate = layui.laydate;
+            laydate.render({
+                elem: '#year',
+                type: 'year',
+                // value: new Date()
+            });
+        })
         $(document).ready(function () {
             $.ajax({
                 type: "post",
@@ -139,7 +150,7 @@
                     {
                         field: 'demand',
                         title: '目标要求/考核目标',
-                        width:180,
+                        width:150,
                         align: 'center',
                         formatter: function(value, row, index) {
                             return $.table.tooltip(value);
@@ -148,7 +159,7 @@
                     {
                         field: 'method',
                         title: '标准要求',
-                        width:180,
+                        width:150,
                         align: 'center',
                         formatter: function(value, row, index) {
                             return $.table.tooltip(value);
@@ -157,7 +168,7 @@
                     {
                         field: 'detailed',
                         title: '工作任务',
-                        width:180,
+                        width:150,
                         align: 'center',
                         formatter: function(value, row, index) {
                             return $.table.tooltip(value);
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 85f1436..e185b74 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/year.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/year.html
@@ -34,11 +34,12 @@
                                 <input type="hidden" name="type" value="季度考核指标"/>
                                 <li>
                                     <label>年份：</label>
-                                    <select name="year" id="year">
-                                        <option>2023</option>
-                                        <option selected>2024</option>
-                                        <option>2025</option>
-                                    </select>
+                                    <input type="text" readonly  name="year" id="year" placeholder="yyyy">
+<!--                                    <select name="year" id="year">-->
+<!--                                        <option>2023</option>-->
+<!--                                        <option selected>2024</option>-->
+<!--                                        <option>2025</option>-->
+<!--                                    </select>-->
                                 </li>
                                 <li>
                                     <label>简写：</label>
@@ -93,6 +94,16 @@
     var editFlag = [[${@permission.hasPermi('base:affairs:edit')}]];
     var removeFlag = [[${@permission.hasPermi('base:affairs:remove')}]];
     var prefix = ctx + "base/affairs";
+    var year = new Date().getFullYear();
+    $('#year').val(year)
+    layui.use('laydate', function() {
+        var laydate = layui.laydate;
+        laydate.render({
+            elem: '#year',
+            type: 'year',
+            // value: new Date()
+        });
+    })
 
     $(document).ready(function () {
         $.ajax({
@@ -164,7 +175,7 @@
                 {
                     field: 'target',
                     title: '考核内容',
-                    width:150,
+                    width:120,
                     align: 'center',
                     formatter: function(value, row, index) {
                         return $.table.tooltip(value);
@@ -182,7 +193,7 @@
                 {
                     field: 'demand',
                     title: '考核目标',
-                    width:180,
+                    width:150,
                     align: 'center',
                     formatter: function(value, row, index) {
                         return $.table.tooltip(value);
@@ -191,7 +202,7 @@
                 {
                     field: 'method',
                     title: '标准要求',
-                    width:180,
+                    width:150,
                     align: 'center',
                     formatter: function(value, row, index) {
                         return $.table.tooltip(value);
@@ -200,7 +211,7 @@
                 {
                     field: 'detailed',
                     title: '评分办法',
-                    width:180,
+                    width:150,
                     align: 'center',
                     formatter: function(value, row, index) {
                         return $.table.tooltip(value);
diff --git a/cyx-admin/src/main/resources/templates/base/trade/trade.html b/cyx-admin/src/main/resources/templates/base/trade/trade.html
index 2f11a78..019b947 100644
--- a/cyx-admin/src/main/resources/templates/base/trade/trade.html
+++ b/cyx-admin/src/main/resources/templates/base/trade/trade.html
@@ -80,20 +80,26 @@
             </div>
         </div>
     </div>
+
     <th:block th:include="include :: footer" />
     <script th:inline="javascript">
+        var year = new Date().getFullYear();
+        var mon = new Date().getMonth() + 1;
+        var str = (year+'-')+(mon>9?mon:'0'+mon)
+        $('#laydate-demo-4').val(str)
         var editFlag = [[${@permission.hasPermi('base:trade:edit')}]];
         var removeFlag = [[${@permission.hasPermi('base:trade:remove')}]];
         var prefix = ctx + "base/trade";
-
         layui.use('laydate', function() {
             var laydate = layui.laydate;
             laydate.render({
                 elem: '#laydate-demo-4',
-                type: 'month'
+                type: 'month',
+                // value: new Date()
             });
         })
 
+
         $(function() {
             var options = {
                 url: prefix + "/list",
diff --git a/cyx-admin/src/main/resources/templates/main.html b/cyx-admin/src/main/resources/templates/main.html
index 9b3f80c..835d8bc 100644
--- a/cyx-admin/src/main/resources/templates/main.html
+++ b/cyx-admin/src/main/resources/templates/main.html
@@ -190,8 +190,9 @@
 
     //加载左上角echarts
     function loadEchartsOne() {
+        var year = new Date().getFullYear();
         $.ajax({
-            url:'/base/index/dwysxt',
+            url:'/base/index/dwysxt?year='+year,
             type:'post',
             dataType:'json',
             success(res){
@@ -258,8 +259,9 @@
 
     //加载左边中间的echarts
     function loadEchartsTwo() {
+        var year = new Date().getFullYear();
         $.ajax({
-            url:'/base/index/dflzjs',
+            url:'/base/index/dflzjs?year='+year,
             type:'post',
             dataType:'json',
             success(res){
@@ -309,8 +311,9 @@
 
     //加载左下角的echarts
     function loadEchartsThree() {
+        var year = new Date().getFullYear();
         $.ajax({
-            url:'/base/index/bmwcqk',
+            url:'/base/index/bmwcqk?year='+year,
             type:'post',
             dataType:'json',
             success(res){
@@ -403,8 +406,9 @@
 
     //加载右上角的echarts
     function loadEchartsFour(){
+        var year = new Date().getFullYear();
         $.ajax({
-            url:'/base/index/rckhzb',
+            url:'/base/index/rckhzb?year='+year,
             type:'post',
             dataType:'json',
             success(res){
@@ -472,8 +476,9 @@
 
     //加载右下角的echarts
     function loadEchartsFive(){
+        var year = new Date().getFullYear();
         $.ajax({
-            url:'/base/index/ndkhbz',
+            url:'/base/index/ndkhbz?year='+year,
             type:'post',
             dataType:'json',
             success(res){
@@ -642,8 +647,9 @@
 
     //加载中间数据
     function loadCenterData(){
+        var year = new Date().getFullYear();
         $.ajax({
-            url:'/base/index/groupAll',
+            url:'/base/index/groupAll?year='+year,
             type:'post',
             dataType:'json',
             success(res){
@@ -679,8 +685,9 @@
     //加载重点工作进度数据
     function loadPeopleData(){
         _peopleData = [];
+        var year = new Date().getFullYear();
         $.ajax({
-            url:'/base/affairs/importantWork',
+            url:'/base/affairs/importantWork?year='+year,
             type:'post',
             dataType:'json',
             success(res){
@@ -705,8 +712,9 @@
 
     //加载资源交易数据
     function loadDepData(){
+        var year = new Date().getFullYear();
         $.ajax({
-            url:'/base/index/tradeEcharts',
+            url:'/base/index/tradeEcharts?year='+year,
             type:'post',
             dataType:'json',
             success(res){