1、资产导入本年折旧额根据年限改动；2、ZC公式报错问题

atms-api/src/main/java/pwc/taxtech/atms/service/impl/AssetListServiceImpl.java

@@ -571,6 +571,14 @@ public class AssetListServiceImpl extends BaseService {
         for(CitAssetsList citAsset:assetsLists){
             //获取税务每月折旧额,（原值-残值）/税法折旧期间
             citAsset.setTaxMonthDepreciationAmount((citAsset.getAcquisitionValue().subtract(citAsset.getResidualRate())).divide(new BigDecimal(citAsset.getTaxDepreciationPeriod()), 2));
+            //获取税务截止本年累计折旧额, 本年折旧期间* 每月折旧额
+            citAsset.setTaxToCurrentYearDepreciationAmount(citAsset.getTaxMonthDepreciationAmount().multiply(new BigDecimal(citAsset.getTaxToCurrentYearDepreciationPeriod())));
+            //获取税务本年折旧额， 截至本年累计折旧期间*每月折旧额
+            citAsset.setTaxCurrentYearDepreciationAmount(citAsset.getTaxMonthDepreciationAmount().multiply(new BigDecimal(citAsset.getTaxYearDepreciationPeriod())));
+            //获取累计差异， 截止本年累计折旧额（税务）- 截止本年累计折旧额（财务）
+            citAsset.setTotalDifferenceAmount(citAsset.getTaxToCurrentYearDepreciationAmount().subtract(citAsset.getAccountTotalDepreciationAmount()));
+            //获取当年差异
+            citAsset.setYearDifferenceAmount(citAsset.getTaxCurrentYearDepreciationAmount().subtract(citAsset.getAccountYearDepreciationAmount()));
             assetListMapper.updateByPrimaryKeySelective(citAsset);
         }
         return null;

atms-dao/src/main/java/pwc/taxtech/atms/dao/CitAssetsListMapper.java

@@ -119,7 +119,7 @@ public interface CitAssetsListMapper extends MyMapper {
      */
     List<CitAssetEamMapping> getAssetEamMapping(CitAssetsList citAsset);
 
-    List<CitAssetDetailResultDto> getCitAssetDetialResult(@Param("assetType") Integer assetType,
+    CitAssetDetailResultDto getCitAssetDetialResult(@Param("assetType") Integer assetType,
                                                        @Param("assetDetailType") Integer assetDetailType,
                                                           @Param("projectId") String projectId);