Merge branch 'master' of http://s.dev01.dkiboss.com:9001/DK-SCU/dkscu-server-finance

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

@@ -56,6 +56,7 @@
         <result column="op_create_time" property="opCreateTime" typeHandler="com.dk.common.infrastructure.handler.TimestampTypeHandler"/>
         <result column="op_update_time" property="opUpdateTime" typeHandler="com.dk.common.infrastructure.handler.TimestampTypeHandler"/>
         <result column="op_update_staff_id" property="opUpdateStaffId" typeHandler="com.dk.common.infrastructure.handler.UuidTypeHandler"/>
+        <result column="due_date" property="dueDate" typeHandler="com.dk.common.infrastructure.handler.TimestampTypeHandler"/>
     </resultMap>
 
     <!-- **************************************** 查询映射结果 **************************************** -->
@@ -113,6 +114,7 @@
         <result column="op_create_time" property="opCreateTime" typeHandler="com.dk.common.infrastructure.handler.TimestampTypeHandler"/>
         <result column="op_update_time" property="opUpdateTime" typeHandler="com.dk.common.infrastructure.handler.TimestampTypeHandler"/>
         <result column="op_update_staff_id" property="opUpdateStaffId" typeHandler="com.dk.common.infrastructure.handler.UuidTypeHandler"/>
+        <result column="due_date" property="dueDate" typeHandler="com.dk.common.infrastructure.handler.TimestampTypeHandler"/>
         <!-- **************************************** 关联表映射 **************************************** -->
         <result column="op_update_staff_name" property="opUpdateStaffName"/>
         <result column="status_invoice_name" property="statusInvoiceName"/>
@@ -121,6 +123,7 @@
         <result column="make_staff_name" property="makeStaffName"/>
         <result column="staff_name" property="staffName"/>
         <result column="type_name" property="typeName"/>
+        <result column="assetTaxRate" property="assetTaxRate"/>
         <result column="calc_method_name" property="calcMethodName"/>
         <result column="ass_sub_name" property="assSubName"/>
         <result column="loss_sub_name" property="lossSubName"/>
@@ -194,6 +197,7 @@
             when t.sum_amt_total_cash = 0 then '未付款'
              when t.sum_amt_should = t.sum_amt_total_cash then '付款完成'
              end as pay_status,
+        t.due_date,
     </sql>
 
     <!-- **************************************** 当前表查询条件 **************************************** -->
@@ -428,6 +432,7 @@
         myex.f_get_name_i18n(dkf.kind_name_i18n,#{i18n}) as status_flow_name,
         staff.staff_name,
         assType.type_name,
+        assType.tax_rate as "assetTaxRate",
         myex.f_get_name_i18n(dkm.kind_name_i18n,#{i18n}) as calc_method_name,
         assSub.subject_name AS ass_sub_name,
         lossSub.subject_name AS loss_sub_name,
@@ -590,6 +595,7 @@
             own_cp_id,
             ctr_cp_id,
             sum_amt_total_cash,
+            due_date,
         </trim>
         )
         values
@@ -777,6 +783,7 @@
                     DEFAULT,
                 </otherwise>
             </choose>
+            #{item.dueDate},
         </trim>
         )
         </foreach>

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

@@ -133,6 +133,13 @@ public class Asset implements Serializable {
     private LocalDate accCalcEnd;
 
     /**
+     * 到期日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class)
+    private LocalDate dueDate;
+
+    /**
      * 已折旧期数
      */
     private Integer happenCalcNo;

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

@@ -236,6 +236,10 @@ public class AssetQuery extends PageInfo<AssetQuery> implements Serializable {
     @ApiModelProperty(value = "修改时间 (触发器自动处理) - 截止")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime opUpdateTimeEnd;
+
+    @ApiModelProperty(value = "到期日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDate dueDate;
     
     // endregion
 

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

@@ -200,6 +200,10 @@ public class AssetResponse implements Serializable {
     @ApiModelProperty(value = "修改用户 (触发器自动处理)")
     private String opUpdateStaffId;
 
+    @ApiModelProperty(value = "到期日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDate dueDate;
+
     // endregion
 
     // region **************************************** 自动生成其他属性 ****************************************
@@ -218,6 +222,8 @@ public class AssetResponse implements Serializable {
     private String makeStaffName;
     @ApiModelProperty(value = "资产类别")
     private String typeName;
+    @ApiModelProperty(value = "净残值率%")
+    private BigDecimal assetTaxRate;
     @ApiModelProperty(value = "折旧方法")
     private String calcMethodName;
     @ApiModelProperty(value = "固定资产科目")

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

@@ -192,6 +192,10 @@ public class AssetVO implements Serializable {
     @ApiModelProperty(value = "总公司ID")
     private Integer ctrCpId;
 
+    @ApiModelProperty(value = "到期日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDate dueDate;
+
     // endregion
 
     // region **************************************** 自动生成其他属性 ****************************************