固定资产删除 变动后原值

src/main/java/com/dk/finance/mapper/fia/AssetMapper.xml

@@ -16,7 +16,6 @@
         <result column="calc_method" property="calcMethod"/>
         <result column="summary" property="summary"/>
         <result column="sum_amt_asset" property="sumAmtAsset"/>
-        <result column="sum_amt_fact_asset" property="sumAmtFactAsset"/>
         <result column="sum_amt_net_worth" property="sumAmtNetWorth"/>
         <result column="sum_amt_net_salvage" property="sumAmtNetSalvage"/>
         <result column="total_calc_no" property="totalCalcNo"/>
@@ -74,7 +73,6 @@
         <result column="calc_method" property="calcMethod"/>
         <result column="summary" property="summary"/>
         <result column="sum_amt_asset" property="sumAmtAsset"/>
-        <result column="sum_amt_fact_asset" property="sumAmtFactAsset"/>
         <result column="sum_amt_net_worth" property="sumAmtNetWorth"/>
         <result column="sum_amt_net_salvage" property="sumAmtNetSalvage"/>
         <result column="total_calc_no" property="totalCalcNo"/>
@@ -150,7 +148,6 @@
         t.calc_method,
         t.summary,
         t.sum_amt_asset,
-        t.sum_amt_fact_asset,
         t.sum_amt_net_worth,
         t.sum_amt_net_salvage,
         t.total_calc_no,
@@ -234,9 +231,6 @@
         <if test="sumAmtAsset != null">
             AND t.sum_amt_asset = #{sumAmtAsset}
         </if>
-        <if test="sumAmtFactAsset != null">
-            AND t.sum_amt_fact_asset = #{sumAmtFactAsset}
-        </if>
         <if test="sumAmtNetWorth != null">
             AND t.sum_amt_net_worth = #{sumAmtNetWorth}
         </if>
@@ -560,7 +554,6 @@
             calc_method,
             summary,
             sum_amt_asset,
-            sum_amt_fact_asset,
             sum_amt_net_worth,
             sum_amt_net_salvage,
             total_calc_no,
@@ -623,14 +616,6 @@
                 </otherwise>
             </choose>
             <choose>
-                <when test="item.sumAmtFactAsset != null">
-                    #{item.sumAmtFactAsset},
-                </when>
-                <otherwise>
-                    DEFAULT,
-                </otherwise>
-            </choose>
-            <choose>
                 <when test="item.sumAmtNetWorth != null">
                     #{item.sumAmtNetWorth},
                 </when>
@@ -813,7 +798,6 @@
         calc_method = excluded."calc_method",
         summary = excluded."summary",
         sum_amt_asset = excluded."sum_amt_asset",
-        sum_amt_fact_asset = excluded."sum_amt_fact_asset",
         sum_amt_net_worth = excluded."sum_amt_net_worth",
         sum_amt_net_salvage = excluded."sum_amt_net_salvage",
         total_calc_no = excluded."total_calc_no",

src/main/java/com/dk/finance/model/pojo/fia/Asset.java

@@ -99,11 +99,6 @@ public class Asset implements Serializable {
     private BigDecimal sumAmtAsset;
 
     /**
-     * 变动后原值
-     */
-    private BigDecimal sumAmtFactAsset;
-
-    /**
      * 资产净额 (资产净额=资产原值-累计折旧-减值准备)
      */
     private BigDecimal sumAmtNetWorth;

src/main/java/com/dk/finance/model/query/fia/AssetQuery.java

@@ -74,8 +74,6 @@ public class AssetQuery extends PageInfo<AssetQuery> implements Serializable {
     @ApiModelProperty(value = "资产原值 (不含税原值)")
     private BigDecimal sumAmtAsset;
 
-    @ApiModelProperty(value = "变动后原值")
-    private BigDecimal sumAmtFactAsset;
 
     @ApiModelProperty(value = "资产净额 (资产净额=资产原值-累计折旧-减值准备)")
     private BigDecimal sumAmtNetWorth;

src/main/java/com/dk/finance/model/response/fia/AssetResponse.java

@@ -72,8 +72,6 @@ public class AssetResponse implements Serializable {
     @ApiModelProperty(value = "资产原值 (不含税原值)")
     private BigDecimal sumAmtAsset;
 
-    @ApiModelProperty(value = "变动后原值")
-    private BigDecimal sumAmtFactAsset;
 
     @ApiModelProperty(value = "资产净额 (资产净额=资产原值-累计折旧-减值准备)")
     private BigDecimal sumAmtNetWorth;

src/main/java/com/dk/finance/model/vo/fia/AssetVO.java

@@ -75,9 +75,6 @@ public class AssetVO implements Serializable {
     @ApiModelProperty(value = "资产原值 (不含税原值)")
     private BigDecimal sumAmtAsset;
 
-    @ApiModelProperty(value = "变动后原值")
-    private BigDecimal sumAmtFactAsset;
-
     @ApiModelProperty(value = "资产净额 (资产净额=资产原值-累计折旧-减值准备)")
     private BigDecimal sumAmtNetWorth;
 

src/main/java/com/dk/finance/service/fia/AssetService.java

@@ -169,7 +169,7 @@ public class AssetService extends BaseService<Asset> implements AccountFeeBusine
 		updateDetail(assetVO, assetVO.getDocId());
 		List<AssetItem> recHandleItemListGT = assetItemMapper.selectList(new QueryWrapper<AssetItem>().lambda()
 				.eq(AssetItem::getDocId, UUID.fromString(asset.getDocId())));
-		this.feePassOrRefuse(assetVO.getApvResult(), assetVO.getApvRemarks(),asset, recHandleItemListGT);
+		//this.feePassOrRefuse(assetVO.getApvResult(), assetVO.getApvRemarks(),asset, recHandleItemListGT);
 		return super.updateByUuid(asset);
 	}