Merge branch 'dev_v1.0.24_wh' of BaseService/biService into feature/v1.0.24

service/acceptance.go

@@ -17,6 +17,7 @@ import (
 )
 
 func AddAcceptance(in *biservice.AcceptanceReq, DkPersonMap []map[string]interface{}, entId int64, productMap map[string]string) string {
+	in.ParamData = strings.ReplaceAll(in.ParamData, "\n", "")
 	nowTime := time.Now().Format(date.Date_Full_Layout)
 	//编号处理
 	is_clue := 1
@@ -109,6 +110,7 @@ func AddAcceptance(in *biservice.AcceptanceReq, DkPersonMap []map[string]interfa
 					"acceptance_no":         acceptance_no,
 					"type":                  strings.Join(dkProduct, ","),
 					"status":                1,
+					"new_status":            nil,
 					"initiator_name":        in.EntUserName,
 					"initiator_position_id": in.PositionId,
 					"current_name":          dkPerson,
@@ -120,6 +122,7 @@ func AddAcceptance(in *biservice.AcceptanceReq, DkPersonMap []map[string]interfa
 					"two_type":              "dk",
 					"department_no":         dkdeptId,
 					"department_name":       dkdeptName,
+					"update_time":           nil,
 				}
 				ok3 := WorkOrder.InsertByTx(tx, "order_work", orderWorkMap)
 				if ok3 <= 0 {
@@ -305,7 +308,7 @@ func WorkMail(gmailAuth []*mail.GmailAuth, personMap map[string]interface{}, pro
 	if personName1 == gconv.String(personMap["superiorDepthPersonName"]) {
 		personMap["superiorDepthPersonMail"] = ""
 	}
-	content := fmt.Sprintf(`%s，您好，“%s”于%s新增了1条"%s”（工单编号：%s）%s%s，请及时前往【剑鱼PC工作台-任务单-工单管理-我负责的】进行工单处理。`, personName1, personName2, createTimeStr, orderType, acceptance_no, gconv.String(common.If(phone == "", "", fmt.Sprintf(`，客户联系方式为：%s`, phone))), gconv.String(common.If(company == "", "", fmt.Sprintf(`，公司名称：%s`, company))))
+	content := fmt.Sprintf(`%s，您好，“%s”于%s新增了1条"%s”（工单编号：%s）%s%s，请及时前往【剑鱼PC工作台-受理-工单管理-我负责的】进行工单处理。`, personName1, personName2, createTimeStr, orderType, acceptance_no, gconv.String(common.If(phone == "", "", fmt.Sprintf(`，客户联系方式为：%s`, phone))), gconv.String(common.If(company == "", "", fmt.Sprintf(`，公司名称：%s`, company))))
 	toMail := gconv.String(personMap["mail"])
 	toCc := fmt.Sprintf("%s%s", gconv.String(common.If(gconv.String(personMap["deptPersonMail"]) == "", "", gconv.String(personMap["deptPersonMail"]))), gconv.String(common.If(gconv.String(personMap["superiorDepthPersonMail"]) == "", "", gconv.String(personMap["superiorDepthPersonMail"]))))
 	log.Println(toMail, toCc, title, content)