fix 已撤回、已作废列表的倒序排序

controllers/contract_approval.go

@@ -145,7 +145,16 @@ func (this *ContractApprovalCommon) List() {
 			return
 		}
 
-		tmpList, err := contract_approval.GetContractApprovalListV2(childCondition, condition, childPars, pars, startSize, pageSize)
+		orderBy := ` modify_time desc `
+		switch status {
+		case "已签回":
+			orderBy = ` check_back_file_time desc `
+		case "已撤回":
+			orderBy = ` c.modify_time desc `
+		case "已作废":
+			orderBy = ` c.invalid_time desc `
+		}
+		tmpList, err := contract_approval.GetContractApprovalListV2(childCondition, condition, orderBy, childPars, pars, startSize, pageSize)
 		if err != nil {
 			this.FailWithMessage("获取审批列表失败！", "获取审批列表失败，Err:"+err.Error())
 			return

models/tables/contract_approval/contract_approval.go

@@ -161,7 +161,7 @@ WHERE c.is_delete = 0  AND a.approval_type="contract" `
 	return
 }
 
-func GetContractApprovalListV2(childCondition, condition string, childPars, pars []interface{}, startSize, pageSize int) (list []*ContractApprovalList, err error) {
+func GetContractApprovalListV2(childCondition, condition, orderBy string, childPars, pars []interface{}, startSize, pageSize int) (list []*ContractApprovalList, err error) {
 	o := orm.NewOrm()
 	sql := `
 SELECT
@@ -175,7 +175,7 @@ c.contract_type,c.start_date,c.end_date,c.price,c.company_name,c.credit_code,c.s
 	JOIN contract_approval_record d on a.contract_approval_id=d.contract_approval_id
 WHERE c.is_delete = 0  AND a.approval_type="contract" `
 	sql += condition
-	sql += ` group by contract_id order by modify_time desc LIMIT ?,? `
+	sql += ` group by contract_id order by ` + orderBy + ` LIMIT ?,? `
 	_, err = o.Raw(sql, childPars, pars, startSize, pageSize).QueryRows(&list)
 	return
 }
@@ -651,7 +651,7 @@ WHERE c.is_delete = 0  AND a.approval_type="seal" `
 	err = o.Raw(sql, childPars, pars).QueryRow(&count)
 	return
 }
-func GetSealApprovalListV2(childCondition, condition string, childPars, pars []interface{}, startSize, pageSize int) (list []*SealApprovalList, err error) {
+func GetSealApprovalListV2(childCondition, condition, orderBy string, childPars, pars []interface{}, startSize, pageSize int) (list []*SealApprovalList, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT a.contract_approval_id,a.contract_id,a.apply_content,a.approve_remark,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 from contract_approval a
 	join 
@@ -662,7 +662,7 @@ func GetSealApprovalListV2(childCondition, condition string, childPars, pars []i
 	JOIN contract_approval_record d on a.contract_approval_id=d.contract_approval_id 
 WHERE c.is_delete = 0 AND a.approval_type="seal" `
 	sql += condition
-	sql += ` group by contract_id order by modify_time desc LIMIT ?,? `
+	sql += ` group by contract_id order by ` + orderBy + ` LIMIT ?,? `
 	_, err = o.Raw(sql, childPars, pars, startSize, pageSize).QueryRows(&list)
 	return
 }