Commit ecf15df3 authored by maliang's avatar maliang

上传bug修复

parent bac467f0
...@@ -19,8 +19,11 @@ public class CopyrightBookServiceImpl implements CopyrightBookService { ...@@ -19,8 +19,11 @@ public class CopyrightBookServiceImpl implements CopyrightBookService {
@Autowired @Autowired
CopyrightDao copyrightDao; CopyrightDao copyrightDao;
static Double schema=0.0;
@Override @Override
public String selectSettlement(Integer copyrightId,Integer page,Integer limit) { public String selectSettlement(Integer copyrightId,Integer page,Integer limit) {
schema=0.0;
Integer roleId = copyrightDao.selectRoleId(UserUtil.getLoginUser().getId()); Integer roleId = copyrightDao.selectRoleId(UserUtil.getLoginUser().getId());
Integer status=null; Integer status=null;
List<BaseSettlement> baseSettlementList =new ArrayList<>(); List<BaseSettlement> baseSettlementList =new ArrayList<>();
...@@ -124,6 +127,7 @@ public class CopyrightBookServiceImpl implements CopyrightBookService { ...@@ -124,6 +127,7 @@ public class CopyrightBookServiceImpl implements CopyrightBookService {
baseSettlement.setSettlementAdAmount(Double.valueOf(df.format(count*0.5))); baseSettlement.setSettlementAdAmount(Double.valueOf(df.format(count*0.5)));
} }
baseSettlement.setCountSettlement(Double.valueOf(df.format(baseSettlement.getSettlementAmount()+baseSettlement.getSettlementAdAmount()))); 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); Integer count = copyrightDao.selectTableListMonthCount(baseSettlementList,status);
return PageTableHandler.getJSONObject(baseSettlements,count); return PageTableHandler.getJSONObject(baseSettlements,count);
...@@ -270,8 +274,10 @@ public class CopyrightBookServiceImpl implements CopyrightBookService { ...@@ -270,8 +274,10 @@ public class CopyrightBookServiceImpl implements CopyrightBookService {
@Override @Override
public String getAllCopyright() { public String getAllCopyright() {
List<BaseSettlement> baseSettlements = copyrightDao.selectCopyrightById(UserUtil.getLoginUser().getId()); List<BaseSettlement> baseSettlements = copyrightDao.selectCopyrightById(UserUtil.getLoginUser().getId());
Integer roleId = copyrightDao.selectRoleId(UserUtil.getLoginUser().getId());
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("data",baseSettlements); jsonObject.put("data",baseSettlements);
jsonObject.put("roleId",roleId);
return jsonObject.toJSONString(); return jsonObject.toJSONString();
} }
......
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