111

dao/approver_dao.go

@@ -47,7 +47,7 @@ func (d *ApproverDao) InsertData(cur_uid int, bid int, pid int, dataType int, da
 		account := &models.CmProjectAccount{Id: safe.Uid}
 		_, err = d.engine.Get(account)
 		title = fmt.Sprintf("%s - %s", account.Name, account.Position)
-		content = fmt.Sprintf("%s-%s-已上报，审批中", safe.Code, safe.InspectionDetail)
+		content = fmt.Sprintf("%s|%s|已上报，审批中", safe.Code, safe.InspectionDetail)
 	} else {
 		quality := &models.CmQuality{Id: dataId}
 		_, err := d.engine.Get(quality)
@@ -60,7 +60,7 @@ func (d *ApproverDao) InsertData(cur_uid int, bid int, pid int, dataType int, da
 			return err
 		}
 		title = fmt.Sprintf("%s - %s", account.Name, account.Position)
-		content = fmt.Sprintf("%s-%s-已上报，审批中", quality.Code, quality.InspectionDetail)
+		content = fmt.Sprintf("%s|%s|已上报，审批中", quality.Code, quality.InspectionDetail)
 	}
 	_, err := d.engine.Exec("delete from project_message where data_type = ? and data_id = ?", dataType, dataId)
 	for i, item := range auditors {
@@ -264,7 +264,7 @@ func (d *ApproverDao) InitStatus(auditType string, bid int, dataType int, dataId
 			msgVM.CreateTime = time.Now()
 			msgVM.DataId = item.DataId
 			msgVM.DataType = item.DataType
-			msgVM.Content = fmt.Sprintf("%s-%s-审批退回到上报人", safe.Code, safe.InspectionDetail)
+			msgVM.Content = fmt.Sprintf("%s|%s|审批退回到上报人", safe.Code, safe.InspectionDetail)
 			msgVM.Title = title
 			msg = append(msg, msgVM)
 		}
@@ -277,7 +277,7 @@ func (d *ApproverDao) InitStatus(auditType string, bid int, dataType int, dataId
 		msgVM.CreateTime = time.Now()
 		msgVM.DataId = safe.Id
 		msgVM.DataType = 1
-		msgVM.Content = fmt.Sprintf("%s-%s-审批退回到上报人", safe.Code, safe.InspectionDetail)
+		msgVM.Content = fmt.Sprintf("%s|%s|审批退回到上报人", safe.Code, safe.InspectionDetail)
 		msgVM.Title = title
 		msg = append(msg, msgVM)
 
@@ -324,7 +324,7 @@ func (d *ApproverDao) InitStatus(auditType string, bid int, dataType int, dataId
 			msgVM.CreateTime = time.Now()
 			msgVM.DataId = item.DataId
 			msgVM.DataType = item.DataType
-			msgVM.Content = fmt.Sprintf("%s-%s-审批退回到上报人", quality.Code, quality.InspectionDetail)
+			msgVM.Content = fmt.Sprintf("%s|%s|审批退回到上报人", quality.Code, quality.InspectionDetail)
 			msgVM.Title = title
 			msg = append(msg, msgVM)
 		}
@@ -337,7 +337,7 @@ func (d *ApproverDao) InitStatus(auditType string, bid int, dataType int, dataId
 		msgVM.CreateTime = time.Now()
 		msgVM.DataId = quality.Id
 		msgVM.DataType = 1
-		msgVM.Content = fmt.Sprintf("%s-%s-审批退回到上报人", quality.Code, quality.InspectionDetail)
+		msgVM.Content = fmt.Sprintf("%s|%s|审批退回到上报人", quality.Code, quality.InspectionDetail)
 		msgVM.Title = title
 		msg = append(msg, msgVM)
 
@@ -426,7 +426,7 @@ func (d *ApproverDao) PassHandler(auditType string, id int, uid int, auditId int
 			msgVM.CreateTime = time.Now()
 			msgVM.DataId = item.DataId
 			msgVM.DataType = item.DataType
-			msgVM.Content = fmt.Sprintf("%s-%s-%s", msgContent, safe.Code, safe.InspectionDetail)
+			msgVM.Content = fmt.Sprintf("%s|%s|%s", msgContent, safe.Code, safe.InspectionDetail)
 			msgVM.Title = title
 			msg = append(msg, msgVM)
 		}
@@ -439,7 +439,7 @@ func (d *ApproverDao) PassHandler(auditType string, id int, uid int, auditId int
 		msgVM.CreateTime = time.Now()
 		msgVM.DataId = safe.Id
 		msgVM.DataType = 1
-		msgVM.Content = fmt.Sprintf("%s-%s-%s", msgContent, safe.Code, safe.InspectionDetail)
+		msgVM.Content = fmt.Sprintf("%s|%s|%s", msgContent, safe.Code, safe.InspectionDetail)
 		msgVM.Title = title
 		msg = append(msg, msgVM)
 
@@ -546,7 +546,7 @@ func (d *ApproverDao) PassHandler(auditType string, id int, uid int, auditId int
 			msgVM.CreateTime = time.Now()
 			msgVM.DataId = item.DataId
 			msgVM.DataType = item.DataType
-			msgVM.Content = fmt.Sprintf("%s-%s-%s", msgContent, quality.Code, quality.InspectionDetail)
+			msgVM.Content = fmt.Sprintf("%s|%s|%s", msgContent, quality.Code, quality.InspectionDetail)
 			msgVM.Title = title
 			msg = append(msg, msgVM)
 		}
@@ -559,7 +559,7 @@ func (d *ApproverDao) PassHandler(auditType string, id int, uid int, auditId int
 		msgVM.CreateTime = time.Now()
 		msgVM.DataId = quality.Id
 		msgVM.DataType = 1
-		msgVM.Content = fmt.Sprintf("%s-%s-%s", msgContent, quality.Code, quality.InspectionDetail)
+		msgVM.Content = fmt.Sprintf("%s|%s|%s", msgContent, quality.Code, quality.InspectionDetail)
 		msgVM.Title = title
 		msg = append(msg, msgVM)
 
@@ -717,7 +717,7 @@ func (d *ApproverDao) BackHandlerWithId(auditType string, id int, uid int, times
 			msgVM.CreateTime = time.Now()
 			msgVM.DataId = item.DataId
 			msgVM.DataType = item.DataType
-			msgVM.Content = fmt.Sprintf("%s-%s-审批退回，退回至%s", safe.Code, safe.InspectionDetail, account.Name)
+			msgVM.Content = fmt.Sprintf("%s|%s|审批退回，退回至%s", safe.Code, safe.InspectionDetail, account.Name)
 			msgVM.Title = title
 			msg = append(msg, msgVM)
 		}
@@ -730,7 +730,7 @@ func (d *ApproverDao) BackHandlerWithId(auditType string, id int, uid int, times
 		msgVM.CreateTime = time.Now()
 		msgVM.DataId = safe.Id
 		msgVM.DataType = 1
-		msgVM.Content = fmt.Sprintf("%s-%s-审批退回，退回至%s", safe.Code, safe.InspectionDetail, account.Name)
+		msgVM.Content = fmt.Sprintf("%s|%s|审批退回，退回至%s", safe.Code, safe.InspectionDetail, account.Name)
 		msg = append(msg, msgVM)
 
 		// 插入消息
@@ -767,7 +767,7 @@ func (d *ApproverDao) BackHandlerWithId(auditType string, id int, uid int, times
 			msgVM.CreateTime = time.Now()
 			msgVM.DataId = item.DataId
 			msgVM.DataType = item.DataType
-			msgVM.Content = fmt.Sprintf("%s-%s-审批退回，退回至%s", quality.Code, quality.InspectionDetail, account.Name)
+			msgVM.Content = fmt.Sprintf("%s|%s|审批退回，退回至%s", quality.Code, quality.InspectionDetail, account.Name)
 			msgVM.Title = title
 			msg = append(msg, msgVM)
 		}
@@ -780,7 +780,7 @@ func (d *ApproverDao) BackHandlerWithId(auditType string, id int, uid int, times
 		msgVM.CreateTime = time.Now()
 		msgVM.DataId = quality.Id
 		msgVM.DataType = 2
-		msgVM.Content = fmt.Sprintf("%s-%s-审批退回，退回至%s", quality.Code, quality.InspectionDetail, account.Name)
+		msgVM.Content = fmt.Sprintf("%s|%s|审批退回，退回至%s", quality.Code, quality.InspectionDetail, account.Name)
 		msgVM.Title = title
 		msg = append(msg, msgVM)
 
@@ -866,7 +866,7 @@ func (d *ApproverDao) CloseHandler(auditType string, id int, opinion string, cur
 			msgVM.CreateTime = time.Now()
 			msgVM.DataId = item.DataId
 			msgVM.DataType = item.DataType
-			msgVM.Content = fmt.Sprintf("%s-%s-已关闭，停止审批流程", safe.Code, safe.InspectionDetail)
+			msgVM.Content = fmt.Sprintf("%s|%s|已关闭，停止审批流程", safe.Code, safe.InspectionDetail)
 			msgVM.Title = title
 			msg = append(msg, msgVM)
 		}
@@ -879,7 +879,7 @@ func (d *ApproverDao) CloseHandler(auditType string, id int, opinion string, cur
 		msgVM.CreateTime = time.Now()
 		msgVM.DataId = safe.Id
 		msgVM.DataType = 1
-		msgVM.Content = fmt.Sprintf("%s-%s-已关闭，停止审批流程", safe.Code, safe.InspectionDetail)
+		msgVM.Content = fmt.Sprintf("%s|%s|已关闭，停止审批流程", safe.Code, safe.InspectionDetail)
 		msgVM.Title = title
 		msg = append(msg, msgVM)
 
@@ -924,7 +924,7 @@ func (d *ApproverDao) CloseHandler(auditType string, id int, opinion string, cur
 			msgVM.CreateTime = time.Now()
 			msgVM.DataId = item.DataId
 			msgVM.DataType = item.DataType
-			msgVM.Content = fmt.Sprintf("%s-%s-已关闭，停止审批流程", quality.Code, quality.InspectionDetail)
+			msgVM.Content = fmt.Sprintf("%s|%s|已关闭，停止审批流程", quality.Code, quality.InspectionDetail)
 			msgVM.Title = title
 			msg = append(msg, msgVM)
 		}
@@ -937,7 +937,7 @@ func (d *ApproverDao) CloseHandler(auditType string, id int, opinion string, cur
 		msgVM.CreateTime = time.Now()
 		msgVM.DataId = quality.Id
 		msgVM.DataType = 2
-		msgVM.Content = fmt.Sprintf("%s-%s-已关闭，停止审批流程", quality.Code, quality.InspectionDetail)
+		msgVM.Content = fmt.Sprintf("%s|%s|已关闭，停止审批流程", quality.Code, quality.InspectionDetail)
 		msgVM.Title = title
 		msg = append(msg, msgVM)