完善 工时 收款 报销

server/api/v1/admin/finance.go

@@ -126,6 +126,17 @@ func (fa *FinanceApi) QueryDailyFileList(c *gin.Context) {
 	}, "获取成功", c)
 }
 
+func (fa *FinanceApi) QueryProjectFinance(c *gin.Context) {
+	code := c.Query("code")
+	finance, err := financeService.QueryProjectFinance(code)
+	if err != nil {
+		response.FailWithMessage("失败", c)
+		global.GVA_LOG.Error("QueryProjectFinance ====== " + err.Error())
+		return
+	}
+	response.OkWithData(finance, c)
+}
+
 func (fa *FinanceApi) CreateDailyExpenses(c *gin.Context) {
 	var expenses dao.DailyExpenses
 	err := c.ShouldBindJSON(&expenses)

server/api/v1/admin/project.go

@@ -124,6 +124,28 @@ func (pa *ProjectApi) QueryWorkingHours(c *gin.Context) {
 	response.OkWithData(hours, c)
 }
 
+func (pa *ProjectApi) QueryWorkingHoursList(c *gin.Context) {
+	var info request.SearchProjectList
+	err := c.ShouldBindJSON(&info)
+	if err != nil {
+		response.FailWithMessage("失败", c)
+		global.GVA_LOG.Error("QueryWorkingHoursList ====== " + err.Error())
+		return
+	}
+	list, total, err := projectService.QueryWorkingHoursList(info)
+	if err != nil {
+		response.FailWithMessage("失败", c)
+		global.GVA_LOG.Error("QueryWorkingHoursList ====== " + err.Error())
+		return
+	}
+	response.OkWithDetailed(response.PageResult{
+		List:     list,
+		Total:    total,
+		Page:     info.PageInfo.Page,
+		PageSize: info.PageInfo.PageSize,
+	}, "获取成功", c)
+}
+
 func (pa *ProjectApi) QueryCollections(c *gin.Context) {
 	code := c.Query("code")
 	collections, err := projectService.QueryCollections(code)
@@ -135,6 +157,28 @@ func (pa *ProjectApi) QueryCollections(c *gin.Context) {
 	response.OkWithData(collections, c)
 }
 
+func (pa *ProjectApi) QueryCollectionList(c *gin.Context) {
+	var info request.SearchProjectList
+	err := c.ShouldBindJSON(&info)
+	if err != nil {
+		response.FailWithMessage("失败", c)
+		global.GVA_LOG.Error("QueryCollectionList ====== " + err.Error())
+		return
+	}
+	list, total, err := projectService.QueryCollectionList(info)
+	if err != nil {
+		response.FailWithMessage("失败", c)
+		global.GVA_LOG.Error("QueryCollectionList ====== " + err.Error())
+		return
+	}
+	response.OkWithDetailed(response.PageResult{
+		List:     list,
+		Total:    total,
+		Page:     info.PageInfo.Page,
+		PageSize: info.PageInfo.PageSize,
+	}, "获取成功", c)
+}
+
 func (pa *ProjectApi) QueryReimbursementList(c *gin.Context) {
 	var info request.SearchProjectList
 	err := c.ShouldBindJSON(&info)

server/dao/collection.go

@@ -7,9 +7,10 @@ import (
 
 type Collection struct {
 	global.GVA_MODEL
-	ProjectCode string          `json:"projectCode" from:"projectCode" gorm:"comment:项目编码"`
-	Price       decimal.Decimal `json:"price" from:"price" gorm:"type:decimal(10,2);not null;comment:收款金额"`
-	Time        string          `json:"time" from:"time" gorm:"comment:收款日期;type:datetime"`
+	ProjectCode    string          `json:"projectCode" from:"projectCode" gorm:"comment:项目编码"`
+	Price          decimal.Decimal `json:"price" from:"price" gorm:"type:decimal(10,2);not null;comment:收款金额"`
+	Remarks        string          `json:"remarks" from:"remarks" gorm:"comment:备注"`
+	CollectionTime string          `json:"collectionTime" from:"collectionTime" gorm:"comment:收款日期;type:datetime"`
 }
 
 func (Collection) TableName() string {
@@ -24,6 +25,22 @@ func QueryCollection(code string) (collection []Collection, err error) {
 	return collection, err
 }
 
+// QueryCollectionList 查询报销列表
+func QueryCollectionList(limit, offset int, code, time string) (collection []Collection, total int64, err error) {
+	// 创建db
+	db := global.GVA_DB.Model(&Collection{}).Where("project_code = ?", code)
+	// 如果有条件搜索 下方会自动创建搜索语句
+	if time != "" {
+		db = db.Where("DATE_FORMAT(collection_time, '%Y-%m') = ?", time)
+	}
+	err = db.Count(&total).Error
+	if err != nil {
+		return
+	}
+	err = db.Order("id desc").Limit(limit).Offset(offset).Find(&collection).Error
+	return collection, total, err
+}
+
 // TODO:收款新增
 
 // CreateCollection 新增收款

server/dao/feeDetails.go

@@ -11,11 +11,11 @@ type FeeDetails struct {
 	Genre           string          `json:"genre" form:"genre" gorm:"comment:项目类型"`
 	Subject         string          `json:"subject" form:"subject" gorm:"comment:科目"`
 	Remarks         string          `json:"remarks" form:"remarks" gorm:"comment:备注"`
-	Price           decimal.Decimal `json:"price" form:"price" gorm:"comment:报销金额"`
+	Price           decimal.Decimal `json:"price" form:"price" gorm:"comment:报销金额;type:decimal(10,2)"`
 }
 
 func (FeeDetails) TableName() string {
-	return "feeDetails"
+	return "fee_details"
 }
 
 // TODO:费用详情查询

server/dao/project.go

@@ -22,6 +22,7 @@ type Project struct {
 	Files          []ProjectFile         `json:"files" form:"files" gorm:"-"`
 	WorkingHours   []ProjectWorkingHours `json:"workingHours" form:"workingHours" gorm:"-"`
 	Collection     []Collection          `json:"collection" form:"collection" gorm:"-"`
+	Reimbursement  []Reimbursement       `json:"reimbursement" form:"reimbursement" gorm:"-"`
 }
 
 func (Project) TableName() string {
@@ -54,7 +55,7 @@ func QueryProjectList(limit, offset, state int, name, time string) (project []Pr
 
 // QueryProjectByCode 查询单个项目  按编号
 func QueryProjectByCode(code string) (project Project, err error) {
-	err = global.GVA_DB.Model(&Project{}).Where("code = ?", code).First(&project).Error
+	err = global.GVA_DB.Model(&Project{}).Where("code = ?", code).Preload("ProjectState").First(&project).Error
 	return
 }
 

server/dao/projectWorkingHours.go

@@ -19,6 +19,22 @@ func (ProjectWorkingHours) TableName() string {
 
 // TODO:工时查询
 
+// QueryWorkingHoursList 查询工时列表
+func QueryWorkingHoursList(limit, offset int, code, name string) (projectWorkingHours []ProjectWorkingHours, total int64, err error) {
+	// 创建db
+	db := global.GVA_DB.Model(&ProjectWorkingHours{}).Where("project_code = ?", code)
+	// 如果有条件搜索 下方会自动创建搜索语句
+	if name != "" {
+		db = db.Where("people LIKE ?", "%"+name+"%")
+	}
+	err = db.Count(&total).Error
+	if err != nil {
+		return
+	}
+	err = db.Order("id desc").Limit(limit).Offset(offset).Find(&projectWorkingHours).Error
+	return projectWorkingHours, total, err
+}
+
 // QueryWorkingHours 查询工时
 func QueryWorkingHours(code string) (workingHours []ProjectWorkingHours, err error) {
 	err = global.GVA_DB.Model(&ProjectWorkingHours{}).Where("project_code = ?", code).Find(&workingHours).Error

server/dao/reimbursement.go

@@ -8,13 +8,15 @@ import (
 
 type Reimbursement struct {
 	global.GVA_MODEL
-	ProjectCode string          `json:"projectCode" form:"projectCode" gorm:"comment:项目编号"`
-	Name        string          `json:"name" form:"name" gorm:"comment:项目名称"`
-	Applicant   string          `json:"applicant" form:"applicant" gorm:"comment:报销申请人"`
-	Approval    string          `json:"approval" form:"approval" gorm:"comment:报销审批人"`
-	Price       decimal.Decimal `json:"price" form:"price" gorm:"comment:项目金额"`
-	Genre       string          `json:"genre" form:"genre" gorm:"comment:项目类型"`
-	FeeDetails  []FeeDetails    `json:"feeDetails" form:"feeDetails" gorm:"-"`
+	ProjectCode     string          `json:"projectCode" form:"projectCode" gorm:"comment:项目编号"`
+	Name            string          `json:"name" form:"name" gorm:"comment:项目名称"`
+	Applicant       string          `json:"applicant" form:"applicant" gorm:"comment:报销申请人"`
+	ApplicationTime string          `json:"applicationTime" form:"applicationTime" gorm:"comment:申请日期"`
+	Approval        int             `json:"approval" form:"approval" gorm:"comment:报销审批人"`
+	User            SysUser         `json:"user" form:"user" gorm:"foreignKey:Approval;references:id;"`
+	Price           decimal.Decimal `json:"price" form:"price" gorm:"comment:项目金额;type:decimal(10,2)"`
+	Genre           string          `json:"genre" form:"genre" gorm:"comment:费用类型"`
+	FeeDetails      []FeeDetails    `json:"feeDetails" form:"feeDetails" gorm:"-"`
 }
 
 func (Reimbursement) TableName() string {
@@ -23,24 +25,27 @@ func (Reimbursement) TableName() string {
 
 // TODO:报销查询
 
-// QueryReimbursementList 查询报销
-func QueryReimbursementList(limit, offset int, code, name string) (reimbursement []Reimbursement, total int64, err error) {
+// QueryReimbursementList 查询报销列表
+func QueryReimbursementList(limit, offset int, code, name, time string) (reimbursement []Reimbursement, total int64, err error) {
 	// 创建db
-	db := global.GVA_DB.Model(&Project{}).Where("project_code = ?", code)
+	db := global.GVA_DB.Model(&Reimbursement{}).Where("project_code = ?", code)
 	// 如果有条件搜索 下方会自动创建搜索语句
 	if name != "" {
 		db = db.Where("name LIKE ?", "%"+name+"%")
 	}
+	if time != "" {
+		db = db.Where("DATE_FORMAT(application_time, '%Y-%m') = ?", time)
+	}
 	err = db.Count(&total).Error
 	if err != nil {
 		return
 	}
-	err = db.Order("id desc").Limit(limit).Offset(offset).Find(&reimbursement).Error
+	err = db.Order("id desc").Limit(limit).Offset(offset).Preload("User").Find(&reimbursement).Error
 	return reimbursement, total, err
 }
 
 func QueryReimbursement(code string) (reimbursement []Reimbursement, err error) {
-	err = global.GVA_DB.Model(&Reimbursement{}).Where("project_code = ?", code).Find(&reimbursement).Error
+	err = global.GVA_DB.Model(&Reimbursement{}).Where("project_code = ?", code).Preload("User").Find(&reimbursement).Error
 	return reimbursement, err
 }
 

server/initialize/gorm.go

@@ -58,6 +58,8 @@ func RegisterTables() {
 		dao.DailyExpenses{},
 		dao.DailyFeeDetails{},
 		dao.DailyFile{},
+		dao.Reimbursement{},
+		dao.FeeDetails{},
 	)
 	if err != nil {
 		global.GVA_LOG.Error("register table failed", zap.Error(err))

server/model/common/request/common.go

@@ -41,6 +41,7 @@ type SearchProjectList struct {
 	PageInfo PageInfo `json:"pageInfo" form:"pageInfo"`
 	Code     string   `json:"code" form:"code"`
 	Name     string   `json:"name" form:"name"`
+	Time     string   `json:"time" form:"time"`
 }
 
 type SearchProjectFileList struct {

server/router/admin/finance.go

@@ -34,5 +34,6 @@ func (s *ProjectRouter) InitFinanceRouter(Router *gin.RouterGroup) {
 		financeRouterWithoutRecord.POST("queryBorrowingList", financeApi.QueryBorrowingList)
 		financeRouterWithoutRecord.GET("queryBorrowing", financeApi.QueryBorrowing)
 		financeRouterWithoutRecord.POST("queryDailyFileList", financeApi.QueryDailyFileList)
+		financeRouterWithoutRecord.GET("queryProjectFinance", financeApi.QueryProjectFinance)
 	}
 }

server/router/admin/project.go

@@ -42,7 +42,9 @@ func (s *ProjectRouter) InitProjectRouter(Router *gin.RouterGroup) {
 		projectRouterWithoutRecord.GET("queryProjectsInfo", projectApi.QueryProjectsInfo)
 		projectRouterWithoutRecord.GET("queryWorkingHours", projectApi.QueryWorkingHours)
 		projectRouterWithoutRecord.GET("queryCollection", projectApi.QueryCollections)
-		projectRouterWithoutRecord.GET("queryReimbursementList", projectApi.QueryReimbursementList)
+		projectRouterWithoutRecord.POST("queryWorkingHoursList", projectApi.QueryWorkingHoursList)
+		projectRouterWithoutRecord.POST("queryCollectionList", projectApi.QueryCollectionList)
+		projectRouterWithoutRecord.POST("queryReimbursementList", projectApi.QueryReimbursementList)
 		projectRouterWithoutRecord.GET("queryReimbursement", projectApi.QueryReimbursement)
 		projectRouterWithoutRecord.POST("projectFilesDownload", projectApi.ProjectFilesDownload)
 		projectRouterWithoutRecord.GET("queryProjectState", projectApi.QueryProjectState)

server/service/admin/finance.go

@@ -49,6 +49,37 @@ func (fs *FinanceService) QueryDailyFileList(info request.SearchIdNameGenre) (li
 	return dailyFiles, total, err
 }
 
+func (fs *FinanceService) QueryProjectFinance(code string) (dao.Project, error) {
+	project, err := dao.QueryProjectByCode(code)
+	if err != nil {
+		return dao.Project{}, err
+	}
+	collection, err := dao.QueryCollection(code)
+	if err != nil {
+		return dao.Project{}, err
+	}
+	workingHours, err := dao.QueryWorkingHours(code)
+	if err != nil {
+		return dao.Project{}, err
+	}
+	reimbursements, err := dao.QueryReimbursement(code)
+	if err != nil {
+		return dao.Project{}, err
+	}
+	for i, reimbursement := range reimbursements {
+		details, err := dao.QueryFeeDetails(int(reimbursement.ID))
+		if err != nil {
+			return dao.Project{}, err
+		}
+		reimbursements[i].FeeDetails = details
+	}
+	project.Collection = collection
+	project.WorkingHours = workingHours
+	project.Reimbursement = reimbursements
+
+	return project, err
+}
+
 func (fs *FinanceService) CreateDailyExpenses(expenses dao.DailyExpenses) error {
 	return expenses.CreateDailyExpenses()
 }

server/service/admin/project.go

@@ -80,14 +80,25 @@ func (ps *ProjectService) QueryWorkingHours(code string) ([]dao.ProjectWorkingHo
 	return dao.QueryWorkingHours(code)
 }
 
+func (ps *ProjectService) QueryWorkingHoursList(info request.SearchProjectList) (list interface{}, total int64, err error) {
+	limit := info.PageInfo.PageSize
+	offset := info.PageInfo.PageSize * (info.PageInfo.Page - 1)
+	return dao.QueryWorkingHoursList(limit, offset, info.Code, info.Name)
+}
+
 func (ps *ProjectService) QueryCollections(code string) ([]dao.Collection, error) {
 	return dao.QueryCollection(code)
 }
 
+func (ps *ProjectService) QueryCollectionList(info request.SearchProjectList) (list interface{}, total int64, err error) {
+	limit := info.PageInfo.PageSize
+	offset := info.PageInfo.PageSize * (info.PageInfo.Page - 1)
+	return dao.QueryCollectionList(limit, offset, info.Code, info.Time)
+}
 func (ps *ProjectService) QueryReimbursementList(info request.SearchProjectList) (list interface{}, total int64, err error) {
 	limit := info.PageInfo.PageSize
 	offset := info.PageInfo.PageSize * (info.PageInfo.Page - 1)
-	return dao.QueryReimbursementList(limit, offset, info.Code, info.Name)
+	return dao.QueryReimbursementList(limit, offset, info.Code, info.Name, info.Time)
 }
 
 func (ps *ProjectService) QueryReimbursement(code string) ([]dao.Reimbursement, error) {