Skip to content

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

上传bug修复

parent cc0e0fd5
Hide whitespace changes
Inline Side-by-side
Showing with 191 additions and 0 deletions
src/main/java/com/boot/security/server/dao/CopyrightDao.java
View file @ 6cba9d86
......@@ -9,6 +9,8 @@ import java.util.List;
@Mapper
public interface CopyrightDao {
List<Integer> selectUserAll();
List<BaseSettlement> selectTableListMonth(@Param("copyrightId") Integer copyrightId,@Param("page") Integer page,@Param("limit")Integer limit);
Integer selectTableListMonthCount(@Param("copyrightId") Integer copyrightId);
......@@ -23,4 +25,6 @@ public interface CopyrightDao {
@Update("update bi_report.report_book_settlement_month set jiesuan_status=#{status},jiesuan_status_name=#{statusName} where report_date=#{reportDate} and copyright_id=#{copyrightId}")
int updateSettlementStatus(@Param("copyrightId") Integer copyrightId,@Param("reportDate") String reportDate,@Param("status") Integer status,@Param("statusName") String statusName);
int updateUserCopyrightMap(List<BaseSettlement> baseSettlements);
}
src/main/java/com/boot/security/server/model/BaseSettlement.java
View file @ 6cba9d86
......@@ -4,6 +4,7 @@ package com.boot.security.server.model;
public class BaseSettlement extends BaseEntity<Long>{
public Integer userId;
public String reportDate;
public Integer copyrightId;
public String copyrightName;
......@@ -28,6 +29,14 @@ public class BaseSettlement extends BaseEntity<Long>{
public Integer status;
public String statusName;
public Integer getUserId() {
return userId;
}
public void setUserId(Integer userId) {
this.userId = userId;
}
public Integer getCpId() {
return cpId;
}
......
src/main/java/com/boot/security/server/service/impl/CopyrightBookServiceImpl.java
View file @ 6cba9d86
......@@ -122,4 +122,15 @@ public class CopyrightBookServiceImpl implements CopyrightBookService {
Integer count = copyrightDao.selectBookInfoCount(copyrightId);
return PageTableHandler.getJSONObject(baseSettlements,count);
}
public void updateUserCopyrightMap(){
List<BaseSettlement> baseSettlements = copyrightDao.selectCopyrightAll();
List<Integer> users = copyrightDao.selectUserAll();
for (Integer user : users) {
for (BaseSettlement baseSettlement : baseSettlements) {
baseSettlement.setUserId(user);
}
}
copyrightDao.updateUserCopyrightMap(baseSettlements);
}
}
src/main/resources/mybatis-mappers/CopyrightMapper.xml
View file @ 6cba9d86
......@@ -37,6 +37,11 @@
FROM bi_report.book_banquanweihu a group by a.copyright_id,a.copyright_name;
</select>
<select id="selectUserAll" resultType="java.util.List" >
SELECT id
FROM sys_user;
</select>
<select id="selectBookInfo" resultType="com.boot.security.server.model.BaseSettlement" >
SELECT book_id bookId,cp_id cpId,book_name bookName,authors
FROM bi_report.books_api
......@@ -56,6 +61,19 @@
</if>
</select>
<insert id="updateUserCopyrightMap" parameterType="java.util.List">
INSERT INTO user_copyright_map(user_id, copyright_id,copyright_name)
VALUES
<foreach collection="list" item="item" index="index" separator=",">
(#{item.userId},#{item.copyrightId},
#{item.copyrightName})
</foreach>
ON DUPLICATE KEY UPDATE
user_id = VALUES(user_id),
copyright_id = VALUES(copyright_id),
copyright_name = VALUES(copyright_name)
</insert>
<select id="selectBookDetail" resultType="com.boot.security.server.model.BaseSettlement" parameterType="java.util.List">
select reportDate,copyright_id copyrightId,copyright_name copyrightName,book_id bookId,book_name bookName,authors,sum(total_amount) totalAmount,sum(total_ad_amount) totalAdvertAmount
from
......
src/main/resources/static/pages/user/UserCopyrightMap.html 0 → 100644
View file @ 6cba9d86
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>广告商负责人设置</title>
<link rel="stylesheet" type="text/css" media="screen" href="../../css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" media="screen" href="../../css/dataTables.bootstrap.min.css">
<link rel="stylesheet" type="text/css" media="screen" href="../../layui/css/layui.css">
</head>
<body>
<div class="layui-form" lay-filter="formTest">
<table class="layui-table">
<thead>
<tr>
<th>用户昵称</th>
<th>版权方</th>
</tr>
</thead>
<tbody id="advertiserTable">
</tbody>
</table>
</div>
</body>
</html>
<script type="text/javascript" src="../../js/libs/jquery-2.1.1.min.js"></script>
<script type="text/javascript" src="../../js/jq.js"></script>
<script type="text/javascript" src="../../js/plugin/datatables/jquery.dataTables.min.js"></script>
<script type="text/javascript" src="../../js/plugin/datatables/dataTables.bootstrap.min.js"></script>
<script type="text/javascript" src="../../js/my/permission.js"></script>
<script type="text/javascript" src="../../layui/layui.js"></script>
<script type="text/javascript" src="../../js/dict.js"></script>
<script type="text/javascript">
var form;
layui.use('form', function() {
form = layui.form;
form.render();
form.on('checkbox(formCheckbox)', function(data){
var elem=data.elem;
if(elem.checked){
changeAdvertiserUserMap(elem.getAttribute("userId"),elem.getAttribute("advertiserId"),elem.getAttribute("title"),1)
}else {
changeAdvertiserUserMap(elem.getAttribute("userId"),elem.getAttribute("advertiserId"),elem.getAttribute("title"),0)
}
});
});
var pers = checkPermission();
var table=$("#advertiserTable");
function setTable(data) {
var str="";
if(data[0].status===0){
str="<tr><td>"+data[0].nickname+"</td><td><input lay-filter='formCheckbox' type=\"checkbox\" advertiserId=\""+data[0].advertiserId+"\" title=\""+data[0].advertiserName+"\" userId=\""+data[0].userId+"\">";
//table.append("<tr><td>"+data[0].nickname+"</td><td><input lay-filter='formCheckbox' type=\"checkbox\" advertiserId=\""+data[0].advertiserId+"\" title=\""+data[0].advertiserName+"\" userId=\""+data[0].userId+"\">");
}else if(data[0].status==1){
str="<tr><td>"+data[0].nickname+"</td><td><input lay-filter='formCheckbox' type=\"checkbox\" advertiserId=\""+data[0].advertiserId+"\" title=\""+data[0].advertiserName+"\" userId=\""+data[0].userId+"\"checked>";
//table.append("<tr><td>"+data[0].nickname+"</td><td><input lay-filter='formCheckbox' type=\"checkbox\" advertiserId=\""+data[0].advertiserId+"\" title=\""+data[0].advertiserName+"\" userId=\""+data[0].userId+"\"checked>");
}
var id=data[0].userId;
for(var i=1;i<data.length;i++){
if(id==data[i].userId){
if(data[i].status===0){
str+="<input lay-filter='formCheckbox' type=\"checkbox\" advertiserId=\""+data[i].advertiserId+"\" title=\""+data[i].advertiserName+"\" userId=\""+data[i].userId+"\">";
//table.append("<input lay-filter='formCheckbox' type=\"checkbox\" advertiserId=\""+data[i].advertiserId+"\" title=\""+data[i].advertiserName+"\" userId=\""+data[i].userId+"\">");
}else if(data[i].status==1){
str+="<input lay-filter='formCheckbox' type=\"checkbox\" advertiserId=\""+data[i].advertiserId+"\" title=\""+data[i].advertiserName+"\" userId=\""+data[i].userId+"\"checked>";
//table.append("<input lay-filter='formCheckbox' type=\"checkbox\" advertiserId=\""+data[i].advertiserId+"\" title=\""+data[i].advertiserName+"\" userId=\""+data[i].userId+"\"checked>");
}
}else{
id=data[i].userId;
//table.append("</td></tr>");
if(data[i].status===0){
str+="</td></tr>";
table.append(str);
str="<tr><td>"+data[i].nickname+"</td><td><input lay-filter='formCheckbox' type=\"checkbox\" advertiserId=\""+data[i].advertiserId+"\" title=\""+data[i].advertiserName+"\" userId=\""+data[i].userId+"\">";
//table.append("<tr><td>"+data[i].nickname+"</td><td><input lay-filter='formCheckbox' type=\"checkbox\" advertiserId=\""+data[i].advertiserId+"\" title=\""+data[i].advertiserName+"\" userId=\""+data[i].userId+"\">");
}else if(data[i].status==1){
str+="</td></tr>";
table.append(str);
str="<tr><td>"+data[i].nickname+"</td><td><input lay-filter='formCheckbox' type=\"checkbox\" advertiserId=\""+data[i].advertiserId+"\" title=\""+data[i].advertiserName+"\" userId=\""+data[i].userId+"\"checked>";
//table.append("<tr><td>"+data[i].nickname+"</td><td><input lay-filter='formCheckbox' type=\"checkbox\" advertiserId=\""+data[i].advertiserId+"\" title=\""+data[i].advertiserName+"\" userId=\""+data[i].userId+"\"checked>");
}
}
}
str+="</td></tr>";
table.append(str);
//table.append("</td></tr>")
}
function init(){
$.ajax({
//请求方式
type : "get",
//请求的媒体类型
contentType: "application/json;charset=UTF-8",
//请求地址
url : "/users/advertiserUserList",
async:false,
//数据，json字符串
//data : JSON.stringify(list),
//请求成功
success : function(result) {
setTable(result.data);
},
//请求失败，包含具体的错误信息
error : function(e){
console.log(e.status);
console.log(e.responseText);
}
});
}
function changeAdvertiserUserMap(userId,advertiserId,advertiserName,status){
var str={userId:userId,advertiserId:advertiserId,advertiserName:advertiserName,status:status};
$.ajax({
//请求方式
type : "post",
//请求的媒体类型
contentType: "application/json;charset=UTF-8",
//请求地址
url : "/users/updateAdvertiserUserMap",
async:true,
//数据，json字符串
data : JSON.stringify(str),
//请求成功
success : function(result) {
console.log("修改所属广告商成功");
},
//请求失败，包含具体的错误信息
error : function(e){
console.log(e.status);
console.log(e.responseText);
}
});
}
init();
</script>
\ No newline at end of file
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