上传bug修复

src/main/java/com/boot/security/server/controller/CopyrightBookController.java

@@ -44,6 +44,13 @@ public class CopyrightBookController {
         copyrightDao.updateSettlementStatus(baseSettlement.getCopyrightId(),baseSettlement.getReportDate(),baseSettlement.getStatus(),baseSettlement.getStatusName());
     }
 
+    @PostMapping("/updateReleaseStatus")
+    @ApiOperation(value = "更新结算状态")
+    public void updateReleaseStatus(@RequestBody PageTableRequest request){
+        BaseSettlement baseSettlement = request.getBaseSettlement();
+        copyrightDao.updateReleaseStatus(baseSettlement.getCopyrightId(),baseSettlement.getReportDate(),baseSettlement.getReleaseStatus(),baseSettlement.getReleaseStatusName());
+    }
+
     @PostMapping("/bookInfo")
     @ApiOperation(value = "获取书籍上架信息")
     @ResponseBody

src/main/java/com/boot/security/server/dao/CopyrightDao.java

@@ -38,5 +38,8 @@ 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);
 
+    @Update("update bi_report.report_book_settlement_month set release_status=#{releaseStatus},release_status_name=#{releaseStatusName} where report_date=#{reportDate} and copyright_id=#{copyrightId}")
+    int updateReleaseStatus(@Param("copyrightId") Integer copyrightId,@Param("reportDate") String reportDate,@Param("releaseStatus") Integer releaseStatus,@Param("releaseStatusName") String releaseStatusName);
+
     int updateUserCopyrightMap(List<BaseSettlement> baseSettlements);
 }

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

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
 
 import java.text.DecimalFormat;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 @Service
@@ -147,18 +148,28 @@ public class CopyrightBookServiceImpl implements CopyrightBookService {
         }
         List<BaseSettlement> baseSettlements = copyrightDao.selectBookDetail(baseSettlementList,bookId,bookName,startTime,endTime,page-1,limit);
         DecimalFormat df = new DecimalFormat("#.00");
-        for (BaseSettlement baseSettlement : baseSettlements) {
+        Iterator<BaseSettlement> iterator = baseSettlements.iterator();
+        while (iterator.hasNext()) {
+            BaseSettlement baseSettlement = iterator.next();
             Boolean flag=false;
             for (BaseSettlement settlement : list) {
-                if( (settlement.getReportDate().equals(baseSettlement.getReportDate())) && (settlement.getCopyrightId()==baseSettlement.getCopyrightId())){
+                Integer id = settlement.getCopyrightId();
+                Integer id1 = baseSettlement.getCopyrightId();
+                if( (settlement.getReportDate().equals(baseSettlement.getReportDate()) ) && id.equals(id1) ){
                     flag=true;
                     break;
                 }
             }
-            if (flag==false&&list.size()>0){
-                baseSettlements.remove(baseSettlement);
+            if(roleId!=3){
+                if(list==null||list.size()==0){
+                    baseSettlements.clear();
                     break;
                 }
+            }
+            if (flag==false&&list.size()>0){
+                iterator.remove();
+                continue;
+            }
             if(baseSettlement.getTotalAmount()==null){
                     baseSettlement.setTotalAmount(0d);
             }

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

@@ -39,6 +39,13 @@
 <script type="text/html" id="operation">
     <a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
 </script>
+<script type="text/html" id="release">
+    {{#  if(d.releaseStatus == 0){ }}
+    <button class="layui-btn layui-btn-normal" name="" lay-event="release">未发布</button>
+    {{#  } else { }}
+    <button class="layui-btn layui-btn-danger" name="" lay-event="release">已发布</button>
+    {{#  } }}
+</script>
 <script>
 
     var copyrightId;
@@ -68,24 +75,75 @@
                 ,{field: 'settlementAdAmount', title: '广告结算'}
                 ,{field: 'countSettlement', title: '总结算'}
                 ,{field: 'statusName', title: '结算状态'}
-                ,{title: '操作', toolbar: '#operation',event:'operation'}
+                ,{title: '操作', toolbar: '#operation'}
                 ,{field: 'releaseStatusName', title: '发布状态'}
                 ,{field: 'releaseStatus', title: '状态值', hide: true}
-                ,{field:'release',title:'发布状态',type:'checkbox',fixed:'right'}
+                ,{title:'发布操作',toolbar: '#release'}
             ]] //设置表头
         });
 
 
-        table.on('checkbox(test)', function(obj){
+        /*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; //获得当前行数据
             var layEvent=obj.event;
+            if(layEvent === 'release'){
+                var releaseStatus=data.releaseStatus;
+                if(releaseStatus==0){
+                    layer.open({
+                        content:'你确定要发布吗？'
+                        ,yes: function(index, layero){
+                            var list={baseSettlement:{releaseStatus:1,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回调，需进行手工关闭
+                        }
+                    });
+                }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({
                     title: '操作'
@@ -129,7 +187,12 @@
         form.on('select(copyright)', function(data){
             copyrights=data.value;
             reload(copyrights)
-
+        });
+        form.on('checkbox(test1)', function(data){
+            console.log(data);
+            layer.open({
+                content:'你确定要发布吗？'
+            });
         });
     });