v3

internal/erpserver/handler/budget/budget.go

@@ -0,0 +1,274 @@
+package budget
+
+import (
+	"errors"
+	"net/http"
+	"strconv"
+	"strings"
+	"time"
+
+	"management/internal/db/model/form"
+	db "management/internal/db/sqlc"
+	"management/internal/erpserver/biz"
+	"management/internal/pkg/convertor"
+	"management/internal/pkg/know"
+	"management/internal/pkg/middleware"
+	"management/internal/pkg/tpl"
+	"management/internal/pkg/tpl/html"
+
+	"github.com/jackc/pgx/v5/pgtype"
+)
+
+type BudgetHandler interface {
+	List(w http.ResponseWriter, r *http.Request)
+	Add(w http.ResponseWriter, r *http.Request)
+	Edit(w http.ResponseWriter, r *http.Request)
+	Save(w http.ResponseWriter, r *http.Request)
+	Data(w http.ResponseWriter, r *http.Request)
+}
+
+type budgetHandler struct {
+	render tpl.Renderer
+	biz    biz.IBiz
+	mi     middleware.IMiddleware
+}
+
+var _ BudgetHandler = (*budgetHandler)(nil)
+
+func NewBudgetHandler(render tpl.Renderer, biz biz.IBiz, mi middleware.IMiddleware) *budgetHandler {
+	return &budgetHandler{
+		render: render,
+		biz:    biz,
+		mi:     mi,
+	}
+}
+
+func (h *budgetHandler) List(w http.ResponseWriter, r *http.Request) {
+	switch r.Method {
+	case http.MethodGet:
+		ctx := r.Context()
+		pp, _ := h.biz.ProjectV1().ListHtml(ctx)
+		cc, _ := h.biz.SystemV1().CategoryBiz().ListHtmlByLetter(ctx, know.BudgetCategory)
+		h.render.HTML(w, r, "budget/list.tmpl", map[string]any{
+			"Statuses":   html.NewSelectControls(html.Statuses, "0"),
+			"Projects":   html.NewSelectControls(pp, "0"),
+			"Categories": html.NewSelectControls(cc, "0"),
+		})
+	case http.MethodPost:
+		ctx := r.Context()
+		project := convertor.ConvertInt[int64](r.PostFormValue("project"), 9999)
+		if project == 0 {
+			project = 9999
+		}
+
+		budgetType := convertor.ConvertInt[int32](r.PostFormValue("budgetType"), 9999)
+		if budgetType == 0 {
+			budgetType = 9999
+		}
+
+		category := convertor.ConvertInt[int32](r.PostFormValue("category"), 9999)
+		if category == 0 {
+			category = 9999
+		}
+
+		title := strings.TrimSpace(r.PostFormValue("title"))
+		var search string
+		if len(title) > 0 {
+			search = "%" + title + "%"
+			if strings.HasSuffix(title, ":") {
+				search = title[:len(title)-1] + "%"
+			}
+		}
+		arg := &db.ListBudgetConditionParam{
+			ProjectID:  project,
+			BudgetType: budgetType,
+			Category:   category,
+			IsTitle:    len(search) > 0,
+			Title:      search,
+			Status:     convertor.ConvertInt[int16](r.PostFormValue("status"), 9999),
+			PageID:     convertor.ConvertInt[int32](r.PostFormValue("page"), 1),
+			PageSize:   convertor.ConvertInt[int32](r.PostFormValue("rows"), 10),
+		}
+		arg.TimeBegin, arg.TimeEnd = convertor.DefaultStartTimeAndEndTime(r.PostFormValue("timeBegin"), r.PostFormValue("timeEnd"))
+		res, total, err := h.biz.BudgetV1().List(ctx, arg)
+		if err != nil {
+			h.render.JSONERR(w, err.Error())
+			return
+		}
+
+		data := tpl.ResponseList{
+			Code:    0,
+			Message: "ok",
+			Count:   total,
+			Data:    res,
+		}
+		h.render.JSON(w, data)
+	default:
+		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
+	}
+}
+
+func (h *budgetHandler) Add(w http.ResponseWriter, r *http.Request) {
+	h.render.HTML(w, r, "budget/edit.tmpl", map[string]any{
+		"Item": &form.BudgetForm{
+			BudgetType: 1,
+		},
+		"Statuses": html.NewSelectControls(html.Statuses, "0"),
+	})
+}
+
+func (h *budgetHandler) Edit(w http.ResponseWriter, r *http.Request) {
+	vars := r.URL.Query()
+	id := convertor.QueryInt[int64](vars, "id", 0)
+	budget := &form.BudgetForm{}
+	ctx := r.Context()
+	if id > 0 {
+		if cus, err := h.biz.BudgetV1().Get(ctx, id); err == nil {
+			budget = budget.ToForm(cus)
+			if u, err := h.biz.SystemV1().UserBiz().Get(ctx, cus.CreatedUserID); err == nil {
+				budget.CreatedName = u.Username
+			}
+			if u, err := h.biz.SystemV1().UserBiz().Get(ctx, cus.UpdatedUserID); err == nil {
+				budget.UpdatedName = u.Username
+			}
+		}
+	}
+	h.render.HTML(w, r, "budget/edit.tmpl", map[string]any{
+		"Item":     budget,
+		"Statuses": html.NewSelectControls(html.Statuses, strconv.Itoa(int(budget.Status))),
+	})
+}
+
+func (h *budgetHandler) Save(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
+	data, err := validForm(r)
+	if err != nil {
+		h.render.JSONERR(w, err.Error())
+		return
+	}
+
+	authUser := h.mi.AuthUser(ctx)
+	if data.ID > 0 {
+		arg := &db.UpdateBudgetParams{
+			ID: data.ID,
+			ProjectID: pgtype.Int8{
+				Int64: data.ProjectID,
+				Valid: true,
+			},
+			Name: pgtype.Text{
+				String: data.Name,
+				Valid:  true,
+			},
+			BudgetType: pgtype.Int4{
+				Int32: data.BudgetType,
+				Valid: true,
+			},
+			Category: pgtype.Int4{
+				Int32: data.Category,
+				Valid: true,
+			},
+			StartAt: pgtype.Timestamptz{
+				Time:  data.StartAt,
+				Valid: true,
+			},
+			EndAt: pgtype.Timestamptz{
+				Time:  data.EndAt,
+				Valid: true,
+			},
+			Amount:          data.AmountF,
+			UsedAmount:      data.UsedAmountF,
+			RemainingAmount: data.RemainingAmountF,
+			Remark: pgtype.Text{
+				String: data.Remark,
+				Valid:  true,
+			},
+			Status: pgtype.Int2{
+				Int16: data.Status,
+				Valid: true,
+			},
+			UpdatedUserID: pgtype.Int4{
+				Int32: authUser.ID,
+				Valid: true,
+			},
+		}
+		_, err := h.biz.BudgetV1().Update(ctx, arg)
+		if err != nil {
+			h.render.JSONERR(w, err.Error())
+			return
+		}
+		h.render.JSONOK(w, "更新成功")
+	} else {
+		arg := &db.CreateBudgetParams{
+			ProjectID:       data.ProjectID,
+			Name:            data.Name,
+			BudgetType:      data.BudgetType,
+			Category:        data.Category,
+			StartAt:         data.StartAt,
+			EndAt:           data.EndAt,
+			Amount:          data.AmountF,
+			UsedAmount:      data.UsedAmountF,
+			RemainingAmount: data.RemainingAmountF,
+			Remark:          data.Remark,
+			CreatedUserID:   authUser.ID,
+		}
+		_, err := h.biz.BudgetV1().Create(ctx, arg)
+		if err != nil {
+			h.render.JSONERR(w, err.Error())
+			return
+		}
+		h.render.JSONOK(w, "添加成功")
+	}
+}
+
+func (h *budgetHandler) Data(w http.ResponseWriter, r *http.Request) {}
+
+func validForm(r *http.Request) (form.BudgetForm, error) {
+	var err error
+	data := form.BudgetForm{}
+
+	data.ID = convertor.ConvertInt[int64](r.PostFormValue("ID"), 0)
+	data.ProjectID, err = strconv.ParseInt(r.PostFormValue("ProjectID"), 10, 64)
+	if err != nil || data.ProjectID == 0 {
+		return data, errors.New("项目不能为空")
+	}
+
+	data.Name = r.PostFormValue("Name")
+	if len(data.Name) == 0 {
+		return data, errors.New("预算名称不能为空")
+	}
+
+	budgetType, err := strconv.ParseInt(r.PostFormValue("BudgetType"), 10, 32)
+	if err != nil {
+		return data, errors.New("预算类型不能为空")
+	}
+	data.BudgetType = int32(budgetType)
+
+	category, err := strconv.ParseInt(r.PostFormValue("Category"), 10, 32)
+	if err != nil {
+		return data, errors.New("预算类别不能为空")
+	}
+	data.Category = int32(category)
+
+	data.StartAt, err = time.ParseInLocation("2006-01-02", r.PostFormValue("StartAt"), time.Local)
+	if err != nil {
+		return data, errors.New("开始时间格式错误")
+	}
+	data.EndAt, err = time.ParseInLocation("2006-01-02", r.PostFormValue("EndAt"), time.Local)
+	if err != nil {
+		return data, errors.New("结束时间格式错误")
+	}
+
+	if err := data.AmountF.Scan(r.PostFormValue("Amount")); err != nil {
+		return data, errors.New("预算金额格式错误")
+	}
+	if err := data.UsedAmountF.Scan(r.PostFormValue("UsedAmount")); err != nil {
+		return data, errors.New("已支付金额格式错误")
+	}
+	if err := data.RemainingAmountF.Scan(r.PostFormValue("RemainingAmount")); err != nil {
+		return data, errors.New("剩余金额格式错误")
+	}
+
+	data.Remark = r.PostFormValue("Remark")
+	data.Status = convertor.ConvertInt[int16](r.PostFormValue("Status"), 9999)
+	return data, nil
+}

