public/cyx-ament-pc
public
/
cyx-ament-pc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: public:1ae3596c932bb591fb587ff6908f44b0cea09682
Branches Tags
public:master
..
compare: public:d0838394c454457a31fd52c92d7e82de61026aa6
Branches Tags
public:master

No commits in common. "1ae3596c932bb591fb587ff6908f44b0cea09682" and "d0838394c454457a31fd52c92d7e82de61026aa6" have entirely different histories.
1ae3596c93 ... d0838394c4

16 changed files with 35 additions and 490 deletions
Show Stats Expand all files Collapse all files

10
cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentTrade.java
View File

@ -26,16 +26,6 @@ public class TAmentTrade extends BaseEntity
@Excel(name = "交易额") @Excel(name = "交易额")
private Long tradeMony; private Long tradeMony;
private String tradeType;
public String getTradeType() {
return tradeType;
}
public void setTradeType(String tradeType) {
this.tradeType = tradeType;
}
/** 类型（房屋建筑、市政、公路、铁路、民航、水运、水利、能源、邮电通信、其他） */ /** 类型（房屋建筑、市政、公路、铁路、民航、水运、水利、能源、邮电通信、其他） */
@Excel(name = "类型", readConverterExp = "房=屋建筑、市政、公路、铁路、民航、水运、水利、能源、邮电通信、其他") @Excel(name = "类型", readConverterExp = "房=屋建筑、市政、公路、铁路、民航、水运、水利、能源、邮电通信、其他")
private String type; private String type;

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

@ -63,12 +63,12 @@
<input required name="score" class="form-control" type="number"/> <input required name="score" class="form-control" type="number"/>
</div> </div>
</div> </div>
<!-- <div class="form-group dy" style="display: none">--> <div class="form-group dy" style="display: none">
<!-- <label class="col-sm-3 control-label" id="unit">考核类别：</label>--> <label class="col-sm-3 control-label" id="unit">考核类别：</label>
<!-- <div class="col-sm-8">--> <div class="col-sm-8">
<!-- <input required name="unit" class="form-control" />--> <input required name="unit" class="form-control" />
<!-- </div>--> </div>
<!-- </div>--> </div>
<div class="form-group" id="dw" style="display: none"> <div class="form-group" id="dw" style="display: none">
<label class="col-sm-3 control-label" >考核方式：</label> <label class="col-sm-3 control-label" >考核方式：</label>
<div class="col-sm-8"> <div class="col-sm-8">
@ -100,17 +100,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="form-group">
<label class="col-sm-3 control-label">周/月/季度：</label>
<div class="col-sm-8">
<select name="unit" id="unit" class="form-control m-b">
<option value="">请选择</option>
<option value="工程建设项目">周</option>
<option value="政府采购">月</option>
<option value="国有产权交易">季度</option>
</select>
</div>
</div>
<div class="form-group dy" style="display: none"> <div class="form-group dy" style="display: none">
<label class="col-sm-3 control-label">部门：</label> <label class="col-sm-3 control-label">部门：</label>
<div class="col-sm-8"> <div class="col-sm-8">

20
cyx-admin/src/main/resources/templates/base/affairs/affairs.html
View File

