|
|
@@ -257,9 +257,10 @@ func GetList(condition string, pars []interface{}, startSize, pageSize int) (lis
|
|
|
//}
|
|
|
|
|
|
type SealApprovalItem struct {
|
|
|
- ContractApprovalId int `description:"审批单ID"`
|
|
|
- ContractId int `description:"合同ID"`
|
|
|
- ContractApprovalRecordId int `description:"审批流ID"`
|
|
|
+ ContractApprovalId int `description:"审批单ID"`
|
|
|
+ ContractId int `description:"合同ID"`
|
|
|
+ ContractApprovalRecordId int `description:"审批流ID"`
|
|
|
+ Code string `description:"合同编号"`
|
|
|
//ContractCode string `description:"合同编号"`
|
|
|
Use string `description:"用印用途,枚举值：'销售合同','渠道合同','付款通知函','招投标','战略合作协议'"`
|
|
|
ContractType string `description:"合同类型,枚举值：'新签合同','续约合同','补充协议','代付合同'"`
|
|
|
@@ -323,7 +324,7 @@ func GetSealApprovalListByWhere(condition, joinCondition string, pars []interfac
|
|
|
//git
|
|
|
o := orm.NewOrm()
|
|
|
fields := `a.contract_approval_id,c.contract_id,a.apply_content,a.approve_remark,a.apply_user_id,a.apply_user_name,a.curr_node_id,a.start_node_id,c.create_time,a.modify_time,a.status approval_status,
|
|
|
- c.status,c.seal_id,c.seal_type,c.service_type contract_type,c.use,c.company_name,c.file_url,c.approve_time,c.invalid_time,c.code,c.credit_code,c.check_back_file_time,c.check_back_file_url,c.affiliated_company `
|
|
|
+ c.status,c.seal_id,c.seal_type,c.service_type contract_type,c.use,c.company_name,c.file_url,c.approve_time,c.invalid_time,c.code,c.credit_code,c.check_back_file_time,c.check_back_file_url,c.affiliated_company,c.product_id `
|
|
|
sql := `SELECT ` + fields + ` from contract_approval a JOIN ( SELECT max( contract_approval_id ) max_id,contract_id FROM contract_approval where 1=1 and approval_type = "seal" `
|
|
|
sql += ` GROUP BY contract_id ) b on a.contract_approval_id=b.max_id
|
|
|
JOIN seal c ON c.seal_id = a.contract_id
|
