bug 修复

@@ -2,37 +2,36 @@ package models
 
 
 import (
 import (
 	"fmt"
 	"fmt"
-	"time"
 
 
 	"github.com/astaxie/beego/orm"
 	"github.com/astaxie/beego/orm"
 )
 )
 
 
 type Chance struct {
 type Chance struct {
-	Id                  int64     `orm:"column(id);pk" description:"id 主键"`
-	UserId              int64     `orm:"column(user_id)" description:"表user_company.id  id"`
-	DepartmentId        int64     `orm:"column(department_id)" description:"表department.id 部门id （提交机会指定的部门）"`
-	ChanceTypeId        int       `orm:"column(chance_type_id)" description:"表chance_type.id 机会类型 "`
-	CompanyId           int64     `orm:"column(company_id)" description:"表company.id 公司编号"`
-	AuditTemplateId     int64     `orm:"column(audit_template_id)" description:"表audit_template.id 所属审批模板编号"`
-	AuditTemplateConfig string    `orm:"column(audit_template_config);size(255);null" description:"模板配置 （存旧的配置信息，对新改动的不影响）"`
-	Content             string    `orm:"column(content)" description:"格式化后的文本内容"`
-	SourceContent       string    `orm:"column(source_content)" description:"原始表单内容 json"`
-	ViewTotal           int       `orm:"column(view_total)" description:"查看总数"`
-	CommentTotal        int       `orm:"column(comment_total)" description:"评论总数"`
-	ZanTotal            int       `orm:"column(zan_total)" description:"点赞总数"`
-	ReviewStatus        int8      `orm:"column(review_status)" description:"审核状态 0:待处理 1:待审核 2:被退回 3:已通过 "`
-	EnableStatus        int8      `orm:"column(enable_status)" description:"有效状态 0:无效 1:有效 "`
-	UpdateAt            time.Time `orm:"column(update_at);type(timestamp)" description:"更新时间"`
-	CreateAt            time.Time `orm:"column(create_at);type(timestamp)" description:"创建时间"`
-	BasicScore          float64   `orm:"column(basic_score);null;digits(4);decimals(1)" description:"基础评分"`
-	ExtraScore          float64   `orm:"column(extra_score);null;digits(4);decimals(1)" description:"附加评分"`
-	ValueScore          float64   `orm:"column(value_score);null;digits(4);decimals(1)" description:"价值评分"`
-	DiscoveryScore      float64   `orm:"column(discovery_score);null;digits(4);decimals(1)" description:"发现得分（发现得分=基础评分*系数 + 附加评分*系数 + 价值评分*系数）"`
-	PublishStatus       int       `orm:"column(publish_status)" description:"公开状态 -1 未公开、1部门公开、2公司公开"`
-	AuditLevel          int       `orm:"column(audit_level)" description:"当前审批步骤"`
-	ApproveData         string    `orm:"column(approve_data);size(500);null" description:"公开数据 （公开状态 公开对象）"`
-	Code                string    `orm:"column(code)" description:"机会编码"`
-	Status              int8      `orm:"column(status)" description:"机会状态 1:开启 2:关闭"`
+	Id                  int64   `orm:"column(id);pk" description:"id 主键"`
+	UserId              int64   `orm:"column(user_id)" description:"表user_company.id  id"`
+	DepartmentId        int64   `orm:"column(department_id)" description:"表department.id 部门id （提交机会指定的部门）"`
+	ChanceTypeId        int     `orm:"column(chance_type_id)" description:"表chance_type.id 机会类型 "`
+	CompanyId           int64   `orm:"column(company_id)" description:"表company.id 公司编号"`
+	AuditTemplateId     int64   `orm:"column(audit_template_id)" description:"表audit_template.id 所属审批模板编号"`
+	AuditTemplateConfig string  `orm:"column(audit_template_config);size(255);null" description:"模板配置 （存旧的配置信息，对新改动的不影响）"`
+	Content             string  `orm:"column(content)" description:"格式化后的文本内容"`
+	SourceContent       string  `orm:"column(source_content)" description:"原始表单内容 json"`
+	ViewTotal           int     `orm:"column(view_total)" description:"查看总数"`
+	CommentTotal        int     `orm:"column(comment_total)" description:"评论总数"`
+	ZanTotal            int     `orm:"column(zan_total)" description:"点赞总数"`
+	ReviewStatus        int8    `orm:"column(review_status)" description:"审核状态 0:待处理 1:待审核 2:被退回 3:已通过 "`
+	EnableStatus        int8    `orm:"column(enable_status)" description:"有效状态 0:无效 1:有效 "`
+	UpdateAt            string  `orm:"column(update_at)" description:"更新时间"`
+	CreateAt            string  `orm:"column(create_at)" description:"创建时间"`
+	BasicScore          float64 `orm:"column(basic_score);null;digits(4);decimals(1)" description:"基础评分"`
+	ExtraScore          float64 `orm:"column(extra_score);null;digits(4);decimals(1)" description:"附加评分"`
+	ValueScore          float64 `orm:"column(value_score);null;digits(4);decimals(1)" description:"价值评分"`
+	DiscoveryScore      float64 `orm:"column(discovery_score);null;digits(4);decimals(1)" description:"发现得分（发现得分=基础评分*系数 + 附加评分*系数 + 价值评分*系数）"`
+	PublishStatus       int     `orm:"column(publish_status)" description:"公开状态 -1 未公开、1部门公开、2公司公开"`
+	AuditLevel          int     `orm:"column(audit_level)" description:"当前审批步骤"`
+	ApproveData         string  `orm:"column(approve_data);size(500);null" description:"公开数据 （公开状态 公开对象）"`
+	Code                string  `orm:"column(code)" description:"机会编码"`
+	Status              int8    `orm:"column(status)" description:"机会状态 1:开启 2:关闭"`
 }
 }
 
 
 func (t *Chance) TableName() string {
 func (t *Chance) TableName() string {

@@ -14,19 +14,19 @@ import (
 )
 )
 
 
 type SqlData struct {
 type SqlData struct {
-	Id              int64     `orm:"column(id)"`
-	UserId          int64     `orm:"column(user_id)"`
-	NickName        string    `orm:"column(nick_name)"`
-	DepartmentId    int64     `orm:"column(department_id)"`
-	AuditTemplateId int64     `orm:"column(audit_template_id)"`
-	ChanceTypeId    int       `orm:"column(chance_type_id)"`
-	PublishStatus   int       `orm:"column(publish_status)"`
-	CreateAt        time.Time `orm:"column(create_at);type(timestamp)"`
-	ReviewStatus    int8      `orm:"column(review_status)"`
-	Status          int8      `orm:"column(status)"`
-	DiscoveryScore  string    `orm:"column(discovery_score)"`
-	CommentTotal    string    `orm:"column(comment_total)"`
-	Code            string    `orm:"column(code)"`
+	Id              int64  `orm:"column(id)"`
+	UserId          int64  `orm:"column(user_id)"`
+	NickName        string `orm:"column(nick_name)"`
+	DepartmentId    int64  `orm:"column(department_id)"`
+	AuditTemplateId int64  `orm:"column(audit_template_id)"`
+	ChanceTypeId    int    `orm:"column(chance_type_id)"`
+	PublishStatus   int    `orm:"column(publish_status)"`
+	CreateAt        string `orm:"column(create_at)`
+	ReviewStatus    int8   `orm:"column(review_status)"`
+	Status          int8   `orm:"column(status)"`
+	DiscoveryScore  string `orm:"column(discovery_score)"`
+	CommentTotal    string `orm:"column(comment_total)"`
+	Code            string `orm:"column(code)"`
 }
 }
 
 
 //根据权限获取机会列表
 //根据权限获取机会列表
@@ -277,7 +277,6 @@ func GetAuditList(param protocol.RequestAuditList, companyid int64, userid int64
 		return returnData, nil
 		return returnData, nil
 	}
 	}
 	for _, v := range data {
 	for _, v := range data {
-		t := v.CreateAt.Unix()
 		item := protocol.RspAuditList{
 		item := protocol.RspAuditList{
 			Id:                fmt.Sprint(v.Id),
 			Id:                fmt.Sprint(v.Id),
 			Status:            v.Status,
 			Status:            v.Status,
@@ -290,12 +289,11 @@ func GetAuditList(param protocol.RequestAuditList, companyid int64, userid int64
 			DiscoveryScore:    v.DiscoveryScore,
 			DiscoveryScore:    v.DiscoveryScore,
 			CommentTotal:      v.CommentTotal,
 			CommentTotal:      v.CommentTotal,
 			UserName:          v.NickName,
 			UserName:          v.NickName,
+			CreateTime:        0,
 		}
 		}
-
-		if t < 0 {
-			item.CreateTime = 0
-		} else {
-			item.CreateTime = t
+		t, err := time.ParseInLocation("2006-01-02 15:04:05", v.CreateAt, time.Local)
+		if err == nil {
+			item.CreateTime = t.Unix()
 		}
 		}
 		if d, err := models.GetDepartmentById(v.DepartmentId); err == nil {
 		if d, err := models.GetDepartmentById(v.DepartmentId); err == nil {
 			item.Department = d.Name
 			item.Department = d.Name
@@ -350,8 +348,7 @@ func GetChanceDetail(chanceid int64, companyid int64) (ResponseChanceInfo, error
 		log.Error("机会的公司不匹配")
 		log.Error("机会的公司不匹配")
 		return returnData, protocol.NewErrWithMessage("1")
 		return returnData, protocol.NewErrWithMessage("1")
 	}
 	}
-	returnData.CreateTime = chanceInfo.CreateAt.Format("2006-01-02 15:16:17")
-
+	returnData.CreateTime = chanceInfo.CreateAt
 	var (
 	var (
 		chanceContent []protocol.InputElement
 		chanceContent []protocol.InputElement
 	)
 	)
@@ -446,7 +443,7 @@ func AllowChanceEnableStatus(chanceid int64, companyid int64) error {
 		return nil
 		return nil
 	}
 	}
 	chanceinfo.Status = models.ChanceStatusAllow
 	chanceinfo.Status = models.ChanceStatusAllow
-	chanceinfo.UpdateAt = time.Now()
+	chanceinfo.UpdateAt = time.Now().String()
 	err = models.UpdateChanceById(chanceinfo, []string{"Status", "UpdateAt"})
 	err = models.UpdateChanceById(chanceinfo, []string{"Status", "UpdateAt"})
 	if err != nil {
 	if err != nil {
 		log.Error("更新机会数据失败：%s", err)
 		log.Error("更新机会数据失败：%s", err)
@@ -470,7 +467,7 @@ func ForbidChanceEnableStatus(chanceid int64, companyid int64) error {
 		return protocol.NewErrWithMessage("1")
 		return protocol.NewErrWithMessage("1")
 	}
 	}
 	chanceinfo.Status = models.ChanceStatusForbid
 	chanceinfo.Status = models.ChanceStatusForbid
-	chanceinfo.UpdateAt = time.Now()
+	chanceinfo.UpdateAt = time.Now().String()
 	err = models.UpdateChanceById(chanceinfo, []string{"Status", "UpdateAt"})
 	err = models.UpdateChanceById(chanceinfo, []string{"Status", "UpdateAt"})
 	if err != nil {
 	if err != nil {
 		log.Error("更新机会数据失败：%s", err)
 		log.Error("更新机会数据失败：%s", err)