Commit 841ba56d authored by zhkwei's avatar zhkwei

固定资产导入计算逻辑。。

parent 38a5bf85
......@@ -489,7 +489,7 @@ public class AssetListServiceImpl extends BaseService {
//获取截止本年累计折旧期间,此值根据分类
if("完全报废".equals(citAsset.getScrapType())){
calendar.setTime(citAsset.getDisposedDate());
citAsset.setTaxToCurrentYearDepreciationPeriod((calendar.get(Calendar.YEAR)-cal.get(Calendar.YEAR))*12+12-cal.get(Calendar.MONTH)-1);
citAsset.setTaxToCurrentYearDepreciationPeriod((calendar.get(Calendar.YEAR)-cal.get(Calendar.YEAR))*12+calendar.get(Calendar.MONTH)-cal.get(Calendar.MONTH));
}else{
citAsset.setTaxToCurrentYearDepreciationPeriod((year-cal.get(Calendar.YEAR))*12+12-cal.get(Calendar.MONTH)-1);
}
......@@ -511,7 +511,7 @@ public class AssetListServiceImpl extends BaseService {
//获取截止本年累计折旧期间,此值根据分类
if("完全报废".equals(citAsset.getScrapType())){
calendar.setTime(citAsset.getDisposedDate());
citAsset.setTaxToCurrentYearDepreciationPeriod((calendar.get(Calendar.YEAR)-cal.get(Calendar.YEAR))*12+12-cal.get(Calendar.MONTH)-1);
citAsset.setTaxToCurrentYearDepreciationPeriod((calendar.get(Calendar.YEAR)-cal.get(Calendar.YEAR))*12+calendar.get(Calendar.MONTH)-cal.get(Calendar.MONTH));
}else{
citAsset.setTaxToCurrentYearDepreciationPeriod((year-cal.get(Calendar.YEAR))*12+12-cal.get(Calendar.MONTH)-1);
}
......@@ -533,7 +533,7 @@ public class AssetListServiceImpl extends BaseService {
//获取截止本年累计折旧期间,此值根据分类
if("完全报废".equals(citAsset.getScrapType())){
calendar.setTime(citAsset.getDisposedDate());
citAsset.setTaxToCurrentYearDepreciationPeriod((calendar.get(Calendar.YEAR)-cal.get(Calendar.YEAR))*12+12-cal.get(Calendar.MONTH));
citAsset.setTaxToCurrentYearDepreciationPeriod((calendar.get(Calendar.YEAR)-cal.get(Calendar.YEAR))*12+calendar.get(Calendar.MONTH)-cal.get(Calendar.MONTH)+1);
}else{
citAsset.setTaxToCurrentYearDepreciationPeriod((year-cal.get(Calendar.YEAR))*12+12-cal.get(Calendar.MONTH));
}
......
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