|
|
@@ -12,7 +12,7 @@ import (
|
|
|
type ContractApproval struct {
|
|
|
ContractApprovalId int `orm:"column(contract_approval_id);pk"`
|
|
|
ApprovalType string `description:"审批单类型，枚举值，合同：contract；用印：seal；默认：contract"`
|
|
|
- ContractId int `orm:"column(contract_id)";description:"合同id"`
|
|
|
+ ContractId int `orm:"column(contract_id)" description:"合同id"`
|
|
|
Status string `description:"审批单状态，枚举值：待审批','已审批','已驳回','已撤回'，默认待审批"`
|
|
|
ApplyContent string `description:"待审内容，长度255位"`
|
|
|
ContractDetail string `description:"审批单详情，完整的合同json数据"`
|
|
|
@@ -88,14 +88,15 @@ type ContractApprovalList struct {
|
|
|
ContractApprovalRecordId int `description:"审批流id"`
|
|
|
ContractCode string `description:"合同编号"`
|
|
|
Status string `description:"合同状态，枚举值：待审批','已审批','已驳回','已撤回'，默认待审批"`
|
|
|
- ApproveStatus string `json:"-";description:"审批单状态，枚举值：待审批','已审批','已驳回','已撤回'，默认待审批"`
|
|
|
+ ApproveStatus string `json:"-" description:"审批单状态，枚举值：待审批','已审批','已驳回','已撤回'，默认待审批"`
|
|
|
ApplyContent string `description:"待审内容"`
|
|
|
- ContractDetail string `json:"-";description:"提交审批时的合同信息；合同快照"`
|
|
|
- ContractInfo contract.ContractDetail `json:"-";description:"提交审批时的合同信息；合同快照"`
|
|
|
+ ContractDetail string `json:"-" description:"提交审批时的合同信息；合同快照"`
|
|
|
+ ContractInfo contract.ContractDetail `json:"-" description:"提交审批时的合同信息；合同快照"`
|
|
|
ApproveRemark string `description:"审核备注"`
|
|
|
ContractType string `description:"合同类型"`
|
|
|
Price float64 `description:"合同金额"`
|
|
|
CompanyName string `description:"客户名称"`
|
|
|
+ CreditCode string `description:"社会统一信用代码,长度64位"`
|
|
|
FileUrl string `description:"合同下载地址"`
|
|
|
SellerId int `description:"销售id"`
|
|
|
ProductId int `description:"产品id，1：ficc；2：权益"`
|
|
|
@@ -124,7 +125,7 @@ func GetContractApprovalList(childCondition, condition, joinCondition string, ch
|
|
|
sql := `
|
|
|
SELECT
|
|
|
a.contract_approval_id,d.contract_approval_record_id,a.contract_id,a.apply_content,a.approve_remark,a.create_time,a.modify_time,a.status approve_status,c.status,c.product_id,
|
|
|
-c.contract_type,c.start_date,c.end_date,c.price,c.company_name,c.seller_id,c.seller_name,c.file_url,c.contract_code,c.approve_time,c.invalid_time,c.check_back_file_time,c.rescind_time from contract_approval a
|
|
|
+c.contract_type,c.start_date,c.end_date,c.price,c.company_name,c.credit_code,c.seller_id,c.seller_name,c.file_url,c.contract_code,c.approve_time,c.invalid_time,c.check_back_file_time,c.rescind_time from contract_approval a
|
|
|
join
|
|
|
( SELECT max( contract_approval_id ) max_id,contract_id FROM contract_approval where 1=1 `
|
|
|
sql += childCondition
|
|
|
@@ -592,10 +593,10 @@ type SealApprovalList struct {
|
|
|
ContractApprovalRecordId int `description:"审批流id"`
|
|
|
ContractCode string `description:"合同编号"`
|
|
|
Status string `description:"合同状态，枚举值：待审批','已审批','已驳回','已撤回'，默认待审批"`
|
|
|
- ApproveStatus string `json:"-";description:"审批单状态，枚举值：待审批','已审批','已驳回','已撤回'，默认待审批"`
|
|
|
+ ApproveStatus string `json:"-" description:"审批单状态，枚举值：待审批','已审批','已驳回','已撤回'，默认待审批"`
|
|
|
ApplyContent string `description:"待审内容"`
|
|
|
- ContractDetail string `json:"-";description:"提交审批时的合同信息；用印快照"`
|
|
|
- ContractInfo contract.ContractDetail `json:"-";description:"提交审批时的合同信息；用印快照"`
|
|
|
+ ContractDetail string `json:"-" description:"提交审批时的合同信息；用印快照"`
|
|
|
+ ContractInfo contract.ContractDetail `json:"-" description:"提交审批时的合同信息；用印快照"`
|
|
|
ApproveRemark string `description:"审核备注"`
|
|
|
SealType string `description:"用印类型"`
|
|
|
CompanyName string `description:"客户名称"`
|
