Browse Source

no message

zhangchuanxing 21 hours ago
parent
commit
0e2049744b
3 changed files with 31 additions and 3 deletions
  1. 24 0
      controllers/seal/seal_approval.go
  2. 2 0
      models/seal/request/seal_approval.go
  3. 5 3
      services/seal/seal.go

+ 24 - 0
controllers/seal/seal_approval.go

@@ -592,6 +592,30 @@ func (this *SealApprovalController) Edit() {
 		br.ErrMsg = "归属公司不能为空"
 		return
 	}
+	startDate := req.StartDate
+	creditCode := req.CreditCode
+	if startDate != "" {
+		companyInfo, tmpErr := company.GetCompanyByCreditCode(creditCode)
+		//如果查询异常,且并不是在系统中找不到该社会信用码,那么就异常返回
+		if tmpErr != nil {
+			br.Msg = "根据社会信用码获取客户信息失败!"
+			br.ErrMsg = "根据社会信用码获取客户信息失败!Err:" + err.Error()
+			return
+		}
+
+		companyId := companyInfo.CompanyId
+		totalLastYear, err := contractService.GetCompanyContractCountRaiByLastYear(companyId, req.StartDate)
+		if err != nil {
+			br.Msg = "获取合同信息失败"
+			br.ErrMsg = "获取合同信息失败,Err:" + err.Error()
+			return
+		}
+		if totalLastYear > 0 {
+			req.ServiceType = "新签合同"
+		} else {
+			req.ServiceType = "续约合同"
+		}
+	}
 
 	// 编辑用印
 	err = seal.EditApply(this.SysUser, req)

+ 2 - 0
models/seal/request/seal_approval.go

@@ -32,6 +32,8 @@ type SealApprovalEditReq struct {
 	FileUrls          []string `description:"多个文件附件地址"`
 	FileNum           int      `description:"文件份数"`
 	AffiliatedCompany string   `description:"归属公司"`
+	StartDate         string   `description:"开始日期."`
+	EndDate           string   `description:"结束日期."`
 }
 
 // 用印审批撤回请求

+ 5 - 3
services/seal/seal.go

@@ -323,7 +323,7 @@ func EditApply(sysUser *system.Admin, req request.SealApprovalEditReq) (err erro
 	}()
 
 	// 编辑用印
-	sealInfo, err := editSeal(req.SealId, sysUser.AdminId, req.ContractId, req.FileNum, req.Use, req.CompanyName, req.UseCompanyName, req.CreditCode, req.ServiceType, req.SealType, req.Remark, req.FileUrls, req.AffiliatedCompany)
+	sealInfo, err := editSeal(req.SealId, sysUser.AdminId, req.ContractId, req.FileNum, req.Use, req.CompanyName, req.UseCompanyName, req.CreditCode, req.ServiceType, req.SealType, req.Remark, req.FileUrls, req.AffiliatedCompany, req.StartDate, req.EndDate)
 	if err != nil {
 		return
 	}
@@ -340,7 +340,7 @@ func EditApply(sysUser *system.Admin, req request.SealApprovalEditReq) (err erro
 }
 
 // editSeal 编辑用印申请
-func editSeal(sealId, userId, contractId, fileNum int, use, companyName, userCompanyName, creditCode, serviceType, sealType, remark string, fileUrls []string, affiliatedCompany string) (sealInfo *seal.Seal, err error) {
+func editSeal(sealId, userId, contractId, fileNum int, use, companyName, userCompanyName, 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("用印用途异常")
 		return
@@ -387,7 +387,9 @@ func editSeal(sealId, userId, contractId, fileNum int, use, companyName, userCom
 	sealInfo.CreateTime = now // 更新提交时间
 	sealInfo.Status = "待提交"
 	sealInfo.AffiliatedCompany = affiliatedCompany
-	err = sealInfo.Update([]string{"Use", "CompanyName", "UseCompanyName", "CreditCode", "ServiceType", "SealType", "Remark", "FileUrl", "FileNum", "ContractId", "ModifyTime", "CreateTime", "Status", "AffiliatedCompany"})
+	sealInfo.StartDate = startDate
+	sealInfo.EndDate = endDate
+	err = sealInfo.Update([]string{"Use", "CompanyName", "UseCompanyName", "CreditCode", "ServiceType", "SealType", "Remark", "FileUrl", "FileNum", "ContractId", "ModifyTime", "CreateTime", "Status", "AffiliatedCompany", "StartDate", "EndDate"})
 	if err != nil {
 		return
 	}