12月18日合并调整后的details_ljk分支

link_homework/internal/controller/record/manageRecord.go

@@ -22,10 +22,7 @@ func (m *ManageRecord) GetRecordList(r *ghttp.Request) {
 			Message: err.Error(),
 		})
 	}
-	groupId := req.Id
-	pageNo := req.PageNo
-	pageSize := req.PageSize
-	result, err := service.Record().GetRecordList(r.Context(), groupId, pageNo, pageSize)
+	result, err := service.Record().GetRecordList(r.Context(), req.Id, req.PageNo, req.PageSize)
 	if err != nil {
 		r.Response.WriteJsonExit(dto.Result{
 			Code:    400,
@@ -48,13 +45,7 @@ func (m *ManageRecord) GetRecordByCondition(r *ghttp.Request) {
 			Message: err.Error(),
 		})
 	}
-	groupId := req.Id
-	jwcode := req.Jwcode
-	deptId := req.DeptId
-	shopId := req.ShopId
-	pageNo := req.PageNo
-	pageSize := req.PageSize
-	result, err := service.Record().GetRecordByCondition(r.Context(), groupId, jwcode, deptId, shopId, pageNo, pageSize)
+	result, err := service.Record().GetRecordByCondition(r.Context(), req.Id, req.Jwcode, req.DeptId, req.ShopId, req.PageNo, req.PageSize)
 	if err != nil {
 		r.Response.WriteJsonExit(dto.Result{
 			Code:    400,
@@ -93,8 +84,7 @@ func (m *ManageRecord) GetShopInfo(r *ghttp.Request) {
 			Message: err.Error(),
 		})
 	}
-	deptId := req.DeptId
-	result, err := service.Record().GetShopInfoByDeptId(r.Context(), deptId)
+	result, err := service.Record().GetShopInfoByDeptId(r.Context(), req.DeptId)
 	if err != nil {
 		r.Response.WriteJsonExit(dto.Result{
 			Code:    400,

link_homework/internal/logic/record/record.go

@@ -27,7 +27,7 @@ func (s *sRecord) GetRecordList(ctx context.Context, groupId, pageNo, pageSize i
 	err = dao.ActivityInteractiveRecord.Ctx(ctx).Fields("jwcode").Where("group_id", groupId).Group("jwcode").
 		Page(pageNo, pageSize).Scan(&record)
 	if err != nil {
-		panic("无条件查jwcode失败")
+		return nil, errors.New("无条件查jwcode失败")
 	}
 
 	fmt.Println(record)
@@ -36,7 +36,7 @@ func (s *sRecord) GetRecordList(ctx context.Context, groupId, pageNo, pageSize i
 		err = g.DB("cms").Model("member_info").Fields("jwcode", "name", "deptId", "deptName", "shopId", "shopName").
 			Where("jwcode", info.Jwcode).Scan(&record[i])
 		if err != nil {
-			panic("无条件根据jwcode查member_info表失败")
+			return nil, errors.New("无条件根据jwcode查member_info表失败")
 		}
 		total, err1 := dao.ActivityInteractiveRecord.Ctx(ctx).Fields("jwcode").Where("group_id", groupId).Group("jwcode").Count()
 		if err1 != nil {
@@ -47,8 +47,14 @@ func (s *sRecord) GetRecordList(ctx context.Context, groupId, pageNo, pageSize i
 		var recordInfo []dto.RecordInfo
 		err = dao.ActivityInteractiveRecord.Ctx(ctx).Fields("content", "content_title", "updated_at", "form_id").
 			Where("jwcode", info.Jwcode).Where("group_id", groupId).Group("form_id").Order("updated_at desc").Scan(&recordInfo) //不是最新的,需要再改
+		if err != nil {
+			return nil, err
+		}
 		for i, title := range recordInfo {
 			err = dao.ActivityInteractiveForm.Ctx(ctx).Fields("description", "type").Where("id", title.FormId).Scan(&recordInfo[i])
+			if err != nil {
+				return nil, err
+			}
 		}
 		record[i].Reply = recordInfo
 		fmt.Println(record)
@@ -61,12 +67,12 @@ func (s *sRecord) GetRecordByCondition(ctx context.Context, groupId, jwcode int,
 	//全查
 	recordList, err := s.GetRecordList(ctx, groupId, pageNo, pageSize)
 	if err != nil {
-		return nil, err
+		return recordList, err
 	}
 	//判断传来的jwcode, deptId, shopId是否为空,根据情况进行不同的筛选
 	if jwcode == 0 { //没有传jwcode
 		if deptId == "" && shopId == "" { //000
-			return recordList, nil
+			return recordList, err
 		} else if deptId != "" && shopId == "" { //010
 			for _, info := range recordList {
 				if info.DeptId == deptId {