|
@@ -5,7 +5,6 @@ import (
|
|
"fmt"
|
|
"fmt"
|
|
"hongze/hz_crm_api/models"
|
|
"hongze/hz_crm_api/models"
|
|
"hongze/hz_crm_api/models/company"
|
|
"hongze/hz_crm_api/models/company"
|
|
- "hongze/hz_crm_api/models/seal"
|
|
|
|
"hongze/hz_crm_api/models/system"
|
|
"hongze/hz_crm_api/models/system"
|
|
"hongze/hz_crm_api/services"
|
|
"hongze/hz_crm_api/services"
|
|
"hongze/hz_crm_api/services/company_apply"
|
|
"hongze/hz_crm_api/services/company_apply"
|
|
@@ -666,34 +665,34 @@ func (this *CompanyApplyController) ApplyTurnPositive() {
|
|
return
|
|
return
|
|
}
|
|
}
|
|
//如果是权益的合同,合同编号另取
|
|
//如果是权益的合同,合同编号另取
|
|
- if productId == 2 {
|
|
|
|
- sealCount, err := seal.GetCountByDateAndCompanyId(req.StartDate, req.EndDate, req.CompanyId)
|
|
|
|
- if err != nil {
|
|
|
|
- br.Msg = "生成合同编码失败"
|
|
|
|
- br.ErrMsg = "获取用印合同数量信息失败,Err:" + err.Error()
|
|
|
|
- return
|
|
|
|
- }
|
|
|
|
- crmConfig, err := company.GetConfigDetailByCode("rai_seal_check") //权益非标合同是否校验用印提交
|
|
|
|
- if err != nil {
|
|
|
|
- br.Msg = "获取配置失败"
|
|
|
|
- br.ErrMsg = "获取配置失败,Err:" + err.Error()
|
|
|
|
- return
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- if sealCount == 0 && crmConfig.ConfigValue == "1" {
|
|
|
|
- br.Msg = "此合同暂未申请用印,请核对合同期限是否有误"
|
|
|
|
- return
|
|
|
|
- }
|
|
|
|
- if sealCount > 0 {
|
|
|
|
- sealInfo, err := seal.GetSealInfoByDateAndCompanyId(req.StartDate, req.EndDate, req.CompanyId)
|
|
|
|
- if err != nil {
|
|
|
|
- br.Msg = "生成合同编码失败"
|
|
|
|
- br.ErrMsg = "获取用印合同信息失败,Err:" + err.Error()
|
|
|
|
- return
|
|
|
|
- }
|
|
|
|
- contractCode = sealInfo.Code
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ //if productId == 2 {
|
|
|
|
+ // sealCount, err := seal.GetCountByDateAndCompanyId(req.StartDate, req.EndDate, req.CompanyId)
|
|
|
|
+ // if err != nil {
|
|
|
|
+ // br.Msg = "生成合同编码失败"
|
|
|
|
+ // br.ErrMsg = "获取用印合同数量信息失败,Err:" + err.Error()
|
|
|
|
+ // return
|
|
|
|
+ // }
|
|
|
|
+ // crmConfig, err := company.GetConfigDetailByCode("rai_seal_check") //权益非标合同是否校验用印提交
|
|
|
|
+ // if err != nil {
|
|
|
|
+ // br.Msg = "获取配置失败"
|
|
|
|
+ // br.ErrMsg = "获取配置失败,Err:" + err.Error()
|
|
|
|
+ // return
|
|
|
|
+ // }
|
|
|
|
+ //
|
|
|
|
+ // if sealCount == 0 && crmConfig.ConfigValue == "1" {
|
|
|
|
+ // br.Msg = "此合同暂未申请用印,请核对合同期限是否有误"
|
|
|
|
+ // return
|
|
|
|
+ // }
|
|
|
|
+ // if sealCount > 0 {
|
|
|
|
+ // sealInfo, err := seal.GetSealInfoByDateAndCompanyId(req.StartDate, req.EndDate, req.CompanyId)
|
|
|
|
+ // if err != nil {
|
|
|
|
+ // br.Msg = "生成合同编码失败"
|
|
|
|
+ // br.ErrMsg = "获取用印合同信息失败,Err:" + err.Error()
|
|
|
|
+ // return
|
|
|
|
+ // }
|
|
|
|
+ // contractCode = sealInfo.Code
|
|
|
|
+ // }
|
|
|
|
+ //}
|
|
//当前是否存在待审批的单子
|
|
//当前是否存在待审批的单子
|
|
nowCompanyApprovalInfo, err := company.GetCompanyApprovalById(req.CompanyId, productId)
|
|
nowCompanyApprovalInfo, err := company.GetCompanyApprovalById(req.CompanyId, productId)
|
|
if (err == nil || nowCompanyApprovalInfo != nil) || err != nil && err.Error() != utils.ErrNoRow() {
|
|
if (err == nil || nowCompanyApprovalInfo != nil) || err != nil && err.Error() != utils.ErrNoRow() {
|