提交

src/main/java/cn/ezhizao/project/business/collection/controller/BizCollectionController.java

@@ -343,7 +343,8 @@ public class BizCollectionController extends BaseController {
             BizArchiveInput archiveInput = archiveInputs.isEmpty() ? null : archiveInputs.get(0);
             if (archiveInput != null) {
                 collection.setContractNo(archiveInput.getContractNo());
-                collection.setContractAmount(archiveInput.getAmount());
+                collection.setContractAmount(archiveInput.getTrueAmount());
+//                collection.setTrueAmount(archiveInput.getTrueAmount());
                 BizCollection collectionCondition = new BizCollection();
                 collectionCondition.setContractId(archiveInput.getId());
                 collectionCondition.setStatus((byte)1);

src/main/java/cn/ezhizao/project/business/collection/domain/BizCollection.java

@@ -1,5 +1,6 @@
 package cn.ezhizao.project.business.collection.domain;
 
+import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
 import cn.ezhizao.framework.web.domain.BaseEntity;
 import cn.ezhizao.project.system.domain.SysFileStorage;
 import com.baomidou.mybatisplus.annotation.FieldFill;
@@ -82,6 +83,10 @@ public class BizCollection extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "付款名称")
     private String applyName;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "实收金额")
+    private BigDecimal trueAmount;
+
     @ApiModelProperty(value = "付款账号")
     private String appyAccount;
 

src/main/java/cn/ezhizao/project/business/order/domain/BizArchiveInputDetail.java

@@ -37,6 +37,11 @@ public class BizArchiveInputDetail extends BaseEntity
     @ApiModelProperty(value = "客户外键")
     private Long companyId;
 
+    /** 实收金额 */
+    @Excel(name = "实收金额")
+    @ApiModelProperty(value = "实收金额")
+    private BigDecimal trueAmount;
+
     /** 月数 */
 //    @Excel(name = "月数")
 //    @ApiModelProperty(value = "月数")

src/main/java/cn/ezhizao/project/system/mapper/SysUserMapper.java

@@ -24,7 +24,7 @@ public interface SysUserMapper
     /**
      * 根据ids查询用户列表
      *
-     * @param sysUser 用户信息
+     * @param userIds 用户信息
      * @return 用户信息集合信息
      */
     public List<SysUser> selectUserListByIds(Long[] userIds);