1、ZC公式；2、固定资产导入

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

@@ -249,7 +249,7 @@ public class AssetListServiceImpl extends BaseService {
                 citAsset.setDisposedDate(sdf.parse(value.toString()));
             }
             //先判断该条数据是否需要直接舍弃掉，筛选条件：报废类型是完全报废，报废日期小于去年年底最后一天的就剔除。
-            if("完全报废".equals(citAsset.getScrapType()) && endOfLastYearDate.after(citAsset.getDisposedDate())){
+            if("完全报废".equals(citAsset.getScrapType()) && citAsset.getDisposedDate()==null && endOfLastYearDate.after(citAsset.getDisposedDate())){
                 errorMsgSb.append(rowNum+"，");
                 continue;
             }

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CitAssetsListExtendsMapper.xml

@@ -281,9 +281,16 @@
 
   <select id="getCitAssetDetialResult" resultMap="citAssetDetailResultDto">
     SELECT
-    sum(acquisition_value),sum(account_year_depreciation_amount),sum(account_total_depreciation_amount),sum(account_month_depreciation_amount),
-    sum(year_end_value),sum(tax_month_depreciation_amount),sum(tax_to_current_year_depreciation_amount),sum(tax_current_year_depreciation_amount),
-    sum(total_difference_amount), sum(year_difference_amount)
+    sum(acquisition_value) as acquisition_value,
+    sum(account_year_depreciation_amount) as account_year_depreciation_amount,
+    sum(account_total_depreciation_amount) as account_total_depreciation_amount,
+    sum(account_month_depreciation_amount) as account_month_depreciation_amount,
+    sum(year_end_value) as year_end_value,
+    sum(tax_month_depreciation_amount) as tax_month_depreciation_amount,
+    sum(tax_to_current_year_depreciation_amount) as tax_to_current_year_depreciation_amount,
+    sum(tax_current_year_depreciation_amount) as tax_current_year_depreciation_amount,
+    sum(total_difference_amount) as total_difference_amount,
+    sum(year_difference_amount) as year_difference_amount
     FROM
     assets_list
     JOIN