internal/erpserver/handler/customer/customer.go

@@ -8,12 +8,12 @@ import (
 	"management/internal/db/model/form"
 	db "management/internal/db/sqlc"
 	"management/internal/erpserver/biz"
-	"management/internal/middleware/manage/auth"
 	"management/internal/pkg/convertor"
 	"management/internal/pkg/know"
+	"management/internal/pkg/middleware"
 	"management/internal/pkg/snowflake"
+	"management/internal/pkg/tpl"
 	"management/internal/pkg/tpl/html"
-	"management/internal/tpl"
 
 	"github.com/jackc/pgx/v5/pgtype"
 )
@@ -28,14 +28,16 @@ type CustomerHandler interface {
 type customerHandler struct {
 	render tpl.Renderer
 	biz    biz.IBiz
+	mi     middleware.IMiddleware
 }
 
 var _ CustomerHandler = (*customerHandler)(nil)
 
-func NewCustomerHandler(render tpl.Renderer, biz biz.IBiz) *customerHandler {
+func NewCustomerHandler(render tpl.Renderer, biz biz.IBiz, mi middleware.IMiddleware) *customerHandler {
 	return &customerHandler{
 		render: render,
 		biz:    biz,
+		mi:     mi,
 	}
 }
 
@@ -143,7 +145,7 @@ func (h *customerHandler) Save(w http.ResponseWriter, r *http.Request) {
 	}
 
 	ctx := r.Context()
-	authUser := auth.AuthUser(ctx)
+	authUser := h.mi.AuthUser(ctx)
 	if data.ID > 0 {
 		arg := &db.UpdateCustomerParams{
 			ID: data.ID,

internal/erpserver/handler/expense/expense.go

@@ -0,0 +1,231 @@
+package expense
+
+import (
+	"errors"
+	"net/http"
+	"strconv"
+	"strings"
+	"time"
+
+	"management/internal/db/model/form"
+	db "management/internal/db/sqlc"
+	"management/internal/erpserver/biz"
+	"management/internal/pkg/convertor"
+	"management/internal/pkg/know"
+	"management/internal/pkg/middleware"
+	"management/internal/pkg/tpl"
+	"management/internal/pkg/tpl/html"
+
+	"github.com/jackc/pgx/v5/pgtype"
+)
+
+type ExpenseHandler interface {
+	List(w http.ResponseWriter, r *http.Request)
+	Add(w http.ResponseWriter, r *http.Request)
+	Edit(w http.ResponseWriter, r *http.Request)
+	Save(w http.ResponseWriter, r *http.Request)
+}
+
+type expenseHandler struct {
+	render tpl.Renderer
+	biz    biz.IBiz
+	mi     middleware.IMiddleware
+}
+
+var _ ExpenseHandler = (*expenseHandler)(nil)
+
+func NewExpenseHandler(render tpl.Renderer, biz biz.IBiz, mi middleware.IMiddleware) *expenseHandler {
+	return &expenseHandler{
+		render: render,
+		biz:    biz,
+		mi:     mi,
+	}
+}
+
+func (h *expenseHandler) List(w http.ResponseWriter, r *http.Request) {
+	switch r.Method {
+	case http.MethodGet:
+		ctx := r.Context()
+		pp, _ := h.biz.ProjectV1().ListHtml(ctx)
+		cc, _ := h.biz.SystemV1().CategoryBiz().ListHtmlByLetter(ctx, know.ExpenseCategory)
+		h.render.HTML(w, r, "expense/list.tmpl", map[string]any{
+			"Statuses":   html.NewSelectControls(html.Statuses, "0"),
+			"Projects":   html.NewSelectControls(pp, "0"),
+			"Categories": html.NewSelectControls(cc, "0"),
+		})
+	case http.MethodPost:
+		ctx := r.Context()
+		project := convertor.ConvertInt[int64](r.PostFormValue("project"), 9999)
+		if project == 0 {
+			project = 9999
+		}
+		budget := convertor.ConvertInt[int64](r.PostFormValue("budget"), 9999)
+		if budget == 0 {
+			budget = 9999
+		}
+		category := convertor.ConvertInt[int32](r.PostFormValue("category"), 9999)
+		if category == 0 {
+			category = 9999
+		}
+
+		title := strings.TrimSpace(r.PostFormValue("title"))
+		var search string
+		if len(title) > 0 {
+			search = "%" + title + "%"
+			if strings.HasSuffix(title, ":") {
+				search = title[:len(title)-1] + "%"
+			}
+		}
+		arg := &db.ListExpenseConditionParam{
+			ProjectID:   project,
+			BudgetID:    budget,
+			ExpenseType: category,
+			IsTitle:     len(search) > 0,
+			Title:       search,
+			Status:      convertor.ConvertInt[int16](r.PostFormValue("status"), 9999),
+			PageID:      convertor.ConvertInt[int32](r.PostFormValue("page"), 1),
+			PageSize:    convertor.ConvertInt[int32](r.PostFormValue("rows"), 10),
+		}
+		arg.TimeBegin, arg.TimeEnd = convertor.DefaultStartTimeAndEndTime(r.PostFormValue("timeBegin"), r.PostFormValue("timeEnd"))
+		res, total, err := h.biz.ExpenseV1().List(ctx, arg)
+		if err != nil {
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
+
+		data := tpl.ResponseList{
+			Code:    0,
+			Message: "ok",
+			Count:   total,
+			Data:    res,
+		}
+		h.render.JSON(w, data)
+	default:
+		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
+	}
+}
+
+func (h *expenseHandler) Add(w http.ResponseWriter, r *http.Request) {
+	h.render.HTML(w, r, "expense/edit.tmpl", map[string]any{
+		"Item":     &form.ExpenseForm{},
+		"Statuses": html.NewSelectControls(html.Statuses, "0"),
+	})
+}
+
+func (h *expenseHandler) Edit(w http.ResponseWriter, r *http.Request) {
+	vars := r.URL.Query()
+	id := convertor.QueryInt[int64](vars, "id", 0)
+	expense := &form.ExpenseForm{}
+	ctx := r.Context()
+	if id > 0 {
+		if cus, err := h.biz.ExpenseV1().Get(ctx, id); err == nil {
+			expense = expense.ToForm(cus)
+			if u, err := h.biz.SystemV1().UserBiz().Get(ctx, cus.CreatedUserID); err == nil {
+				expense.CreatedName = u.Username
+			}
+			if u, err := h.biz.SystemV1().UserBiz().Get(ctx, cus.UpdatedUserID); err == nil {
+				expense.UpdatedName = u.Username
+			}
+		}
+	}
+	h.render.HTML(w, r, "expense/edit.tmpl", map[string]any{
+		"Item":     expense,
+		"Statuses": html.NewSelectControls(html.Statuses, strconv.Itoa(int(expense.Status))),
+	})
+}
+
+func (h *expenseHandler) Save(w http.ResponseWriter, r *http.Request) {
+	data, err := validForm(r)
+	if err != nil {
+		h.render.JSONERR(w, err.Error())
+		return
+	}
+
+	ctx := r.Context()
+	authUser := h.mi.AuthUser(ctx)
+	if data.ID > 0 {
+		arg := &db.UpdateExpenseParams{
+			ID: data.ID,
+			ProjectID: pgtype.Int8{
+				Int64: data.ProjectID,
+				Valid: true,
+			},
+			BudgetID: pgtype.Int8{
+				Int64: data.BudgetID,
+				Valid: true,
+			},
+			Amount: data.AmountF,
+			ExpensesAt: pgtype.Timestamptz{
+				Time:  data.ExpensesAt,
+				Valid: true,
+			},
+			ExpensesType: pgtype.Int4{
+				Int32: data.ExpensesType,
+				Valid: true,
+			},
+			Remark: pgtype.Text{
+				String: data.Remark,
+				Valid:  true,
+			},
+			Status: pgtype.Int2{
+				Int16: data.Status,
+				Valid: true,
+			},
+			UpdatedUserID: pgtype.Int4{
+				Int32: authUser.ID,
+				Valid: true,
+			},
+		}
+		_, err := h.biz.ExpenseV1().Update(ctx, arg)
+		if err != nil {
+			h.render.JSONERR(w, err.Error())
+			return
+		}
+		h.render.JSONOK(w, "更新成功")
+	} else {
+		arg := &db.CreateExpenseParams{
+			ProjectID:     data.ProjectID,
+			BudgetID:      data.BudgetID,
+			Amount:        data.AmountF,
+			ExpensesAt:    data.ExpensesAt,
+			ExpensesType:  data.ExpensesType,
+			Remark:        data.Remark,
+			Status:        data.Status,
+			CreatedUserID: authUser.ID,
+		}
+		_, err := h.biz.ExpenseV1().Create(ctx, arg)
+		if err != nil {
+			h.render.JSONERR(w, err.Error())
+			return
+		}
+		h.render.JSONOK(w, "添加成功")
+	}
+}
+
+func validForm(r *http.Request) (form.ExpenseForm, error) {
+	var err error
+	data := form.ExpenseForm{}
+
+	data.ID = convertor.ConvertInt[int64](r.PostFormValue("ID"), 0)
+	data.ProjectID, err = strconv.ParseInt(r.PostFormValue("ProjectID"), 10, 64)
+	if err != nil || data.ProjectID == 0 {
+		return data, errors.New("项目不能为空")
+	}
+	data.BudgetID, err = strconv.ParseInt(r.PostFormValue("BudgetID"), 10, 64)
+
+	if err := data.AmountF.Scan(r.PostFormValue("Amount")); err != nil {
+		return data, errors.New("报销金额格式错误")
+	}
+	data.ExpensesAt, err = time.ParseInLocation("2006-01-02", r.PostFormValue("ExpensesAt"), time.Local)
+	if err != nil {
+		return data, errors.New("报销时间格式错误")
+	}
+	expensesType, err := strconv.ParseInt(r.PostFormValue("ExpensesType"), 10, 64)
+	if err != nil || expensesType == 0 {
+		return data, errors.New("报销类型不能为空")
+	}
+	data.ExpensesType = int32(expensesType)
+
+	data.Status = convertor.ConvertInt[int16](r.PostFormValue("Status"), 9999)
+	return data, nil
+}

internal/erpserver/handler/handler.go

@@ -3,10 +3,14 @@ package handler
 import (
 	"management/internal/config"
 	"management/internal/erpserver/biz"
+	"management/internal/erpserver/handler/budget"
 	"management/internal/erpserver/handler/common"
 	"management/internal/erpserver/handler/customer"
+	"management/internal/erpserver/handler/expense"
+	"management/internal/erpserver/handler/income"
 	"management/internal/erpserver/handler/project"
 	"management/internal/erpserver/handler/system"
+	"management/internal/pkg/middleware"
 	"management/internal/pkg/redis"
 	"management/internal/pkg/session"
 	"management/internal/pkg/tpl"
@@ -18,8 +22,11 @@ type IHandler interface {
 	CommonHandler() common.CommonHandler
 	// 获取 System Handler 接口.
 	SystemHandler() system.SystemHandler
-	PorjectHandler() project.PorjectHandler
+	ProjectHandler() project.ProjectHandler
+	BudgetHandler() budget.BudgetHandler
 	CustomerHandler() customer.CustomerHandler
+	IncomeHandler() income.IncomeHandler
+	ExpenseHandler() expense.ExpenseHandler
 }
 
 // handler 是 IHandler 的一个具体实现.
@@ -29,19 +36,21 @@ type handler struct {
 	redis   redis.IRedis
 	session session.ISession
 	biz     biz.IBiz
+	mi      middleware.IMiddleware
 }
 
 // 确保 handler 实现了 IHandler 接口.
 var _ IHandler = (*handler)(nil)
 
 // NewHandler 创建一个 IHandler 类型的实例.
-func NewHandler(conf *config.Config, render tpl.Renderer, redis redis.IRedis, session session.ISession, biz biz.IBiz) *handler {
+func NewHandler(conf *config.Config, render tpl.Renderer, redis redis.IRedis, session session.ISession, biz biz.IBiz, mi middleware.IMiddleware) *handler {
 	return &handler{
 		conf:    conf,
 		render:  render,
 		redis:   redis,
 		session: session,
 		biz:     biz,
+		mi:      mi,
 	}
 }
 
@@ -52,15 +61,30 @@ func (h *handler) CommonHandler() common.CommonHandler {
 
 // SystemHandler 返回一个实现了 SystemHandler 接口的实例.
 func (h *handler) SystemHandler() system.SystemHandler {
-	return system.NewSystemHandler(h.render, h.redis, h.session, h.biz)
+	return system.NewSystemHandler(h.render, h.redis, h.session, h.biz, h.mi)
 }
 
-// PorjectHandler 返回一个实现了 PorjectHandler 接口的实例.
-func (h *handler) PorjectHandler() project.PorjectHandler {
-	return project.NewPorjectHandler(h.render, h.biz)
+// ProjectHandler 返回一个实现了 ProjectHandler 接口的实例.
+func (h *handler) ProjectHandler() project.ProjectHandler {
+	return project.NewProjectHandler(h.render, h.biz, h.mi)
+}
+
+// BudgetHandler 返回一个实现了 BudgetHandler 接口的实例.
+func (h *handler) BudgetHandler() budget.BudgetHandler {
+	return budget.NewBudgetHandler(h.render, h.biz, h.mi)
 }
 
 // CustomerHandler 返回一个实现了 CustomerHandler 接口的实例.
 func (h *handler) CustomerHandler() customer.CustomerHandler {
-	return customer.NewCustomerHandler(h.render, h.biz)
+	return customer.NewCustomerHandler(h.render, h.biz, h.mi)
+}
+
+// IncomeHandler 返回一个实现了 IncomeHandler 接口的实例.
+func (h *handler) IncomeHandler() income.IncomeHandler {
+	return income.NewIncomeHandler(h.render, h.biz, h.mi)
+}
+
+// ExpenseHandler 返回一个实现了 ExpenseHandler 接口的实例.
+func (h *handler) ExpenseHandler() expense.ExpenseHandler {
+	return expense.NewExpenseHandler(h.render, h.biz, h.mi)
 }

internal/erpserver/handler/income/income.go

@@ -0,0 +1,249 @@
+package income
+
+import (
+	"errors"
+	"net/http"
+	"strconv"
+	"strings"
+	"time"
+
+	"management/internal/db/model/form"
+	db "management/internal/db/sqlc"
+	"management/internal/erpserver/biz"
+	"management/internal/pkg/convertor"
+	"management/internal/pkg/know"
+	"management/internal/pkg/middleware"
+	"management/internal/pkg/tpl"
+	"management/internal/pkg/tpl/html"
+
+	"github.com/jackc/pgx/v5/pgtype"
+)
+
+type IncomeHandler interface {
+	List(w http.ResponseWriter, r *http.Request)
+	Add(w http.ResponseWriter, r *http.Request)
+	Edit(w http.ResponseWriter, r *http.Request)
+	Save(w http.ResponseWriter, r *http.Request)
+}
+
+type incomeHandler struct {
+	render tpl.Renderer
+	biz    biz.IBiz
+	mi     middleware.IMiddleware
+}
+
+var _ IncomeHandler = (*incomeHandler)(nil)
+
+func NewIncomeHandler(render tpl.Renderer, biz biz.IBiz, mi middleware.IMiddleware) *incomeHandler {
+	return &incomeHandler{
+		render: render,
+		biz:    biz,
+		mi:     mi,
+	}
+}
+
+func (h *incomeHandler) List(w http.ResponseWriter, r *http.Request) {
+	switch r.Method {
+	case http.MethodGet:
+		ctx := r.Context()
+		pp, _ := h.biz.ProjectV1().ListHtml(ctx)
+		cc, _ := h.biz.SystemV1().CategoryBiz().ListHtmlByLetter(ctx, know.IncomeCategory)
+		h.render.HTML(w, r, "income/list.tmpl", map[string]any{
+			"Statuses":   html.NewSelectControls(html.Statuses, "0"),
+			"Projects":   html.NewSelectControls(pp, "0"),
+			"Categories": html.NewSelectControls(cc, "0"),
+		})
+	case http.MethodPost:
+		ctx := r.Context()
+		project := convertor.ConvertInt[int64](r.PostFormValue("project"), 9999)
+		if project == 0 {
+			project = 9999
+		}
+		budget := convertor.ConvertInt[int64](r.PostFormValue("budget"), 9999)
+		if budget == 0 {
+			budget = 9999
+		}
+		category := convertor.ConvertInt[int32](r.PostFormValue("category"), 9999)
+		if category == 0 {
+			category = 9999
+		}
+
+		title := strings.TrimSpace(r.PostFormValue("title"))
+		var search string
+		if len(title) > 0 {
+			search = "%" + title + "%"
+			if strings.HasSuffix(title, ":") {
+				search = title[:len(title)-1] + "%"
+			}
+		}
+		arg := &db.ListIncomeConditionParam{
+			ProjectID:  project,
+			BudgetID:   budget,
+			IncomeType: category,
+			IsTitle:    len(search) > 0,
+			Title:      search,
+			Status:     convertor.ConvertInt[int16](r.PostFormValue("status"), 9999),
+			PageID:     convertor.ConvertInt[int32](r.PostFormValue("page"), 1),
+			PageSize:   convertor.ConvertInt[int32](r.PostFormValue("rows"), 10),
+		}
+		arg.TimeBegin, arg.TimeEnd = convertor.DefaultStartTimeAndEndTime(r.PostFormValue("timeBegin"), r.PostFormValue("timeEnd"))
+		res, total, err := h.biz.IncomeV1().List(ctx, arg)
+		if err != nil {
+			h.render.JSONERR(w, err.Error())
+			return
+		}
+
+		data := tpl.ResponseList{
+			Code:    0,
+			Message: "ok",
+			Count:   total,
+			Data:    res,
+		}
+		h.render.JSON(w, data)
+	default:
+		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
+	}
+}
+
+func (h *incomeHandler) Add(w http.ResponseWriter, r *http.Request) {
+	h.render.HTML(w, r, "income/edit.tmpl", map[string]any{
+		"Item":     &form.IncomeForm{},
+		"Statuses": html.NewSelectControls(html.Statuses, "0"),
+	})
+}
+
+func (h *incomeHandler) Edit(w http.ResponseWriter, r *http.Request) {
+	vars := r.URL.Query()
+	id := convertor.ConvertInt[int64](vars.Get("id"), 0)
+	income := &form.IncomeForm{}
+	ctx := r.Context()
+	if id > 0 {
+		if cus, err := h.biz.IncomeV1().Get(ctx, id); err == nil {
+			income = income.ToForm(cus)
+			if u, err := h.biz.SystemV1().UserBiz().Get(ctx, cus.CreatedUserID); err == nil {
+				income.CreatedName = u.Username
+			}
+			if u, err := h.biz.SystemV1().UserBiz().Get(ctx, cus.UpdatedUserID); err == nil {
+				income.UpdatedName = u.Username
+			}
+		}
+	}
+	h.render.HTML(w, r, "income/edit.tmpl", map[string]any{
+		"Item":     income,
+		"Statuses": html.NewSelectControls(html.Statuses, strconv.Itoa(int(income.Status))),
+	})
+}
+
+func (h *incomeHandler) Save(w http.ResponseWriter, r *http.Request) {
+	data, err := validForm(r)
+	if err != nil {
+		h.render.JSONERR(w, err.Error())
+		return
+	}
+
+	ctx := r.Context()
+	authUser := h.mi.AuthUser(ctx)
+	if data.ID > 0 {
+		arg := &db.UpdateIncomeParams{
+			ID: data.ID,
+			ProjectID: pgtype.Int8{
+				Int64: data.ProjectID,
+				Valid: true,
+			},
+			BudgetID: pgtype.Int8{
+				Int64: data.BudgetID,
+				Valid: true,
+			},
+			Amount: data.AmountF,
+			IncomeAt: pgtype.Timestamptz{
+				Time:  data.IncomeAt,
+				Valid: true,
+			},
+			IncomeType: pgtype.Int4{
+				Int32: data.IncomeType,
+				Valid: true,
+			},
+			IncomeBank: pgtype.Int4{
+				Int32: data.IncomeBank,
+				Valid: true,
+			},
+			Remark: pgtype.Text{
+				String: data.Remark,
+				Valid:  true,
+			},
+			Status: pgtype.Int2{
+				Int16: data.Status,
+				Valid: true,
+			},
+			UpdatedUserID: pgtype.Int4{
+				Int32: authUser.ID,
+				Valid: true,
+			},
+		}
+		_, err := h.biz.IncomeV1().Update(ctx, arg)
+		if err != nil {
+			h.render.JSONERR(w, err.Error())
+			return
+		}
+		h.render.JSONOK(w, "更新成功")
+	} else {
+		arg := &db.CreateIncomeParams{
+			ProjectID:     data.ProjectID,
+			BudgetID:      data.BudgetID,
+			Amount:        data.AmountF,
+			IncomeAt:      data.IncomeAt,
+			IncomeType:    data.IncomeType,
+			IncomeBank:    data.IncomeBank,
+			Remark:        data.Remark,
+			Status:        data.Status,
+			CreatedUserID: authUser.ID,
+		}
+		_, err := h.biz.IncomeV1().Create(ctx, arg)
+		if err != nil {
+			h.render.JSONERR(w, err.Error())
+			return
+		}
+		h.render.JSONOK(w, "添加成功")
+	}
+}
+
+func validForm(r *http.Request) (form.IncomeForm, error) {
+	var err error
+	data := form.IncomeForm{}
+	data.ID = convertor.ConvertInt[int64](r.PostFormValue("ID"), 0)
+
+	data.ProjectID, err = strconv.ParseInt(r.PostFormValue("ProjectID"), 10, 64)
+	if err != nil || data.ProjectID == 0 {
+		return data, errors.New("项目不能为空")
+	}
+
+	data.BudgetID, err = strconv.ParseInt(r.PostFormValue("BudgetID"), 10, 64)
+	if err != nil {
+		data.BudgetID = 0
+	}
+
+	if err := data.AmountF.Scan(r.PostFormValue("Amount")); err != nil {
+		return data, errors.New("报销金额格式错误")
+	}
+
+	data.IncomeAt, err = time.ParseInLocation("2006-01-02", r.PostFormValue("IncomeAt"), time.Local)
+	if err != nil {
+		return data, errors.New("回款时间格式错误")
+	}
+
+	incomeType, err := strconv.ParseInt(r.PostFormValue("IncomeType"), 10, 64)
+	if err != nil {
+		return data, errors.New("收入类型数据错误")
+	}
+	data.IncomeType = int32(incomeType)
+
+	incomeBank, err := strconv.ParseInt(r.PostFormValue("IncomeBank"), 10, 64)
+	if err != nil {
+		return data, errors.New("收入银行数据错误")
+	}
+	data.IncomeBank = int32(incomeBank)
+
+	data.Remark = r.PostFormValue("Remark")
+	data.Status = convertor.ConvertInt[int16](r.PostFormValue("Status"), 9999)
+	return data, nil
+}

internal/erpserver/handler/project/dashboard.go

@@ -0,0 +1,369 @@
+package project
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+
+	"management/internal/db/model/view"
+	"management/internal/pkg/convertor"
+	"management/internal/pkg/tpl"
+)
+
+func (h *projectHandler) Dashboard(w http.ResponseWriter, r *http.Request) {
+	switch r.Method {
+	case http.MethodGet:
+		pp, _ := h.biz.ProjectV1().ListHtml(r.Context())
+		h.render.HTML(w, r, "project/dashboard.tmpl", map[string]any{
+			"Projects": pp,
+		})
+	case http.MethodPost:
+		ctx := r.Context()
+		t := r.PostFormValue("type")
+		if t == "project" {
+			var projectIncome float64
+			var projectExpense float64
+			projectID := convertor.ConvertInt[int64](r.PostFormValue("projectID"), 0)
+			if projectID == 0 {
+				si, _ := h.biz.IncomeV1().Sum(ctx)
+				projectIncome = convertor.NumericToFloat64(si)
+				se, _ := h.biz.ExpenseV1().Sum(ctx)
+				projectExpense = convertor.NumericToFloat64(se)
+			} else {
+				pi, _ := h.biz.IncomeV1().SumByProjectID(ctx, projectID)
+				projectIncome = convertor.NumericToFloat64(pi)
+				pe, _ := h.biz.ExpenseV1().SumByProjectID(ctx, projectID)
+				projectExpense = convertor.NumericToFloat64(pe)
+			}
+
+			projectProfit := projectIncome - projectExpense
+			var projectProfitRate float64 = 0
+			if projectExpense > 0 {
+				projectProfitRate = projectProfit / projectExpense
+			}
+
+			res := &view.DashboardProject{
+				ProjectIncome:        projectIncome,
+				ProjectExpense:       projectExpense,
+				ProjectProfit:        projectProfit,
+				ProjectProfitRate:    fmt.Sprintf("%0.2f%%", projectProfitRate*100),
+				IncomeExpenseEcharts: h.incomeExpenseEcharts(ctx, projectID),
+				IncomeEcharts:        h.incomeEcharts(ctx, projectID),
+				ExpenseEcharts:       h.expenseEcharts(ctx, projectID),
+			}
+			h.render.JSON(w, tpl.Response{Success: true, Message: "ok", Data: res})
+			return
+		} else if t == "budget" {
+		}
+		h.render.JSONERR(w, "failed to valid type")
+	default:
+		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
+	}
+}
+
+func (h *projectHandler) incomeExpenseEcharts(ctx context.Context, projectId int64) view.EchartsOption {
+	var name []string
+	var income []float64
+	var expense []float64
+
+	if projectId == 0 {
+		rows, err := h.biz.ProjectV1().Statistics(ctx)
+		if err != nil || len(rows) == 0 {
+			return view.EchartsOption{}
+		}
+
+		for _, row := range rows {
+			name = append(name, row.Name)
+			income = append(income, convertor.NumericToFloat64(row.Income))
+			expense = append(expense, convertor.NumericToFloat64(row.Expense))
+		}
+	} else {
+		row, err := h.biz.ProjectV1().StatisticsItem(ctx, projectId)
+		if err != nil || row == nil {
+			return view.EchartsOption{}
+		}
+		name = append(name, row.Name)
+		income = append(income, convertor.NumericToFloat64(row.Income))
+		expense = append(expense, convertor.NumericToFloat64(row.Expense))
+	}
+
+	return view.EchartsOption{
+		Title: view.Title{
+			Text:     "项目收支情况",
+			Left:     "center",
+			Top:      2,
+			FontSize: 15,
+			TextStyle: view.TextStyle{
+				Color:      "#666666",
+				FontWeight: "normal",
+			},
+		},
+		Color: []string{"#fed46b", "#2194ff"},
+		ToolTip: view.ToolTip{
+			Trigger: "axis",
+			AxisPointer: view.AxisPointer{
+				Type: "shadow",
+			},
+		},
+		Grid: view.Grid{
+			Left:         "3%",
+			Right:        "4%",
+			Bottom:       "10%",
+			ContainLabel: true,
+		},
+		Legend: view.Legend{
+			Left: "center",
+			Top:  "bottom",
+			Data: []string{"支出金额", "收入金额"},
+		},
+		XAxis: []view.XAxis{
+			{
+				Type: "category",
+				Data: name,
+				AxisTick: view.AxisTick{
+					AlignWithLabel: true,
+				},
+			},
+		},
+		YAxis: []view.YAxis{
+			{
+				Type: "value",
+				Name: "单位：元",
+			},
+		},
+		BarMaxWidth: "30",
+		Label: view.Label{
+			Show:     true,
+			Position: "top",
+		},
+		Series: []view.Series{
+			{
+				Name: "支出金额",
+				Type: "bar",
+				Data: expense,
+				ItemStyle: view.ItemStyle{
+					Normal: view.Normal{
+						Color: "#f89588",
+					},
+				},
+			},
+			{
+				Name: "收入金额",
+				Type: "bar",
+				Data: income,
+				ItemStyle: view.ItemStyle{
+					Normal: view.Normal{
+						Color: "#76da91",
+					},
+				},
+			},
+		},
+	}
+}
+
+func (h *projectHandler) incomeEcharts(ctx context.Context, projectId int64) view.EchartsOption {
+	var name []string
+	data := []view.DataItem{}
+
+	if projectId == 0 {
+		rows, err := h.biz.IncomeV1().Statistics(ctx)
+		if err != nil || len(rows) == 0 {
+			return view.EchartsOption{}
+		}
+
+		for _, row := range rows {
+			name = append(name, row.IncomeTypeName)
+			data = append(data, view.DataItem{
+				Name:  row.IncomeTypeName,
+				Value: convertor.NumericToFloat64(row.TotalAmount),
+			})
+		}
+	} else {
+		rows, err := h.biz.IncomeV1().StatisticsByProjectID(ctx, projectId)
+		if err != nil || len(rows) == 0 {
+			return view.EchartsOption{}
+		}
+
+		for _, row := range rows {
+			name = append(name, row.IncomeTypeName)
+			data = append(data, view.DataItem{
+				Name:  row.IncomeTypeName,
+				Value: convertor.NumericToFloat64(row.TotalAmount),
+			})
+		}
+	}
+
+	return view.EchartsOption{
+		Title: view.Title{
+			Text:     "收入分布",
+			Left:     "center",
+			Orient:   "vertical",
+			FontSize: 15,
+			TextStyle: view.TextStyle{
+				Color:      "#666666",
+				FontWeight: "normal",
+			},
+		},
+		ToolTip: view.ToolTip{
+			Trigger: "item",
+		},
+		Legend: view.Legend{
+			Left: "center",
+			Top:  "bottom",
+			Data: name,
+		},
+		Color: []string{"#63b2ee", "#76da91", "#f8cb7f", "#f89588", "#7cd6cf", "#9192ab", "#7898e1", "#efa666", "#eddd86", "#9987ce", "#63b2ee", "#76da91"},
+		Series: []view.Series{
+			{
+				Type:   "pie",
+				Radius: "50%",
+				Data:   data,
+				Label: view.Label{
+					Show: true,
+					TextStyle: view.TextStyle{
+						Color: "#666666",
+					},
+					Normal: view.LableNormal{
+						Formatter: "{c} ({d}%)",
+						TextStyle: view.TextStyle{
+							Color:      "#666666",
+							FontWeight: "normal",
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
+func (h *projectHandler) expenseEcharts(ctx context.Context, projectId int64) view.EchartsOption {
+	var name []string
+	data := []view.DataItem{}
+
+	if projectId == 0 {
+		rows, err := h.biz.ExpenseV1().Statistics(ctx)
+		if err != nil || len(rows) == 0 {
+			return view.EchartsOption{}
+		}
+
+		for _, row := range rows {
+			name = append(name, row.ExpensesTypeName)
+			data = append(data, view.DataItem{
+				Name:  row.ExpensesTypeName,
+				Value: convertor.NumericToFloat64(row.TotalAmount),
+			})
+		}
+	} else {
+		rows, err := h.biz.ExpenseV1().StatisticsByProjectID(ctx, projectId)
+		if err != nil || len(rows) == 0 {
+			return view.EchartsOption{}
+		}
+
+		for _, row := range rows {
+			name = append(name, row.ExpensesTypeName)
+			data = append(data, view.DataItem{
+				Name:  row.ExpensesTypeName,
+				Value: convertor.NumericToFloat64(row.TotalAmount),
+			})
+		}
+	}
+
+	return view.EchartsOption{
+		Title: view.Title{
+			Text:     "支出分布",
+			Left:     "center",
+			Orient:   "vertical",
+			FontSize: 15,
+			TextStyle: view.TextStyle{
+				Color:      "#666666",
+				FontWeight: "normal",
+			},
+		},
+		ToolTip: view.ToolTip{
+			Trigger: "item",
+		},
+		Legend: view.Legend{
+			Left: "center",
+			Top:  "bottom",
+			Data: name,
+		},
+		Color: []string{"#63b2ee", "#76da91", "#f8cb7f", "#f89588", "#7cd6cf", "#9192ab", "#7898e1", "#efa666", "#eddd86", "#9987ce", "#63b2ee", "#76da91"},
+		Series: []view.Series{
+			{
+				Type:   "pie",
+				Radius: "50%",
+				Data:   data,
+				Label: view.Label{
+					Show: true,
+					TextStyle: view.TextStyle{
+						Color: "#666666",
+					},
+					Normal: view.LableNormal{
+						Formatter: "{c} ({d}%)",
+						TextStyle: view.TextStyle{
+							Color:      "#666666",
+							FontWeight: "normal",
+						},
+					},
+				},
+			},
+		},
+	}
+
+	// return view.EchartsOption{
+	// 	Title: view.Title{
+	// 		Text:     "支出分布",
+	// 		Left:     "center",
+	// 		Top:      2,
+	// 		FontSize: 15,
+	// 		TextStyle: view.TextStyle{
+	// 			Color:      "#666666",
+	// 			FontWeight: "normal",
+	// 		},
+	// 	},
+	// 	Color: []string{"#fed46b", "#2194ff"},
+	// 	ToolTip: view.ToolTip{
+	// 		Trigger: "axis",
+	// 		AxisPointer: view.AxisPointer{
+	// 			Type: "shadow",
+	// 		},
+	// 	},
+	// 	Grid: view.Grid{
+	// 		Left:         "3%",
+	// 		Right:        "4%",
+	// 		Bottom:       "10%",
+	// 		ContainLabel: true,
+	// 	},
+	// 	XAxis: []view.XAxis{
+	// 		{
+	// 			Type: "category",
+	// 			Data: name,
+	// 			AxisTick: view.AxisTick{
+	// 				AlignWithLabel: true,
+	// 			},
+	// 		},
+	// 	},
+	// 	YAxis: []view.YAxis{
+	// 		{
+	// 			Type: "value",
+	// 			Name: "单位：元",
+	// 		},
+	// 	},
+	// 	BarMaxWidth: "30",
+	// 	Label: view.Label{
+	// 		Show:     true,
+	// 		Position: "top",
+	// 	},
+	// 	Series: []view.Series{
+	// 		{
+	// 			Type: "bar",
+	// 			Data: expense,
+	// 			ItemStyle: view.ItemStyle{
+	// 				Normal: view.Normal{
+	// 					Color: "#f89588",
+	// 				},
+	// 			},
+	// 		},
+	// 	},
+	// }
+}

internal/erpserver/handler/project/project.go

@@ -10,43 +10,45 @@ import (
 	formDto "management/internal/db/model/form"
 	db "management/internal/db/sqlc"
 	"management/internal/erpserver/biz"
-	"management/internal/global"
-	"management/internal/global/html"
-	"management/internal/middleware/manage/auth"
 	"management/internal/pkg/convertor"
+	"management/internal/pkg/middleware"
 	"management/internal/pkg/snowflake"
-	"management/internal/router/manage/util"
-	"management/internal/tpl"
+	"management/internal/pkg/tpl"
+	"management/internal/pkg/tpl/html"
 
 	"github.com/jackc/pgx/v5/pgtype"
 )
 
-type PorjectHandler interface {
+type ProjectHandler interface {
 	List(w http.ResponseWriter, r *http.Request)
 	Add(w http.ResponseWriter, r *http.Request)
 	Edit(w http.ResponseWriter, r *http.Request)
 	Save(w http.ResponseWriter, r *http.Request)
+	Data(w http.ResponseWriter, r *http.Request)
+	Dashboard(w http.ResponseWriter, r *http.Request)
 }
 
-type porjectHandler struct {
+type projectHandler struct {
 	render tpl.Renderer
 	biz    biz.IBiz
+	mi     middleware.IMiddleware
 }
 
-var _ PorjectHandler = (*porjectHandler)(nil)
+var _ ProjectHandler = (*projectHandler)(nil)
 
-func NewPorjectHandler(render tpl.Renderer, biz biz.IBiz) *porjectHandler {
-	return &porjectHandler{
+func NewProjectHandler(render tpl.Renderer, biz biz.IBiz, mi middleware.IMiddleware) *projectHandler {
+	return &projectHandler{
 		render: render,
 		biz:    biz,
+		mi:     mi,
 	}
 }
 
-func (h *porjectHandler) List(w http.ResponseWriter, r *http.Request) {
+func (h *projectHandler) List(w http.ResponseWriter, r *http.Request) {
 	switch r.Method {
 	case http.MethodGet:
 		h.render.HTML(w, r, "project/list.tmpl", map[string]any{
-			"Statuses": html.NewSelectControls(global.ProjectStatuses, 0),
+			"Statuses": html.NewSelectControls(html.ProjectStatuses, "0"),
 		})
 	case http.MethodPost:
 		title := strings.TrimSpace(r.PostFormValue("title"))
@@ -64,7 +66,7 @@ func (h *porjectHandler) List(w http.ResponseWriter, r *http.Request) {
 			PageID:   convertor.ConvertInt[int32](r.PostFormValue("page"), 1),
 			PageSize: convertor.ConvertInt[int32](r.PostFormValue("rows"), 10),
 		}
-		arg.TimeBegin, arg.TimeEnd = util.DefaultStartTimeAndEndTime(r.PostFormValue("timeBegin"), r.PostFormValue("timeEnd"))
+		arg.TimeBegin, arg.TimeEnd = convertor.DefaultStartTimeAndEndTime(r.PostFormValue("timeBegin"), r.PostFormValue("timeEnd"))
 		res, total, err := h.biz.ProjectV1().List(r.Context(), arg)
 		if err != nil {
 			h.render.JSONERR(w, err.Error())
@@ -83,8 +85,8 @@ func (h *porjectHandler) List(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-func (h *porjectHandler) Add(w http.ResponseWriter, r *http.Request) {
-	authUser := auth.AuthUser(r.Context())
+func (h *projectHandler) Add(w http.ResponseWriter, r *http.Request) {
+	authUser := h.mi.AuthUser(r.Context())
 	h.render.HTML(w, r, "project/edit.tmpl", map[string]any{
 		"Item": &formDto.ProjectForm{
 			ApplyUserID: authUser.ID,
@@ -92,11 +94,11 @@ func (h *porjectHandler) Add(w http.ResponseWriter, r *http.Request) {
 				ProjectFileItems: []*formDto.ProjectFileItemForm{},
 			},
 		},
-		"Statuses": html.NewSelectControls(global.ProjectStatuses, 0),
+		"Statuses": html.NewSelectControls(html.ProjectStatuses, "0"),
 	})
 }
 
-func (h *porjectHandler) Edit(w http.ResponseWriter, r *http.Request) {
+func (h *projectHandler) Edit(w http.ResponseWriter, r *http.Request) {
 	form := &formDto.ProjectForm{}
 	id := convertor.ConvertInt[int64](r.URL.Query().Get("id"), 0)
 	if id > 0 {
@@ -109,7 +111,7 @@ func (h *porjectHandler) Edit(w http.ResponseWriter, r *http.Request) {
 			}
 			form = form.ToForm(po, pfs)
 			if form.ApplyUserID == 0 {
-				authUser := auth.AuthUser(ctx)
+				authUser := h.mi.AuthUser(ctx)
 				form.ApplyUserID = authUser.ID
 			}
 			// if c, err := db.Engine.GetCustomer(ctx, po.CustomerID); err == nil {
@@ -125,19 +127,19 @@ func (h *porjectHandler) Edit(w http.ResponseWriter, r *http.Request) {
 	}
 	h.render.HTML(w, r, "project/edit.tmpl", map[string]any{
 		"Item":     form,
-		"Statuses": html.NewSelectControls(global.ProjectStatuses, form.Status),
+		"Statuses": html.NewSelectControls(html.ProjectStatuses, strconv.Itoa(int(form.Status))),
 	})
 }
 
-func (h *porjectHandler) Save(w http.ResponseWriter, r *http.Request) {
+func (h *projectHandler) Save(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 	form, err := validForm(r)
 	if err != nil {
-		tpl.JSONERR(w, err.Error())
+		h.render.JSONERR(w, err.Error())
 		return
 	}
 
-	authUser := auth.AuthUser(ctx)
+	authUser := h.mi.AuthUser(ctx)
 	if form.ID > 0 {
 		p := &db.UpdateProjectParams{
 			ID: form.ID,
@@ -199,10 +201,10 @@ func (h *porjectHandler) Save(w http.ResponseWriter, r *http.Request) {
 		}
 		err := h.biz.ProjectV1().Update(ctx, p, cpfs)
 		if err != nil {
-			tpl.JSONERR(w, err.Error())
+			h.render.JSONERR(w, err.Error())
 			return
 		}
-		tpl.JSONOK(w, "更新成功")
+		h.render.JSONOK(w, "更新成功")
 	} else {
 		p := &db.CreateProjectParams{
 			ID:            snowflake.GetId(),
@@ -231,13 +233,30 @@ func (h *porjectHandler) Save(w http.ResponseWriter, r *http.Request) {
 		}
 		err := h.biz.ProjectV1().Create(ctx, p, cpfs)
 		if err != nil {
-			tpl.JSONERR(w, err.Error())
+			h.render.JSONERR(w, err.Error())
 			return
 		}
-		tpl.JSONOK(w, "添加成功")
+		h.render.JSONOK(w, "添加成功")
 	}
 }
 
+func (h *projectHandler) Data(w http.ResponseWriter, r *http.Request) {
+	vars := r.URL.Query()
+	t := vars.Get("type")
+	if t == "xmselect" {
+		res, err := h.biz.ProjectV1().XmSelect(r.Context())
+		if err != nil {
+			h.render.JSONERR(w, err.Error())
+			return
+		}
+
+		h.render.JSON(w, res)
+		return
+	}
+
+	h.render.JSON(w, nil)
+}
+
 func validForm(r *http.Request) (formDto.ProjectForm, error) {
 	var err error
 	form := formDto.ProjectForm{}

internal/erpserver/handler/system/audit.go

@@ -7,7 +7,6 @@ import (
 	"management/internal/erpserver/biz"
 	"management/internal/pkg/convertor"
 	"management/internal/pkg/tpl"
-	"management/internal/router/manage/util"
 )
 
 type AuditHandler interface {
@@ -34,7 +33,7 @@ func (h *auditHandler) List(w http.ResponseWriter, r *http.Request) {
 		h.render.HTML(w, r, "audit_log/list.tmpl", nil)
 	case http.MethodPost:
 		var q dto.SearchDto
-		q.SearchTimeBegin, q.SearchTimeEnd = util.DefaultStartTimeAndEndTime(r.PostFormValue("timeBegin"), r.PostFormValue("timeEnd"))
+		q.SearchTimeBegin, q.SearchTimeEnd = convertor.DefaultStartTimeAndEndTime(r.PostFormValue("timeBegin"), r.PostFormValue("timeEnd"))
 		q.SearchName = r.PostFormValue("name")
 		q.SearchEmail = r.PostFormValue("email")
 		q.Page = convertor.ConvertInt(r.PostFormValue("page"), 1)

internal/erpserver/handler/system/category.go

@@ -214,6 +214,15 @@ func (h *categoryHandler) Data(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
+		h.render.JSON(w, res)
+		return
+	} else if t == "xmselect" {
+		res, err := h.biz.SystemV1().CategoryBiz().XmSelect(ctx, vars.Get("letter"))
+		if err != nil {
+			h.render.JSONERR(w, err.Error())
+			return
+		}
+
 		h.render.JSON(w, res)
 		return
 	}

internal/erpserver/handler/system/config.go

@@ -8,8 +8,8 @@ import (
 	"management/internal/db/model/dto"
 	db "management/internal/db/sqlc"
 	"management/internal/erpserver/biz"
-	"management/internal/global/pearadmin"
 	"management/internal/pkg/convertor"
+	"management/internal/pkg/know/pearadmin"
 	"management/internal/pkg/redis"
 	"management/internal/pkg/tpl"
 )

internal/erpserver/handler/system/login_log.go

@@ -7,7 +7,6 @@ import (
 	"management/internal/erpserver/biz"
 	"management/internal/pkg/convertor"
 	"management/internal/pkg/tpl"
-	"management/internal/router/manage/util"
 )
 
 type LoginLogHandler interface {
@@ -34,7 +33,7 @@ func (h *loginLogHandler) List(w http.ResponseWriter, r *http.Request) {
 		h.render.HTML(w, r, "login_log/list.tmpl", nil)
 	case http.MethodPost:
 		var q dto.SearchDto
-		q.SearchTimeBegin, q.SearchTimeEnd = util.DefaultStartTimeAndEndTime(r.PostFormValue("timeBegin"), r.PostFormValue("timeEnd"))
+		q.SearchTimeBegin, q.SearchTimeEnd = convertor.DefaultStartTimeAndEndTime(r.PostFormValue("timeBegin"), r.PostFormValue("timeEnd"))
 		q.SearchName = r.PostFormValue("name")
 		q.SearchEmail = r.PostFormValue("email")
 		q.Page = convertor.ConvertInt(r.PostFormValue("page"), 1)

internal/erpserver/handler/system/menu.go

@@ -10,8 +10,8 @@ import (
 	"management/internal/db/model/dto"
 	db "management/internal/db/sqlc"
 	"management/internal/erpserver/biz"
-	"management/internal/global/know"
 	"management/internal/pkg/convertor"
+	"management/internal/pkg/know"
 	"management/internal/pkg/session"
 	"management/internal/pkg/tpl"
 

internal/erpserver/handler/system/role.go

@@ -11,7 +11,6 @@ import (
 	"management/internal/erpserver/biz"
 	"management/internal/pkg/convertor"
 	"management/internal/pkg/tpl"
-	"management/internal/router/manage/util"
 )
 
 type RoleHandler interface {
@@ -302,7 +301,7 @@ func (h *roleHandler) SetMenu(w http.ResponseWriter, r *http.Request) {
 
 		var menuList []*db.SysMenu
 		for _, v := range menuArr {
-			menuID := util.ConvertInt(v, 0)
+			menuID := convertor.ConvertInt(v, 0)
 			if menuID > 0 {
 				menu, err := h.biz.SystemV1().MenuBiz().Get(ctx, int32(menuID))
 				if err != nil {

internal/erpserver/handler/system/system.go

@@ -4,6 +4,7 @@ import (
 	"net/http"
 
 	"management/internal/erpserver/biz"
+	"management/internal/pkg/middleware"
 	"management/internal/pkg/redis"
 	"management/internal/pkg/session"
 	"management/internal/pkg/tpl"
@@ -26,16 +27,18 @@ type systemHandler struct {
 	redis   redis.IRedis
 	session session.ISession
 	biz     biz.IBiz
+	mi      middleware.IMiddleware
 }
 
 var _ SystemHandler = (*systemHandler)(nil)
 
-func NewSystemHandler(render tpl.Renderer, redis redis.IRedis, session session.ISession, biz biz.IBiz) *systemHandler {
+func NewSystemHandler(render tpl.Renderer, redis redis.IRedis, session session.ISession, biz biz.IBiz, mi middleware.IMiddleware) *systemHandler {
 	return &systemHandler{
 		render:  render,
 		redis:   redis,
 		session: session,
 		biz:     biz,
+		mi:      mi,
 	}
 }
 
@@ -44,7 +47,7 @@ func (h *systemHandler) Home(w http.ResponseWriter, r *http.Request) {
 }
 
 func (h *systemHandler) UserHandler() UserHandler {
-	return NewUserHandler(h.render, h.session, h.biz)
+	return NewUserHandler(h.render, h.session, h.biz, h.mi)
 }
 
 func (h *systemHandler) MenuHandler() MenuHandler {

internal/erpserver/handler/system/user.go

@@ -10,16 +10,14 @@ import (
 	db "management/internal/db/sqlc"
 	"management/internal/erpserver/biz"
 	"management/internal/erpserver/model/req"
-	"management/internal/global"
-	"management/internal/global/html"
-	"management/internal/global/know"
-	"management/internal/middleware/manage/auth"
 	"management/internal/pkg/convertor"
 	"management/internal/pkg/crypto"
+	"management/internal/pkg/know"
+	"management/internal/pkg/middleware"
 	"management/internal/pkg/rand"
 	"management/internal/pkg/session"
 	"management/internal/pkg/tpl"
-	"management/internal/router/manage/util"
+	"management/internal/pkg/tpl/html"
 
 	"github.com/google/uuid"
 	"github.com/zhang2092/browser"
@@ -46,16 +44,18 @@ type userHandler struct {
 	render  tpl.Renderer
 	session session.ISession
 	biz     biz.IBiz
+	mi      middleware.IMiddleware
 }
 
 // 确保 userHandler 实现了 UserHandler 接口.
 var _ UserHandler = (*userHandler)(nil)
 
-func NewUserHandler(render tpl.Renderer, session session.ISession, biz biz.IBiz) *userHandler {
+func NewUserHandler(render tpl.Renderer, session session.ISession, biz biz.IBiz, mi middleware.IMiddleware) *userHandler {
 	return &userHandler{
 		render:  render,
 		session: session,
 		biz:     biz,
+		mi:      mi,
 	}
 }
 
@@ -200,16 +200,16 @@ func (h *userHandler) List(w http.ResponseWriter, r *http.Request) {
 	switch r.Method {
 	case http.MethodGet:
 		h.render.HTML(w, r, "user/list.tmpl", map[string]any{
-			"Statuses": html.NewSelectControls(global.SearchStatuses, 0),
+			"Statuses": html.NewSelectControls(html.SearchStatuses, "0"),
 		})
 	case http.MethodPost:
 		var q dto.SearchDto
-		q.SearchStatus = util.ConvertInt(r.PostFormValue("status"), 9999)
+		q.SearchStatus = convertor.ConvertInt(r.PostFormValue("status"), 9999)
 		q.SearchName = r.PostFormValue("name")
 		q.SearchEmail = r.PostFormValue("email")
 		q.SearchID = convertor.ConvertInt[int64](r.PostFormValue("id"), 0)
-		q.Page = util.ConvertInt(r.PostFormValue("page"), 1)
-		q.Rows = util.ConvertInt(r.PostFormValue("rows"), 10)
+		q.Page = convertor.ConvertInt(r.PostFormValue("page"), 1)
+		q.Rows = convertor.ConvertInt(r.PostFormValue("rows"), 10)
 		res, count, err := h.biz.SystemV1().UserBiz().List(r.Context(), q)
 		if err != nil {
 			h.render.JSONERR(w, err.Error())
@@ -230,7 +230,7 @@ func (h *userHandler) List(w http.ResponseWriter, r *http.Request) {
 
 func (h *userHandler) Profile(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
-	user := auth.AuthUser(ctx)
+	user := h.mi.AuthUser(ctx)
 	vm, _ := h.biz.SystemV1().UserBiz().Get(ctx, user.ID)
 	h.render.HTML(w, r, "user/profile.tmpl", map[string]any{
 		"Item": vm,