fix 客户搜索

controllers/approval.go

@@ -44,6 +44,7 @@ func (this *ApprovalCommon) List() {
 	status := this.GetString("Status")
 	keyword := this.GetString("Keyword")
 	keyWord := this.GetString("KeyWord")
+	fmt.Println("keyword:", keyword)
 	if keyword == "" {
 		keyword = keyWord
 	}
@@ -78,7 +79,7 @@ func (this *ApprovalCommon) List() {
 	}
 
 	if keyword != "" {
-		condition += ` AND (a.company_name LIKE '%` + keyword + `%' OR a.credit_code LIKE '%` + keyWord + `%') `
+		condition += ` AND (a.company_name LIKE '%` + keyword + `%' OR a.credit_code LIKE '%` + keyword + `%') `
 	}
 
 	total, err := company_approval.GetApprovalCount(condition, pars)

controllers/message.go

@@ -121,6 +121,7 @@ func (this *MessageCommon) MessageList() {
 
 	//将所有未读消息标记为已读
 	_ = company_approval_message.ModifyAllCompanyApprovalMessageStatus(sysUserId, sourceType)
+
 	companyApprovalIds := make([]string, 0)
 	newApprovalRecordIds := make([]string, 0)
 	companyApprovalMap := make(map[int]*company_approval.CompanyApproval)
@@ -201,16 +202,16 @@ func (this *MessageCommon) MessageList() {
 					approvalInfo.Type = "服务更新"
 				}
 				approvalInfo.ApplyName = companyApproval.ApplyRealName
-				approvalInfo.ApplyTime = companyApproval.CreateTime.Format(utils.FormatDateTime)
-				approvalInfo.ApprovalTime = companyApproval.ApproveTime.Format(utils.FormatDateTime)
+				approvalInfo.ApplyTime = companyApproval.CreateTime
+				approvalInfo.ApprovalTime = companyApproval.ApproveTime
 			}
 		} else {
 			if messageInfo.MessageType != 3 {
 				if newApproval, ok := newApprovalMap[messageInfo.CompanyApprovalId]; ok {
 					approvalInfo.Type = newApproval.ApplyContent
 					approvalInfo.ApplyName = newApproval.ApplyUserName
-					approvalInfo.ApplyTime = newApproval.CreateTime.Format(utils.FormatDateTime)
-					approvalInfo.ApprovalTime = newApproval.ModifyTime.Format(utils.FormatDateTime)
+					approvalInfo.ApplyTime = newApproval.CreateTime
+					approvalInfo.ApprovalTime = newApproval.ModifyTime
 				}
 			}
 		}

models/tables/company_approval_message/company_approval_message.go

@@ -51,7 +51,6 @@ type CompanyApprovalMessageList struct {
 	Content           string       `description:"消息内容"`
 	CompanyName       string       `description:"客户名称"`
 	CreateTime        time.Time    `description:"创建时间"`
-	CreateTimeStr     string       `json:"CreateTime";description:"创建时间"`
 	RealName          string       `description:"销售名称"`
 	CompanyApprovalId int          `description:"审批单id"`
 	ApprovalInfo      ApprovalInfo `description:"审批单信息"`
@@ -59,10 +58,10 @@ type CompanyApprovalMessageList struct {
 
 //消息审批单信息
 type ApprovalInfo struct {
-	ApplyName    string `description:"申请人姓名"`
-	Type         string `description:"类型"`
-	ApplyTime    string `description:"提交时间"`
-	ApprovalTime string `description:"审批时间"`
+	ApplyName    string    `description:"申请人姓名"`
+	Type         string    `description:"类型"`
+	ApplyTime    time.Time `description:"提交时间"`
+	ApprovalTime time.Time `description:"审批时间"`
 }
 
 type CompanyApprovalMessageListResp struct {