Merge branch 'master' of http://192.168.1.41:3000/caipin/construction_management

services/quality_audit.service.go

@@ -60,7 +60,7 @@ func (s *qualityAuditService) CloseAudit(id int, opinion string, curUid int, sav
 func (s *qualityAuditService) BackAudit(id int, opinion string, curUid int, saveId int, auditId int) error {
 	auditor, err := s.daoApprover.FindApproverById(id)
 	if auditor.AuditId != curUid {
-		return errors.New("该用户没有审批权限!")
+		return errors.New("该用户没有审批权限")
 	}
 	safe := s.daoQuality.FindById(saveId)
 
@@ -85,7 +85,7 @@ func (s *qualityAuditService) PassAudit(id int, uid int, auditId int, opinion st
 func (s *qualityAuditService) StartAudit(qualityId int, bidsectionId int, auditors []int, reAuditors []int, uid int, pid int, inspection string, inspectionDetail string, demand string, createTime time.Time) error {
 	quality := s.daoQuality.FindById(qualityId)
 	if quality.Uid != uid {
-		return errors.New("该用户没有操作权限!")
+		return errors.New("该用户没有操作权限")
 	}
 	// 清除可能有的旧的审批流程
 	err := s.daoApprover.DeleteOldAuditors(bidsectionId, 1, qualityId)

services/rule_service.go

@@ -60,7 +60,7 @@ func (s *ruleService) AutoCode(bid int, pid int, codeType string) (string, strin
 	rule := s.daoRule.FindByPidWithBid(pid, bid)
 	if codeType == "safeRule" {
 		if rule.SafeRule == "" {
-			return "", "", errors.New("该标段未设置编号规则!")
+			return "", "", errors.New("该标段未设置编号规则")
 		}
 		var code viewmodels.RuleCode
 		err := json.Unmarshal([]byte(rule.SafeRule), &code)
@@ -71,7 +71,7 @@ func (s *ruleService) AutoCode(bid int, pid int, codeType string) (string, strin
 
 	} else if codeType == "contractReturnRule" {
 		if rule.ContractReturnRule == "" {
-			return "", "", errors.New("该标段未设置编号规则!")
+			return "", "", errors.New("该标段未设置编号规则")
 		}
 		var code viewmodels.RuleCode
 		err := json.Unmarshal([]byte(rule.ContractReturnRule), &code)
@@ -83,7 +83,7 @@ func (s *ruleService) AutoCode(bid int, pid int, codeType string) (string, strin
 
 	} else if codeType == "contractPaidRule" {
 		if rule.ContractPaidRule == "" {
-			return "", "", errors.New("该标段未设置编号规则!")
+			return "", "", errors.New("该标段未设置编号规则")
 		}
 		var code viewmodels.RuleCode
 		err := json.Unmarshal([]byte(rule.ContractPaidRule), &code)
@@ -94,7 +94,7 @@ func (s *ruleService) AutoCode(bid int, pid int, codeType string) (string, strin
 
 	} else if codeType == "contractPaidRule" {
 		if rule.ContractPaidRule == "" {
-			return "", "", errors.New("该标段未设置编号规则!")
+			return "", "", errors.New("该标段未设置编号规则")
 		}
 		var code viewmodels.RuleCode
 		err := json.Unmarshal([]byte(rule.ContractPaidRule), &code)
@@ -105,7 +105,7 @@ func (s *ruleService) AutoCode(bid int, pid int, codeType string) (string, strin
 
 	} else if codeType == "contractPaidRule" {
 		if rule.ContractPaidRule == "" {
-			return "", "", errors.New("该标段未设置编号规则!")
+			return "", "", errors.New("该标段未设置编号规则")
 		}
 		var code viewmodels.RuleCode
 		err := json.Unmarshal([]byte(rule.ContractPaidRule), &code)
@@ -115,7 +115,7 @@ func (s *ruleService) AutoCode(bid int, pid int, codeType string) (string, strin
 		return rule.ContractPaidRule, newCode, err
 	} else {
 		if rule.QualityRule == "" {
-			return "", "", errors.New("该标段未设置编号规则!")
+			return "", "", errors.New("该标段未设置编号规则")
 		}
 		var code viewmodels.RuleCode
 		err := json.Unmarshal([]byte(rule.QualityRule), &code)
@@ -124,7 +124,6 @@ func (s *ruleService) AutoCode(bid int, pid int, codeType string) (string, strin
 		newCode := utils.CreateRuleCode(int64(k), total, len(code.Code))
 		return rule.QualityRule, newCode, err
 	}
-	return "", "", errors.New("生成code失败")
 }
 
 func (s *ruleService) ValidRule(ctx iris.Context) (viewmodels.ValidField, error) {

services/safe_audit.service.go

@@ -62,7 +62,7 @@ func (s *safeAuditService) CloseAudit(id int, opinion string, curUid int, saveId
 func (s *safeAuditService) BackAudit(id int, opinion string, curUid int, saveId int, auditId int) error {
 	auditor, err := s.daoApprover.FindApproverById(id)
 	if auditor.AuditId != curUid {
-		return errors.New("该用户没有审批权限!")
+		return errors.New("该用户没有审批权限")
 	}
 	safe := s.daoSafe.FindById(saveId)
 
@@ -87,7 +87,7 @@ func (s *safeAuditService) PassAudit(id int, uid int, auditId int, opinion strin
 func (s *safeAuditService) StartAudit(safeId int, bidsectionId int, auditors []int, reAuditors []int, uid int, pid int, inspection string, inspectionDetail string, demand string, createTime time.Time) error {
 	safe := s.daoSafe.FindById(safeId)
 	if safe.Uid != uid {
-		return errors.New("该用户没有操作权限!")
+		return errors.New("该用户没有操作权限")
 	}
 	// 清除可能有的旧的审批流程
 	err := s.daoApprover.DeleteOldAuditors(bidsectionId, 1, safeId)