kenneth/projectx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2_10

Browse Source
This commit is contained in:
kenneth
2025-03-31 17:36:49 +08:00
parent 490630d4c9
commit d7183fcc00
805 changed files with 1055 additions and 304753 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/erpserver/biz/biz.go
View File

@@ -3,6 +3,8 @@ package biz
import (
db "management/internal/db/sqlc"
commonv1 "management/internal/erpserver/biz/v1/common"
customerv1 "management/internal/erpserver/biz/v1/customer"
projectv1 "management/internal/erpserver/biz/v1/project"
systemv1 "management/internal/erpserver/biz/v1/system"
"management/internal/pkg/redis"
"management/internal/pkg/session"
@@ -14,6 +16,10 @@ type IBiz interface {
CommonV1() commonv1.CommonBiz
// 获取系统业务接口.
SystemV1() systemv1.SystemBiz
// 项目管理
ProjectV1() projectv1.ProjectBiz
// 客户管理
CustomerV1() customerv1.CustomerBiz
}
// biz 是 IBiz 的一个具体实现.
@@ -44,3 +50,11 @@ func (b *biz) CommonV1() commonv1.CommonBiz {
func (b *biz) SystemV1() systemv1.SystemBiz {
return systemv1.New(b.store, b.redis, b.session)
}
func (b *biz) ProjectV1() projectv1.ProjectBiz {
return projectv1.New(b.store, b.redis)
}
func (b *biz) CustomerV1() customerv1.CustomerBiz {
return customerv1.New(b.store, b.redis)
}

45
internal/erpserver/biz/v1/customer/customer.go Normal file
View File

@@ -0,0 +1,45 @@
package customer
import (
"context"
db "management/internal/db/sqlc"
"management/internal/pkg/redis"
)
type CustomerBiz interface {
Create(ctx context.Context, arg *db.CreateCustomerParams) (*db.Customer, error)
Update(ctx context.Context, arg *db.UpdateCustomerParams) (*db.Customer, error)
List(ctx context.Context, arg *db.ListCustomerConditionParam) ([]*db.CustomerView, int64, error)
Get(ctx context.Context, id int64) (*db.Customer, error)
}
type customerBiz struct {
store db.Store
redis redis.IRedis
}
var _ CustomerBiz = (*customerBiz)(nil)
func New(store db.Store, redis redis.IRedis) *customerBiz {
return &customerBiz{
store: store,
redis: redis,
}
}
func (b *customerBiz) Create(ctx context.Context, arg *db.CreateCustomerParams) (*db.Customer, error) {
return b.store.CreateCustomer(ctx, arg)
}
func (b *customerBiz) Update(ctx context.Context, arg *db.UpdateCustomerParams) (*db.Customer, error) {
return b.store.UpdateCustomer(ctx, arg)
}
func (b *customerBiz) List(ctx context.Context, arg *db.ListCustomerConditionParam) ([]*db.CustomerView, int64, error) {
return b.store.ListCustomerCondition(ctx, arg)
}
func (b *customerBiz) Get(ctx context.Context, id int64) (*db.Customer, error) {
return b.store.GetCustomer(ctx, id)
}

93
internal/erpserver/biz/v1/project/project.go Normal file
View File

@@ -0,0 +1,93 @@
package project
import (
"context"
db "management/internal/db/sqlc"
"management/internal/pkg/redis"
)
type ProjectBiz interface {
Create(ctx context.Context, p *db.CreateProjectParams, pf []*db.CreateProjectFileParams) error
Update(ctx context.Context, p *db.UpdateProjectParams, pf []*db.CreateProjectFileParams) error
List(ctx context.Context, q *db.ListProjectConditionParam) ([]*db.ProjectView, int64, error)
Get(ctx context.Context, id int64) (*db.Project, error)
ProjectExpansion
}
type ProjectExpansion interface {
ListProjectFiles(ctx context.Context, projectID int64) ([]*db.ProjectFile, error)
}
type projectBiz struct {
store db.Store
redis redis.IRedis
}
var _ ProjectBiz = (*projectBiz)(nil)
func New(store db.Store, redis redis.IRedis) *projectBiz {
return &projectBiz{
store: store,
redis: redis,
}
}
func (b *projectBiz) Create(ctx context.Context, p *db.CreateProjectParams, pf []*db.CreateProjectFileParams) error {
return b.store.ExecTx(ctx, func(q *db.Queries) error {
_, err := q.CreateProject(ctx, p)
if err != nil {
return err
}
for _, item := range pf {
_, err = q.CreateProjectFile(ctx, item)
if err != nil {
return err
}
}
return nil
})
}
func (b *projectBiz) Update(ctx context.Context, p *db.UpdateProjectParams, pf []*db.CreateProjectFileParams) error {
return b.store.ExecTx(ctx, func(q *db.Queries) error {
_, err := q.UpdateProject(ctx, p)
if err != nil {
return err
}
err = q.DeleteProjectFile(ctx, p.ID)
if err != nil {
return err
}
for _, item := range pf {
_, err = q.CreateProjectFile(ctx, item)
if err != nil {
return err
}
}
return nil
})
}
func (b *projectBiz) List(ctx context.Context, q *db.ListProjectConditionParam) ([]*db.ProjectView, int64, error) {
res, total, err := b.store.ListProjectCondition(ctx, q)
if err != nil {
return nil, 0, err
}
return res, total, nil
}
func (b *projectBiz) Get(ctx context.Context, id int64) (*db.Project, error) {
return b.store.GetProject(ctx, id)
}
func (b *projectBiz) ListProjectFiles(ctx context.Context, projectID int64) ([]*db.ProjectFile, error) {
return b.store.ListProjectFiles(ctx, projectID)
}

43
internal/erpserver/biz/v1/system/category.go
View File

@@ -3,6 +3,7 @@ package system
import (
"context"
"encoding/json"
"errors"
"strconv"
"time"
@@ -11,6 +12,7 @@ import (
"management/internal/erpserver/model/view"
"management/internal/global/keys"
"management/internal/pkg/redis"
"management/internal/pkg/tpl/html"
)
type CategoryBiz interface {
@@ -23,7 +25,9 @@ type CategoryBiz interface {
RebuildParentPath(ctx context.Context) error
Tree(ctx context.Context, id int32) ([]*view.LayuiTree, error)
XmSelect(ctx context.Context, id int32) ([]*view.XmSelectTree, error)
XmSelectTree(ctx context.Context, id int32) ([]*view.XmSelectTree, error)
ListHtmlByLetter(ctx context.Context, letter string) ([]*html.SelectDict, error)
}
type categoryBiz struct {
@@ -130,7 +134,7 @@ func (b *categoryBiz) Tree(ctx context.Context, id int32) ([]*view.LayuiTree, er
return b.toTree(id, all), nil
}
func (b *categoryBiz) XmSelect(ctx context.Context, id int32) ([]*view.XmSelectTree, error) {
func (b *categoryBiz) XmSelectTree(ctx context.Context, id int32) ([]*view.XmSelectTree, error) {
all, err := b.All(ctx)
if err != nil {
return nil, err
@@ -139,6 +143,41 @@ func (b *categoryBiz) XmSelect(ctx context.Context, id int32) ([]*view.XmSelectT
return b.toXmSelectTree(id, all), nil
}
func (b *categoryBiz) ListHtmlByLetter(ctx context.Context, letter string) ([]*html.SelectDict, error) {
all, err := b.All(ctx)
if err != nil || len(all) == 0 {
return nil, err
}
var current *db.Category
for _, v := range all {
if v.Letter == letter {
current = v
break
}
}
if current == nil {
return nil, errors.New("未找到当前类别")
}
var res []*html.SelectDict
res = append(res, &html.SelectDict{
Name: "请选择",
Value: "0",
})
for _, v := range all {
if v.ParentID == current.ID {
item := html.SelectDict{
Name: v.Name,
Value: strconv.Itoa(int(v.ID)),
}
res = append(res, &item)
}
}
return res, nil
}
func (b *categoryBiz) toTree(parentId int32, data []*db.Category) []*view.LayuiTree {
var res []*view.LayuiTree
for _, v := range data {

4
internal/erpserver/biz/v1/system/department.go
View File

@@ -23,7 +23,7 @@ type DepartmentBiz interface {
RebuildParentPath(ctx context.Context) error
Tree(ctx context.Context, id int32) ([]*view.LayuiTree, error)
XmSelect(ctx context.Context, id int32) ([]*view.XmSelectTree, error)
XmSelectTree(ctx context.Context, id int32) ([]*view.XmSelectTree, error)
DepartmentExpansion
}
@@ -136,7 +136,7 @@ func (b *departmentBiz) Tree(ctx context.Context, id int32) ([]*view.LayuiTree,
return b.toTree(id, all), nil
}
func (b *departmentBiz) XmSelect(ctx context.Context, id int32) ([]*view.XmSelectTree, error) {
func (b *departmentBiz) XmSelectTree(ctx context.Context, id int32) ([]*view.XmSelectTree, error) {
all, err := b.All(ctx)
if err != nil {
return nil, err

4
internal/erpserver/biz/v1/system/menu.go
View File

@@ -36,7 +36,7 @@ type MenuExpansion interface {
SetMenuViewData(ctx context.Context, roleID int32) ([]*dto.SetMenuDto, error)
Tree(ctx context.Context, id int32) ([]*view.LayuiTree, error)
XmSelect(ctx context.Context, id int32) ([]*view.XmSelectTree, error)
XmSelectTree(ctx context.Context, id int32) ([]*view.XmSelectTree, error)
SetMenu(ctx context.Context, roleID int32, menus []*db.SysMenu) error
}
@@ -268,7 +268,7 @@ func (b *menuBiz) Tree(ctx context.Context, id int32) ([]*view.LayuiTree, error)
return b.toTree(id, all), nil
}
func (b *menuBiz) XmSelect(ctx context.Context, id int32) ([]*view.XmSelectTree, error) {
func (b *menuBiz) XmSelectTree(ctx context.Context, id int32) ([]*view.XmSelectTree, error) {
all, err := b.AllMenusCache(ctx)
if err != nil {
return nil, err

4
internal/erpserver/biz/v1/system/role.go
View File

@@ -23,7 +23,7 @@ type RoleBiz interface {
RebuildParentPath(ctx context.Context) error
Tree(ctx context.Context, id int32) ([]*view.LayuiTree, error)
XmSelect(ctx context.Context, id int32) ([]*view.XmSelectTree, error)
XmSelectTree(ctx context.Context, id int32) ([]*view.XmSelectTree, error)
RoleExpansion
}
@@ -136,7 +136,7 @@ func (b *roleBiz) Tree(ctx context.Context, id int32) ([]*view.LayuiTree, error)
return b.toTree(id, all), nil
}
func (b *roleBiz) XmSelect(ctx context.Context, id int32) ([]*view.XmSelectTree, error) {
func (b *roleBiz) XmSelectTree(ctx context.Context, id int32) ([]*view.XmSelectTree, error) {
all, err := b.All(ctx)
if err != nil {
return nil, err

25
internal/erpserver/biz/v1/system/user.go
View File

@@ -4,11 +4,13 @@ import (
"context"
"encoding/json"
"errors"
"strconv"
"time"
"management/internal/db/model/dto"
db "management/internal/db/sqlc"
"management/internal/erpserver/model/req"
"management/internal/erpserver/model/view"
"management/internal/global/know"
"management/internal/pkg/crypto"
"management/internal/pkg/session"
@@ -18,9 +20,12 @@ import (
type UserBiz interface {
Create(ctx context.Context, req *db.CreateSysUserParams) (*db.SysUser, error)
Update(ctx context.Context, req *db.UpdateSysUserParams) (*db.SysUser, error)
All(ctx context.Context) ([]*db.SysUser, error)
List(ctx context.Context, q dto.SearchDto) ([]*db.ListSysUserConditionRow, int64, error)
Get(ctx context.Context, id int32) (*db.SysUser, error)
XmSelect(ctx context.Context) ([]*view.XmSelect, error)
UserExpansion
}
@@ -53,6 +58,10 @@ func (b *userBiz) Update(ctx context.Context, req *db.UpdateSysUserParams) (*db.
return b.store.UpdateSysUser(ctx, req)
}
func (b *userBiz) All(ctx context.Context) ([]*db.SysUser, error) {
return b.store.ListSysUser(ctx)
}
func (b *userBiz) List(ctx context.Context, q dto.SearchDto) ([]*db.ListSysUserConditionRow, int64, error) {
count, err := b.store.CountSysUserCondition(ctx, &db.CountSysUserConditionParams{
IsStatus: q.SearchStatus != 9999,
@@ -87,6 +96,22 @@ func (b *userBiz) Get(ctx context.Context, id int32) (*db.SysUser, error) {
return b.store.GetSysUser(ctx, id)
}
func (b *userBiz) XmSelect(ctx context.Context) ([]*view.XmSelect, error) {
all, err := b.store.ListSysUser(ctx)
if err != nil || len(all) == 0 {
return nil, err
}
var res []*view.XmSelect
for _, user := range all {
res = append(res, &view.XmSelect{
Name: user.Username,
Value: strconv.Itoa(int(user.ID)),
})
}
return res, nil
}
func (b *userBiz) Login(ctx context.Context, req *req.Login) error {
log := &db.CreateSysUserLoginLogParams{
CreatedAt: time.Now(),

207
internal/erpserver/handler/customer/customer.go Normal file
View File

@@ -0,0 +1,207 @@
package customer
import (
"net/http"
"strconv"
"strings"
"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/snowflake"
"management/internal/pkg/tpl/html"
"management/internal/tpl"
"github.com/jackc/pgx/v5/pgtype"
)
type CustomerHandler 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 customerHandler struct {
render tpl.Renderer
biz biz.IBiz
}
var _ CustomerHandler = (*customerHandler)(nil)
func NewCustomerHandler(render tpl.Renderer, biz biz.IBiz) *customerHandler {
return &customerHandler{
render: render,
biz: biz,
}
}
func (h *customerHandler) List(w http.ResponseWriter, r *http.Request) {
switch r.Method {
case http.MethodGet:
ctx := r.Context()
cc, _ := h.biz.SystemV1().CategoryBiz().ListHtmlByLetter(ctx, know.CustomerCategory)
ss, _ := h.biz.SystemV1().CategoryBiz().ListHtmlByLetter(ctx, know.CustomerSource)
h.render.HTML(w, r, "customer/list.tmpl", map[string]any{
"Statuses": html.NewSelectControls(html.Statuses, "0"),
"Categories": html.NewSelectControls(cc, "0"),
"Sources": html.NewSelectControls(ss, "0"),
})
case http.MethodPost:
ctx := r.Context()
category := convertor.ConvertInt[int32](r.PostFormValue("category"), 9999)
if category == 0 {
category = 9999
}
source := convertor.ConvertInt[int32](r.PostFormValue("source"), 9999)
if source == 0 {
source = 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.ListCustomerConditionParam{
IsTitle: len(search) > 0,
Title: search,
Status: convertor.ConvertInt[int16](r.PostFormValue("status"), 9999),
Category: category,
Source: source,
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.CustomerV1().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 *customerHandler) Add(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
cc, _ := h.biz.SystemV1().CategoryBiz().ListHtmlByLetter(ctx, know.CustomerCategory)
ss, _ := h.biz.SystemV1().CategoryBiz().ListHtmlByLetter(ctx, know.CustomerSource)
h.render.HTML(w, r, "customer/edit.tmpl", map[string]any{
"Item": &form.CustomerForm{},
"Statuses": html.NewSelectControls(html.Statuses, "0"),
"Categories": html.NewSelectControls(cc, "0"),
"Sources": html.NewSelectControls(ss, "0"),
})
}
func (h *customerHandler) Edit(w http.ResponseWriter, r *http.Request) {
vars := r.URL.Query()
id := convertor.ConvertInt[int64](vars.Get("id"), 0)
customer := &form.CustomerForm{}
ctx := r.Context()
if id > 0 {
if cus, err := h.biz.CustomerV1().Get(ctx, id); err == nil {
customer = customer.ToForm(cus)
if u, err := h.biz.SystemV1().UserBiz().Get(ctx, cus.CreatedBy); err == nil {
customer.CreatedBy = u.Username
}
if u, err := h.biz.SystemV1().UserBiz().Get(ctx, cus.UpdatedBy); err == nil {
customer.UpdatedBy = u.Username
}
}
}
cc, _ := h.biz.SystemV1().CategoryBiz().ListHtmlByLetter(ctx, know.CustomerCategory)
ss, _ := h.biz.SystemV1().CategoryBiz().ListHtmlByLetter(ctx, know.CustomerSource)
h.render.HTML(w, r, "customer/edit.tmpl", map[string]any{
"Item": customer,
"Statuses": html.NewSelectControls(html.Statuses, strconv.Itoa(int(customer.Status))),
"Categories": html.NewSelectControls(cc, strconv.Itoa(int(customer.Category))),
"Sources": html.NewSelectControls(ss, strconv.Itoa(int(customer.Source))),
})
}
func (h *customerHandler) Save(w http.ResponseWriter, r *http.Request) {
data := &form.CustomerForm{}
if err := form.BindForm(r, data); err != nil {
h.render.JSONERR(w, err.Error())
return
}
ctx := r.Context()
authUser := auth.AuthUser(ctx)
if data.ID > 0 {
arg := &db.UpdateCustomerParams{
ID: data.ID,
Name: pgtype.Text{
String: data.Name,
Valid: true,
},
Category: pgtype.Int4{
Int32: data.Category,
Valid: true,
},
Source: pgtype.Int4{
Int32: data.Source,
Valid: true,
},
Address: pgtype.Text{
String: data.Address,
Valid: true,
},
ContactName: pgtype.Text{
String: data.ContactName,
Valid: true,
},
ContactPhone: pgtype.Text{
String: data.ContactPhone,
Valid: true,
},
Status: pgtype.Int2{
Int16: data.Status,
Valid: true,
},
UpdatedBy: pgtype.Int4{
Int32: authUser.ID,
Valid: true,
},
}
_, err := h.biz.CustomerV1().Update(ctx, arg)
if err != nil {
h.render.JSONERR(w, err.Error())
return
}
h.render.JSONOK(w, "更新成功")
} else {
arg := &db.CreateCustomerParams{
ID: snowflake.GetId(),
Name: data.Name,
Category: data.Category,
Source: data.Source,
Address: data.Address,
ContactName: data.ContactName,
ContactPhone: data.ContactPhone,
CreatedBy: authUser.ID,
}
_, err := h.biz.CustomerV1().Create(ctx, arg)
if err != nil {
h.render.JSONERR(w, err.Error())
return
}
h.render.JSONOK(w, "添加成功")
}
}

14
internal/erpserver/handler/handler.go
View File

@@ -4,6 +4,8 @@ import (
"management/internal/config"
"management/internal/erpserver/biz"
"management/internal/erpserver/handler/common"
"management/internal/erpserver/handler/customer"
"management/internal/erpserver/handler/project"
"management/internal/erpserver/handler/system"
"management/internal/pkg/redis"
"management/internal/pkg/session"
@@ -16,6 +18,8 @@ type IHandler interface {
CommonHandler() common.CommonHandler
// 获取 System Handler 接口.
SystemHandler() system.SystemHandler
PorjectHandler() project.PorjectHandler
CustomerHandler() customer.CustomerHandler
}
// handler 是 IHandler 的一个具体实现.
@@ -50,3 +54,13 @@ func (h *handler) CommonHandler() common.CommonHandler {
func (h *handler) SystemHandler() system.SystemHandler {
return system.NewSystemHandler(h.render, h.redis, h.session, h.biz)
}
// PorjectHandler 返回一个实现了 PorjectHandler 接口的实例.
func (h *handler) PorjectHandler() project.PorjectHandler {
return project.NewPorjectHandler(h.render, h.biz)
}
// CustomerHandler 返回一个实现了 CustomerHandler 接口的实例.
func (h *handler) CustomerHandler() customer.CustomerHandler {
return customer.NewCustomerHandler(h.render, h.biz)
}

318
internal/erpserver/handler/project/project.go Normal file
View File

@@ -0,0 +1,318 @@
package project
import (
"errors"
"net/http"
"strconv"
"strings"
"time"
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/snowflake"
"management/internal/router/manage/util"
"management/internal/tpl"
"github.com/jackc/pgx/v5/pgtype"
)
type PorjectHandler 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 porjectHandler struct {
render tpl.Renderer
biz biz.IBiz
}
var _ PorjectHandler = (*porjectHandler)(nil)
func NewPorjectHandler(render tpl.Renderer, biz biz.IBiz) *porjectHandler {
return &porjectHandler{
render: render,
biz: biz,
}
}
func (h *porjectHandler) 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),
})
case http.MethodPost:
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.ListProjectConditionParam{
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 = util.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())
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 *porjectHandler) Add(w http.ResponseWriter, r *http.Request) {
authUser := auth.AuthUser(r.Context())
h.render.HTML(w, r, "project/edit.tmpl", map[string]any{
"Item": &formDto.ProjectForm{
ApplyUserID: authUser.ID,
ProjectFiles: &formDto.ProjectFileForm{
ProjectFileItems: []*formDto.ProjectFileItemForm{},
},
},
"Statuses": html.NewSelectControls(global.ProjectStatuses, 0),
})
}
func (h *porjectHandler) Edit(w http.ResponseWriter, r *http.Request) {
form := &formDto.ProjectForm{}
id := convertor.ConvertInt[int64](r.URL.Query().Get("id"), 0)
if id > 0 {
ctx := r.Context()
if po, err := h.biz.ProjectV1().Get(ctx, id); err == nil {
pfs, err := h.biz.ProjectV1().ListProjectFiles(ctx, po.ID)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
form = form.ToForm(po, pfs)
if form.ApplyUserID == 0 {
authUser := auth.AuthUser(ctx)
form.ApplyUserID = authUser.ID
}
// if c, err := db.Engine.GetCustomer(ctx, po.CustomerID); err == nil {
// form.CustomerName = c.Name
// }
if u, err := h.biz.SystemV1().UserBiz().Get(ctx, po.CreatedUserID); err == nil {
form.CreatedName = u.Username
}
if u, err := h.biz.SystemV1().UserBiz().Get(ctx, po.UpdatedUserID); err == nil {
form.UpdatedName = u.Username
}
}
}
h.render.HTML(w, r, "project/edit.tmpl", map[string]any{
"Item": form,
"Statuses": html.NewSelectControls(global.ProjectStatuses, form.Status),
})
}
func (h *porjectHandler) Save(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
form, err := validForm(r)
if err != nil {
tpl.JSONERR(w, err.Error())
return
}
authUser := auth.AuthUser(ctx)
if form.ID > 0 {
p := &db.UpdateProjectParams{
ID: form.ID,
Name: pgtype.Text{
String: form.Name,
Valid: true,
},
StartAt: pgtype.Timestamptz{
Time: form.StartAt,
Valid: true,
},
EndAt: pgtype.Timestamptz{
Time: form.EndAt,
Valid: true,
},
CustomerID: pgtype.Int8{
Int64: form.CustomerID,
Valid: true,
},
TotalMoney: form.TotalMoneyF,
Description: pgtype.Text{
String: form.Description,
Valid: true,
},
ApplyAt: pgtype.Timestamptz{
Time: form.ApplyAt,
Valid: true,
},
ApplyUserID: pgtype.Int4{
Int32: form.ApplyUserID,
Valid: true,
},
ManagerID: pgtype.Int4{
Int32: form.ManagerID,
Valid: true,
},
Members: pgtype.Text{
String: form.Members,
Valid: true,
},
Status: pgtype.Int2{
Int16: form.Status,
Valid: true,
},
UpdatedUserID: pgtype.Int4{
Int32: authUser.ID,
Valid: true,
},
}
cpfs := []*db.CreateProjectFileParams{}
for _, pfile := range form.ProjectFiles.ProjectFileItems {
cpfs = append(cpfs, &db.CreateProjectFileParams{
ID: snowflake.GetId(),
Name: pfile.Name,
Path: pfile.Path,
ProjectID: form.ID,
CreatedUserID: authUser.ID,
})
}
err := h.biz.ProjectV1().Update(ctx, p, cpfs)
if err != nil {
tpl.JSONERR(w, err.Error())
return
}
tpl.JSONOK(w, "更新成功")
} else {
p := &db.CreateProjectParams{
ID: snowflake.GetId(),
Name: form.Name,
StartAt: form.StartAt,
EndAt: form.EndAt,
CustomerID: form.CustomerID,
TotalMoney: form.TotalMoneyF,
Description: form.Description,
ApplyAt: form.ApplyAt,
ApplyUserID: form.ApplyUserID,
ManagerID: form.ManagerID,
Members: form.Members,
Status: form.Status,
CreatedUserID: authUser.ID,
}
cpfs := []*db.CreateProjectFileParams{}
for _, pfile := range form.ProjectFiles.ProjectFileItems {
cpfs = append(cpfs, &db.CreateProjectFileParams{
ID: snowflake.GetId(),
Name: pfile.Name,
Path: pfile.Path,
ProjectID: p.ID,
CreatedUserID: authUser.ID,
})
}
err := h.biz.ProjectV1().Create(ctx, p, cpfs)
if err != nil {
tpl.JSONERR(w, err.Error())
return
}
tpl.JSONOK(w, "添加成功")
}
}
func validForm(r *http.Request) (formDto.ProjectForm, error) {
var err error
form := formDto.ProjectForm{}
form.ID = convertor.ConvertInt[int64](r.PostFormValue("ID"), 0)
form.CustomerID, err = strconv.ParseInt(r.PostFormValue("CustomerID"), 10, 64)
if err != nil || form.CustomerID == 0 {
return form, errors.New("客户不能为空")
}
form.Name = r.PostFormValue("Name")
if len(form.Name) == 0 {
return form, errors.New("名称不能为空")
}
form.StartAt, err = time.ParseInLocation("2006-01-02", r.PostFormValue("StartAt"), time.Local)
if err != nil {
return form, errors.New("开始时间格式错误")
}
form.EndAt, err = time.ParseInLocation("2006-01-02", r.PostFormValue("EndAt"), time.Local)
if err != nil {
return form, errors.New("结束时间格式错误")
}
if err := form.TotalMoneyF.Scan(r.PostFormValue("TotalMoney")); err != nil {
return form, errors.New("总金额格式错误")
}
form.Description = r.PostFormValue("Description")
form.ApplyAt, err = time.ParseInLocation("2006-01-02", r.PostFormValue("ApplyAt"), time.Local)
if err != nil {
return form, errors.New("申请时间格式错误")
}
form.ApplyUserID = convertor.ConvertInt[int32](r.PostFormValue("ApplyUserID"), 0)
if form.ApplyUserID == 0 {
return form, errors.New("申请人不能为空")
}
form.ManagerID = convertor.ConvertInt[int32](r.PostFormValue("ManagerID"), 0)
if form.ManagerID == 0 {
return form, errors.New("项目经理不能为空")
}
form.Members = r.PostFormValue("Members")
if len(form.Members) > 0 {
membersSplit := strings.SplitSeq(form.Members, ",")
for v := range membersSplit {
m := convertor.ConvertInt[int32](v, 0)
if m == 0 {
return form, errors.New("项目成员数据错误")
}
}
}
form.Status = convertor.ConvertInt[int16](r.PostFormValue("Status"), 9999)
form.ProjectFiles = &formDto.ProjectFileForm{
ProjectFileItems: []*formDto.ProjectFileItemForm{},
}
fns := r.PostFormValue("Paths")
if len(fns) > 0 {
fnsSplit := strings.SplitSeq(fns, ",")
for v := range fnsSplit {
if len(v) > 0 {
read := strings.Split(v, "|")
if len(read) != 2 {
return form, errors.New("文件路径数据错误")
}
pff := &formDto.ProjectFileItemForm{
Name: read[0],
Path: read[1],
Combination: v,
}
form.ProjectFiles.ProjectFileItems = append(form.ProjectFiles.ProjectFileItems, pff)
}
}
}
return form, nil
}

13
internal/erpserver/handler/system/category.go
View File

@@ -21,7 +21,7 @@ type CategoryHandler interface {
AddChildren(w http.ResponseWriter, r *http.Request)
Edit(w http.ResponseWriter, r *http.Request)
Save(w http.ResponseWriter, r *http.Request)
Tree(w http.ResponseWriter, r *http.Request)
Data(w http.ResponseWriter, r *http.Request)
Refresh(w http.ResponseWriter, r *http.Request)
RebuildParentPath(w http.ResponseWriter, r *http.Request)
}
@@ -194,11 +194,12 @@ func (h *categoryHandler) Save(w http.ResponseWriter, r *http.Request) {
}
}
func (h *categoryHandler) Tree(w http.ResponseWriter, r *http.Request) {
func (h *categoryHandler) Data(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
vars := r.URL.Query()
if vars.Get("type") == "xmselect" {
res, err := h.biz.SystemV1().CategoryBiz().XmSelect(ctx, 0)
t := vars.Get("type")
if t == "tree" {
res, err := h.biz.SystemV1().CategoryBiz().Tree(ctx, 0)
if err != nil {
h.render.JSONERR(w, err.Error())
return
@@ -206,8 +207,8 @@ func (h *categoryHandler) Tree(w http.ResponseWriter, r *http.Request) {
h.render.JSON(w, res)
return
} else {
res, err := h.biz.SystemV1().CategoryBiz().Tree(ctx, 0)
} else if t == "xmselect_tree" {
res, err := h.biz.SystemV1().CategoryBiz().XmSelectTree(ctx, 0)
if err != nil {
h.render.JSONERR(w, err.Error())
return

13
internal/erpserver/handler/system/department.go
View File

@@ -18,7 +18,7 @@ type DepartmentHandler interface {
AddChildren(w http.ResponseWriter, r *http.Request)
Edit(w http.ResponseWriter, r *http.Request)
Save(w http.ResponseWriter, r *http.Request)
Tree(w http.ResponseWriter, r *http.Request)
Data(w http.ResponseWriter, r *http.Request)
Refresh(w http.ResponseWriter, r *http.Request)
RebuildParentPath(w http.ResponseWriter, r *http.Request)
}
@@ -159,11 +159,12 @@ func (h *departmentHandler) Save(w http.ResponseWriter, r *http.Request) {
}
}
func (h *departmentHandler) Tree(w http.ResponseWriter, r *http.Request) {
func (h *departmentHandler) Data(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
vars := r.URL.Query()
if vars.Get("type") == "xmselect" {
res, err := h.biz.SystemV1().DepartmentBiz().XmSelect(ctx, 0)
t := vars.Get("type")
if t == "tree" {
res, err := h.biz.SystemV1().DepartmentBiz().Tree(ctx, 0)
if err != nil {
h.render.JSONERR(w, err.Error())
return
@@ -171,8 +172,8 @@ func (h *departmentHandler) Tree(w http.ResponseWriter, r *http.Request) {
h.render.JSON(w, res)
return
} else {
res, err := h.biz.SystemV1().DepartmentBiz().Tree(ctx, 0)
} else if t == "xmselect_tree" {
res, err := h.biz.SystemV1().DepartmentBiz().XmSelectTree(ctx, 0)
if err != nil {
h.render.JSONERR(w, err.Error())
return

13
internal/erpserver/handler/system/menu.go
View File

@@ -32,7 +32,7 @@ type MenuExpansion interface {
AddChildren(w http.ResponseWriter, r *http.Request)
Edit(w http.ResponseWriter, r *http.Request)
Save(w http.ResponseWriter, r *http.Request)
Tree(w http.ResponseWriter, r *http.Request)
Data(w http.ResponseWriter, r *http.Request)
Refresh(w http.ResponseWriter, r *http.Request)
}
@@ -221,11 +221,12 @@ func (h *menuHandler) Save(w http.ResponseWriter, r *http.Request) {
}
}
func (h *menuHandler) Tree(w http.ResponseWriter, r *http.Request) {
func (h *menuHandler) Data(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
vars := r.URL.Query()
if vars.Get("type") == "xmselect" {
res, err := h.biz.SystemV1().MenuBiz().XmSelect(ctx, 0)
t := vars.Get("type")
if t == "tree" {
res, err := h.biz.SystemV1().MenuBiz().Tree(ctx, 0)
if err != nil {
h.render.JSONERR(w, err.Error())
return
@@ -233,8 +234,8 @@ func (h *menuHandler) Tree(w http.ResponseWriter, r *http.Request) {
h.render.JSON(w, res)
return
} else {
res, err := h.biz.SystemV1().MenuBiz().Tree(ctx, 0)
} else if t == "xmselect_tree" {
res, err := h.biz.SystemV1().MenuBiz().XmSelectTree(ctx, 0)
if err != nil {
h.render.JSONERR(w, err.Error())
return

13
internal/erpserver/handler/system/role.go
View File

@@ -20,7 +20,7 @@ type RoleHandler interface {
AddChildren(w http.ResponseWriter, r *http.Request)
Edit(w http.ResponseWriter, r *http.Request)
Save(w http.ResponseWriter, r *http.Request)
Tree(w http.ResponseWriter, r *http.Request)
Data(w http.ResponseWriter, r *http.Request)
Refresh(w http.ResponseWriter, r *http.Request)
RebuildParentPath(w http.ResponseWriter, r *http.Request)
RefreshRoleMenus(w http.ResponseWriter, r *http.Request)
@@ -171,11 +171,12 @@ func (h *roleHandler) Save(w http.ResponseWriter, r *http.Request) {
}
}
func (h *roleHandler) Tree(w http.ResponseWriter, r *http.Request) {
func (h *roleHandler) Data(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
vars := r.URL.Query()
if vars.Get("type") == "xmselect" {
res, err := h.biz.SystemV1().RoleBiz().XmSelect(ctx, 0)
t := vars.Get("type")
if t == "tree" {
res, err := h.biz.SystemV1().RoleBiz().Tree(ctx, 0)
if err != nil {
h.render.JSONERR(w, err.Error())
return
@@ -183,8 +184,8 @@ func (h *roleHandler) Tree(w http.ResponseWriter, r *http.Request) {
h.render.JSON(w, res)
return
} else {
res, err := h.biz.SystemV1().RoleBiz().Tree(ctx, 0)
} else if t == "xmselect_tree" {
res, err := h.biz.SystemV1().RoleBiz().XmSelectTree(ctx, 0)
if err != nil {
h.render.JSONERR(w, err.Error())
return

19
internal/erpserver/handler/system/user.go
View File

@@ -31,7 +31,7 @@ type UserHandler interface {
Save(w http.ResponseWriter, r *http.Request)
List(w http.ResponseWriter, r *http.Request)
Profile(w http.ResponseWriter, r *http.Request)
Tree(w http.ResponseWriter, r *http.Request)
Data(w http.ResponseWriter, r *http.Request)
UserExpansion
}
@@ -237,7 +237,22 @@ func (h *userHandler) Profile(w http.ResponseWriter, r *http.Request) {
})
}
func (h *userHandler) Tree(w http.ResponseWriter, r *http.Request) {}
func (h *userHandler) Data(w http.ResponseWriter, r *http.Request) {
vars := r.URL.Query()
t := vars.Get("type")
if t == "xmselect" {
res, err := h.biz.SystemV1().UserBiz().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 (h *userHandler) Login(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()

33
internal/erpserver/http.go
View File

@@ -63,7 +63,7 @@ func NewRouter(handler handler.IHandler, mw mw.IMiddleware) *chi.Mux {
r.Get("/add_children", handler.SystemHandler().DepartmentHandler().AddChildren)
r.Get("/edit", handler.SystemHandler().DepartmentHandler().Edit)
r.Post("/save", handler.SystemHandler().DepartmentHandler().Save)
r.Post("/tree", handler.SystemHandler().DepartmentHandler().Tree)
r.Post("/data", handler.SystemHandler().DepartmentHandler().Data)
r.Post("/refresh", handler.SystemHandler().DepartmentHandler().Refresh)
r.Post("/rebuild_parent_path", handler.SystemHandler().DepartmentHandler().RebuildParentPath)
})
@@ -76,7 +76,7 @@ func NewRouter(handler handler.IHandler, mw mw.IMiddleware) *chi.Mux {
r.Get("/add_children", handler.SystemHandler().RoleHandler().AddChildren)
r.Get("/edit", handler.SystemHandler().RoleHandler().Edit)
r.Post("/save", handler.SystemHandler().RoleHandler().Save)
r.Post("/tree", handler.SystemHandler().RoleHandler().Tree)
r.Post("/data", handler.SystemHandler().RoleHandler().Data)
r.Post("/refresh", handler.SystemHandler().RoleHandler().Refresh)
r.Post("/rebuild_parent_path", handler.SystemHandler().RoleHandler().RebuildParentPath)
r.Post("/refresh_role_menus", handler.SystemHandler().RoleHandler().RefreshRoleMenus)
@@ -91,7 +91,7 @@ func NewRouter(handler handler.IHandler, mw mw.IMiddleware) *chi.Mux {
r.Get("/edit", handler.SystemHandler().UserHandler().Edit)
r.Post("/save", handler.SystemHandler().UserHandler().Save)
r.Get("/profile", handler.SystemHandler().UserHandler().Profile)
r.Post("/tree", handler.SystemHandler().UserHandler().Tree)
r.Post("/data", handler.SystemHandler().UserHandler().Data)
})
r.Route("/login_log", func(r chi.Router) {
@@ -113,7 +113,7 @@ func NewRouter(handler handler.IHandler, mw mw.IMiddleware) *chi.Mux {
r.Get("/add_children", handler.SystemHandler().MenuHandler().AddChildren)
r.Get("/edit", handler.SystemHandler().MenuHandler().Edit)
r.Post("/save", handler.SystemHandler().MenuHandler().Save)
r.Post("/tree", handler.SystemHandler().MenuHandler().Tree)
r.Post("/data", handler.SystemHandler().MenuHandler().Data)
r.Post("/refresh_cache", handler.SystemHandler().MenuHandler().Refresh)
})
@@ -125,11 +125,34 @@ func NewRouter(handler handler.IHandler, mw mw.IMiddleware) *chi.Mux {
r.Get("/add_children", handler.SystemHandler().CategoryHandler().AddChildren)
r.Get("/edit", handler.SystemHandler().CategoryHandler().Edit)
r.Post("/save", handler.SystemHandler().CategoryHandler().Save)
r.Post("/tree", handler.SystemHandler().CategoryHandler().Tree)
r.Post("/data", handler.SystemHandler().CategoryHandler().Data)
r.Post("/refresh", handler.SystemHandler().CategoryHandler().Refresh)
r.Post("/rebuild_parent_path", handler.SystemHandler().CategoryHandler().RebuildParentPath)
})
})
// 客户
r.Route("/customer", func(r chi.Router) {
r.Use(mw.Authorize)
r.Get("/list", handler.CustomerHandler().List)
r.Post("/list", handler.CustomerHandler().List)
r.Get("/add", handler.CustomerHandler().Add)
r.Get("/edit", handler.CustomerHandler().Edit)
r.Post("/save", handler.CustomerHandler().Save)
})
// 项目
r.Route("/project", func(r chi.Router) {
r.Use(mw.Authorize)
r.Get("/list", handler.PorjectHandler().List)
r.Post("/list", handler.PorjectHandler().List)
r.Get("/add", handler.PorjectHandler().Add)
r.Get("/edit", handler.PorjectHandler().Edit)
r.Post("/save", handler.PorjectHandler().Save)
// r.Post("/xmselect", projecthandler.XmSelect)
// r.Get("/dashboard", projecthandler.Dashboard)
// r.Post("/dashboard", projecthandler.PostDashboard)
})
})
return r

5
internal/erpserver/model/view/system.go
View File

@@ -12,3 +12,8 @@ type XmSelectTree struct {
Value string `json:"value"`
Children []*XmSelectTree `json:"children"`
}
type XmSelect struct {
Name string `json:"name"`
Value string `json:"value"`
}

11
internal/pkg/convertor/http_form.go
View File

@@ -3,6 +3,7 @@ package convertor
import (
"net/url"
"strconv"
"time"
)
func ConvertInt[T int | int16 | int32 | int64](value string, defaultValue T) T {
@@ -35,3 +36,13 @@ func QueryInt[T int | int16 | int32 | int64](vars url.Values, key string, defaul
return T(i)
}
func DefaultStartTimeAndEndTime(start string, end string) (string, string) {
if len(start) == 0 {
start = "2000-01-01 00:00:00"
}
if len(end) == 0 {
end = time.Now().Add(time.Hour * 24).Format(time.DateTime)
}
return start, end
}

45
internal/pkg/know/know.go Normal file
View File

@@ -0,0 +1,45 @@
package know
const (
CustomerCategory = "customer_category"
CustomerSource = "customer_source"
BudgetCategory = "budget_category"
IncomeBank = "income_bank"
IncomeCategory = "income_category"
ExpenseCategory = "expense_category"
CookieName = "authorize"
StoreName = "authorize_user"
)
var (
// pear admin 配置
PearAdmin = "m:pearjson"
// 所有类别
AllCategories = "m:category:all"
// 所有类别 简单信息
AllCategorySimple = "m:categorysimple:all"
// 类别列表 根据 父id 获取
ListCategoriesByParentID = "m:category:parent_id:%d"
// 所有部门
AllDepartments = "m:department:all"
// 所有菜单
AllMenus = "m:menus:all"
// 递归菜单
RecursiveMenus = "m:rec_menus:%d"
// 根据用户ID获取菜单
AdminMenus = "m:admin_menus:%d"
// 登陆用户的菜单
OwnerMenus = "m:owner_menus:%d"
// 登陆用户的菜单
OwnerMenusMap = "m:owner_menus_map:%d"
// 所有角色
AllRoles = "m:role:all"
)

17
internal/pkg/tpl/html/select.go Normal file
View File

@@ -0,0 +1,17 @@
package html
type SelectDict struct {
Name string
Value string
Selected bool
}
func NewSelectControls(data []*SelectDict, value string) []*SelectDict {
for _, item := range data {
item.Selected = false
if item.Value == value {
item.Selected = true
}
}
return data
}

19
internal/pkg/tpl/html/vars.go Normal file
View File

@@ -0,0 +1,19 @@
package html
var SearchStatuses = []*SelectDict{
{Name: "状态", Value: "9999", Selected: false},
{Name: "正常", Value: "0", Selected: false},
{Name: "删除", Value: "-1", Selected: false},
}
var Statuses = []*SelectDict{
{Name: "正常", Value: "0", Selected: false},
{Name: "删除", Value: "-1", Selected: false},
}
var ProjectStatuses = []*SelectDict{
{Name: "未开始", Value: "0", Selected: false},
{Name: "进行中", Value: "10", Selected: false},
{Name: "已结项", Value: "20", Selected: false},
{Name: "已删除", Value: "-1", Selected: false},
}