Pārlūkot izejas kodu

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

zhangchuanxing 1 mēnesi atpakaļ
vecāks
revīzija
1f210be50a
1 mainītis faili ar 14 papildinājumiem un 1 dzēšanām
  1. 14 1
      controllers/seal/seal_approval.go

+ 14 - 1
controllers/seal/seal_approval.go

@@ -427,7 +427,7 @@ func ApprovalListExport(this *SealApprovalController, condition, joinCondition s
 		br.ErrMsg = "保存文件失败"
 		return
 	}
-	downloadFileName := "用印审批列表" + time.Now().Format("2006.01.02")+ ".xlsx"
+	downloadFileName := "用印审批列表" + time.Now().Format("2006.01.02") + ".xlsx"
 	this.Ctx.Output.Download(downLoadnFilePath, downloadFileName)
 	defer func() {
 		os.Remove(downLoadnFilePath)
@@ -480,6 +480,19 @@ func (this *SealApprovalController) Apply() {
 		br.ErrMsg = "参数丢失!Err:" + err.Error()
 		return
 	}
+	creditCode := req.CreditCode
+	startDate := req.StartDate
+
+	if startDate != "" {
+		companyInfo, tmpErr := company.GetCompanyByCreditCode(creditCode)
+		//如果查询异常,且并不是在系统中找不到该社会信用码,那么就异常返回
+		if tmpErr != nil {
+			br.Msg = "根据社会信用码获取客户信息失败!"
+			br.ErrMsg = "根据社会信用码获取客户信息失败!Err:" + err.Error()
+			return
+		}
+		req.CompanyId = companyInfo.CompanyId
+	}
 
 	// 申请用印
 	err = seal.ApplySeal(this.SysUser, req)