Skip to content

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

上传bug修复

parent ecf15df3
Hide whitespace changes
Inline Side-by-side
Showing with 161 additions and 9 deletions
src/main/java/com/boot/security/server/controller/CopyrightBookController.java
View file @ 78cb92fa
......@@ -37,6 +37,13 @@ public class CopyrightBookController {
return copyrightBookService.getAllCopyright();
}
@PostMapping("/getSchema")
@ApiOperation(value = "获取总的未结算数据")
@ResponseBody
public String getSchema(@RequestBody PageTableRequest request){
return copyrightBookService.getSchema(request.getCopyrightIds());
}
@PostMapping("/updateSettlementStatus")
@ApiOperation(value = "更新结算状态")
public void updateSettlementStatus(@RequestBody PageTableRequest request){
......
src/main/java/com/boot/security/server/dao/CopyrightDao.java
View file @ 78cb92fa
......@@ -20,6 +20,8 @@ public interface CopyrightDao {
List<BaseSettlement> selectTableListMonth(@Param("copyrightId") List<BaseSettlement> copyrightId,@Param("page") Integer page,@Param("limit")Integer limit,@Param("status") Integer status);
List<BaseSettlement> selectTableListMonthSchema(@Param("copyrightId") List<BaseSettlement> copyrightId,@Param("status") Integer status);
Integer selectTableListMonthCount(@Param("copyrightId") List<BaseSettlement> copyrightId,@Param("status") Integer status);
List<BaseSettlement> selectBookInfo(@Param("copyrightId") List<BaseSettlement> copyrightId,@Param("page") Integer page,@Param("limit")Integer limit);
......
src/main/java/com/boot/security/server/service/CopyrightBookService.java
View file @ 78cb92fa
......@@ -5,5 +5,6 @@ public interface CopyrightBookService {
String selectSettlement(Integer copyrightId,Integer page,Integer limit);
String selectBookSettlement(Integer copyrightId,String startTime,String endTime,Long bookId,String bookName,Integer page,Integer limit);
String getAllCopyright();
String getSchema(Integer copyrightId);
String selectBookInfo(Integer copyrightId,Integer page,Integer limit);
}
src/main/java/com/boot/security/server/service/impl/CopyrightBookServiceImpl.java
View file @ 78cb92fa
......@@ -19,11 +19,9 @@ public class CopyrightBookServiceImpl implements CopyrightBookService {
@Autowired
CopyrightDao copyrightDao;
static Double schema=0.0;
@Override
public String selectSettlement(Integer copyrightId,Integer page,Integer limit) {
schema=0.0;
Integer roleId = copyrightDao.selectRoleId(UserUtil.getLoginUser().getId());
Integer status=null;
List<BaseSettlement> baseSettlementList =new ArrayList<>();
......@@ -127,7 +125,6 @@ public class CopyrightBookServiceImpl implements CopyrightBookService {
baseSettlement.setSettlementAdAmount(Double.valueOf(df.format(count*0.5)));
}
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);
return PageTableHandler.getJSONObject(baseSettlements,count);
......@@ -281,6 +278,122 @@ public class CopyrightBookServiceImpl implements CopyrightBookService {
return jsonObject.toJSONString();
}
@Override
public String getSchema(Integer copyrightId) {
Double schema=0.0;
Integer roleId = copyrightDao.selectRoleId(UserUtil.getLoginUser().getId());
Integer status=null;
List<BaseSettlement> baseSettlementList =new ArrayList<>();
if(copyrightId==null||copyrightId==0){
baseSettlementList = copyrightDao.selectCopyrightById(UserUtil.getLoginUser().getId());
}else {
BaseSettlement baseSettlement = new BaseSettlement();
baseSettlement.setCopyrightId(copyrightId);
baseSettlementList.add(baseSettlement);
}
if(roleId!=3){
status=1;
}
List<BaseSettlement> baseSettlements = copyrightDao.selectTableListMonthSchema(baseSettlementList,status);
DecimalFormat df = new DecimalFormat("#.00");
for (BaseSettlement baseSettlement : baseSettlements) {
Double totalAmount = baseSettlement.getTotalAmount();
Double count=0.0;
if(totalAmount<=2000.0){
count=totalAmount;
}else if(totalAmount>=2001.0&&totalAmount<=5000.0){
Double a1=totalAmount-2000.0;
count=2000.0+a1*0.5;
}else if(totalAmount>=5001.0&&totalAmount<=10000.0){
Double a1=totalAmount-5000.0;
count=2000.0+3000*0.5+a1*0.2;
}else if(totalAmount>=10001.0&&totalAmount<=30000.0){
Double a1=totalAmount-10000.0;
count=2000.0+3000*0.5+5000*0.2+a1*0.2;
}else if(totalAmount>=30001.0&&totalAmount<=50000.0){
Double a1=totalAmount-30000.0;
count=2000.0+3000*0.5+5000*0.2+20000*0.2+a1*0.15;
}else if(totalAmount>=50001.0&&totalAmount<=100000.0){
Double a1=totalAmount-50000.0;
count=2000.0+3000*0.5+5000*0.2+20000*0.2*2+a1*0.15;
}else if(totalAmount>=100001.0&&totalAmount<=300000.0){
Double a1=totalAmount-100000.0;
count=2000.0+3000*0.5+5000*0.2+20000*0.2*2+50000*0.15+a1*0.1;
}else if(totalAmount>=300001.0&&totalAmount<=500000.0){
Double a1=totalAmount-300000.0;
count=2000.0+3000*0.5+5000*0.2+20000*0.2*2+50000*0.15+200000*0.1+a1*0.05;
}else if(totalAmount>=500001.0&&totalAmount<=1000000.0){
Double a1=totalAmount-500000.0;
count=2000.0+3000*0.5+5000*0.2+20000*0.2*2+50000*0.15+200000*0.1*2+a1*0.02;
}else if(totalAmount>=1000001.0&&totalAmount<=3000000.0){
Double a1=totalAmount-1000000.0;
count=2000.0+3000*0.5+5000*0.2+20000*0.2*2+50000*0.15+200000*0.1*2+500000*0.02+a1*0.02;
}else if(totalAmount>=3000001.0&&totalAmount<=5000000.0){
Double a1=totalAmount-3000000.0;
count=2000.0+3000*0.5+5000*0.2+20000*0.2*2+50000*0.15+200000*0.1*2+500000*0.02+2000000*0.02+a1*0.02;
}
count=Double.valueOf(df.format(count));
baseSettlement.setTotalAmount(count);
baseSettlement.setSettlementAmount(Double.valueOf(df.format(count*0.5)));
count=0.0;
Double totalAdvertAmount = baseSettlement.getTotalAdvertAmount();
if(totalAdvertAmount<=2000.0){
count=totalAdvertAmount;
}else if(totalAdvertAmount>=2001.0&&totalAdvertAmount<=5000.0){
Double a1=totalAdvertAmount-2000.0;
count=2000.0+a1*0.5;
}else if(totalAdvertAmount>=5001.0&&totalAdvertAmount<=10000.0){
Double a1=totalAdvertAmount-5000.0;
count=2000.0+3000*0.5+a1*0.2;
}else if(totalAdvertAmount>=10001.0&&totalAdvertAmount<=30000.0){
Double a1=totalAdvertAmount-10000.0;
count=2000.0+3000*0.5+5000*0.2+a1*0.2;
}else if(totalAdvertAmount>=30001.0&&totalAdvertAmount<=50000.0){
Double a1=totalAdvertAmount-30000.0;
count=2000.0+3000*0.5+5000*0.2+20000*0.2+a1*0.15;
}else if(totalAdvertAmount>=50001.0&&totalAdvertAmount<=100000.0){
Double a1=totalAdvertAmount-50000.0;
count=2000.0+3000*0.5+5000*0.2+20000*0.2*2+a1*0.15;
}else if(totalAdvertAmount>=100001.0&&totalAdvertAmount<=300000.0){
Double a1=totalAdvertAmount-100000.0;
count=2000.0+3000*0.5+5000*0.2+20000*0.2*2+50000*0.15+a1*0.1;
}else if(totalAdvertAmount>=300001.0&&totalAdvertAmount<=500000.0){
Double a1=totalAdvertAmount-300000.0;
count=2000.0+3000*0.5+5000*0.2+20000*0.2*2+50000*0.15+200000*0.1+a1*0.05;
}else if(totalAdvertAmount>=500001.0&&totalAdvertAmount<=1000000.0){
Double a1=totalAdvertAmount-500000.0;
count=2000.0+3000*0.5+5000*0.2+20000*0.2*2+50000*0.15+200000*0.1*2+a1*0.02;
}else if(totalAdvertAmount>=1000001.0&&totalAdvertAmount<=3000000.0){
Double a1=totalAdvertAmount-1000000.0;
count=2000.0+3000*0.5+5000*0.2+20000*0.2*2+50000*0.15+200000*0.1*2+500000*0.02+a1*0.02;
}else if(totalAdvertAmount>=3000001.0&&totalAdvertAmount<=5000000.0){
Double a1=totalAdvertAmount-3000000.0;
count=2000.0+3000*0.5+5000*0.2+20000*0.2*2+50000*0.15+200000*0.1*2+500000*0.02+2000000*0.02+a1*0.02;
}
count=Double.valueOf(df.format(count));
Integer id = baseSettlement.getCopyrightId();
if(id==3219||id==3230||id==3254||id==3253){
count=Double.valueOf(df.format(baseSettlement.getTotalAmount()+count));
baseSettlement.setTotalAmount(count);
baseSettlement.setSettlementAmount(Double.valueOf(df.format(count*0.5)));
baseSettlement.setTotalAdvertAmount(0d);
baseSettlement.setSettlementAdAmount(0d);
}else {
baseSettlement.setTotalAdvertAmount(count);
baseSettlement.setSettlementAdAmount(Double.valueOf(df.format(count*0.5)));
}
baseSettlement.setCountSettlement(Double.valueOf(df.format(baseSettlement.getSettlementAmount()+baseSettlement.getSettlementAdAmount())));
if(baseSettlement.getStatus().equals(0)){
schema+=Double.valueOf(df.format(baseSettlement.getSettlementAmount()+baseSettlement.getSettlementAdAmount()));
}
}
Integer count = copyrightDao.selectTableListMonthCount(baseSettlementList,status);
JSONObject jsonObject = new JSONObject();
jsonObject.put("schema",schema);
return jsonObject.toJSONString();
}
@Override
public String selectBookInfo(Integer copyrightId,Integer page,Integer limit) {
List<BaseSettlement> baseSettlementList =new ArrayList<>();
......
src/main/resources/mybatis-mappers/CopyrightMapper.xml
View file @ 78cb92fa
......@@ -44,6 +44,26 @@
ORDER BY a.total_amount DESC ;
</select>
<select id="selectTableListMonthSchema" resultType="com.boot.security.server.model.BaseSettlement" parameterType="com.boot.security.server.model.BaseSettlement">
SELECT
a.report_date AS reportDate,a.copyright_id as copyrightId,a.copyright_name as copyrightName,
a.total_amount as totalAmount,IFNULL(b.total_ad_amount,0) totalAdvertAmount,jiesuan_status_name statusName,jiesuan_status status,release_status_name releaseStatusName,release_status releaseStatus
FROM bi_report.report_book_settlement_month a
LEFT JOIN bi_report.report_book_advert_month b
ON a.report_date=b.report_date AND a.batch_id=b.batch_id AND a.batch_name=b.batch_name
WHERE a.report_date>='2020-04'
<if test="copyrightId != null">
and a.copyright_id in
<foreach collection="copyrightId" item="item" index="index" separator="," open="(" close=")">
#{item.copyrightId}
</foreach>
</if>
<if test="status != null and status!='' ">
and a.release_status = #{status}
</if>
ORDER BY a.total_amount DESC
</select>
<select id="selectCopyrightById" resultType="com.boot.security.server.model.BaseSettlement" >
SELECT a.copyright_id as copyrightId,a.copyright_name as copyrightName
FROM bi_report.book_banquanweihu a inner join (select copyright_id from user_copyright_map where user_id=#{userId} and status=1) b on a.copyright_id=b.copyright_id group by a.copyright_id,a.copyright_name;
......
src/main/resources/static/pages/copyrightBookData/copyrightMonthSettlement.html
View file @ 78cb92fa
......@@ -18,7 +18,7 @@
</select>
</div>
<div class="layui-col-md4">
<span style="float: right;color: #ed1c24;" id="schema">未结算金额:</span>
<span style="float: right;color: #ed1c24;" id="schema"></span>
</div>
</div>
<div class="layui-row">
......@@ -140,6 +140,7 @@
//请求成功
success : function(result) {
tableIns.reload();
setSchema();
}
});
layer.close(index); //如果设定了yes回调，需进行手工关闭
......@@ -163,6 +164,7 @@
//请求成功
success : function(result) {
tableIns.reload();
setSchema();
}
});
layer.close(index); //如果设定了yes回调，需进行手工关闭
......@@ -197,6 +199,7 @@
//请求成功
success : function(result) {
tableIns.reload();
setSchema();
//var jsonObj = JSON.parse(result);
}
});
......@@ -216,7 +219,7 @@
form = layui.form;
form.on('select(copyright)', function(data){
copyrights=data.value;
reload(copyrights)
reload(copyrights);
});
form.on('checkbox(test1)', function(data){
console.log(data);
......@@ -236,6 +239,8 @@
copyrightIds: data
}
});
setSchema();
}
var roleId;
......@@ -269,30 +274,34 @@
}
function setSchema(){
var list={copyrightIds:copyrights};
$.ajax({
//请求方式
type : "post",
//请求的媒体类型
contentType: "application/json;charset=UTF-8",
//请求地址
url : "/copyrightBookController/getAllCopyright",
url : "/copyrightBookController/getSchema",
async:false,
//数据，json字符串
//data : JSON.stringify(list),ajax controller有请求参数必须传参写data
data : JSON.stringify(list),
//请求成功
success : function(result) {
var jsonObj = JSON.parse(result);
roleId=jsonObj.roleId;
setOption(jsonObj.data);
schema.empty();
schema.append("未结算金额:"+jsonObj.schema)
}
});
}
init();
if(roleId==3){
table1();
setSchema();
}else {
table2();
setSchema();
}
</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