@ -64,9 +64,9 @@
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="base:affairs:remove"> <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="base:affairs:remove">
<i class="fa fa-remove"></i> 删除 <i class="fa fa-remove"></i> 删除
</a> </a>
<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="base:affairs:export">--> <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="base:affairs:export">
<!-- <i class="fa fa-download"></i> 导出--> <i class="fa fa-download"></i> 导出
<!-- </a>--> </a>
</div> </div>
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
@ -205,19 +205,7 @@
}, },
{ {
field: 'finishDate', 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', field: 'remark',

20
cyx-admin/src/main/resources/templates/base/affairs/day.html
View File

@ -67,9 +67,9 @@
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="base:affairs:remove"> <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="base:affairs:remove">
<i class="fa fa-remove"></i> 删除 <i class="fa fa-remove"></i> 删除
</a> </a>
<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="base:affairs:export">--> <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="base:affairs:export">
<!-- <i class="fa fa-download"></i> 导出--> <i class="fa fa-download"></i> 导出
<!-- </a>--> </a>
</div> </div>
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
@ -230,19 +230,7 @@
}, },
{ {
field: 'finishDate', 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', field: 'remark',

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

@ -107,17 +107,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="form-group">
<label class="col-sm-3 control-label">周/月/季度：</label>
<div class="col-sm-8">
<select name="unit" id="unit" th:field="*{unit}" class="form-control m-b">
<option value="">请选择</option>
<option value="1">周</option>
<option value="2">月</option>
<option value="3">季度</option>
</select>
</div>
</div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">操作人员：</label> <label class="col-sm-3 control-label">操作人员：</label>
<div class="col-sm-8"> <div class="col-sm-8">

20
cyx-admin/src/main/resources/templates/base/affairs/partystyle.html
View File

@ -64,9 +64,9 @@
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="base:affairs:remove"> <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="base:affairs:remove">
<i class="fa fa-remove"></i> 删除 <i class="fa fa-remove"></i> 删除
</a> </a>
<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="base:affairs:export">--> <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="base:affairs:export">
<!-- <i class="fa fa-download"></i> 导出--> <i class="fa fa-download"></i> 导出
<!-- </a>--> </a>
</div> </div>
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
@ -199,19 +199,7 @@
}, },
{ {
field: 'finishDate', 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', field: 'remark',

14
cyx-admin/src/main/resources/templates/base/affairs/warn.html
View File

@ -138,19 +138,7 @@
}, },
{ {
field: 'finishDate', 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', field: 'deptName',

20
cyx-admin/src/main/resources/templates/base/affairs/year.html
View File

@ -67,9 +67,9 @@
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="base:affairs:remove"> <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="base:affairs:remove">
<i class="fa fa-remove"></i> 删除 <i class="fa fa-remove"></i> 删除
</a> </a>
<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="base:affairs:export">--> <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="base:affairs:export">
<!-- <i class="fa fa-download"></i> 导出--> <i class="fa fa-download"></i> 导出
<!-- </a>--> </a>
</div> </div>
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
@ -224,19 +224,7 @@
}, },
{ {
field: 'finishDate', 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', field: 'remark',

6
cyx-admin/src/main/resources/templates/base/branch/branch.html
View File

@ -37,9 +37,9 @@
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="base:branch:remove"> <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="base:branch:remove">
<i class="fa fa-remove"></i> 删除 <i class="fa fa-remove"></i> 删除
</a> </a>
<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="base:branch:export">--> <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="base:branch:export">
<!-- <i class="fa fa-download"></i> 导出--> <i class="fa fa-download"></i> 导出
<!-- </a>--> </a>
</div> </div>
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>

6
cyx-admin/src/main/resources/templates/base/his/his.html
View File

@ -49,9 +49,9 @@
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="base:his:remove"> <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="base:his:remove">
<i class="fa fa-remove"></i> 删除 <i class="fa fa-remove"></i> 删除
</a> </a>
<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="base:his:export">--> <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="base:his:export">
<!-- <i class="fa fa-download"></i> 导出--> <i class="fa fa-download"></i> 导出
<!-- </a>--> </a>
</div> </div>
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>

6
cyx-admin/src/main/resources/templates/base/personnel/personnel.html
View File

@ -37,9 +37,9 @@
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="base:personnel:remove"> <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="base:personnel:remove">
<i class="fa fa-remove"></i> 删除 <i class="fa fa-remove"></i> 删除
</a> </a>
<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="base:personnel:export">--> <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="base:personnel:export">
<!-- <i class="fa fa-download"></i> 导出--> <i class="fa fa-download"></i> 导出
<!-- </a>--> </a>
</div> </div>
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>

103
cyx-admin/src/main/resources/templates/base/trade/add.html
View File

@ -1,103 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('新增交易数据')" />
<th:block th:include="include :: datetimepicker-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-trade-add">
<div class="form-group">
<label class="col-sm-3 control-label">大类：</label>
<div class="col-sm-8">
<select required name="type" id="type" class="form-control ">
<option value="工程建设项目">工程建设项目</option>
<option value="政府采购">政府采购</option>
<option value="国有产权交易">国有产权交易</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">小类：</label>
<div class="col-sm-8">
<select required name="tradeType" id="tradeType" class="form-control ">
<option value="房屋建筑">房屋建筑</option>
<option value="市政">市政</option>
<option value="公路">公路</option>
<option value="铁路">铁路</option>
<option value="民航">民航</option>
<option value="水运">水运</option>
<option value="水利">水利</option>
<option value="能源">能源</option>
<option value="邮电通信">邮电通信</option>
<option value="公开招标">公开招标</option>
<option value="邀请招标">邀请招标</option>
<option value="竞争性磋商">竞争性磋商</option>
<option value="竞争性谈判">竞争性谈判</option>
<option value="询价">询价</option>
<option value="单一来源">单一来源</option>
<option value="拍卖">拍卖</option>
<option value="招投标">招投标</option>
<option value="网络竞价">网络竞价</option>
<option value="协议转让">协议转让</option>
<option value="其他">其他</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">交易数：</label>
<div class="col-sm-8">
<input name="tradeCount" class="form-control" type="number">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">交易额：</label>
<div class="col-sm-8">
<input name="tradeMony" class="form-control" type="number">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">年月份：</label>
<div class="col-sm-8">
<input type="text" readonly class="form-control" name="monthOf" id="laydate-demo-4" placeholder="yyyy-MM">
<!-- <div class="input-group date">-->
<!-- <input name="monthOf" class="form-control" placeholder="yyyy-MM-dd" type="text">-->
<!-- <span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
<!-- </div>-->
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript">
var prefix = ctx + "base/trade"
$("#form-trade-add").validate({
focusCleanup: true
});
layui.use('laydate', function() {
var laydate = layui.laydate;
laydate.render({
elem: '#laydate-demo-4',
type: 'month'
});
})
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-trade-add').serialize());
}
}
// $("input[name='monthOf']").datetimepicker({
// format: "yyyy-mm-dd",
// minView: "month",
// autoclose: true
// });
</script>
</body>
</html>

