浏览代码

Merge branch 'crm/crm_16.8' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

zhangchuanxing 1 月之前
父节点
当前提交
88476f8d95
共有 2 个文件被更改,包括 42 次插入0 次删除
  1. 40 0
      models/seal/seal.go
  2. 2 0
      services/seal/seal.go

+ 40 - 0
models/seal/seal.go

@@ -195,6 +195,46 @@ func GetList(condition string, pars []interface{}, startSize, pageSize int) (lis
 	return
 }
 
+//type SealApprovalItem struct {
+//	ContractApprovalId       int                     `description:"审批单ID"`
+//	ContractId               int                     `description:"合同ID"`
+//	ContractApprovalRecordId int                     `description:"审批流ID"`
+//	Code                     string                  `description:"合同编号"`
+//	Use                      string                  `description:"用印用途,枚举值:'销售合同','渠道合同','付款通知函','招投标','战略合作协议'"`
+//	ContractType             string                  `description:"合同类型,枚举值:'新签合同','续约合同','补充协议','代付合同'"`
+//	Status                   string                  `description:"合同状态,枚举值:待审批','已审批','已驳回','已撤回','已签回',默认待审批"`
+//	ApproveStatus            string                  `json:"-" description:"审批单状态,枚举值:待审批','已审批','已驳回','已撤回',默认待审批"`
+//	ApplyContent             string                  `description:"申请内容"`
+//	ApplyUserId              int                     `description:"申请人ID"`
+//	ApplyUserName            string                  `description:"申请人名称"`
+//	ContractDetail           string                  `json:"-" description:"提交审批时的合同信息;用印快照"`
+//	ContractInfo             contract.ContractDetail `json:"-" description:"提交审批时的合同信息;用印快照"`
+//	ApproveRemark            string                  `description:"审核备注"`
+//	SealType                 string                  `description:"用印类型"`
+//	CompanyName              string                  `description:"客户名称"`
+//	FileUrl                  string                  `description:"合同下载地址"`
+//	CurrNodeId               int                     `description:"当前审批节点id"`
+//	StartNodeId              int                     `description:"开始审批节点id"`
+//	//UserId                   int                     `description:"申请人id"`
+//	//UserName                 string                  `description:"申请人名称"`
+//	SealId               int       `description:"用印审批ID"`
+//	CreateTime           time.Time `description:"发起审批的时间"`
+//	ModifyTime           time.Time `description:"最后一次修改的时间"`
+//	ApproveTime          time.Time `description:"审批时间"`
+//	InvalidTime          time.Time `description:"作废时间"`
+//	CheckBackFileUrl     string    `description:"签回附件地址"`
+//	CheckBackFileTime    time.Time `description:"签回用印附件时间"`
+//	CreditCode           string    `description:"社会信用码"`
+//	CreateTimeStr        string    `description:"发起审批的时间(字符串)"`
+//	ModifyTimeStr        string    `description:"最后一次修改的时间(字符串)"`
+//	ApproveTimeStr       string    `description:"审批时间(字符串)"`
+//	InvalidTimeStr       string    `description:"作废时间(字符串)"`
+//	CheckBackFileTimeStr string    `description:"签回用印附件时间(字符串)"`
+//	ContractCode         string    `description:"合同编码"`
+//	AffiliatedCompany    string    `description:"归属公司"`
+//	ProductId            int       `description:"产品id,1:ficc;2:权益。"`
+//}
+
 type SealApprovalItem struct {
 	ContractApprovalId       int `description:"审批单ID"`
 	ContractId               int `description:"合同ID"`

+ 2 - 0
services/seal/seal.go

@@ -674,6 +674,7 @@ func GetSealApprovalPageList(condition, joinCondition string, pars []interface{}
 			}
 
 			// 合同编码
+
 			//if selfContract, has := selfContractMap[item.ContractId]; has {
 			//	list[i].ContractCode = selfContract.ContractCode
 			//} else {
@@ -681,6 +682,7 @@ func GetSealApprovalPageList(condition, joinCondition string, pars []interface{}
 			//		list[i].ContractCode = item.Code
 			//	}
 			//}
+
 			if selfContract, has := selfContractMap[item.ContractId]; has {
 				list[i].ContractCode = selfContract.ContractCode
 			}