浏览代码

小修改

yuliang1112 2 年之前
父节点
当前提交
efb0413b37
共有 4 个文件被更改,包括 5 次插入6 次删除
  1. 2 2
      db/project.go
  2. 1 1
      handler/project_show.go
  3. 1 2
      model/http_model/project_show.go
  4. 1 1
      service/project.go

+ 2 - 2
db/project.go

@@ -33,7 +33,7 @@ func GetFullProjectList(ctx context.Context, pageSize, pageNum int32, condition
 			db = db.Where(fmt.Sprintf("%s = ?", tag), value.Interface())
 		}
 		if tag == "updated_at" && value.Interface() != "0" {
-			db = db.Where(fmt.Sprintf("%s > ?", tag), value.Interface())
+			db = db.Where(fmt.Sprintf("updated_at like '%s%%'", value.Interface()))
 		}
 		if tag == "project_name" && !util.IsBlank(value) {
 			db = db.Where(fmt.Sprintf("%s = ?", tag), value.Interface())
@@ -49,7 +49,7 @@ func GetFullProjectList(ctx context.Context, pageSize, pageNum int32, condition
 	// 查询该页数据
 	limit := pageSize
 	offset := pageSize * pageNum // assert pageNum start with 0
-	err := db.Order("project_id").Limit(int(limit)).Offset(int(offset)).Find(&fullProjects).Error
+	err := db.Order("updated_at").Limit(int(limit)).Offset(int(offset)).Find(&fullProjects).Error
 	if err != nil {
 		logrus.WithContext(ctx).Errorf("[GetFullProjectList] error query mysql find, err:%+v", err)
 		return nil, 0, err

+ 1 - 1
handler/project_show.go

@@ -40,7 +40,7 @@ func (h *ShowProjectHandler) getResponse() interface{} {
 func (h *ShowProjectHandler) run() {
 	data := http_model.ShowProjectRequest{}
 	data = *h.req
-	res, err := service.Project.GetProjectDetail(h.ctx, data.EnterpriseID, data.ProjectID)
+	res, err := service.Project.GetProjectDetail(h.ctx, data.ProjectID)
 	if err != nil {
 		logrus.Errorf("[ShowProjectHandler] call Show err:%+v\n", err)
 		util.HandlerPackErrorResp(h.resp, consts.ErrorInternal, "")

+ 1 - 2
model/http_model/project_show.go

@@ -38,8 +38,7 @@ type ShowProjectData struct {
 }
 
 type ShowProjectRequest struct {
-	EnterpriseID string `json:"enterprise_id"` // 企业id
-	ProjectID    int64  `json:"Project_id"`    // 项目id
+	ProjectID int64 `json:"Project_id"` // 项目id
 }
 
 func NewShowProjectRequest() *ShowProjectRequest {

+ 1 - 1
service/project.go

@@ -32,7 +32,7 @@ func (*project) GetFullProjectList(ctx context.Context, pageSize, pageNum int32,
 	return fullProjectListData, nil
 }
 
-func (*project) GetProjectDetail(ctx context.Context, EnterpriseID string, projectID int64) (*http_model.ShowProjectData, error) {
+func (*project) GetProjectDetail(ctx context.Context, projectID int64) (*http_model.ShowProjectData, error) {
 	project, err := db.GetProjectDetail(ctx, projectID)
 	if err != nil {
 		logrus.WithContext(ctx).Errorf("[project service] call GetPorjectDetail error,err:%+v", err)