feature 报修反馈添加删除操作

handler/feedback/feedback.go

@@ -159,3 +159,19 @@ func (c *Feedback) Export(ctx context.Context, req *feedback.FeedbackListReq, rs
 	rsp.Data = base64.StdEncoding.EncodeToString(buf.Bytes())
 	return nil
 }
+
+func (c *Feedback) Delete(ctx context.Context, req *feedback.FeedbackDeleteReq, rsp *comm_def.CommonMsg) error {
+	g.Log().Infof("LearningQuestion.Delete request %#v ", *req)
+	s, err := feedbackSrv.NewFeedbackService(ctx)
+	if err != nil {
+		return err
+	}
+	err = s.Delete(ctx, req.Id)
+	_, err, code, msg := myerrors.CheckError(err)
+	if err != nil {
+		return err
+	}
+	rsp.Code = code
+	rsp.Msg = msg
+	return nil
+}

handler/repair/repair.go

@@ -159,3 +159,19 @@ func (c *Repair) Export(ctx context.Context, req *repair.RepairListReq, rsp *com
 	rsp.Data = base64.StdEncoding.EncodeToString(buf.Bytes())
 	return nil
 }
+
+func (c *Repair) Delete(ctx context.Context, req *repair.RepairDeleteReq, rsp *comm_def.CommonMsg) error {
+	g.Log().Infof("LearningQuestion.Delete request %#v ", *req)
+	s, err := repairSrv.NewRepairService(ctx)
+	if err != nil {
+		return err
+	}
+	err = s.Delete(ctx, req.Id)
+	_, err, code, msg := myerrors.CheckError(err)
+	if err != nil {
+		return err
+	}
+	rsp.Code = code
+	rsp.Msg = msg
+	return nil
+}

model/feedback/feedback.go

@@ -62,3 +62,7 @@ type FeedbackProcessorRsp struct {
 	Id       int    `json:"id"`
 	Realname string `json:"name"`
 }
+
+type FeedbackDeleteReq struct {
+	Id []int `json:"id" v:"required#请输入反馈Id"` // 反馈Id
+}

model/repair/repair.go

@@ -62,3 +62,7 @@ type RepairProcessorRsp struct {
 	Id       int    `json:"id"`
 	Realname string `json:"name"`
 }
+
+type RepairDeleteReq struct {
+	Id []int `json:"id" v:"required#请输入报修Id"` // 报修Id
+}

service/feedback/feedback.go

@@ -348,6 +348,19 @@ func (s FeedbackService) Processor(ctx context.Context) ([]feedback.FeedbackProc
 	return rsp, err
 }
 
+func (s FeedbackService) Delete(ctx context.Context, id []int) error {
+	_, err := s.Dao.Where("Id IN (?)", id).Delete()
+	if err != nil {
+		return err
+	}
+	_, err = s.DaoFlow.Where("FeedbackId IN (?)", id).Delete()
+	if err != nil {
+		return err
+	}
+	_, err = s.DaoResult.Where("FeedbackId IN (?)", id).Delete()
+	return err
+}
+
 func (s FeedbackService) Export(ctx context.Context, req *feedback.FeedbackListReq) (*excelize.File, error) {
 	_, data, err := s.List(ctx, req)
 	if err != nil {

service/repair/repair.go

@@ -348,6 +348,19 @@ func (s RepairService) Processor(ctx context.Context) ([]repair.RepairProcessorR
 	return rsp, err
 }
 
+func (s RepairService) Delete(ctx context.Context, id []int) error {
+	_, err := s.Dao.Where("Id IN (?)", id).Delete()
+	if err != nil {
+		return err
+	}
+	_, err = s.DaoFlow.Where("RepairId IN (?)", id).Delete()
+	if err != nil {
+		return err
+	}
+	_, err = s.DaoResult.Where("RepairId IN (?)", id).Delete()
+	return err
+}
+
 func (s RepairService) Export(ctx context.Context, req *repair.RepairListReq) (*excelize.File, error) {
 	_, data, err := s.List(ctx, req)
 	if err != nil {

swaggerui/swagger.yml

@@ -1030,6 +1030,31 @@ paths:
                   success:
                     $ref: "#/components/examples/success"
 
+    /Feedback.Delete:
+      post:
+        tags:
+          - 反馈
+        operationId: FeedbackDelete
+        summary: 删除反馈
+        requestBody:
+          required: true
+          content:
+            application/json:
+              schema:
+                oneOf:
+                  - $ref: '#/components/schemas/IdsReq'
+              examples:
+                FeedbackDelete:
+                  $ref: '#/components/examples/FeedbackDelete'
+        responses:
+          200:
+            description: 请求成功
+            content:
+              application/json:
+                examples:
+                  success:
+                    $ref: "#/components/examples/success"
+
     /Repair.List:
       post:
         tags:
@@ -1183,9 +1208,9 @@ paths:
     /Repair.Export:
       post:
         tags:
-          - 反馈
+          - 报修
         operationId: RepairExport
-        summary: 导出反馈
+        summary: 导出报修
         requestBody:
           required: true
           content:
@@ -1230,6 +1255,31 @@ paths:
                   success:
                     $ref: "#/components/examples/success"
 
+    /Repair.Delete:
+      post:
+        tags:
+          - 报修
+        operationId: RepairDelete
+        summary: 删除报修
+        requestBody:
+          required: true
+          content:
+            application/json:
+              schema:
+                oneOf:
+                  - $ref: '#/components/schemas/IdsReq'
+              examples:
+                RepairDelete:
+                  $ref: '#/components/examples/RepairDelete'
+        responses:
+          200:
+            description: 请求成功
+            content:
+              application/json:
+                examples:
+                  success:
+                    $ref: "#/components/examples/success"
+
 # 添加这个 swagger ui 会显示授权按钮
 security:
   - bearerAuth: []
@@ -2365,3 +2415,9 @@ components:
     RepairExport:
       value:
         createdAtStart: "2022-04-29 11:00:00"
+    FeedbackDelete:
+      value:
+        id: [1]
+    RepairDelete:
+      value:
+        id: [1]