From 76445706a7212aa759c161d64c3089bb70ebc4ad Mon Sep 17 00:00:00 2001
From: lijikun <ljk190610@163.com>
Date: Wed, 18 Dec 2024 10:56:23 +0800
Subject: [PATCH 1/3] =?UTF-8?q?12=E6=9C=8818=E6=97=A5=E8=B0=83=E6=95=B4log?=
 =?UTF-8?q?ic=E5=B1=82=E4=B8=8Eservice=E5=B1=82=E5=90=8D=E5=AD=97=EF=BC=8C?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=9C=AA=E5=8F=98=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../internal/controller/clientPage/clientPage.go   | 23 +++--------------
 link_homework/internal/logic/homework/.gitkeep     |  0
 link_homework/internal/logic/logic.go              |  2 +-
 .../{homework/homeworkList.go => record/record.go} | 30 +++++++++++++---------
 .../internal/service/{homework.go => record.go}    | 16 ++++++------
 link_homework/manifest/config/config.yaml          |  2 --
 6 files changed, 31 insertions(+), 42 deletions(-)
 create mode 100644 link_homework/internal/logic/homework/.gitkeep
 rename link_homework/internal/logic/{homework/homeworkList.go => record/record.go} (72%)
 rename link_homework/internal/service/{homework.go => record.go} (74%)

