更新密码找回uniapp
This commit is contained in:
1 parent
7f9a66da0f
commit
3fdda89833
1304 files changed
+3503
-26132
No files matched your search
@@ -15,7 +15,6 @@ import (
|
||||
|
||||
const scBoardMaxDays = 62
|
||||
|
||||
// scEntryView 看板单元格里的排班信息。
|
||||
type scEntryView struct {
|
||||
ID uint64 `json:"id"`
|
||||
PlanID uint64 `json:"plan_id"`
|
||||
@@ -51,8 +50,6 @@ func (c *BackendOaSchedulingController) scEntryQuery(tid uint64) orm.QuerySeter
|
||||
Filter("is_deleted", 0)
|
||||
}
|
||||
|
||||
// Board 排班看板:按员工 × 日期返回区间内的排班矩阵。
|
||||
// GET /backend/oa/scheduling/board?start_date=&end_date=&org_id=&include_child=1&keyword=
|
||||
func (c *BackendOaSchedulingController) Board() {
|
||||
tid, _, _, ok := c.scOperator()
|
||||
if !ok {
|
||||
@@ -62,7 +59,6 @@ func (c *BackendOaSchedulingController) Board() {
|
||||
startDate := strings.TrimSpace(c.GetString("start_date"))
|
||||
endDate := strings.TrimSpace(c.GetString("end_date"))
|
||||
if startDate == "" || endDate == "" {
|
||||
// 默认展示本周(周一至周日)
|
||||
now := time.Now()
|
||||
weekday := int(now.Weekday())
|
||||
if weekday == 0 {
|
||||
@@ -196,7 +192,6 @@ func (c *BackendOaSchedulingController) Board() {
|
||||
dateCells = append(dateCells, scDateCell{Date: date, Weekday: weekday, IsToday: date == today})
|
||||
}
|
||||
|
||||
// 汇总:排班人次、临时调配数、未排班人数、今日在岗、班次分布
|
||||
entryCount, tempCount, unassigned := 0, 0, 0
|
||||
todayOnDuty := 0
|
||||
shiftCounter := map[string]int{}
|
||||
@@ -261,7 +256,6 @@ func strconvParseUint(value string) (uint64, error) {
|
||||
return strconv.ParseUint(strings.TrimSpace(value), 10, 64)
|
||||
}
|
||||
|
||||
// scEntryTargets 解析临时排班/批量清除的目标员工与日期。
|
||||
func (c *BackendOaSchedulingController) scEntryTargets(tid uint64, body map[string]interface{}) ([]models.BackendEmployee, []string, string) {
|
||||
employeeIDs := scUintSlice(body, "employee_ids")
|
||||
if len(employeeIDs) == 0 {
|
||||
@@ -299,9 +293,6 @@ func (c *BackendOaSchedulingController) scEntryTargets(tid uint64, body map[stri
|
||||
return employees, workdays, ""
|
||||
}
|
||||
|
||||
// SaveEntries 临时排班:给一个或多个员工在指定日期/星期安排班次。
|
||||
// shift_id=0 时表示清除这些日期的排班。
|
||||
// POST /backend/oa/scheduling/entries/save
|
||||
func (c *BackendOaSchedulingController) SaveEntries() {
|
||||
tid, uid, username, ok := c.scOperator()
|
||||
if !ok {
|
||||
@@ -365,7 +356,6 @@ func (c *BackendOaSchedulingController) SaveEntries() {
|
||||
key := fmt.Sprintf("%d|%s", employee.ID, date)
|
||||
row := existingMap[key]
|
||||
|
||||
// shift_id=0:清除排班
|
||||
if shift == nil {
|
||||
if row == nil {
|
||||
stats["skipped"]++
|
||||
@@ -401,8 +391,6 @@ func (c *BackendOaSchedulingController) SaveEntries() {
|
||||
row.Note = note
|
||||
row.CreatedBy = uid
|
||||
row.CreatedByName = username
|
||||
// 指定字段更新:DATE 列从库里读回 string 会带上
|
||||
// "00:00:00 +0800 CST" 后缀,全字段 Update 会写回导致 MySQL 1292
|
||||
if _, updateErr := models.Orm.Update(row,
|
||||
"shift_id", "shift_name", "short_name", "color", "work_start", "work_end",
|
||||
"source", "note", "created_by", "created_by_name"); updateErr != nil {
|
||||
@@ -450,10 +438,6 @@ func (c *BackendOaSchedulingController) SaveEntries() {
|
||||
c.scOK(stats)
|
||||
}
|
||||
|
||||
// SaveEntryCells 批量按格子编辑排班:cells 为任意「员工 × 日期」组合(排班板多选)。
|
||||
// shift_id>0 时把这些格子设为该班次(已有排班视为调班,无排班则新增临时排班);
|
||||
// shift_id=0 时清除这些格子的排班(休息 / 请假)。
|
||||
// POST /backend/oa/scheduling/entries/save-cells
|
||||
func (c *BackendOaSchedulingController) SaveEntryCells() {
|
||||
tid, uid, username, ok := c.scOperator()
|
||||
if !ok {
|
||||
@@ -509,7 +493,6 @@ func (c *BackendOaSchedulingController) SaveEntryCells() {
|
||||
shift = loaded
|
||||
}
|
||||
|
||||
// 排班来源:normal=正常排班(不显示临时标记),temp=临时调整(默认,显示「临」角标)
|
||||
entrySource := models.OaEntrySourceTemp
|
||||
if scStringValue(body, "source") == "normal" {
|
||||
entrySource = models.OaEntrySourcePlan
|
||||
@@ -568,7 +551,6 @@ func (c *BackendOaSchedulingController) SaveEntryCells() {
|
||||
position = *employee.Position
|
||||
}
|
||||
|
||||
// 清除排班(休息 / 请假):只处理已有排班的格子
|
||||
if shift == nil {
|
||||
if row == nil {
|
||||
stats["skipped"]++
|
||||
@@ -587,7 +569,6 @@ func (c *BackendOaSchedulingController) SaveEntryCells() {
|
||||
continue
|
||||
}
|
||||
|
||||
// 已有排班:调整为目标班次(调班)
|
||||
if row != nil {
|
||||
oldShiftID, oldShiftName := row.ShiftID, row.ShiftName
|
||||
row.ShiftID = shift.ID
|
||||
@@ -600,8 +581,6 @@ func (c *BackendOaSchedulingController) SaveEntryCells() {
|
||||
row.Note = note
|
||||
row.CreatedBy = uid
|
||||
row.CreatedByName = username
|
||||
// 指定字段更新:DATE 列从库里读回 string 会带上
|
||||
// "00:00:00 +0800 CST" 后缀,全字段 Update 会写回导致 MySQL 1292
|
||||
if _, updateErr := models.Orm.Update(row,
|
||||
"shift_id", "shift_name", "short_name", "color", "work_start", "work_end",
|
||||
"source", "note", "created_by", "created_by_name"); updateErr != nil {
|
||||
@@ -614,7 +593,6 @@ func (c *BackendOaSchedulingController) SaveEntryCells() {
|
||||
continue
|
||||
}
|
||||
|
||||
// 无排班:新增临时排班(上班)
|
||||
entry := &models.OaScheduleEntry{
|
||||
Tid: int(tid),
|
||||
EmployeeID: employee.ID,
|
||||
@@ -649,8 +627,6 @@ func (c *BackendOaSchedulingController) SaveEntryCells() {
|
||||
c.scOK(stats)
|
||||
}
|
||||
|
||||
// SwapEntry 单条调班:把某个员工某天的班次换成另一个班次。
|
||||
// POST /backend/oa/scheduling/entries/swap/:id
|
||||
func (c *BackendOaSchedulingController) SwapEntry() {
|
||||
tid, uid, username, ok := c.scOperator()
|
||||
if !ok {
|
||||
@@ -705,8 +681,6 @@ func (c *BackendOaSchedulingController) SwapEntry() {
|
||||
c.scOK(map[string]interface{}{"entry": entry, "old_shift_name": oldShiftName})
|
||||
}
|
||||
|
||||
// ClearEntries 批量清除排班:按明细 ID,或按员工 + 日期区间。
|
||||
// POST /backend/oa/scheduling/entries/clear
|
||||
func (c *BackendOaSchedulingController) ClearEntries() {
|
||||
tid, uid, username, ok := c.scOperator()
|
||||
if !ok {
|
||||
@@ -779,9 +753,6 @@ func (c *BackendOaSchedulingController) ClearEntries() {
|
||||
c.scOK(map[string]interface{}{"cleared": len(entries)})
|
||||
}
|
||||
|
||||
// MyBoard 当前登录用户的排班:按登录身份匹配员工档案,返回区间内每天的排班,
|
||||
// 供工作台今日卡片与日程日历渲染上班/休息背景。
|
||||
// GET /backend/oa/scheduling/my?start_date=&end_date=
|
||||
func (c *BackendOaSchedulingController) MyBoard() {
|
||||
tid, uid, username, ok := c.scOperator()
|
||||
if !ok {
|
||||
@@ -805,9 +776,6 @@ func (c *BackendOaSchedulingController) MyBoard() {
|
||||
return
|
||||
}
|
||||
|
||||
// 解析当前登录者对应的员工档案。OIDC 换码签发的令牌里 username 为空,
|
||||
// 即使有值也是认证中心昵称而非员工工号,因此以「身份+租户」绑定账号为主,
|
||||
// 再用令牌 username 按 账号 → 姓名 兜底。都匹配不到时返回空列表。
|
||||
employee, ok := c.scFindSelfEmployee(tid, uid, username)
|
||||
if !ok {
|
||||
c.scOK(map[string]interface{}{"employee": nil, "list": []map[string]interface{}{}})
|
||||
@@ -842,14 +810,10 @@ func (c *BackendOaSchedulingController) MyBoard() {
|
||||
})
|
||||
}
|
||||
|
||||
// scFindSelfEmployee 把登录身份映射到本租户的员工档案。
|
||||
func (c *BackendOaSchedulingController) scFindSelfEmployee(tid, identityID uint64, username string) (models.BackendEmployee, bool) {
|
||||
return findSelfEmployee(tid, identityID, username)
|
||||
}
|
||||
|
||||
// findSelfEmployee 把登录身份映射到本租户的员工档案(包级函数,排班与考勤共用)。
|
||||
// 优先取认证中心「身份+租户」绑定记录里的账号(与 /auth/userinfo 同源,最可靠),
|
||||
// 其次用令牌 username 按「账号 → 姓名」匹配。
|
||||
func findSelfEmployee(tid, identityID uint64, username string) (models.BackendEmployee, bool) {
|
||||
var employee models.BackendEmployee
|
||||
|
||||
@@ -879,12 +843,10 @@ func findSelfEmployee(tid, identityID uint64, username string) (models.BackendEm
|
||||
return employee, false
|
||||
}
|
||||
|
||||
// scEmployeeByField 在本租户员工档案中按指定字段匹配,取第一条有效记录
|
||||
func (c *BackendOaSchedulingController) scEmployeeByField(tid uint64, field, value string) (models.BackendEmployee, bool) {
|
||||
return findEmployeeByField(tid, field, value)
|
||||
}
|
||||
|
||||
// findEmployeeByField 包级实现:本租户员工档案按指定字段匹配,取第一条有效记录。
|
||||
func findEmployeeByField(tid uint64, field, value string) (models.BackendEmployee, bool) {
|
||||
var rows []models.BackendEmployee
|
||||
if _, err := employeeBaseQuery(tid).
|
||||
@@ -897,7 +859,6 @@ func findEmployeeByField(tid uint64, field, value string) (models.BackendEmploye
|
||||
return models.BackendEmployee{}, false
|
||||
}
|
||||
|
||||
// authBindValue 取认证绑定记录里的可空字符串
|
||||
func authBindValue(p *string) string {
|
||||
if p == nil {
|
||||
return ""
|
||||
@@ -905,8 +866,6 @@ func authBindValue(p *string) string {
|
||||
return strings.TrimSpace(*p)
|
||||
}
|
||||
|
||||
// ChangeList 排班变更记录(最近 100 条),用于追溯临时调配。
|
||||
// GET /backend/oa/scheduling/changes?start_date=&end_date=&employee_id=
|
||||
func (c *BackendOaSchedulingController) ChangeList() {
|
||||
tid, _, _, ok := c.scOperator()
|
||||
if !ok {
|
||||
@@ -939,8 +898,6 @@ func (c *BackendOaSchedulingController) ChangeList() {
|
||||
c.scOK(map[string]interface{}{"list": rows})
|
||||
}
|
||||
|
||||
// ScheduleEmployeeOptions 排班可选员工(供“指定员工”范围选择)。
|
||||
// GET /backend/oa/scheduling/employees?org_id=&include_child=1&keyword=
|
||||
func (c *BackendOaSchedulingController) ScheduleEmployeeOptions() {
|
||||
tid, _, _, ok := c.scOperator()
|
||||
if !ok {
|
||||
|
||||
Reference in new issue
Block a user