Merge branch 'pool_639'

controller/contract/register.go

@@ -3843,8 +3843,8 @@ func (rg *RegisterController) CheckContractName(c *gin.Context) {
 }
 
 // CheckContract
-// @Title 货币单位列表
-// @Description 货币单位列表
+// @Title 校验重复合同
+// @Description 校验重复合同
 // @Success 200 {object} fms.CheckContractNameResp
 // @router /contract/register/check_contract_duplicate [post]
 func (rg *RegisterController) CheckContractDuplicate(c *gin.Context) {
@@ -3902,17 +3902,24 @@ func (rg *RegisterController) CheckContractDuplicate(c *gin.Context) {
 		return
 	}
 
+	typeIdMap := make(map[int]int)
 	registerIds := make([]int, 0)
 	for i := range list {
 		registerIds = append(registerIds, list[i].ContractRegisterId)
+		if list[i].ContractCode != "" {
+			typeIdMap[list[i].ContractRegisterId] = 1
+		}
 	}
 
-	idlist, e := fms.CheckContractServiceDuplicate(registerIds)
+	dupList, e := fms.CheckContractServiceDuplicate(registerIds)
 	if e != nil {
 		resp.FailMsg("操作失败", "查询重复合同套餐失败, Err: "+e.Error(), c)
 		return
 	}
-
+	serviceIdMap := make(map[int]string)
+	for _, v := range dupList {
+		serviceIdMap[v.ContractRegisterId] = v.Ids
+	}
 	//校验套餐
 	if len(req.Services) > 0 {
 		serviceAmountMap := make(map[int]float64)
@@ -3932,11 +3939,17 @@ func (rg *RegisterController) CheckContractDuplicate(c *gin.Context) {
 		}
 		templateIdStr := strings.Join(ids, ",")
 
-		for _, s := range idlist {
-			if templateIdStr == *s {
-				data.Exist = 1
+		for _, v := range dupList {
+			if serviceIds, ok := serviceIdMap[v.ContractRegisterId]; ok{
+				if serviceIds == templateIdStr{
+					data.Exist = 1
+					if _, ok2 := typeIdMap[v.ContractRegisterId]; ok2{
+						data.Type = 1
+					}
+				}
 			}
 		}
+
 	}
 
 	resp.OkData("查询成功", data, c)

models/fms/contract_register.go

@@ -616,8 +616,8 @@ func UpdateContractPreRegister(item *ContractRegister, updateCols []string, serv
 	}
 
 	for i := range invoiceList {
-		fmt.Println("invoiceList[i].SellerName",invoiceList[i].SellerName)
-		fmt.Println("invoiceList[i].SellerId",invoiceList[i].SellerId)
+		fmt.Println("invoiceList[i].SellerName", invoiceList[i].SellerName)
+		fmt.Println("invoiceList[i].SellerId", invoiceList[i].SellerId)
 		if invoiceList[i].ContractInvoiceId == 0 {
 			if e := invoiceList[i].Create(); e != nil {
 				err = e
@@ -663,9 +663,9 @@ func UpdateContractPreRegister(item *ContractRegister, updateCols []string, serv
 		SellerTeamId:       sellerItem.TeamId,
 		SellerTeamName:     sellerItem.TeamName,
 	}
-	if registerType == 3{
-		tx.Model(&invoiceItem).Select([]string{"StartDate", "EndDate", "CurrencyUnit","SellerId",
-			"SellerName","SellerGroupId","SellerGroupName","SellerTeamId","SellerTeamName"}).Where("contract_register_id = ? AND invoice_type = 4", item.ContractRegisterId).Updates(invoiceItem)
+	if registerType == 3 {
+		tx.Model(&invoiceItem).Select([]string{"StartDate", "EndDate", "CurrencyUnit", "SellerId",
+			"SellerName", "SellerGroupId", "SellerGroupName", "SellerTeamId", "SellerTeamName"}).Where("contract_register_id = ? AND invoice_type = 4", item.ContractRegisterId).Updates(invoiceItem)
 	} else {
 		tx.Model(&invoiceItem).Select([]string{"StartDate", "EndDate", "CurrencyUnit"}).Where("contract_register_id", item.ContractRegisterId).Updates(invoiceItem)
 	}
@@ -789,14 +789,12 @@ func UpdateContractRegisterPre(item *ContractRegister, updateCols []string, serv
 			otherInvoiceItem.SellerTeamId = invoiceList[0].SellerTeamId
 			otherInvoiceItem.SellerTeamName = invoiceList[0].SellerTeamName
 		}
-		tx.Model(&otherInvoiceItem).Select([]string{"ServiceProductId","SellerId", "SellerName", "SellerGroupId","SellerGroupName","SellerTeamId","SellerTeamName"}).Updates(otherInvoiceItem)
+		tx.Model(&otherInvoiceItem).Select([]string{"ServiceProductId", "SellerId", "SellerName", "SellerGroupId", "SellerGroupName", "SellerTeamId", "SellerTeamName"}).Updates(otherInvoiceItem)
 	} else {
 		otherInvoiceItem.ContractInvoiceId = ppItem.InvoiceId
 		tx.Model(&otherInvoiceItem).Select([]string{"ServiceProductId"}).Updates(otherInvoiceItem)
 	}
 
-
-
 	//更新另一类型的invoice表数据
 	invoiceItem := ContractInvoice{
 		ContractRegisterId: item.ContractRegisterId,
@@ -916,7 +914,7 @@ type CheckContractDuplicateReq struct {
 	Services    []ContractServiceAddReq `json:"services" description:"服务套餐内容"`
 }
 
-func CheckContractDuplicate(condition string, pars []interface{}) (list []*ContractRegister,err error) {
+func CheckContractDuplicate(condition string, pars []interface{}) (list []*ContractRegister, err error) {
 	query := global.DEFAULT_MYSQL.Table("contract_register AS a").
 		Select("a.* ").
 		Joins(" JOIN contract_service AS b ON a.contract_register_id = b.contract_register_id ").
@@ -926,15 +924,19 @@ func CheckContractDuplicate(condition string, pars []interface{}) (list []*Contr
 	return
 }
 
-
 type CheckContractDuplicateResp struct {
 	Exist int `json:"exist" description:"是否存在重复的合同：0不存在，1存在"`
+	Type  int `json:"type" description:"重复的合同类型：0预登记，1合规登记"`
+}
+type ContractServiceDuplicateItem struct {
+	Ids string
+	ContractRegisterId int
 }
 
-func CheckContractServiceDuplicate(registerIds []int) (ids []*string, err error) {
+func CheckContractServiceDuplicate(registerIds []int) (list []*ContractServiceDuplicateItem, err error) {
 	err = global.DEFAULT_MYSQL.Table("contract_service").
-		Select("GROUP_CONCAT(service_template_id ORDER BY service_template_id)  AS ids ").
+		Select("GROUP_CONCAT(service_template_id ORDER BY service_template_id)  AS ids, contract_register_id ").
 		Where("contract_register_id IN (?)", registerIds).
-		Group("contract_register_id").Scan(&ids).Error
+		Group("contract_register_id").Find(&list).Error
 	return
-}
+}