diff --git a/link_homework/internal/controller/clientPage/clientPage.go b/link_homework/internal/controller/clientPage/clientPage.go
index 7bb2154..8a3d956 100644
--- a/link_homework/internal/controller/clientPage/clientPage.go
+++ b/link_homework/internal/controller/clientPage/clientPage.go
@@ -16,7 +16,7 @@ func NewClientPage() *ClientPage {
 // 查询作业列表
 func (c *ClientPage) GetHomeworkList(r *ghttp.Request) {
 	//请求中不需要携带任何参数
-	result, err := service.Homework().GetHomeworkList(r.Context())
+	result, err := service.Record().GetHomeworkList(r.Context())
 	if err != nil {
 		r.Response.WriteJsonExit(dto.Result{
 			Code:    400,
@@ -40,7 +40,7 @@ func (c *ClientPage) GetHomeworkQuestion(r *ghttp.Request) {
 		})
 	}
 	groupId := req.Id
-	result, err := service.Homework().GetHomeworkQuestion(r.Context(), groupId)
+	result, err := service.Record().GetHomeworkQuestion(r.Context(), groupId)
 	if err != nil {
 		r.Response.WriteJsonExit(dto.Result{
 			Code:    400,
@@ -64,7 +64,7 @@ func (c *ClientPage) CommitHomework(r *ghttp.Request) {
 		})
 	}
 
-	err := service.Homework().CommitHomework(r.Context(), req, jwcode)
+	err := service.Record().CommitHomework(r.Context(), req, jwcode)
 	if err != nil {
 		r.Response.WriteJsonExit(dto.Result{
 			Code:    400,
@@ -73,21 +73,6 @@ func (c *ClientPage) CommitHomework(r *ghttp.Request) {
 	}
 	r.Response.WriteJsonExit(dto.Result{
 		Code:    200,
-		Message: "success",
+		Message: "提交作业成功",
 	})
-
-	//
-	//parts := strings.SplitN(answer, ",", 2)
-	//// 使用正则表达式提取汉字部分
-	//re := regexp.MustCompile(`[\p{Han}]+`)
-	//matches := re.FindAllString(parts[0], -1)
-	//// 将 matches 转换为数组
-	//
-	//contentTitle := matches[0]
-	//fmt.Println(contentTitle)
-	//re = regexp.MustCompile(`"insert":"(.*?)"`)
-	//matches = re.FindStringSubmatch(parts[1])
-	//content := matches[1]
-	//fmt.Println(content)
-
 }
diff --git a/link_homework/internal/logic/homework/.gitkeep b/link_homework/internal/logic/homework/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/link_homework/internal/logic/logic.go b/link_homework/internal/logic/logic.go
index 42a3350..a38656e 100644
--- a/link_homework/internal/logic/logic.go
+++ b/link_homework/internal/logic/logic.go
@@ -1,5 +1,5 @@
 package logic
 
 import (
-	_ "link_homework/internal/logic/homework"
+	_ "link_homework/internal/logic/record"
 )
diff --git a/link_homework/internal/logic/homework/homeworkList.go b/link_homework/internal/logic/record/record.go
similarity index 72%
rename from link_homework/internal/logic/homework/homeworkList.go
rename to link_homework/internal/logic/record/record.go
index 4ca4a4d..798aaa5 100644
--- a/link_homework/internal/logic/homework/homeworkList.go
+++ b/link_homework/internal/logic/record/record.go
@@ -10,13 +10,13 @@ import (
 	"link_homework/internal/service"
 )
 
-type sHomework struct{}
+type sRecord struct{}
 
 func init() {
-	service.RegisterHomework(&sHomework{})
+	service.RegisterRecord(&sRecord{})
 }
 
-func (s *sHomework) GetHomeworkList(ctx context.Context) (homeworkList []ClientPage.GetHomeworkListRse, err error) {
+func (s *sRecord) GetHomeworkList(ctx context.Context) (homeworkList []ClientPage.GetHomeworkListRse, err error) {
 	var jwcode = 90038794 //需要从token中获取当前的数据
 	err = dao.ActivityInteractiveGroup.Ctx(ctx).Fields("id", "name", "DATE_FORMAT(end_date, '%Y-%m-%d') as end_date").
 		Where("end_date>?", gtime.Now()).OrderDesc("end_date").Scan(&homeworkList)
@@ -31,7 +31,7 @@ func (s *sHomework) GetHomeworkList(ctx context.Context) (homeworkList []ClientP
 			fmt.Println("提交记录数查询失败:", err)
 			return
 		}
-		num, err1 := dao.ActivityInteractiveForm.Ctx(ctx).Where("group", item.Id).Count()
+		num, err1 := dao.ActivityInteractiveForm.Ctx(ctx).Where("group_id", item.Id).Count()
 		if err1 != nil {
 			fmt.Println("题目数查询失败:", err1)
 			return
@@ -41,40 +41,46 @@ func (s *sHomework) GetHomeworkList(ctx context.Context) (homeworkList []ClientP
 	return
 }
 
-func (s *sHomework) GetHomeworkQuestion(ctx context.Context, groupId int) (questions []ClientPage.GetHomeworkQuestionRes, err error) {
+func (s *sRecord) GetHomeworkQuestion(ctx context.Context, groupId int) (questions []ClientPage.GetHomeworkQuestionRes, err error) {
 	err = dao.ActivityInteractiveForm.Ctx(ctx).Fields("id", "name", "content", "status", "type").
 		Where("group_id", groupId).Scan(&questions)
 	return
 }
 
-func (s *sHomework) CommitHomework(ctx context.Context, req ClientPage.CommitHomeworkReq, jwcode int) (err error) {
+func (s *sRecord) CommitHomework(ctx context.Context, req ClientPage.CommitHomeworkReq, jwcode int) (err error) {
 	//req中需要有:作业id,提交的每一个题的答案,每一个提的类型
 	for _, answer := range req.CommitedAnswer {
 		if answer.Type == 1 { //单选或者多选
-			num, err := dao.ActivityInteractiveRecord.Ctx(ctx).Data(g.Map{
+			_, err := dao.ActivityInteractiveRecord.Ctx(ctx).Data(g.Map{
 				"jwcode":   jwcode,
 				"form_id":  answer.Id,
 				"group_id": req.GroupId,
 				"content":  answer.Answer[0],
 			}).Insert()
-			fmt.Println(num, err)
+			if err != nil {
+				return err
+			}
 		} else if answer.Type == 2 { //多选
-			num, err := dao.ActivityInteractiveRecord.Ctx(ctx).Data(g.Map{
+			_, err := dao.ActivityInteractiveRecord.Ctx(ctx).Data(g.Map{
 				"jwcode":   jwcode,
 				"form_id":  answer.Id,
 				"group_id": req.GroupId,
 				"content":  answer.Answer,
 			}).Insert()
-			fmt.Println(num, err)
+			if err != nil {
+				return err
+			}
 		} else if answer.Type == 3 { //简答
-			num, err := dao.ActivityInteractiveRecord.Ctx(ctx).Data(g.Map{
+			_, err := dao.ActivityInteractiveRecord.Ctx(ctx).Data(g.Map{
 				"jwcode":        jwcode,
 				"form_id":       answer.Id,
 				"group_id":      req.GroupId,
 				"content_title": answer.Answer[0],
 				"content":       answer.Answer[1],
 			}).Insert()
-			fmt.Println(num, err)
+			if err != nil {
+				return err
+			}
 		}
 	}
 	return
diff --git a/link_homework/internal/service/homework.go b/link_homework/internal/service/record.go
similarity index 74%
rename from link_homework/internal/service/homework.go
rename to link_homework/internal/service/record.go
index 1b71bfb..a4637b0 100644
--- a/link_homework/internal/service/homework.go
+++ b/link_homework/internal/service/record.go
@@ -11,7 +11,7 @@ import (
 )
 
 type (
-	IHomework interface {
+	IRecord interface {
 		GetHomeworkList(ctx context.Context) (homeworkList []ClientPage.GetHomeworkListRse, err error)
 		GetHomeworkQuestion(ctx context.Context, groupId int) (questions []ClientPage.GetHomeworkQuestionRes, err error)
 		CommitHomework(ctx context.Context, req ClientPage.CommitHomeworkReq, jwcode int) (err error)
@@ -19,16 +19,16 @@ type (
 )
 
 var (
-	localHomework IHomework
+	localRecord IRecord
 )
 
-func Homework() IHomework {
-	if localHomework == nil {
-		panic("implement not found for interface IHomework, forgot register?")
+func Record() IRecord {
+	if localRecord == nil {
+		panic("implement not found for interface IRecord, forgot register?")
 	}
-	return localHomework
+	return localRecord
 }
 
-func RegisterHomework(i IHomework) {
-	localHomework = i
+func RegisterRecord(i IRecord) {
+	localRecord = i
 }
diff --git a/link_homework/manifest/config/config.yaml b/link_homework/manifest/config/config.yaml
index b188f3a..5e56ab6 100644
--- a/link_homework/manifest/config/config.yaml
+++ b/link_homework/manifest/config/config.yaml
@@ -17,5 +17,3 @@ database:
   cms:
     link: "mysql:cms:AF42R3ib6YkFaemm@tcp(39.101.133.168:3306)/cms?charset=utf8mb4&parseTime=True&loc=Local"
     debug: true
-
-# redis暂不配置,记得加
\ No newline at end of file

From 5b963fdb5d52eb90843d5230dc5840d0cfac2d29 Mon Sep 17 00:00:00 2001
From: lijikun <ljk190610@163.com>
Date: Wed, 18 Dec 2024 11:11:24 +0800
Subject: [PATCH 2/3] =?UTF-8?q?12=E6=9C=8818=E6=97=A5=E8=B0=83=E6=95=B4log?=
 =?UTF-8?q?ic=E5=B1=82=E4=B8=8Eservice=E5=B1=82=E5=90=8D=E5=AD=97=EF=BC=8C?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=9C=AA=E5=8F=98=E5=8A=A8,=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E4=B8=8D=E5=B1=9E=E4=BA=8E=E8=BF=99=E4=B8=AA=E5=88=86?=
 =?UTF-8?q?=E6=94=AF=E7=9A=84=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 link_homework/api/v1/ClientPage/ClientPage.go      | 27 -----------
 link_homework/internal/cmd/cmd.go                  |  3 --
 .../internal/controller/clientPage/clientPage.go   | 53 ----------------------
 .../internal/controller/record/manageRecord.go     | 16 ++-----
 .../internal/logic/homework/homeworkList.go        | 47 -------------------
 link_homework/internal/logic/logic.go              |  1 -
 link_homework/internal/logic/record/record.go      | 14 ++++--
 link_homework/internal/service/homework.go         | 33 --------------
 8 files changed, 13 insertions(+), 181 deletions(-)
 delete mode 100644 link_homework/api/v1/ClientPage/ClientPage.go
 delete mode 100644 link_homework/internal/controller/clientPage/clientPage.go
 delete mode 100644 link_homework/internal/logic/homework/homeworkList.go
 delete mode 100644 link_homework/internal/service/homework.go

diff --git a/link_homework/api/v1/ClientPage/ClientPage.go b/link_homework/api/v1/ClientPage/ClientPage.go
deleted file mode 100644
index eba8737..0000000
--- a/link_homework/api/v1/ClientPage/ClientPage.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package ClientPage
-
-import (
-	"github.com/gogf/gf/v2/os/gtime"
-)
-
-type GetHomeworkListRse struct {
-	Id      int         `json:"id" orm:"table:activity_interactive_group;column:id" dc:"id" `
-	Name    string      `json:"name" orm:"table:activity_interactive_group;column:name" dc:"作业题目"`
-	EndDate *gtime.Time `json:"endData" orm:"table:activity_interactive_group;column:end_date;time_format:yy-MM-dd" dc:"作业截止时间"`
-	Submit  int         `json:"submit"`
-}
-
-type GetHomeworkQuestionReq struct {
-	Id int `json:"id" dc:"作业id"`
-}
-
-type GetHomeworkQuestionRes struct {
-	Id          int    `json:"id" orm:"table:activity_interactive_form;column:id" dc:"题目id"`
-	Name        string `json:"name" orm:"table:activity_interactive_form;column:name" dc:"作业名称"`
-	Description string `json:"description" orm:"table:activity_interactive_form;column:description" dc:"作业题目名字"`
-	Content     string `json:"content" orm:"table:activity_interactive_form;column:content" dc:"题目内容"`
-	Status      int    `json:"status"`
-	Type        int    `json:"type" orm:"table:activity_interactive_form;column:type" dc:"题目类型"`
-}
-
-//需要id(group_id)(form表),查id,form.name是作业的题目,form.description是作业题目的名字,content, status,type
diff --git a/link_homework/internal/cmd/cmd.go b/link_homework/internal/cmd/cmd.go
index 5c90aa0..ddfea9f 100644
--- a/link_homework/internal/cmd/cmd.go
+++ b/link_homework/internal/cmd/cmd.go
@@ -5,7 +5,6 @@ import (
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/net/ghttp"
 	"github.com/gogf/gf/v2/os/gcmd"
-	"link_homework/internal/controller/clientPage"
 	"link_homework/internal/controller/record"
 	"link_homework/internal/logic/middleware"
 )
@@ -51,8 +50,6 @@ var (
 				//group.Middleware(middleware.MiddlewareIsLogin)
 				//gfToken.Middleware(ctx, group)
 				//直接写接口,不用再分组
-				group.POST("/gethomeworklist", clientPage.NewClientPage().GetHomeworkList)
-				group.POST("/gethomeworkquestion", clientPage.NewClientPage().GetHomeworkQuestion)
 			})
 			s.Run()
 
diff --git a/link_homework/internal/controller/clientPage/clientPage.go b/link_homework/internal/controller/clientPage/clientPage.go
deleted file mode 100644
index fe4ca4f..0000000
--- a/link_homework/internal/controller/clientPage/clientPage.go
+++ /dev/null
@@ -1,53 +0,0 @@
-package clientPage
-
-import (
-	"github.com/gogf/gf/v2/net/ghttp"
-	CPage "link_homework/api/v1/ClientPage"
-	"link_homework/internal/model/dto"
-	"link_homework/internal/service"
-)
-
-type ClientPage struct{}
-
-func NewClientPage() *ClientPage {
-	return &ClientPage{}
-}
-
-func (c *ClientPage) GetHomeworkList(r *ghttp.Request) {
-	//请求中不需要携带任何参数
-	result, err := service.Homework().GetHomeworkList(r.Context())
-	if err != nil {
-		r.Response.WriteJsonExit(dto.Result{
-			Code:    400,
-			Message: err.Error(),
-		})
-	}
-	r.Response.WriteJsonExit(dto.Result{
-		Code:    200,
-		Message: "success",
-		Data:    result,
-	})
-}
-
-func (c *ClientPage) GetHomeworkQuestion(r *ghttp.Request) {
-	var req CPage.GetHomeworkQuestionReq
-	if err := r.Parse(&req); err != nil {
-		r.Response.WriteJsonExit(dto.Result{
-			Code:    400,
-			Message: err.Error(),
-		})
-	}
-	groupId := req.Id
-	result, err := service.Homework().GetHomeworkQuestion(r.Context(), groupId)
-	if err != nil {
-		r.Response.WriteJsonExit(dto.Result{
-			Code:    400,
-			Message: err.Error(),
-		})
-	}
-	r.Response.WriteJsonExit(dto.Result{
-		Code:    200,
-		Message: "success",
-		Data:    result,
-	})
-}
diff --git a/link_homework/internal/controller/record/manageRecord.go b/link_homework/internal/controller/record/manageRecord.go
index cb7dd08..528512e 100644
--- a/link_homework/internal/controller/record/manageRecord.go
+++ b/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,
diff --git a/link_homework/internal/logic/homework/homeworkList.go b/link_homework/internal/logic/homework/homeworkList.go
deleted file mode 100644
index 5feecf1..0000000
--- a/link_homework/internal/logic/homework/homeworkList.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package homework
-
-import (
-	"context"
-	"fmt"
-	"github.com/gogf/gf/v2/os/gtime"
-	"link_homework/api/v1/ClientPage"
-	"link_homework/internal/dao"
-	"link_homework/internal/service"
-)
-
-type sHomework struct{}
-
-func init() {
-	service.RegisterHomework(&sHomework{})
-}
-
-func (s *sHomework) GetHomeworkList(ctx context.Context) (homeworkList []ClientPage.GetHomeworkListRse, err error) {
-	var jwcode = 90038794 //需要从token中获取当前的数据
-	err = dao.ActivityInteractiveGroup.Ctx(ctx).Fields("id", "name", "DATE_FORMAT(end_date, '%Y-%m-%d') as end_date").
-		Where("end_date>?", gtime.Now()).OrderDesc("end_date").Scan(&homeworkList)
-	if err != nil {
-		fmt.Println("作业列表查询失败:", err)
-		return
-	}
-	for i, item := range homeworkList {
-		var count int
-		count, err = dao.ActivityInteractiveRecord.Ctx(ctx).Where("group_id=?", item.Id).Where("jwcode", jwcode).Count() //只有精网号和作业id查出来的结果是所需要的结果的题目数倍数
-		if err != nil {
-			fmt.Println("提交记录数查询失败:", err)
-			return
-		}
-		num, err1 := dao.ActivityInteractiveForm.Ctx(ctx).Where("group", item.Id).Count()
-		if err1 != nil {
-			fmt.Println("题目数查询失败:", err1, num)
-			return
-		}
-		homeworkList[i].Submit = count / num
-	}
-	return
-}
-
-func (s *sHomework) GetHomeworkQuestion(ctx context.Context, groupId int) (questions []ClientPage.GetHomeworkQuestionRes, err error) {
-	err = dao.ActivityInteractiveForm.Ctx(ctx).Fields("id", "name", "content", "status", "type").
-		Where("group_id", groupId).Scan(&questions)
-	return
-}
diff --git a/link_homework/internal/logic/logic.go b/link_homework/internal/logic/logic.go
index bd7d6cb..a38656e 100644
--- a/link_homework/internal/logic/logic.go
+++ b/link_homework/internal/logic/logic.go
@@ -1,6 +1,5 @@
 package logic
 
 import (
-	_ "link_homework/internal/logic/homework"
 	_ "link_homework/internal/logic/record"
 )
diff --git a/link_homework/internal/logic/record/record.go b/link_homework/internal/logic/record/record.go
index 1783d51..0900281 100644
--- a/link_homework/internal/logic/record/record.go
+++ b/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 {
diff --git a/link_homework/internal/service/homework.go b/link_homework/internal/service/homework.go
deleted file mode 100644
index 63fd6b8..0000000
--- a/link_homework/internal/service/homework.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// ================================================================================
-// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
-// You can delete these comments if you wish manually maintain this interface file.
-// ================================================================================
-
-package service
-
-import (
-	"context"
-	"link_homework/api/v1/ClientPage"
-)
-
-type (
-	IHomework interface {
-		GetHomeworkList(ctx context.Context) (homeworkList []ClientPage.GetHomeworkListRse, err error)
-		GetHomeworkQuestion(ctx context.Context, groupId int) (questions []ClientPage.GetHomeworkQuestionRes, err error)
-	}
-)
-
-var (
-	localHomework IHomework
-)
-
-func Homework() IHomework {
-	if localHomework == nil {
-		panic("implement not found for interface IHomework, forgot register?")
-	}
-	return localHomework
-}
-
-func RegisterHomework(i IHomework) {
-	localHomework = i
-}

From 52faf6c60e488e07e5da2bebb8d6e0d97a61ee57 Mon Sep 17 00:00:00 2001
From: lijikun <ljk190610@163.com>
Date: Wed, 18 Dec 2024 11:22:12 +0800
Subject: [PATCH 3/3] =?UTF-8?q?12=E6=9C=8818=E6=97=A5=E8=B0=83=E6=95=B4log?=
 =?UTF-8?q?ic=E5=B1=82=E4=B8=8Eservice=E5=B1=82=E5=90=8D=E5=AD=97=EF=BC=8C?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=9C=AA=E5=8F=98=E5=8A=A8,=E5=AF=B9?=
 =?UTF-8?q?=E4=B8=8A=E6=AC=A1=E8=B0=83=E6=95=B4=E6=94=B9=E9=94=99=E5=90=8D?=
 =?UTF-8?q?=E5=AD=97=E7=9A=84=E6=94=B9=E6=88=90=E4=BA=86=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../internal/controller/clientPage/clientPage.go       |  7 +++----
 .../logic/{record/record.go => client/client.go}       | 12 ++++++------
 link_homework/internal/logic/logic.go                  |  2 +-
 .../internal/service/{record.go => client.go}          | 18 +++++++++---------
 4 files changed, 19 insertions(+), 20 deletions(-)
 rename link_homework/internal/logic/{record/record.go => client/client.go} (88%)
 rename link_homework/internal/service/{record.go => client.go} (66%)

diff --git a/link_homework/internal/controller/clientPage/clientPage.go b/link_homework/internal/controller/clientPage/clientPage.go
index 8a3d956..9329225 100644
--- a/link_homework/internal/controller/clientPage/clientPage.go
+++ b/link_homework/internal/controller/clientPage/clientPage.go
@@ -16,7 +16,7 @@ func NewClientPage() *ClientPage {
 // 查询作业列表
 func (c *ClientPage) GetHomeworkList(r *ghttp.Request) {
 	//请求中不需要携带任何参数
-	result, err := service.Record().GetHomeworkList(r.Context())
+	result, err := service.Client().ClientGetHomeworkList(r.Context())
 	if err != nil {
 		r.Response.WriteJsonExit(dto.Result{
 			Code:    400,
@@ -39,8 +39,7 @@ func (c *ClientPage) GetHomeworkQuestion(r *ghttp.Request) {
 			Message: err.Error(),
 		})
 	}
-	groupId := req.Id
-	result, err := service.Record().GetHomeworkQuestion(r.Context(), groupId)
+	result, err := service.Client().GetHomeworkQuestion(r.Context(), req.Id)
 	if err != nil {
 		r.Response.WriteJsonExit(dto.Result{
 			Code:    400,
@@ -64,7 +63,7 @@ func (c *ClientPage) CommitHomework(r *ghttp.Request) {
 		})
 	}
 
-	err := service.Record().CommitHomework(r.Context(), req, jwcode)
+	err := service.Client().CommitHomework(r.Context(), req, jwcode)
 	if err != nil {
 		r.Response.WriteJsonExit(dto.Result{
 			Code:    400,
diff --git a/link_homework/internal/logic/record/record.go b/link_homework/internal/logic/client/client.go
similarity index 88%
rename from link_homework/internal/logic/record/record.go
rename to link_homework/internal/logic/client/client.go
index 798aaa5..378d3a0 100644
--- a/link_homework/internal/logic/record/record.go
+++ b/link_homework/internal/logic/client/client.go
@@ -1,4 +1,4 @@
-package homework
+package client
 
 import (
 	"context"
@@ -10,13 +10,13 @@ import (
 	"link_homework/internal/service"
 )
 
-type sRecord struct{}
+type sClient struct{}
 
 func init() {
-	service.RegisterRecord(&sRecord{})
+	service.RegisterClient(&sClient{})
 }
 
-func (s *sRecord) GetHomeworkList(ctx context.Context) (homeworkList []ClientPage.GetHomeworkListRse, err error) {
+func (s *sClient) ClientGetHomeworkList(ctx context.Context) (homeworkList []ClientPage.GetHomeworkListRse, err error) {
 	var jwcode = 90038794 //需要从token中获取当前的数据
 	err = dao.ActivityInteractiveGroup.Ctx(ctx).Fields("id", "name", "DATE_FORMAT(end_date, '%Y-%m-%d') as end_date").
 		Where("end_date>?", gtime.Now()).OrderDesc("end_date").Scan(&homeworkList)
@@ -41,13 +41,13 @@ func (s *sRecord) GetHomeworkList(ctx context.Context) (homeworkList []ClientPag
 	return
 }
 
-func (s *sRecord) GetHomeworkQuestion(ctx context.Context, groupId int) (questions []ClientPage.GetHomeworkQuestionRes, err error) {
+func (s *sClient) GetHomeworkQuestion(ctx context.Context, groupId int) (questions []ClientPage.GetHomeworkQuestionRes, err error) {
 	err = dao.ActivityInteractiveForm.Ctx(ctx).Fields("id", "name", "content", "status", "type").
 		Where("group_id", groupId).Scan(&questions)
 	return
 }
 
-func (s *sRecord) CommitHomework(ctx context.Context, req ClientPage.CommitHomeworkReq, jwcode int) (err error) {
+func (s *sClient) CommitHomework(ctx context.Context, req ClientPage.CommitHomeworkReq, jwcode int) (err error) {
 	//req中需要有:作业id,提交的每一个题的答案,每一个提的类型
 	for _, answer := range req.CommitedAnswer {
 		if answer.Type == 1 { //单选或者多选
diff --git a/link_homework/internal/logic/logic.go b/link_homework/internal/logic/logic.go
index a38656e..0c10339 100644
--- a/link_homework/internal/logic/logic.go
+++ b/link_homework/internal/logic/logic.go
@@ -1,5 +1,5 @@
 package logic
 
 import (
-	_ "link_homework/internal/logic/record"
+	_ "link_homework/internal/logic/client"
 )
diff --git a/link_homework/internal/service/record.go b/link_homework/internal/service/client.go
similarity index 66%
rename from link_homework/internal/service/record.go
rename to link_homework/internal/service/client.go
index a4637b0..57314c2 100644
--- a/link_homework/internal/service/record.go
+++ b/link_homework/internal/service/client.go
@@ -11,24 +11,24 @@ import (
 )
 
 type (
-	IRecord interface {
-		GetHomeworkList(ctx context.Context) (homeworkList []ClientPage.GetHomeworkListRse, err error)
+	IClient interface {
+		ClientGetHomeworkList(ctx context.Context) (homeworkList []ClientPage.GetHomeworkListRse, err error)
 		GetHomeworkQuestion(ctx context.Context, groupId int) (questions []ClientPage.GetHomeworkQuestionRes, err error)
 		CommitHomework(ctx context.Context, req ClientPage.CommitHomeworkReq, jwcode int) (err error)
 	}
 )
 
 var (
-	localRecord IRecord
+	localClient IClient
 )
 
-func Record() IRecord {
-	if localRecord == nil {
-		panic("implement not found for interface IRecord, forgot register?")
+func Client() IClient {
+	if localClient == nil {
+		panic("implement not found for interface IClient, forgot register?")
 	}
-	return localRecord
+	return localClient
 }
 
-func RegisterRecord(i IRecord) {
-	localRecord = i
+func RegisterClient(i IClient) {
+	localClient = i
 }