上传bug修复

src/main/java/com/boot/security/server/model/BaseSettlement.java

@@ -29,6 +29,24 @@ public class BaseSettlement extends BaseEntity<Long>{
 	public Double countSettlement;
 	public Integer status;
 	public String statusName;
+	public String releaseStatusName;
+	public Integer releaseStatus;
+
+	public String getReleaseStatusName() {
+		return releaseStatusName;
+	}
+
+	public void setReleaseStatusName(String releaseStatusName) {
+		this.releaseStatusName = releaseStatusName;
+	}
+
+	public Integer getReleaseStatus() {
+		return releaseStatus;
+	}
+
+	public void setReleaseStatus(Integer releaseStatus) {
+		this.releaseStatus = releaseStatus;
+	}
 
 	public String getNickname() {
 		return nickname;

src/main/resources/mybatis-mappers/CopyrightMapper.xml

@@ -6,7 +6,7 @@
     <select id="selectTableListMonth"  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
+        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

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

@@ -51,6 +51,7 @@
         var table = layui.table;
         tableIns=table.render({
             elem: '#copyrightMonth_table'
+            ,id:'idTest'
             ,method:'post'
             ,contentType:'application/json'
             ,url: '/copyrightBookController/settlementMonth'
@@ -67,43 +68,58 @@
                 ,{field: 'settlementAdAmount', title: '广告结算'}
                 ,{field: 'countSettlement', title: '总结算'}
                 ,{field: 'statusName', title: '结算状态'}
-                ,{title: '操作', toolbar: '#operation',fixed: 'right'}
+                ,{title: '操作', toolbar: '#operation',event:'operation'}
+                ,{field: 'releaseStatusName', title: '发布状态'}
+                ,{field: 'releaseStatus', title: '状态值', hide: true}
+                ,{field:'release',title:'发布状态',type:'checkbox',fixed:'right'}
             ]] //设置表头
         });
 
+
+        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; //获得当前行数据
-            layer.open({
-                title: '操作'
-                ,content: '合作方:'+data.copyrightName+"<br>"+'日期:'+data.reportDate+'<br>结算金额:'+data.totalAmount+'<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);
+            var layEvent=obj.event;
+            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='已结算';
                         }
-                    });
-                    layer.close(index); //如果设定了yes回调，需进行手工关闭
-                }
-            });
+                        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回调，需进行手工关闭
+                    }
+                });
+            }
+
         });
     });