fix:修复审批列表的名称

models/tables/contract_approval/contract_approval.go

@@ -67,7 +67,7 @@ SELECT
 a.contract_approval_id,a.contract_id,a.apply_content,a.contract_detail,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 from contract_approval a
 	join 
-	( SELECT max( contract_approval_id ) max_id,contract_id FROM contract_approval where 1=1 `
+	( SELECT max( contract_approval_id ) max_id,contract_id FROM contract_approval where 1=1 and approval_type="contract" `
 	sql += childCondition
 	sql += `  GROUP BY contract_id ) b on a.contract_approval_id=b.max_id
 	JOIN contract c ON a.contract_id = c.contract_id 
@@ -128,7 +128,7 @@ 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.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,c.contract_business_type from contract_approval a
 	join 
-	( SELECT max( contract_approval_id ) max_id,contract_id FROM contract_approval where 1=1 `
+	( SELECT max( contract_approval_id ) max_id,contract_id FROM contract_approval where 1=1 and approval_type="contract" `
 	sql += childCondition
 	sql += `  GROUP BY contract_id ) b on a.contract_approval_id=b.max_id
 	JOIN contract c ON a.contract_id = c.contract_id 
@@ -148,7 +148,7 @@ SELECT
 a.contract_approval_id,a.contract_id,a.apply_content,a.contract_detail,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 from contract_approval a
 	join 
-	( SELECT max( contract_approval_id ) max_id,contract_id FROM contract_approval where 1=1 `
+	( SELECT max( contract_approval_id ) max_id,contract_id FROM contract_approval where 1=1 and approval_type="contract" `
 	sql += childCondition
 	sql += `  GROUP BY contract_id ) b on a.contract_approval_id=b.max_id
 	JOIN contract c ON a.contract_id = c.contract_id 
@@ -170,7 +170,7 @@ 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.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,c.contract_business_type from contract_approval a
 	join 
-	( SELECT max( contract_approval_id ) max_id,contract_id FROM contract_approval where 1=1 `
+	( SELECT max( contract_approval_id ) max_id,contract_id FROM contract_approval where 1=1 and approval_type="contract" `
 	sql += childCondition
 	sql += `  GROUP BY contract_id ) b on a.contract_approval_id=b.max_id
 	JOIN contract c ON a.contract_id = c.contract_id 
@@ -188,7 +188,7 @@ func GetCompanyNameListV2(childCondition, condition string, childPars, pars []in
 	sql := `
 SELECT c.company_name from contract_approval a
 	join 
-	( SELECT max( contract_approval_id ) max_id,contract_id FROM contract_approval where 1=1 `
+	( SELECT max( contract_approval_id ) max_id,contract_id FROM contract_approval where 1=1 and approval_type="contract" `
 	sql += childCondition
 	sql += `  GROUP BY contract_id ) b on a.contract_approval_id=b.max_id
 	JOIN contract c ON a.contract_id = c.contract_id 
@@ -208,7 +208,7 @@ 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
 	join 
-	( SELECT max( contract_approval_id ) max_id,contract_id FROM contract_approval where 1=1 `
+	( SELECT max( contract_approval_id ) max_id,contract_id FROM contract_approval where 1=1 and approval_type="contract" `
 	sql += childCondition
 	sql += `  GROUP BY contract_id ) b on a.contract_approval_id=b.max_id
 	JOIN contract c ON a.contract_id = c.contract_id 
@@ -236,7 +236,7 @@ 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,c.contract_business_type from contract_approval a
 	join 
-	( SELECT max( contract_approval_id ) max_id,contract_id FROM contract_approval where 1=1 `
+	( SELECT max( contract_approval_id ) max_id,contract_id FROM contract_approval where 1=1 and approval_type="contract" `
 	sql += childCondition
 	sql += `  GROUP BY contract_id ) b on a.contract_approval_id=b.max_id
 	JOIN contract c ON a.contract_id = c.contract_id 
@@ -574,7 +574,7 @@ func GetSealApprovalListCount(childCondition, condition, joinCondition string, c
 	sql := `SELECT a.contract_approval_id,a.contract_id,a.apply_content,a.approve_remark,a.create_time,a.modify_time,a.status,c.status seal_status,
 c.seal_type,c.company_name,c.user_id,c.user_name,c.file_url,c.code from contract_approval a
 	join 
-	( SELECT max( contract_approval_id ) max_id,contract_id FROM contract_approval where 1=1 `
+	( SELECT max( contract_approval_id ) max_id,contract_id FROM contract_approval where 1=1 and approval_type="seal" `
 	sql += childCondition
 	sql += `  GROUP BY contract_id ) b on a.contract_approval_id=b.max_id
 	JOIN seal c ON c.seal_id = a.contract_id 
@@ -627,7 +627,7 @@ func GetSealApprovalList(childCondition, condition, joinCondition string, childP
 	o := orm.NewOrm()
 	sql := `SELECT a.contract_approval_id,a.contract_id,a.apply_content,a.approve_remark,a.apply_user_id,a.apply_user_name,a.curr_node_id,a.start_node_id,a.create_time,a.modify_time,a.status approval_status,c.status,c.seal_type,c.company_name,c.user_id,c.user_name,c.file_url,c.approve_time,c.invalid_time,c.code,c.check_back_file_time from contract_approval a
 	join 
-	( SELECT max( contract_approval_id ) max_id,contract_id FROM contract_approval where 1=1 `
+	( SELECT max( contract_approval_id ) max_id,contract_id FROM contract_approval where 1=1 and approval_type="seal" `
 	sql += childCondition
 	sql += `  GROUP BY contract_id ) b on a.contract_approval_id=b.max_id
 	JOIN seal c ON c.seal_id = a.contract_id 
@@ -645,7 +645,7 @@ func GetSealApprovalListCountV2(childCondition, condition string, childPars, par
 	sql := `SELECT a.contract_approval_id,a.contract_id,a.apply_content,a.approve_remark,a.create_time,a.modify_time,a.status,c.status seal_status,
 c.seal_type,c.company_name,c.user_id,c.user_name,c.file_url,c.code from contract_approval a
 	join 
-	( SELECT max( contract_approval_id ) max_id,contract_id FROM contract_approval where 1=1 `
+	( SELECT max( contract_approval_id ) max_id,contract_id FROM contract_approval where 1=1 and approval_type="seal" `
 	sql += childCondition
 	sql += `  GROUP BY contract_id ) b on a.contract_approval_id=b.max_id
 	JOIN seal c ON c.seal_id = a.contract_id 
@@ -662,7 +662,7 @@ func GetSealApprovalListV2(childCondition, condition, orderBy string, childPars,
 	o := orm.NewOrm()
 	sql := `SELECT a.contract_approval_id,a.contract_id,a.apply_content,a.approve_remark,a.apply_user_id,a.apply_user_name,a.curr_node_id,a.start_node_id,a.create_time,a.modify_time,a.status approval_status,c.status,c.seal_type,c.company_name,c.user_id,c.user_name,c.file_url,c.approve_time,c.invalid_time,c.code,c.check_back_file_time from contract_approval a
 	join 
-	( SELECT max( contract_approval_id ) max_id,contract_id FROM contract_approval where 1=1 `
+	( SELECT max( contract_approval_id ) max_id,contract_id FROM contract_approval where 1=1 and approval_type="seal" `
 	sql += childCondition
 	sql += `  GROUP BY contract_id ) b on a.contract_approval_id=b.max_id
 	JOIN seal c ON c.seal_id = a.contract_id 

models/tables/seal/seal.go

@@ -123,7 +123,7 @@ func GetCompanyNameListV2(childCondition, condition string, childPars, pars []in
 	o := orm.NewOrm()
 	sql := `SELECT c.company_name,a.modify_time from contract_approval a
 	join 
-	( SELECT max( contract_approval_id ) max_id,contract_id FROM contract_approval where 1=1 `
+	( SELECT max( contract_approval_id ) max_id,contract_id FROM contract_approval where 1=1 AND approval_type="seal" `
 	sql += childCondition
 	sql += `  GROUP BY contract_id ) b on a.contract_approval_id=b.max_id
 	JOIN seal c ON c.seal_id = a.contract_id