Commit f9a1d80b authored by maliang's avatar maliang

上传bug修复

parent 12568f50
...@@ -52,10 +52,6 @@ public class CopyrightBookController { ...@@ -52,10 +52,6 @@ public class CopyrightBookController {
@ApiOperation(value = "获取总的未结算数据") @ApiOperation(value = "获取总的未结算数据")
@ResponseBody @ResponseBody
public String getDeductionConfig(@RequestBody PageTableRequest request){ public String getDeductionConfig(@RequestBody PageTableRequest request){
List<BaseSettlement> array = request.getArray();
for (BaseSettlement baseSettlement : array) {
System.out.println(baseSettlement.getContext());
}
List<BaseSettlement> deductionConfig = copyrightDao.getDeductionConfig(request.getPage(),request.getLimit()); List<BaseSettlement> deductionConfig = copyrightDao.getDeductionConfig(request.getPage(),request.getLimit());
List<BaseSettlement> deductionConfigs = copyrightDao.getDeductionConfig(0,1000); List<BaseSettlement> deductionConfigs = copyrightDao.getDeductionConfig(0,1000);
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
...@@ -72,6 +68,12 @@ public class CopyrightBookController { ...@@ -72,6 +68,12 @@ public class CopyrightBookController {
if(request.getTypeName().equals("固定扣量")){ if(request.getTypeName().equals("固定扣量")){
type=2; type=2;
} }
List<BaseSettlement> array = request.getArray();
if(array.size()>0){
for (BaseSettlement baseSettlement : array) {
copyrightDao.updateDeductionConfig(baseSettlement.getCopyrightId(),request.getTypeName(),type,request.getContext());
}
}
copyrightDao.updateDeductionConfig(request.getCopyrightId(),request.getTypeName(),type,request.getContext()); copyrightDao.updateDeductionConfig(request.getCopyrightId(),request.getTypeName(),type,request.getContext());
} }
......
...@@ -132,9 +132,6 @@ ...@@ -132,9 +132,6 @@
var checkStatus = table.checkStatus('idTest'); var checkStatus = table.checkStatus('idTest');
var typeName=$("#deductionSelect").val(); var typeName=$("#deductionSelect").val();
var context=$("#deductionInput").val(); var context=$("#deductionInput").val();
console.log(checkStatus.data);
console.log(typeName);
console.log(context);
var list={typeName:typeName,context:context,array:checkStatus.data} var list={typeName:typeName,context:context,array:checkStatus.data}
$.ajax({ $.ajax({
//请求方式 //请求方式
......
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