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

controllers/company_apply_v2.go

@@ -665,7 +665,7 @@ func (this *CompanyApplyController) ApplyTurnPositive() {
 			br.ErrMsg = "生成合同编码失败,Err:" + err.Error()
 			return
 		}
-		//如果是权益的合同,合同编号另取
+		//如果是权益的合同,合同编号另 取
 		if productId == 2 {
 			sealCount, err := seal.GetCountByDateAndCompanyId(req.StartDate, req.EndDate, req.CompanyId)
 			if err != nil {

controllers/seal/seal_approval.go

@@ -485,6 +485,7 @@ func (this *SealApprovalController) Apply() {
 			br.ErrMsg = "根据社会信用码获取客户信息失败！Err:" + err.Error()
 			return
 		}
+
 		req.CompanyId = companyInfo.CompanyId
 	} else {
 		reqVerify["ServiceType"] = []string{utils.NotEmpty()}

models/seal/request/seal_approval.go

@@ -15,7 +15,7 @@ type SealApprovalApplyReq struct {
 	AffiliatedCompany string   `description:"归属公司"`
 	CompanyId         int      `description:"客户id"`
 	StartDate         string   `description:"开始日期"`
-	EndDate           string   `description:"结束日期"`
+	EndDate           string   `description:"结束日期."`
 }
 
 // 用印审批编辑请求

models/seal/seal.go

@@ -37,7 +37,7 @@ type Seal struct {
 	ProductId         int       `description:"产品id，1：ficc；2：权益"`
 	CompanyId         int       `description:"客户id"`
 	StartDate         string    `description:"开始日期"`
-	EndDate           string    `description:"结束日期"`
+	EndDate           string    `description:"结束日期。"`
 }
 
 var EnumUse = []string{"销售合同", "渠道合同", "付款通知函", "招投标", "战略合作协议", "代付合同", "总对总协议"}
@@ -64,6 +64,7 @@ func GetSealInfoByContractId(sealId int) (sealInfo *Seal, err error) {
 // GetSealInfoByDateAndCompanyId 根据起始时间，公司ID获取合同信息
 func GetSealInfoByDateAndCompanyId(startDate, endDate string, companyId int) (sealInfo *Seal, err error) {
 	o := orm.NewOrm()
+
 	sql := `select * from seal where start_date = ? and end_date = ? AND company_id =?  AND  product_id = 2  order by seal_id asc limit 1 `
 	err = o.Raw(sql, startDate, endDate, companyId).QueryRow(&sealInfo)
 	return
@@ -72,6 +73,7 @@ func GetSealInfoByDateAndCompanyId(startDate, endDate string, companyId int) (se
 // GetCountByDateAndCompanyId  根据起始时间，公司ID获取合同信息数量
 func GetCountByDateAndCompanyId(startDate, endDate string, companyId int) (count int, err error) {
 	o := orm.NewOrm()
+
 	sql := "select count(*) AS COUNT from seal   where start_date = ? and end_date = ? AND company_id =?  AND  product_id = 2   "
 	err = o.Raw(sql, startDate, endDate, companyId).QueryRow(&count)
 	return
@@ -130,7 +132,7 @@ func GetSealCode() (code string, err error) {
 	return
 }
 
-// GetSealCodeRai 生成权益合同编号
+// GetSealCodeRai 生成权益合同编号1
 func GetSealCodeRai() (code string, err error) {
 	var num int
 	o := orm.NewOrm()
@@ -230,7 +232,7 @@ type SealApprovalItem struct {
 	CheckBackFileTimeStr string    `description:"签回用印附件时间(字符串)"`
 	ContractCode         string    `description:"合同编码"`
 	AffiliatedCompany    string    `description:"归属公司"`
-	ProductId            int       `description:"产品id，1：ficc；2：权益"`
+	ProductId            int       `description:"产品id，1：ficc；2：权益。"`
 }
 
 // GetSealApprovalListByWhere 获取用印审批列表-分页

services/seal/seal.go

@@ -139,7 +139,7 @@ func ApplySeal(sysUser *system.Admin, req request.SealApprovalApplyReq) (err err
 	return
 }
 
-// addSeal 新增用印
+// addSeal 新增用印.
 func addSeal(userId, contractId, fileNum, companyId int, userName, use, companyName, useCompanyName, creditCode, serviceType, sealType, remark string, fileUrls []string, affiliatedCompany, startDate, endDate string) (sealInfo *seal.Seal, err error) {
 	if !strings.Contains(strings.Join(seal.EnumUse, ","), use) {
 		err = errors.New("用印用途异常")
@@ -179,6 +179,7 @@ func addSeal(userId, contractId, fileNum, companyId int, userName, use, companyN
 	if len(fileUrls) == 1 {
 		fileUrl = fileUrls[0]
 	}
+
 	sealInfo = &seal.Seal{
 		Code:              sealCode,
 		UserId:            userId,