From f4a3813202da0450f3444bef6cbb141141302680 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期五, 19 四月 2024 16:35:28 +0800
Subject: [PATCH] 考勤导入

---
 controllers/fineness.go |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/controllers/fineness.go b/controllers/fineness.go
index b675bcf..2724ed3 100644
--- a/controllers/fineness.go
+++ b/controllers/fineness.go
@@ -43,10 +43,13 @@
 		util.ResponseFormat(c, code.RequestParamError, err.Error())
 		return
 	}
+
+	isNew := params.ID == 0
+
 	err := models.WithTransaction(func(db *gorm.DB) error {
 		search := models.NewFinenessRegisterSearch().SetOrm(db)
 
-		if params.ID != 0 {
+		if !isNew {
 			if err := models.NewFinenessItemSearch().SetOrm(db).SetFinenessRegisterID(params.ID).Delete(); err != nil {
 				return err
 			}
@@ -59,7 +62,7 @@
 		util.ResponseFormat(c, code.RequestParamError, "淇濆瓨澶辫触")
 	}
 
-	err = service.FinenessCheck(&params)
+	err = service.FinenessCheck(&params, isNew)
 	if err != nil {
 		logx.Errorf("service.FinenessCheck err:%v, finenessRegister:%+v", err, params)
 		util.ResponseFormat(c, code.RequestParamError, "鐢熸垚妫�楠岃〃澶辫触")
@@ -101,7 +104,7 @@
 		return
 	}
 
-	list, total, err := models.NewFinenessRegisterSearch().SetKeyword(params.Keyword).SetPage(params.Page, params.PageSize).Find()
+	list, total, err := models.NewFinenessRegisterSearch().SetKeyword(params.Keyword).SetPage(params.Page, params.PageSize).SetOrder("id desc").Find()
 	if err != nil {
 		util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
 		return
@@ -180,7 +183,7 @@
 		return
 	}
 
-	list, total, err := models.NewFinenessCheckSearch().SetPage(params.Page, params.PageSize).Find()
+	list, total, err := models.NewFinenessCheckSearch().SetPage(params.Page, params.PageSize).SetPreload().SetOrder("id desc").Find()
 	if err != nil {
 		util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
 		return

--
Gitblit v1.8.0