From 21d02c857fc161659c6eee992bc411d61968ae72 Mon Sep 17 00:00:00 2001 From: DengBiao <2319963317@qq.com> Date: Mon, 6 Nov 2023 20:16:52 +0800 Subject: [PATCH] update --- app/admin/svc/svc_data_statisstics.go | 7 +++++++ app/customer/hdl/hdl_user_identity.go | 5 +++++ app/customer/md/md_user_identity.go | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/admin/svc/svc_data_statisstics.go b/app/admin/svc/svc_data_statisstics.go index 0112d02..4be7a9e 100644 --- a/app/admin/svc/svc_data_statisstics.go +++ b/app/admin/svc/svc_data_statisstics.go @@ -1848,6 +1848,13 @@ func CentralKitchenForSchoolDataStatisticsExport(req md.CentralKitchenForSchoolD } } //xls.DeleteSheet("template") //删除模板表 + + //xls.SetSheetRow("template", "A"+strconv.Itoa(j), &[]interface{}{"总计", + // v["早餐"]["count"], v["早餐"]["sum"], + // v["午餐"]["count"], v["午餐"]["sum"], + // v["晚餐"]["count"], v["晚餐"]["sum"], + // v["合计"]["count"], v["合计"]["sum"], + //}) //将文件保存至服务器 xls.SaveAs("./static" + downloadPath) break diff --git a/app/customer/hdl/hdl_user_identity.go b/app/customer/hdl/hdl_user_identity.go index 6ea66ad..541a0a3 100644 --- a/app/customer/hdl/hdl_user_identity.go +++ b/app/customer/hdl/hdl_user_identity.go @@ -137,6 +137,11 @@ func SaveSelfSupportForSchoolUserIdentity(c *gin.Context) { now := time.Now() var identity = enum.UserIdentityForSelfSupportForStudent var kind = enum.UserIdentityKindForCommon + + if req.CertType == 0 { + req.CertType = enum.UserIdentityCertTypeForIdCard + } + if req.Kind == enum.UserIdentityKindForWorker { kind = enum.UserIdentityKindForWorker identity = enum.UserIdentityForSelfSupportForWorker diff --git a/app/customer/md/md_user_identity.go b/app/customer/md/md_user_identity.go index 6fc355a..658892e 100644 --- a/app/customer/md/md_user_identity.go +++ b/app/customer/md/md_user_identity.go @@ -23,7 +23,7 @@ type SaveSelfSupportForSchoolUserIdentityReq struct { IsTeacher bool `json:"is_teacher" label:"是否教师"` Name string `json:"name" binding:"required" label:"姓名"` IdNo string `json:"id_no" binding:"required" label:"身份证号码"` - CertType int `json:"cert_type" binding:"required" label:"证件类型(1:身份证 2:学工号 3:护照)"` + CertType int `json:"cert_type" label:"证件类型(1:身份证 2:学工号 3:护照)"` GradeId int `json:"grade_id" label:"年级id"` ClassId int `json:"class_id" label:"班级id"` }