100
cyx-admin/src/main/resources/templates/base/trade/edit.html
View File

@ -1,100 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('修改交易数据')" />
<th:block th:include="include :: datetimepicker-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-trade-edit" th:object="${tAmentTrade}">
<input name="id" th:field="*{id}" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label">大类：</label>
<div class="col-sm-8">
<select name="type" th:field="*{type}" id="type" class="form-control">
<option value="工程建设项目">工程建设项目</option>
<option value="政府采购">政府采购</option>
<option value="国有产权交易">国有产权交易</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">小类：</label>
<div class="col-sm-8">
<select name="tradeType" th:field="*{tradeType}" id="tradeType" class="form-control">
<option value="房屋建筑">房屋建筑</option>
<option value="市政">市政</option>
<option value="公路">公路</option>
<option value="铁路">铁路</option>
<option value="民航">民航</option>
<option value="水运">水运</option>
<option value="水利">水利</option>
<option value="能源">能源</option>
<option value="邮电通信">邮电通信</option>
<option value="公开招标">公开招标</option>
<option value="邀请招标">邀请招标</option>
<option value="竞争性磋商">竞争性磋商</option>
<option value="竞争性谈判">竞争性谈判</option>
<option value="询价">询价</option>
<option value="单一来源">单一来源</option>
<option value="拍卖">拍卖</option>
<option value="招投标">招投标</option>
<option value="网络竞价">网络竞价</option>
<option value="协议转让">协议转让</option>
<option value="其他">其他</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">交易数：</label>
<div class="col-sm-8">
<input name="tradeCount" th:field="*{tradeCount}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">交易额：</label>
<div class="col-sm-8">
<input name="tradeMony" th:field="*{tradeMony}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">年月份：</label>
<div class="col-sm-8">
<input type="text" readonly class="form-control" th:field="*{monthOf}" name="monthOf" id="laydate-demo-4" placeholder="yyyy-MM">
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript">
var prefix = ctx + "base/trade";
$("#form-trade-edit").validate({
focusCleanup: true
});
layui.use('laydate', function() {
var laydate = layui.laydate;
laydate.render({
elem: '#laydate-demo-4',
type: 'month'
});
})
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-trade-edit').serialize());
}
}
// $("input[name='monthOf']").datetimepicker({
// format: "yyyy-mm-dd",
// minView: "month",
// autoclose: true
// });
</script>
</body>
</html>

