|
|
@@ -32,43 +32,44 @@ import java.util.Map;
|
|
|
*/
|
|
|
public class WorkContractInfo extends ActEntity<WorkContractInfo> {
|
|
|
public static final String SERIAL_BIZCODE = "2";
|
|
|
+
|
|
|
/*新增属性*/
|
|
|
private WorkBidProject project; // 投标项目
|
|
|
- private String projectName; // 项目名称
|
|
|
+ private String projectName; // 项目名称
|
|
|
private String ext;
|
|
|
- private String alterState; //变更状态（1暂存2审批中3驳回回4已变更5撤回字典暂弃）
|
|
|
+ private String alterState; //变更状态（1暂存2审批中3驳回回4已变更5撤回字典暂弃）
|
|
|
private String alterProcessInstanceId;//变更流程Id
|
|
|
- private String alterBeforeId; //变更前合同id
|
|
|
+ private String alterBeforeId; //变更前合同id
|
|
|
private WorkContractInfo oldWorkContractInfo;
|
|
|
- private String alterSign; //标记
|
|
|
- private String recordState; //归档状态
|
|
|
- private String alterType ; //变更前中后
|
|
|
- private String times; //变更次数
|
|
|
+ private String alterSign; //标记
|
|
|
+ private String recordState; //归档状态
|
|
|
+ private String alterType ; //变更前中后
|
|
|
+ private String times; //变更次数
|
|
|
/*-----------------------------------------------------------------*/
|
|
|
private static final long serialVersionUID = 1L;
|
|
|
private WorkClientInfo client; // 客户ID(主委托方)
|
|
|
private List<WorkClientInfo> workClientInfoList = Lists.newArrayList(); //委托方列表
|
|
|
- private Date contractDate; // 签订日期
|
|
|
- private Date effectiveDate; // 合同生效日期
|
|
|
- private Date closingDate; // 合同终止日期
|
|
|
- private String name; // 合同名称
|
|
|
- private String contractCategory; //变更原因
|
|
|
- private String contractNum; // 合同编号
|
|
|
+ private Date contractDate; // 签订日期
|
|
|
+ private Date effectiveDate; // 合同生效日期
|
|
|
+ private Date closingDate; // 合同终止日期
|
|
|
+ private String name; // 合同名称
|
|
|
+ private String contractCategory; //变更原因
|
|
|
+ private String contractNum; // 合同编号
|
|
|
private String contractPrice; // 合同金额(元）
|
|
|
- private String contractOpposite; // 对方合同编号
|
|
|
+ private String contractOpposite; // 对方合同编号
|
|
|
private String contractType; // 合同类型
|
|
|
private String contractTypeDoc; //合同类型说明
|
|
|
- private String contractFee; // 收费标准
|
|
|
- private String contractFeeDoc; //收费标准说明
|
|
|
+ private String contractFee; // 收费标准
|
|
|
+ private String contractFeeDoc; //收费标准说明
|
|
|
private String contractSpecial; // 合同特别条款
|
|
|
private String contractState; // 合同状态
|
|
|
private Date beginContractDate; // 开始 签订日期
|
|
|
private Date endContractDate; // 结束 签订日期
|
|
|
- private String chargeCompany; //(合同所属部门)
|
|
|
- private String chargeCompanyName; //部门名称
|
|
|
- private String contractFileId; //合同文件id
|
|
|
- private String contractRole; //审批角色
|
|
|
- private String applyView; //审核意见
|
|
|
+ private String chargeCompany; //(合同所属部门)
|
|
|
+ private String chargeCompanyName; //部门名称
|
|
|
+ private String contractFileId; //合同文件id
|
|
|
+ private String contractRole; //审批角色
|
|
|
+ private String applyView; //审核意见
|
|
|
private String processInstanceId;
|
|
|
private String companyId;
|
|
|
private String officeId; //暂弃
|
user4