上传bug修复

src/main/java/com/boot/security/server/service/impl/CopyrightBookServiceImpl.java

@@ -19,8 +19,11 @@ 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<>();
@@ -124,6 +127,7 @@ 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);
@@ -270,8 +274,10 @@ public class CopyrightBookServiceImpl implements CopyrightBookService {
     @Override
     public String getAllCopyright() {
         List<BaseSettlement> baseSettlements = copyrightDao.selectCopyrightById(UserUtil.getLoginUser().getId());
+        Integer roleId = copyrightDao.selectRoleId(UserUtil.getLoginUser().getId());
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("data",baseSettlements);
+        jsonObject.put("roleId",roleId);
         return jsonObject.toJSONString();
     }
 

src/main/resources/static/pages/copyrightBookData/copyrightMonthSettlement.html

@@ -18,7 +18,7 @@
                 </select>
             </div>
             <div class="layui-col-md4">
-                <span style="float: right;color: #ed1c24;">未结算金额:</span>
+                <span style="float: right;color: #ed1c24;" id="schema">未结算金额:</span>
             </div>
         </div>
         <div class="layui-row">
@@ -53,7 +53,34 @@
     var form;
     var copyrights;
     var tableIns;
+    var schema=$("#schema");
 
+    function table2() {
+        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: 'totalAmount', title: '销售金额'}
+                    , {field: 'settlementAmount', title: '销售结算'}
+                    , {field: 'totalAdvertAmount', title: '广告金额'}
+                    , {field: 'settlementAdAmount', title: '广告结算'}
+                    , {field: 'countSettlement', title: '总结算'}
+                    , {field: 'statusName', title: '结算状态'}
+                ]] //设置表头
+            });
+        });
+    }
+
+    function table1(){
         layui.use('table', function() {
             var table = layui.table;
             tableIns=table.render({
@@ -180,6 +207,9 @@
 
             });
         });
+    }
+
+
 
 
     layui.use('form', function() {
@@ -208,6 +238,7 @@
         });
     }
 
+    var roleId;
 
     function init(){
         //var list={copyrightId:copyrightId};
@@ -224,6 +255,7 @@
             //请求成功
             success : function(result) {
                 var jsonObj = JSON.parse(result);
+                roleId=jsonObj.roleId;
                 setOption(jsonObj.data);
             }
         });
@@ -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>