148
cyx-admin/src/main/resources/templates/base/trade/trade.html
View File

@ -1,148 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('交易数据列表')" />
</head>
<body class="gray-bg">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<li>
<label>大类：</label>
<select name="type" id="type">
<option value="">请选择</option>
<option value="工程建设项目">工程建设项目</option>
<option value="政府采购">政府采购</option>
<option value="国有产权交易">国有产权交易</option>
</select>
</li>
<li>
<label>小类：</label>
<select name="tradeType" id="tradeType" >
<option value="">请选择</option>
<option value="房屋建筑">房屋建筑</option>
<option value="市政">市政</option>
<option value="公路">公路</option>
<option value="铁路">铁路</option>
<option value="民航">民航</option>
<option value="水运">水运</option>
<option value="水利">水利</option>
<option value="能源">能源</option>
<option value="邮电通信">邮电通信</option>
<option value="公开招标">公开招标</option>
<option value="邀请招标">邀请招标</option>
<option value="竞争性磋商">竞争性磋商</option>
<option value="竞争性谈判">竞争性谈判</option>
<option value="询价">询价</option>
<option value="单一来源">单一来源</option>
<option value="拍卖">拍卖</option>
<option value="招投标">招投标</option>
<option value="网络竞价">网络竞价</option>
<option value="协议转让">协议转让</option>
<option value="其他">其他</option>
</select>
</li>
<li>
<label>年月份：</label>
<input type="text" readonly name="monthOf" id="laydate-demo-4" placeholder="yyyy-MM">
</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>
</li>
</ul>
</div>
</form>
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="base:trade:add">
<i class="fa fa-plus"></i> 添加
</a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="base:trade:edit">
<i class="fa fa-edit"></i> 修改
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="base:trade:remove">
<i class="fa fa-remove"></i> 删除
</a>
<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="base:trade:export">-->
<!-- <i class="fa fa-download"></i> 导出-->
<!-- </a>-->
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
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'
});
})
$(function() {
var options = {
url: prefix + "/list",
createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
modalName: "交易数据",
columns: [{
checkbox: true
},
{
field: 'id',
title: '',
visible: false
},
{
field: 'tradeCount',
title: '交易数'
},
{
field: 'tradeMony',
title: '交易额'
},
{
field: 'type',
title: '类型'
},
{
field: 'monthOf',
title: '年月份'
},
{
field: 'tradeType',
title: '交易类型'
},
{
title: '操作',
align: 'center',
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join('');
}
}]
};
$.table.init(options);
});
</script>
</body>
</html>

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

