|
@@ -68,7 +68,7 @@ public class SyncAssetsImpl implements SyncAssetsService {
|
|
|
//月折旧额
|
|
|
float depreciation = UtilMap.getFloat((Map) formMap,"numberField_lu2eb47d");
|
|
|
//已计提期数
|
|
|
- int count = UtilMap.getInt((Map) formMap,"numberField_lutjo2dt");
|
|
|
+ long count = UtilMap.getInt((Map) formMap,"numberField_lutjo2dt");
|
|
|
long toMonth = DateUtil.beginOfMonth(new Date()).getTime();
|
|
|
//购入日期
|
|
|
if (ObjectUtil.isNotNull(formMap.get("dateField_lty0oyv9"))){
|
|
@@ -83,7 +83,8 @@ public class SyncAssetsImpl implements SyncAssetsService {
|
|
|
String endDate = DateUtil.date(endTime).toString("yyyy-MM");
|
|
|
long parseTime = DateUtil.beginOfMonth(DateUtil.parse(endDate, "yyyy-MM")).getTime();
|
|
|
if (toMonth <= parseTime){
|
|
|
- count = count + 1;
|
|
|
+ DateBetween dateBetween = new DateBetween(DateUtil.date(buyTime),DateUtil.date(toMonth));
|
|
|
+ count = dateBetween.betweenMonth(true) - 1;
|
|
|
}
|
|
|
}
|
|
|
DateBetween dateBetween = new DateBetween(DateUtil.date(buyTime),DateUtil.date(toMonth));
|