修改导出,删除字段

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/ContractCustom.java

@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Seyason
- * @since 2024-09-10
+ * @since 2024-09-23
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -102,48 +102,6 @@ public class ContractCustom extends Model<ContractCustom> {
     @TableField("currency")
     private String currency;
 
-    /**
-     * 已付款金额（元）
-     */
-    @TableField("payed_amount")
-    private BigDecimal payedAmount;
-
-    /**
-     * 付款类型:1-预付，2-报账
-     */
-    @TableField("pay_way")
-    private Integer payWay;
-
-    /**
-     * 凭证号
-     */
-    @TableField("bill_number")
-    private String billNumber;
-
-    /**
-     * 已冲销金额
-     */
-    @TableField("reserved_amounts")
-    private BigDecimal reservedAmounts;
-
-    /**
-     * 冲销凭证号
-     */
-    @TableField("reserved_bill_number")
-    private String reservedBillNumber;
-
-    /**
-     * 付款总金额
-     */
-    @TableField("total_payed_amounts")
-    private BigDecimal totalPayedAmounts;
-
-    /**
-     * 待付款金额
-     */
-    @TableField("pending_amounts")
-    private BigDecimal pendingAmounts;
-
     /**
      * 合同状态（是否结清）:1-履约中，2-履约结束
      */

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ContractServiceImpl.java

@@ -809,18 +809,18 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
                 customItem.setCurrency(row.getCell(19)==null?null:row.getCell(19).getStringCellValue());
 
                 String s = row.getCell(20) == null ? null : row.getCell(20).getStringCellValue();
-                if (StringUtils.isNotBlank(s)){
+                /*if (StringUtils.isNotBlank(s)){
                     customItem.setPayedAmount(new BigDecimal(s));
-                }
+                }*/
                 String s1 = (row.getCell(21) == null) ? null : row.getCell(21).getStringCellValue();
-                if (StringUtils.isNotBlank(s1)){
+                /*if (StringUtils.isNotBlank(s1)){
                     if ("预付".equals(s1)) {
                         customItem.setPayWay(1);
                     } else {
                         customItem.setPayWay(2);
                     }
-                }
-                customItem.setBillNumber(row.getCell(22)==null?null:row.getCell(22).getStringCellValue());
+                }*/
+                /*customItem.setBillNumber(row.getCell(22)==null?null:row.getCell(22).getStringCellValue());
                 String s2 = row.getCell(23) == null ? null : row.getCell(23).getStringCellValue();
                 if (StringUtils.isNotBlank(s2)){
                     customItem.setReservedAmounts(new BigDecimal(s2));
@@ -833,7 +833,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
                 String s4 = row.getCell(26) == null ? null : row.getCell(26).getStringCellValue();
                 if (StringUtils.isNotBlank(s4)){
                     customItem.setPendingAmounts(new BigDecimal(s4));
-                }
+                }*/
                 String status = row.getCell(27)==null?null:row.getCell(27).getStringCellValue();
                 if (StringUtils.isNotBlank(status)){
                     if ("履约中".equals(status)) {

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ContractCustomMapper.xml

@@ -17,20 +17,13 @@
         <result column="tax_rate" property="taxRate" />
         <result column="amounts_no_tax" property="amountsNoTax" />
         <result column="currency" property="currency" />
-        <result column="payed_amount" property="payedAmount" />
-        <result column="pay_way" property="payWay" />
-        <result column="bill_number" property="billNumber" />
-        <result column="reserved_amounts" property="reservedAmounts" />
-        <result column="reserved_bill_number" property="reservedBillNumber" />
-        <result column="total_payed_amounts" property="totalPayedAmounts" />
-        <result column="pending_amounts" property="pendingAmounts" />
         <result column="finish_status" property="finishStatus" />
         <result column="stamp_duty_items" property="stampDutyItems" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        contract_id, customer_org, customer_contact, customer_phone, use_department, funds_source, undertaker, agent, sign_date, filings_date, tax_rate, amounts_no_tax, currency, payed_amount, pay_way, bill_number, reserved_amounts, reserved_bill_number, total_payed_amounts, pending_amounts, finish_status, stamp_duty_items
+        contract_id, customer_org, customer_contact, customer_phone, use_department, funds_source, undertaker, agent, sign_date, filings_date, tax_rate, amounts_no_tax, currency, finish_status, stamp_duty_items
     </sql>
 
 </mapper>