Merge branch 'crm1.0' into debug

controllers/contract_approval.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	contractReq "hongze/hongze_mobile_admin/models/request/contract"
 	"hongze/hongze_mobile_admin/models/response/contract"
-	contractTable "hongze/hongze_mobile_admin/models/tables/contract"
 	"hongze/hongze_mobile_admin/models/tables/contract_approval"
 	"hongze/hongze_mobile_admin/models/tables/contract_approval_record"
 	contractService "hongze/hongze_mobile_admin/services/contract"
@@ -162,13 +161,7 @@ func (this *ContractApprovalCommon) List() {
 			list[i].CreateTimeStr = item.CreateTime.Format(utils.FormatDateTime)
 			list[i].ModifyTimeStr = item.ModifyTime.Format(utils.FormatDateTime)
 
-			var contractDetail contractTable.ContractDetail
-			jsonErr := json.Unmarshal([]byte(list[i].ContractDetail), &contractDetail)
-			if jsonErr != nil {
-				this.FailWithMessage("获取审批列表失败！", "获取审批列表失败，Err:"+jsonErr.Error())
-				return
-			}
-			list[i].ContractInfo = contractDetail
+			//list[i].ContractInfo = contractDetail
 			//校验最新审批流数据
 			if contractApprovalRecord, has := contractApprovalRecordMap[item.ContractApprovalId]; has {
 				//审批流id

models/tables/contract_approval/contract_approval.go

@@ -80,7 +80,7 @@ WHERE c.is_delete = 0 `
 	sql += ` group by contract_id `
 
 	sql = `select count(*) count from (` + sql + `) g`
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = o.Raw(sql, childPars, pars).QueryRow(&count)
 	return
 }
 
@@ -94,7 +94,7 @@ type ContractApprovalList struct {
 	ContractStatus           string                  `json:"-";description:"合同状态，枚举值：待审批','已审批','已驳回','已撤回'，默认待审批"`
 	ApplyContent             string                  `description:"待审内容"`
 	ContractDetail           string                  `json:"-";description:"提交审批时的合同信息；合同快照"`
-	ContractInfo             contract.ContractDetail `description:"提交审批时的合同信息；合同快照"`
+	ContractInfo             contract.ContractDetail `json:"-";description:"提交审批时的合同信息；合同快照"`
 	ApproveRemark            string                  `description:"审核备注"`
 	ContractType             string                  `description:"合同类型"`
 	Price                    float64                 `description:"合同金额"`