修改导出字段,添加字段

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

@@ -125,6 +125,12 @@ public class Contract extends Model<Contract> {
     @TableField("status")
     private Integer status;
 
+    /**
+     * 采购方式:0公开招标、1邀请招标、2询比价、3竞争性谈判、4单一来源
+     */
+    @TableField("procurement_way")
+    private Integer procurementWay;
+
 
     /**
      * 创建时间

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

@@ -5,9 +5,12 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -120,6 +123,23 @@ public class ContractCustom extends Model<ContractCustom> {
     @TableField("stamp_duty_items")
     private String stampDutyItems;
 
+    /**
+     * 印花税缴纳状态 0无需缴纳、1未缴纳、2已缴纳、3部分缴纳。
+     * 合同新增后，默认置值未缴纳，状态随时可修改，不予审核状态关联
+     */
+    @TableField("stamp_duty_status")
+    private Integer stampDutyStatus;
+
+    /**
+     * 印花税缴纳时间
+     * 印花税缴纳状态为无需缴纳、未缴纳时，禁用；
+     * 部分缴纳、已缴纳时，启用。
+     */
+    @TableField("stamp_duty_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Integer stampDutyTime;
+
 
     @Override
     protected Serializable pkVal() {

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

@@ -1226,8 +1226,8 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
             headList.add("合同号");
             headList.add("合同类别");
             headList.add("二级分类");
-            headList.add("对方单位");
-            headList.add("对方联系人");
+            headList.add("供应商名称");
+            headList.add("供应商联系人");
             headList.add("对方联系电话");
             headList.add("使用部门");
             headList.add("经费来源");