@ -114,15 +114,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN t_ament_branch e ON a.branch_id = e.branch_id 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 LEFT JOIN sys_dept f ON a.dept_id = f.dept_id
where (now() > a.finish_date or datediff(a.finish_date,now()) &lt;=3 or a.status = 2) where (now() > a.finish_date or datediff(a.finish_date,now()) &lt;=3 or a.status = 2)
and (
a.unit is null and((now() > a.finish_date or datediff(a.finish_date,now()) &lt;=3 or a.status = 2)) or
a.unit IS NOT NULL
AND (weekday(NOW())+ 1 = 5 OR
0 &lt;= DATEDIFF(LAST_DAY( NOW()), now())&lt;= 3 OR
0 &lt;= DATEDIFF(LAST_DAY( MAKEDATE( EXTRACT( YEAR FROM CURDATE()), 1 ) + INTERVAL QUARTER ( CURDATE())* 3-1 MONTH ),NOW()) &lt;= 3
)
)
<if test="type != null and type != ''"> and a.type = #{type}</if> <if test="type != null and type != ''"> and a.type = #{type}</if>
<if test="unit != null and unit != ''"> and a.unit = #{unit}</if>
<if test="target != null and target != ''"> <if test="target != null and target != ''">
AND a.target like concat('%', #{target}, '%') AND a.target like concat('%', #{target}, '%')
</if> </if>
@ -138,7 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="perId != null "> and a.per_id = #{perId}</if> <if test="perId != null "> and a.per_id = #{perId}</if>
<if test="deptId != null "> and a.dept_id = #{deptId}</if> <if test="deptId != null "> and a.dept_id = #{deptId}</if>
<if test="branchId != null "> and a.branch_id = #{branchId}</if> <if test="branchId != null "> and a.branch_id = #{branchId}</if>
order by finish_date,id order by finish_date
</select> </select>
<select id="deptTree" parameterType="TAmentPartyAffairs" resultType="map"> <select id="deptTree" parameterType="TAmentPartyAffairs" resultType="map">

7
cyx-system/src/main/resources/mapper/base/TAmentTradeMapper.xml
View File

@ -8,13 +8,12 @@
<result property="id" column="id" /> <result property="id" column="id" />
<result property="tradeCount" column="trade_count" /> <result property="tradeCount" column="trade_count" />
<result property="tradeMony" column="trade_mony" /> <result property="tradeMony" column="trade_mony" />
<result property="tradeType" column="trade_type" />
<result property="type" column="type" /> <result property="type" column="type" />
<result property="monthOf" column="month_of" /> <result property="monthOf" column="month_of" />
</resultMap> </resultMap>
<sql id="selectTAmentTradeVo"> <sql id="selectTAmentTradeVo">
select id, trade_count, trade_mony, trade_type, type, month_of from t_ament_trade select id, trade_count, trade_mony, type, month_of from t_ament_trade
</sql> </sql>
<select id="selectTAmentTradeList" parameterType="TAmentTrade" resultMap="TAmentTradeResult"> <select id="selectTAmentTradeList" parameterType="TAmentTrade" resultMap="TAmentTradeResult">
@ -22,7 +21,6 @@
<where> <where>
<if test="tradeCount != null "> and trade_count = #{tradeCount}</if> <if test="tradeCount != null "> and trade_count = #{tradeCount}</if>
<if test="tradeMony != null "> and trade_mony = #{tradeMony}</if> <if test="tradeMony != null "> and trade_mony = #{tradeMony}</if>
<if test="tradeType != null and tradeType != ''"> and trade_type = #{tradeType}</if>
<if test="type != null and type != ''"> and type = #{type}</if> <if test="type != null and type != ''"> and type = #{type}</if>
<if test="monthOf != null and monthOf != ''"> and month_of = #{monthOf}</if> <if test="monthOf != null and monthOf != ''"> and month_of = #{monthOf}</if>
</where> </where>
@ -56,14 +54,12 @@
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="tradeCount != null">trade_count,</if> <if test="tradeCount != null">trade_count,</if>
<if test="tradeMony != null">trade_mony,</if> <if test="tradeMony != null">trade_mony,</if>
<if test="tradeType != null">trade_type,</if>
<if test="type != null">type,</if> <if test="type != null">type,</if>
<if test="monthOf != null">month_of,</if> <if test="monthOf != null">month_of,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="tradeCount != null">#{tradeCount},</if> <if test="tradeCount != null">#{tradeCount},</if>
<if test="tradeMony != null">#{tradeMony},</if> <if test="tradeMony != null">#{tradeMony},</if>
<if test="tradeType != null">#{tradeType},</if>
<if test="type != null">#{type},</if> <if test="type != null">#{type},</if>
<if test="monthOf != null">#{monthOf},</if> <if test="monthOf != null">#{monthOf},</if>
</trim> </trim>
@ -74,7 +70,6 @@
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="tradeCount != null">trade_count = #{tradeCount},</if> <if test="tradeCount != null">trade_count = #{tradeCount},</if>
<if test="tradeMony != null">trade_mony = #{tradeMony},</if> <if test="tradeMony != null">trade_mony = #{tradeMony},</if>
<if test="tradeType != null">trade_type = #{tradeType},</if>
<if test="type != null">type = #{type},</if> <if test="type != null">type = #{type},</if>
<if test="monthOf != null">month_of = #{monthOf},</if> <if test="monthOf != null">month_of = #{monthOf},</if>
</trim> </trim>