|
|
@@ -224,7 +224,7 @@ WHERE c.is_delete = 0 AND a.approval_type="seal" `
|
|
|
func GetSealApprovalList(condition, joinCondition string, pars []interface{}) (list []*SealApprovalItem, err error) {
|
|
|
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.contract_code,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 `
|
|
|
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
|
xiziwen