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 d8805ee..ad880eb 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/partystyle.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/partystyle.html
@@ -64,9 +64,9 @@
删除
-
- 导出
-
+
+
+
@@ -199,7 +199,19 @@
},
{
field: 'finishDate',
- title: '完成截止时间'
+ title: '完成截止时间',
+ align: 'center',
+ formatter: function(value, row, index) {
+ if (row.unit === '1'){
+ return '周'
+ }else if (row.unit === '2'){
+ return '月'
+ }else if (row.unit === '3'){
+ return '季度'
+ }else {
+ return row.finishDate
+ }
+ }
},
{
field: 'remark',
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 990cb95..6c0b080 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/warn.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/warn.html
@@ -138,7 +138,19 @@
},
{
field: 'finishDate',
- title: '截止时间'
+ title: '截止时间',
+ align: 'center',
+ formatter: function(value, row, index) {
+ if (row.unit === '1'){
+ return '周'
+ }else if (row.unit === '2'){
+ return '月'
+ }else if (row.unit === '3'){
+ return '季度'
+ }else {
+ return row.finishDate
+ }
+ }
},
{
field: 'deptName',
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 f88b9b0..50e7eaf 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/year.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/year.html
@@ -67,9 +67,9 @@
删除
-
- 导出
-
+
+
+
@@ -224,7 +224,19 @@
},
{
field: 'finishDate',
- title: '完成截止时间'
+ title: '完成截止时间',
+ align: 'center',
+ formatter: function(value, row, index) {
+ if (row.unit === '1'){
+ return '周'
+ }else if (row.unit === '2'){
+ return '月'
+ }else if (row.unit === '3'){
+ return '季度'
+ }else {
+ return row.finishDate
+ }
+ }
},
{
field: 'remark',
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 c716842..029d0b1 100644
--- a/cyx-admin/src/main/resources/templates/base/branch/branch.html
+++ b/cyx-admin/src/main/resources/templates/base/branch/branch.html
@@ -37,9 +37,9 @@
删除
-
- 导出
-
+
+
+
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 93110a4..1265911 100644
--- a/cyx-admin/src/main/resources/templates/base/his/his.html
+++ b/cyx-admin/src/main/resources/templates/base/his/his.html
@@ -49,9 +49,9 @@
删除
-
- 导出
-
+
+
+
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 474c0c1..d9737d2 100644
--- a/cyx-admin/src/main/resources/templates/base/personnel/personnel.html
+++ b/cyx-admin/src/main/resources/templates/base/personnel/personnel.html
@@ -37,9 +37,9 @@
删除
-
- 导出
-
+
+
+
diff --git a/cyx-admin/src/main/resources/templates/base/trade/add.html b/cyx-admin/src/main/resources/templates/base/trade/add.html
new file mode 100644
index 0000000..eaab011
--- /dev/null
+++ b/cyx-admin/src/main/resources/templates/base/trade/add.html
@@ -0,0 +1,103 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/cyx-admin/src/main/resources/templates/base/trade/edit.html b/cyx-admin/src/main/resources/templates/base/trade/edit.html
new file mode 100644
index 0000000..eac9c7e
--- /dev/null
+++ b/cyx-admin/src/main/resources/templates/base/trade/edit.html
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/cyx-admin/src/main/resources/templates/base/trade/trade.html b/cyx-admin/src/main/resources/templates/base/trade/trade.html
new file mode 100644
index 0000000..2f11a78
--- /dev/null
+++ b/cyx-admin/src/main/resources/templates/base/trade/trade.html
@@ -0,0 +1,148 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml b/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml
index d551cce..14072f2 100644
--- a/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml
+++ b/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml
@@ -114,8 +114,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN t_ament_branch e ON a.branch_id = e.branch_id
LEFT JOIN sys_dept f ON a.dept_id = f.dept_id
where (now() > a.finish_date or datediff(a.finish_date,now()) <=3 or a.status = 2)
+ and (
+ a.unit is null and((now() > a.finish_date or datediff(a.finish_date,now()) <=3 or a.status = 2)) or
+ a.unit IS NOT NULL
+ AND (weekday(NOW())+ 1 = 5 OR
+ 0 <= DATEDIFF(LAST_DAY( NOW()), now())<= 3 OR
+ 0 <= DATEDIFF(LAST_DAY( MAKEDATE( EXTRACT( YEAR FROM CURDATE()), 1 ) + INTERVAL QUARTER ( CURDATE())* 3-1 MONTH ),NOW()) <= 3
+ )
+ )
and a.type = #{type}
-
and a.unit = #{unit}
AND a.target like concat('%', #{target}, '%')
@@ -131,7 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and a.per_id = #{perId}
and a.dept_id = #{deptId}
and a.branch_id = #{branchId}
- order by finish_date
+ order by finish_date,id
diff --git a/cyx-system/src/main/resources/mapper/base/TAmentTradeMapper.xml b/cyx-system/src/main/resources/mapper/base/TAmentTradeMapper.xml
index 522cec4..15c32fe 100644
--- a/cyx-system/src/main/resources/mapper/base/TAmentTradeMapper.xml
+++ b/cyx-system/src/main/resources/mapper/base/TAmentTradeMapper.xml
@@ -8,12 +8,13 @@
+
- select id, trade_count, trade_mony, type, month_of from t_ament_trade
+ select id, trade_count, trade_mony, trade_type, type, month_of from t_ament_trade
@@ -21,6 +22,7 @@
and trade_count = #{tradeCount}
and trade_mony = #{tradeMony}
+ and trade_type = #{tradeType}
and type = #{type}
and month_of = #{monthOf}
@@ -54,12 +56,14 @@
trade_count,
trade_mony,
+ trade_type,
type,
month_of,
#{tradeCount},
#{tradeMony},
+ #{tradeType},
#{type},
#{monthOf},
@@ -70,6 +74,7 @@
trade_count = #{tradeCount},
trade_mony = #{tradeMony},
+ trade_type = #{tradeType},
type = #{type},
month_of = #{monthOf},