Merge branch 'dev_v1.5.3_wh' of jianyu/datatools into feature/v1.5.3

clueSync/jobutil.go

@@ -158,6 +158,10 @@ func AddOrderWork(acceptanceData map[string]interface{}, userData map[string]int
 	if gconv.String(userData["type"]) == "kc" {
 		two_type = "kc"
 	}
+	personMap := GetPerson(gconv.String(userData["position_id"]))
+	if personMap == nil || len(personMap) == 0 {
+		return false
+	}
 	orderWorkMap := map[string]interface{}{
 		"work_order_no":         work_order_no,
 		"acceptance_no":         gconv.String(acceptanceData["acceptance_no"]),
@@ -172,21 +176,33 @@ func AddOrderWork(acceptanceData map[string]interface{}, userData map[string]int
 		"creator_position_id":   gconv.String(acceptanceData["creator_position_id"]),
 		"creator_time":          nowTime,
 		"two_type":              two_type,
-		"department_no":         gconv.String(acceptanceData["department_no"]),
-		"department_name":       gconv.String(acceptanceData["department_name"]),
+		"department_no":         gconv.String(personMap["deptId"]),
+		"department_name":       gconv.String(personMap["deptName"]),
 	}
 	ok3 := WorkOrder.Insert("order_work", orderWorkMap)
 	if ok3 > 0 {
+
 		WorkOrder.Update("order_acceptance", map[string]interface{}{
 			"id": acceptanceData["id"],
 		}, map[string]interface{}{
 			"is_clue": 3,
 		})
 		//发送邮件
-		personMap := GetPerson(gconv.String(userData["position_id"]))
-		if personMap == nil || len(personMap) == 0 {
-			return false
+
+		//日志添加
+		approvalRecordMap := map[string]interface{}{
+			"work_order_no":       work_order_no,
+			"status":              common.If(gconv.Int64(userData["orderStatus"]) == 0, 2, 1),
+			"handle_name":         userData["name"],
+			"handle_position_id":  userData["position_id"],
+			"handle_dept_id":      gconv.String(personMap["deptId"]),
+			"handle_dept_name":    gconv.String(personMap["deptName"]),
+			"creator_name":        gconv.String(acceptanceData["creator_name"]),
+			"creator_position_id": gconv.String(acceptanceData["initiator_position_id"]),
+			"is_delete":           1,
+			"creator_time":        nowTime,
 		}
+		WorkOrder.Insert("approval_record", approvalRecordMap)
 		WorkMail(personMap,
 			strings.Join(productArr, ","),
 			gconv.Int64(common.If(gconv.Int64(userData["orderStatus"]) == 0, 1, 2)),
@@ -216,21 +232,25 @@ func GetPerson(positionId string) map[string]interface{} {
 	phone := gconv.String((*positionArrMap)[0]["phone"])
 	entId := gconv.String((*positionArrMap)[0]["ent_id"])
 	entUserArrMap := Mysql.SelectBySql(fmt.Sprintf(`SELECT
-	a.name as  name,a.mail as mail,b.dept_id as  deptId,a.phone
+	a.name as  name,a.mail as mail,b.dept_id as  deptId,a.phone ,c.name as deptName
 FROM
 	entniche_user a
 	INNER JOIN entniche_department_user b ON a.ent_id =%s
 	AND a.phone IN %s
-	and  a.id=b.user_id`, entId, fmt.Sprintf("(%s)", phone)))
+	and  a.id=b.user_id
+	inner  join  entniche_department c  on   b.dept_id=c.id
+`, entId, fmt.Sprintf("(%s)", phone)))
 	//商机管理员
 	if entUserArrMap == nil || len(*entUserArrMap) == 0 {
 		return map[string]interface{}{}
 	}
 	deptId := gconv.Int64((*entUserArrMap)[0]["deptId"])
 	person = map[string]interface{}{
-		"name":  gconv.String((*entUserArrMap)[0]["name"]),
-		"mail":  gconv.String((*entUserArrMap)[0]["mail"]),
-		"phone": gconv.String((*entUserArrMap)[0]["phone"]),
+		"name":     gconv.String((*entUserArrMap)[0]["name"]),
+		"mail":     gconv.String((*entUserArrMap)[0]["mail"]),
+		"phone":    gconv.String((*entUserArrMap)[0]["phone"]),
+		"deptId":   gconv.String((*entUserArrMap)[0]["deptId"]),
+		"deptName": gconv.String((*entUserArrMap)[0]["deptName"]),
 	}
 	//本部门管理员查询
 	depthMap := Mysql.SelectBySql(`SELECT