添加专项查询

db/project.go

@@ -17,9 +17,13 @@ import (
 	"youngee_m_api/util"
 )
 
-func GetFullProjectList(ctx context.Context, pageSize, pageNum int32, condition *common_model.ProjectCondition) ([]*gorm_model.ProjectInfo, int64, error) {
+func GetFullProjectList(ctx context.Context, pageSize, pageNum int32, condition *common_model.ProjectCondition, projectType string) ([]*gorm_model.ProjectInfo, int64, error) {
 	db := GetReadDB(ctx)
-	db = db.Debug().Model(gorm_model.ProjectInfo{}).Where("project_type = 1")
+	if projectType == "2" {
+		db = db.Debug().Model(gorm_model.ProjectInfo{}).Where("project_type = 2")
+	} else {
+		db = db.Debug().Model(gorm_model.ProjectInfo{}).Where("project_type = 1")
+	}
 	// 根据Project条件过滤
 	conditionType := reflect.TypeOf(condition).Elem()
 	conditionValue := reflect.ValueOf(condition).Elem()

handler/product_list.go

@@ -45,7 +45,7 @@ func (h *FullProjectListHandler) getResponse() interface{} {
 }
 func (h *FullProjectListHandler) run() {
 	condition := pack.HttpFullProjectRequestToCondition(h.req)
-	data, err := service.Project.GetFullProjectList(h.ctx, h.req.PageSize, h.req.PageNum, condition)
+	data, err := service.Project.GetFullProjectList(h.ctx, h.req.PageSize, h.req.PageNum, condition, h.req.ProjectType)
 	if err != nil {
 		logrus.WithContext(h.ctx).Errorf("[FullProjectListHandler] error GetFullProjectList, err:%+v", err)
 		util.HandlerPackErrorResp(h.resp, consts.ErrorInternal, consts.DefaultToast)

model/http_model/full_project_list.go

@@ -6,6 +6,7 @@ type FullProjectListRequest struct {
 	ProjectId          string `json:"project_id"`           // 项目ID
 	ProjectName        string `json:"project_name"`         // 项目名
 	ProjectStatus      string `json:"project_status"`       // 项目状态
+	ProjectType        string `json:"project_type"`         // 项目类型
 	ProjectPlatform    string `json:"project_platform"`     // 项目平台
 	ProjectForm        string `json:"project_form"`         // 项目形式
 	ProjectContentType string `json:"project_content_type"` // 内容形式

service/project.go

@@ -23,8 +23,8 @@ var Project *project
 type project struct {
 }
 
-func (*project) GetFullProjectList(ctx context.Context, pageSize, pageNum int32, condition *common_model.ProjectCondition) (*http_model.FullProjectListData, error) {
-	fullProjects, total, err := db.GetFullProjectList(ctx, pageSize, pageNum, condition)
+func (*project) GetFullProjectList(ctx context.Context, pageSize, pageNum int32, condition *common_model.ProjectCondition, projectType string) (*http_model.FullProjectListData, error) {
+	fullProjects, total, err := db.GetFullProjectList(ctx, pageSize, pageNum, condition, projectType)
 	if err != nil {
 		logrus.WithContext(ctx).Errorf("[project service] call GetFullProjectList error,err:%+v", err)
 		return nil, err