From 50fb58286ed3b718c39a97e0987ee7561a295651 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期五, 04 七月 2025 17:56:41 +0800 Subject: [PATCH] git ch --- server/service/src/main/java/com/doumee/dao/business/model/Contract.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 55 insertions(+), 4 deletions(-) diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Contract.java b/server/service/src/main/java/com/doumee/dao/business/model/Contract.java index e2d8d0f..20e1e44 100644 --- a/server/service/src/main/java/com/doumee/dao/business/model/Contract.java +++ b/server/service/src/main/java/com/doumee/dao/business/model/Contract.java @@ -1,5 +1,6 @@ package com.doumee.dao.business.model; +import com.baomidou.mybatisplus.annotation.TableField; import com.doumee.core.annotation.excel.ExcelColumn; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -55,8 +56,13 @@ @ExcelColumn(name="鍚堝悓鍚嶇О") private String name; - @ApiModelProperty(value = "浼佷笟鎴栬�呭晢鎴风紪鐮�(鍏宠仈company锛�", example = "1") - @ExcelColumn(name="浼佷笟鎴栬�呭晢鎴风紪鐮�(鍏宠仈company锛�") + + @ApiModelProperty(value = "鐢叉柟浼佷笟涓婚敭", example = "1") + @ExcelColumn(name="鐢叉柟浼佷笟涓婚敭") + private Integer partyCompanyId; + + @ApiModelProperty(value = "涔欐柟浼佷笟涓婚敭", example = "1") + @ExcelColumn(name="涔欐柟浼佷笟涓婚敭") private Integer companyId; @ApiModelProperty(value = "璇存槑") @@ -111,11 +117,11 @@ @ApiModelProperty(value = "鎴戞柟绛剧讲鍚堝悓鍙�") @ExcelColumn(name="鎴戞柟绛剧讲鍚堝悓鍙�") - private String appyno; + private String applyNo; @ApiModelProperty(value = "鏈�缁堢缃插悎鍚屽彿") @ExcelColumn(name="鏈�缁堢缃插悎鍚屽彿") - private String doneApplyno; + private String doneApplyNo; @ApiModelProperty(value = "鍚堝悓寮�濮嬫椂闂�") @ExcelColumn(name="鍚堝悓寮�濮嬫椂闂�") @@ -140,4 +146,49 @@ @ExcelColumn(name="鍙栨秷澶囨敞") private String cancelInfo; + + @ApiModelProperty(value = "鏌ヨ鐘舵�侊細0=骞冲彴绛剧讲锛�1=鍟嗘埛绛剧讲锛�2=浼佷笟绛剧讲锛�3=宸插畬鎴愶紱4=宸插彇娑堬紱5=鍏抽棴") + @TableField(exist = false) + private Integer queryStatus; + + + @ApiModelProperty(value = "绛剧讲鏂囦欢") + @TableField(exist = false) + private Multifile multifile; + + @ApiModelProperty(value = "缁勭粐绫诲瀷锛�0浼佷笟 1鍟嗘埛") + @TableField(exist = false) + private Integer companyType; + + @ApiModelProperty(value = "涔欐柟缁勭粐鍚嶇О") + @TableField(exist = false) + private String companyName; + + @ApiModelProperty(value = "鐢叉柟缁勭粐鍚嶇О") + @TableField(exist = false) + private String partyCompanyName; + + @ApiModelProperty(value = "绛剧讲绫诲瀷锛�0 = 骞冲彴-鍟嗘埛锛�1= 骞冲彴-浼佷笟锛�2=鍟嗘埛-浼佷笟") + @ExcelColumn(name="鍙栨秷澶囨敞") + private Integer signType; + + + @ApiModelProperty(value = "鎴戞柟 宸茬缃叉枃浠�") + @TableField(exist = false) + private Multifile multiFirstFile; + + @ApiModelProperty(value = "鍟嗘埛鎴栦紒涓氬凡绛剧讲鏂囦欢") + @TableField(exist = false) + private Multifile multiDoneFile; + + @ApiModelProperty(value = "鎴戞柟绛剧讲浜�") + @TableField(exist = false) + private String firstSignUserName; + + @ApiModelProperty(value = "浼佷笟鎴栧晢鎴风缃蹭汉鍚嶇О") + @TableField(exist = false) + private String doneSignUserName; + + + } -- Gitblit v1.9.3