Roc il y a 3 ans
Parent
commit
fe6767e00f

+ 4 - 0
controllers/contract.go

@@ -106,6 +106,10 @@ func (this *ContractCommon) CompanyList() {
 	condition := ""
 	childPars := make([]interface{}, 0)
 	pars := make([]interface{}, 0)
+	if status != "" {
+		condition += `and c.status=? `
+		pars = append(pars, status)
+	}
 	//归属
 	if status == "待审批" {
 		condition += ` AND ((c.seller_id = ? and a.start_node_id = a.curr_node_id) OR (d.approve_user_id = ? )) and d.status="待审批" `

+ 1 - 1
models/tables/contract_approval/contract_approval.go

@@ -166,7 +166,7 @@ func GetContractApprovalListV2(childCondition, condition string, childPars, pars
 	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