Commit c0c11e02 by yinyong

借支单冲销日志-冲销金额+归还金额

parent 647aab1c
...@@ -181,12 +181,12 @@ public class CostCheckLendController { ...@@ -181,12 +181,12 @@ public class CostCheckLendController {
} }
costLogService.save(costNo, Integer.valueOf(updateuserid),"财务审核费用单通过"); costLogService.save(costNo, Integer.valueOf(updateuserid),"财务审核费用单通过");
costLogService.save(supCost.getCostNo(), Integer.valueOf(updateuserid),"借还单【" + costNo + "】冲销借支单【" + supCost.getCostNo() + costLogService.save(supCost.getCostNo(), Integer.valueOf(updateuserid),"借还单【" + costNo + "】冲销借支单【" + supCost.getCostNo() +
"】成功,金额为" + costDomainByNo.getCounteract() + costDomainByNo.getDic()); "】成功,冲销金额为" + costDomainByNo.getCounteract() + costDomainByNo.getDic() + ",归还金额为" + costDomainByNo.getLendBalance() + costDomainByNo.getDic());
return map; return map;
} }
costLogService.save(costNo, Integer.valueOf(updateuserid),"财务审核费用单通过"); costLogService.save(costNo, Integer.valueOf(updateuserid),"财务审核费用单通过");
costLogService.save(supCost.getCostNo(), Integer.valueOf(updateuserid),"借还单【" + costNo + "】冲销借支单【" + supCost.getCostNo() + costLogService.save(supCost.getCostNo(), Integer.valueOf(updateuserid),"借还单【" + costNo + "】冲销借支单【" + supCost.getCostNo() +
"】成功,金额为" + costDomainByNo.getCounteract() + costDomainByNo.getDic()); "】成功,冲销金额为" + costDomainByNo.getCounteract() + costDomainByNo.getDic() + ",归还金额为" + costDomainByNo.getLendBalance() + costDomainByNo.getDic());
return map; return map;
} }
......
...@@ -309,10 +309,7 @@ public class CostListController { ...@@ -309,10 +309,7 @@ public class CostListController {
if (null != cost) { if (null != cost) {
filePath = cost.getCashierFilePath(); filePath = cost.getCashierFilePath();
if (null != filePath){ if (null != filePath){
String[] split = filePath.split("."); fileName = filePath.substring(filePath.lastIndexOf("/")+1);
if (null != split && split.length>=1){
fileName = split[split.length-1];
}
} }
}else { }else {
return null; return null;
......
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