Skip to content

L
lwby_copyright_book_data
Commit ecf15df3 authored by maliang's avatar maliang
Browse files
Options

上传bug修复

parent bac467f0
Hide whitespace changes
Inline Side-by-side
Showing with 163 additions and 101 deletions
src/main/java/com/boot/security/server/service/impl/CopyrightBookServiceImpl.java
View file @ ecf15df3
...@@ -19,8 +19,11 @@ public class CopyrightBookServiceImpl implements CopyrightBookService { ...@@ -19,8 +19,11 @@ public class CopyrightBookServiceImpl implements CopyrightBookService {
@Autowired @Autowired
CopyrightDao copyrightDao; CopyrightDao copyrightDao;
static Double schema=0.0;
@Override @Override
public String selectSettlement(Integer copyrightId,Integer page,Integer limit) { public String selectSettlement(Integer copyrightId,Integer page,Integer limit) {
schema=0.0;
Integer roleId = copyrightDao.selectRoleId(UserUtil.getLoginUser().getId()); Integer roleId = copyrightDao.selectRoleId(UserUtil.getLoginUser().getId());
Integer status=null; Integer status=null;
List<BaseSettlement> baseSettlementList =new ArrayList<>(); List<BaseSettlement> baseSettlementList =new ArrayList<>();
...@@ -124,6 +127,7 @@ public class CopyrightBookServiceImpl implements CopyrightBookService { ...@@ -124,6 +127,7 @@ public class CopyrightBookServiceImpl implements CopyrightBookService {
baseSettlement.setSettlementAdAmount(Double.valueOf(df.format(count*0.5))); baseSettlement.setSettlementAdAmount(Double.valueOf(df.format(count*0.5)));
} }
baseSettlement.setCountSettlement(Double.valueOf(df.format(baseSettlement.getSettlementAmount()+baseSettlement.getSettlementAdAmount()))); baseSettlement.setCountSettlement(Double.valueOf(df.format(baseSettlement.getSettlementAmount()+baseSettlement.getSettlementAdAmount())));
schema=Double.valueOf(df.format(baseSettlement.getSettlementAmount()+baseSettlement.getSettlementAdAmount()))+schema;
} }
Integer count = copyrightDao.selectTableListMonthCount(baseSettlementList,status); Integer count = copyrightDao.selectTableListMonthCount(baseSettlementList,status);
return PageTableHandler.getJSONObject(baseSettlements,count); return PageTableHandler.getJSONObject(baseSettlements,count);
...@@ -270,8 +274,10 @@ public class CopyrightBookServiceImpl implements CopyrightBookService { ...@@ -270,8 +274,10 @@ public class CopyrightBookServiceImpl implements CopyrightBookService {
@Override @Override
public String getAllCopyright() { public String getAllCopyright() {
List<BaseSettlement> baseSettlements = copyrightDao.selectCopyrightById(UserUtil.getLoginUser().getId()); List<BaseSettlement> baseSettlements = copyrightDao.selectCopyrightById(UserUtil.getLoginUser().getId());
Integer roleId = copyrightDao.selectRoleId(UserUtil.getLoginUser().getId());
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("data",baseSettlements); jsonObject.put("data",baseSettlements);
jsonObject.put("roleId",roleId);
return jsonObject.toJSONString(); return jsonObject.toJSONString();
} }
......
src/main/resources/static/pages/copyrightBookData/copyrightMonthSettlement.html
View file @ ecf15df3
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</select> </select>
</div> </div>
<div class="layui-col-md4"> <div class="layui-col-md4">
<span style="float: right;color: #ed1c24;">未结算金额:</span> <span style="float: right;color: #ed1c24;" id="schema">未结算金额:</span>
</div> </div>
</div> </div>
<div class="layui-row"> <div class="layui-row">
...@@ -53,89 +53,151 @@ ...@@ -53,89 +53,151 @@
var form; var form;
var copyrights; var copyrights;
var tableIns; var tableIns;
var schema=$("#schema");
layui.use('table', function() { function table2() {
var table = layui.table; layui.use('table', function() {
tableIns=table.render({ var table = layui.table;
elem: '#copyrightMonth_table' tableIns = table.render({
,id:'idTest' elem: '#copyrightMonth_table'
,method:'post' , id: 'idTest'
,contentType:'application/json' , method: 'post'
,url: '/copyrightBookController/settlementMonth' , contentType: 'application/json'
,page: true , url: '/copyrightBookController/settlementMonth'
,toolbar:'true' , page: true
,defaultToolbar: ['exports'] , toolbar: 'true'
,cols: [[ , defaultToolbar: ['exports']
{field: 'reportDate', title: '日期', sort: true,fixed:'left'} , cols: [[
,{field: 'copyrightId', title: '版权费id', hide: true} {field: 'reportDate', title: '日期', sort: true, fixed: 'left'}
,{field: 'copyrightName', title: '版权方名称'} , {field: 'totalAmount', title: '销售金额'}
,{field: 'totalAmount', title: '销售金额'} , {field: 'settlementAmount', title: '销售结算'}
,{field: 'settlementAmount', title: '销售结算'} , {field: 'totalAdvertAmount', title: '广告金额'}
,{field: 'totalAdvertAmount', title: '广告金额'} , {field: 'settlementAdAmount', title: '广告结算'}
,{field: 'settlementAdAmount', title: '广告结算'} , {field: 'countSettlement', title: '总结算'}
,{field: 'countSettlement', title: '总结算'} , {field: 'statusName', title: '结算状态'}
,{field: 'statusName', title: '结算状态'} ]] //设置表头
,{title: '操作', toolbar: '#operation'} });
,{field: 'releaseStatusName', title: '发布状态'}
,{field: 'releaseStatus', title: '状态值', hide: true}
,{title:'发布操作',toolbar: '#release'}
]] //设置表头
}); });
}
function table1(){
layui.use('table', function() {
var table = layui.table;
tableIns=table.render({
elem: '#copyrightMonth_table'
,id:'idTest'
,method:'post'
,contentType:'application/json'
,url: '/copyrightBookController/settlementMonth'
,page: true
,toolbar:'true'
,defaultToolbar: ['exports']
,cols: [[
{field: 'reportDate', title: '日期', sort: true,fixed:'left'}
,{field: 'copyrightId', title: '版权费id', hide: true}
,{field: 'copyrightName', title: '版权方名称'}
,{field: 'totalAmount', title: '销售金额'}
,{field: 'settlementAmount', title: '销售结算'}
,{field: 'totalAdvertAmount', title: '广告金额'}
,{field: 'settlementAdAmount', title: '广告结算'}
,{field: 'countSettlement', title: '总结算'}
,{field: 'statusName', title: '结算状态'}
,{title: '操作', toolbar: '#operation'}
,{field: 'releaseStatusName', title: '发布状态'}
,{field: 'releaseStatus', title: '状态值', hide: true}
,{title:'发布操作',toolbar: '#release'}
]] //设置表头
});
/*table.on('checkbox(test)', function(obj){
console.log(obj.checked); //当前是否选中状态
console.log(obj.data); //选中行的相关数据
console.log(obj.type); //如果触发的是全选，则为：all，如果触发的是单选，则为：one
});*/
/*table.on('checkbox(test)', function(obj){
console.log(obj.checked); //当前是否选中状态
console.log(obj.data); //选中行的相关数据
console.log(obj.type); //如果触发的是全选，则为：all，如果触发的是单选，则为：one
});*/
table.on('tool(test)', function(obj){
var data = obj.data; //获得当前行数据 table.on('tool(test)', function(obj){
var layEvent=obj.event; var data = obj.data; //获得当前行数据
if(layEvent === 'release'){ var layEvent=obj.event;
var releaseStatus=data.releaseStatus; if(layEvent === 'release'){
if(releaseStatus==0){ var releaseStatus=data.releaseStatus;
layer.open({ if(releaseStatus==0){
content:'你确定要发布吗？' layer.open({
,yes: function(index, layero){ content:'你确定要发布吗？'
var list={baseSettlement:{releaseStatus:1,reportDate:data.reportDate,copyrightId:data.copyrightId,releaseStatusName:'已发布'}}; ,yes: function(index, layero){
$.ajax({ var list={baseSettlement:{releaseStatus:1,reportDate:data.reportDate,copyrightId:data.copyrightId,releaseStatusName:'已发布'}};
//请求方式 $.ajax({
type : "post", //请求方式
//请求的媒体类型 type : "post",
contentType: "application/json;charset=UTF-8", //请求的媒体类型
//请求地址 contentType: "application/json;charset=UTF-8",
url : "/copyrightBookController/updateReleaseStatus", //请求地址
async:false, url : "/copyrightBookController/updateReleaseStatus",
//数据，json字符串 async:false,
data : JSON.stringify(list),//ajax controller有请求参数必须传参写data //数据，json字符串
//请求成功 data : JSON.stringify(list),//ajax controller有请求参数必须传参写data
success : function(result) { //请求成功
tableIns.reload(); success : function(result) {
} tableIns.reload();
}); }
layer.close(index); //如果设定了yes回调，需进行手工关闭 });
} layer.close(index); //如果设定了yes回调，需进行手工关闭
}); }
}else { });
}else {
layer.open({
content:'你确定取消发布吗？'
,yes: function(index, layero){
var list={baseSettlement:{releaseStatus:0,reportDate:data.reportDate,copyrightId:data.copyrightId,releaseStatusName:'未发布'}};
$.ajax({
//请求方式
type : "post",
//请求的媒体类型
contentType: "application/json;charset=UTF-8",
//请求地址
url : "/copyrightBookController/updateReleaseStatus",
async:false,
//数据，json字符串
data : JSON.stringify(list),//ajax controller有请求参数必须传参写data
//请求成功
success : function(result) {
tableIns.reload();
}
});
layer.close(index); //如果设定了yes回调，需进行手工关闭
}
});
}
}
if(layEvent === 'edit'){
layer.open({ layer.open({
content:'你确定取消发布吗？' title: '操作'
,content: '合作方:'+data.copyrightName+"<br>"+'日期:'+data.reportDate+'<br>结算金额:'+data.countSettlement+'<br>'+'<select id="statusId"><option value="0">未结算</option><option value="1">已结算</option></select>'
,yes: function(index, layero){ ,yes: function(index, layero){
var list={baseSettlement:{releaseStatus:0,reportDate:data.reportDate,copyrightId:data.copyrightId,releaseStatusName:'未发布'}}; var status=$("#statusId").val();
var statusName;
if(status==0){
statusName='未结算';
}else {
statusName='已结算';
}
var list={baseSettlement:{status:status,reportDate:data.reportDate,copyrightId:data.copyrightId,statusName:statusName}};
$.ajax({ $.ajax({
//请求方式 //请求方式
type : "post", type : "post",
//请求的媒体类型 //请求的媒体类型
contentType: "application/json;charset=UTF-8", contentType: "application/json;charset=UTF-8",
//请求地址 //请求地址
url : "/copyrightBookController/updateReleaseStatus", url : "/copyrightBookController/updateSettlementStatus",
async:false, async:false,
//数据，json字符串 //数据，json字符串
data : JSON.stringify(list),//ajax controller有请求参数必须传参写data data : JSON.stringify(list),//ajax controller有请求参数必须传参写data
//请求成功 //请求成功
success : function(result) { success : function(result) {
tableIns.reload(); tableIns.reload();
//var jsonObj = JSON.parse(result);
} }
}); });
layer.close(index); //如果设定了yes回调，需进行手工关闭 layer.close(index); //如果设定了yes回调，需进行手工关闭
...@@ -143,43 +205,11 @@ ...@@ -143,43 +205,11 @@
}); });
} }
} });
if(layEvent === 'edit'){
layer.open({
title: '操作'
,content: '合作方:'+data.copyrightName+"<br>"+'日期:'+data.reportDate+'<br>结算金额:'+data.countSettlement+'<br>'+'<select id="statusId"><option value="0">未结算</option><option value="1">已结算</option></select>'
,yes: function(index, layero){
var status=$("#statusId").val();
var statusName;
if(status==0){
statusName='未结算';
}else {
statusName='已结算';
}
var list={baseSettlement:{status:status,reportDate:data.reportDate,copyrightId:data.copyrightId,statusName:statusName}};
$.ajax({
//请求方式
type : "post",
//请求的媒体类型
contentType: "application/json;charset=UTF-8",
//请求地址
url : "/copyrightBookController/updateSettlementStatus",
async:false,
//数据，json字符串
data : JSON.stringify(list),//ajax controller有请求参数必须传参写data
//请求成功
success : function(result) {
tableIns.reload();
//var jsonObj = JSON.parse(result);
}
});
layer.close(index); //如果设定了yes回调，需进行手工关闭
}
});
}
}); });
}); }
layui.use('form', function() { layui.use('form', function() {
...@@ -208,6 +238,7 @@ ...@@ -208,6 +238,7 @@
}); });
} }
var roleId;
function init(){ function init(){
//var list={copyrightId:copyrightId}; //var list={copyrightId:copyrightId};
...@@ -224,6 +255,7 @@ ...@@ -224,6 +255,7 @@
//请求成功 //请求成功
success : function(result) { success : function(result) {
var jsonObj = JSON.parse(result); var jsonObj = JSON.parse(result);
roleId=jsonObj.roleId;
setOption(jsonObj.data); setOption(jsonObj.data);
} }
}); });
...@@ -236,8 +268,32 @@ ...@@ -236,8 +268,32 @@
} }
} }
function setSchema(){
$.ajax({
//请求方式
type : "post",
//请求的媒体类型
contentType: "application/json;charset=UTF-8",
//请求地址
url : "/copyrightBookController/getAllCopyright",
async:false,
//数据，json字符串
//data : JSON.stringify(list),ajax controller有请求参数必须传参写data
//请求成功
success : function(result) {
var jsonObj = JSON.parse(result);
roleId=jsonObj.roleId;
setOption(jsonObj.data);
}
});
}
init(); init();
if(roleId==3){
table1();
}else {
table2();
}
</script> </script>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment