审批

server/api/v1/system/notice.go

@@ -27,6 +27,23 @@ func (na *NoticeApi) QueryUserUnreadNotice(c *gin.Context) {
 	response.OkWithData(noticeList, c)
 }
 
+func (na *NoticeApi) QueryUserAllNotice(c *gin.Context) {
+	id := c.Query("id")
+	userId, err := strconv.Atoi(id)
+	if err != nil {
+		response.FailWithMessage("参数错误", c)
+		global.GVA_LOG.Error("QueryUserAllNotice ====== " + err.Error())
+		return
+	}
+	noticeList, err := noticeService.QueryUserAllNotice(userId)
+	if err != nil {
+		response.FailWithMessage("查询失败", c)
+		global.GVA_LOG.Error("QueryUserAllNotice ====== " + err.Error())
+		return
+	}
+	response.OkWithData(noticeList, c)
+}
+
 func (na *NoticeApi) QueryAllNotices(c *gin.Context) {
 	noticeList, err := noticeService.QueryAllNotices()
 	if err != nil {

server/dao/description.go

@@ -103,7 +103,7 @@ func ProcessOperate(projectProcess ProjectProcess, description Description) (err
 		//通知
 		notice := Notice{
 			Title:   "审批结果",
-			Content: fmt.Sprintf("您的申请未通过，请补充文件"),
+			Content: "您的申请未通过，请补充文件." + description.ApprovalOpinion,
 			Type:    projectProcess.ProjectType,
 			UserId:  projectProcess.Applicant,
 		}
@@ -191,7 +191,7 @@ func ProcessOperate(projectProcess ProjectProcess, description Description) (err
 		//通知
 		notice := Notice{
 			Title:   "审批结果",
-			Content: fmt.Sprintf("您的申请未通过，请补充文件"),
+			Content: "您的申请未通过，请补充文件." + description.ApprovalOpinion,
 			Type:    projectProcess.ProjectType,
 			UserId:  projectProcess.Applicant,
 		}

server/dao/notice.go

@@ -22,6 +22,11 @@ func QueryUserUnreadNotice(userId int) (notices []Notice, err error) {
 	return
 }
 
+func QueryUserAllNotice(userId int) (notices []Notice, err error) {
+	err = global.GVA_DB.Where("user_id =?", userId).Order("id").Find(&notices).Error
+	return
+}
+
 // QueryAllNotices 查询所有通知
 func QueryAllNotices() (notices []Notice, err error) {
 	err = global.GVA_DB.Find(&notices).Error

server/dao/project.go

@@ -1,7 +1,6 @@
 package dao
 
 import (
-	"fmt"
 	"github.com/shopspring/decimal"
 	"gorm.io/gorm"
 	"server/global"
@@ -50,7 +49,7 @@ func (Project) TableName() string {
 // QueryProjectList 查询项目列表
 func QueryProjectList(limit, offset, state int, name, time string) (project []Project, total int64, err error) {
 	// 创建db
-	db := global.GVA_DB.Model(&Project{})
+	db := global.GVA_DB.Model(&Project{}).Where("is_approve = ?", true)
 	// 如果有条件搜索 下方会自动创建搜索语句
 	if state != 0 {
 		db = db.Where("state = ?", state)
@@ -144,7 +143,6 @@ func (p Project) CreateProject() error {
 				}
 			}
 		}
-		fmt.Println(process.Nodes)
 		// 查询是否有使用的流程
 		if process.ID != 0 {
 			projectProcess := ProjectProcess{

server/dao/project_process.go

@@ -1,6 +1,8 @@
 package dao
 
-import "server/global"
+import (
+	"server/global"
+)
 
 type ProjectProcess struct {
 	global.GVA_MODEL
@@ -14,7 +16,7 @@ type ProjectProcess struct {
 	Process            Process       `json:"process" form:"process" gorm:"foreignKey:ProcessApprovalId;references:id"`
 	ProjectType        string        `json:"projectType" form:"projectType" gorm:"comment:项目类型"`
 	Descriptions       []Description `json:"descriptions" form:"descriptions" gorm:"foreignKey:ProjectProcessId;"`
-	State              int           `json:"isOver" form:"isOver" gorm:"comment:状态;default:0;"`
+	State              int           `json:"state" form:"state" gorm:"comment:状态;default:0;"`
 	Code               string        `json:"code" form:"code" gorm:"-"`
 	IsBack             bool          `json:"isBack" form:"isBack" gorm:"default:false;comment:是否打回"`
 }
@@ -68,7 +70,7 @@ func QueryProjectApplicantList(limit, offset, applicant int) (projectProcesses [
 
 func QueryProjectProcessList(limit, offset, applicant int) (projectProcesses []ProjectProcess, total int64, err error) {
 	// 创建db
-	db := global.GVA_DB.Model(&ProjectProcess{}).Joins("JOIN node ON project_process.current_node_order = node.id").Where("node.approver_id = ? AND project_process.is_back = ?", applicant, false)
+	db := global.GVA_DB.Model(&ProjectProcess{}).Joins("JOIN node ON project_process.current_node_order = node.id").Where("node.approver_id = ? AND project_process.is_back = ? AND project_process.state = ?", applicant, false, 0)
 	// 如果有条件搜索 下方会自动创建搜索语句
 	err = db.Count(&total).Error
 	if err != nil {
@@ -145,6 +147,7 @@ func QueryProjectProcessById(id int) (projectProcess ProjectProcess, err error)
 	return projectProcess, err
 }
 
+// QueryProjectProcessByProcessApprovalId 按流程审批 ID 查询项目流程
 func QueryProjectProcessByProcessApprovalId(id int) (projectProcesses []ProjectProcess, err error) {
 	err = global.GVA_DB.Where("process_approval_id =?", id).Preload("User").Preload("Node").Preload("Process").Preload("Descriptions").Find(&projectProcesses).Error
 
@@ -180,7 +183,21 @@ func (pp ProjectProcess) UpdateProjectProcess() error {
 	return global.GVA_DB.Where("id = ?", pp.ID).Updates(&pp).Error
 }
 
+// Replenished 补充完毕
 func Replenished(id int) error {
+	process, err := QueryProjectProcessById(id)
+	if err != nil {
+		return err
+	}
+	err = Notice{
+		Title:   "审批补充",
+		Content: process.ProjectProcessName + "已完成文件补充",
+		UserId:  process.Node.ApproverId,
+		Type:    process.ProjectType,
+	}.CreateNotice()
+	if err != nil {
+		return err
+	}
 	return global.GVA_DB.Model(&ProjectProcess{}).Where("id = ?", id).Update("is_back", false).Error
 }
 

server/router/storehouse/commodity.go

@@ -0,0 +1,25 @@
+package storehouse
+
+import (
+	"github.com/gin-gonic/gin"
+	v1 "server/api/v1"
+	"server/middleware"
+)
+
+type CommodityRouter struct{}
+
+func (s *CommodityRouter) InitCommodityRouter(Router *gin.RouterGroup) {
+	commodityRouter := Router.Group("commodity").Use(middleware.OperationRecord())
+	commodityRouterWithoutRecord := Router.Group("commodity")
+
+	commodityApi := v1.ApiGroupApp.StorehouseApiGroup.CommodityApi
+	{
+		commodityRouter.POST("createCommodity", commodityApi.CreateCommodity)
+		commodityRouter.PUT("updateCommodity", commodityApi.UpdateCommodity)
+		commodityRouter.DELETE("deleteCommodity", commodityApi.DeleteCommodity)
+	}
+	{
+		commodityRouterWithoutRecord.GET("queryAllCommodity", commodityApi.QueryAllCommodity)
+		commodityRouterWithoutRecord.POST("queryCommodityList", commodityApi.QueryCommodityList)
+	}
+}

server/router/storehouse/commodityGenre.go

@@ -0,0 +1,25 @@
+package storehouse
+
+import (
+	"github.com/gin-gonic/gin"
+	v1 "server/api/v1"
+	"server/middleware"
+)
+
+type CommodityGenreRouter struct{}
+
+func (r *CommodityGenreRouter) InitCommodityGenreRouter(Router *gin.RouterGroup) {
+	commodityGenreRouter := Router.Group("commodityGenre").Use(middleware.OperationRecord())
+	commodityGenreRouterWithoutRecord := Router.Group("commodityGenre")
+	commodityGenreApi := v1.ApiGroupApp.StorehouseApiGroup.CommodityGenreApi
+
+	{
+		commodityGenreRouter.POST("createCommodityGenre", commodityGenreApi.CreateCommodityGenre)
+		commodityGenreRouter.PUT("updateCommodityGenre", commodityGenreApi.UpdateCommodityGenre)
+		commodityGenreRouter.DELETE("deleteCommodityGenre", commodityGenreApi.DeleteCommodityGenre)
+	}
+
+	{
+		commodityGenreRouterWithoutRecord.GET("queryAllCommodityGenre", commodityGenreApi.QueryAllCommodityGenre)
+	}
+}

server/router/storehouse/enter.go

@@ -0,0 +1,8 @@
+package storehouse
+
+type RouterGroup struct {
+	CommodityRouter
+	CommodityGenreRouter
+	SupplierRouter
+	WarehouseRouter
+}

server/router/storehouse/supplier.go

@@ -0,0 +1,25 @@
+package storehouse
+
+import (
+	"github.com/gin-gonic/gin"
+	v1 "server/api/v1"
+	"server/middleware"
+)
+
+type SupplierRouter struct{}
+
+func (r *SupplierRouter) InitSupplierRouter(Router *gin.RouterGroup) {
+	supplierRouter := Router.Group("supplier").Use(middleware.OperationRecord())
+	supplierRouterWithoutRecord := Router.Group("supplier")
+	supplierApi := v1.ApiGroupApp.StorehouseApiGroup.SupplierApi
+
+	{
+		supplierRouter.POST("createSupplier", supplierApi.CreateSupplier)
+		supplierRouter.POST("updateSupplier", supplierApi.UpdateSupplier)
+		supplierRouter.DELETE("deleteSupplier", supplierApi.DeleteSupplier)
+	}
+
+	{
+		supplierRouterWithoutRecord.GET("queryAllSupplier", supplierApi.QueryAllSupplier)
+	}
+}

server/router/storehouse/warehouse.go

@@ -0,0 +1,26 @@
+package storehouse
+
+import (
+	"github.com/gin-gonic/gin"
+	v1 "server/api/v1"
+	"server/middleware"
+)
+
+type WarehouseRouter struct{}
+
+func (r *WarehouseRouter) InitWarehouseRouter(Router *gin.RouterGroup) {
+	warehouseRouter := Router.Group("warehouse").Use(middleware.OperationRecord())
+	warehouseRouterWithoutRecord := Router.Group("warehouse")
+
+	warehouseApi := v1.ApiGroupApp.StorehouseApiGroup.WarehouseApi
+
+	{
+		warehouseRouter.POST("createWarehouse", warehouseApi.CreateWarehouse)
+		warehouseRouter.PUT("updateWarehouse", warehouseApi.UpdateWarehouse)
+		warehouseRouter.DELETE("deleteWarehouse", warehouseApi.DeleteWarehouse)
+	}
+	{
+		warehouseRouterWithoutRecord.GET("queryAllWarehouse", warehouseApi.QueryAllWarehouse)
+		warehouseRouterWithoutRecord.GET("queryWarehouseList", warehouseApi.QueryWarehouseList)
+	}
+}

server/router/system/Notice.go

@@ -20,6 +20,7 @@ func (s *NoticeRouter) InitNoticeRouter(Router *gin.RouterGroup) {
 	}
 	{
 		noticeRouterWithoutRecord.GET("queryUserUnreadNotice", noticeApi.QueryUserUnreadNotice)
+		noticeRouterWithoutRecord.GET("queryUserAllNotice", noticeApi.QueryUserAllNotice)
 		noticeRouterWithoutRecord.GET("queryAllNotices", noticeApi.QueryAllNotices)
 	}
 }

server/service/system/notice.go

@@ -8,6 +8,10 @@ func (ns *NoticeService) QueryUserUnreadNotice(userId int) ([]dao.Notice, error)
 	return dao.QueryUserUnreadNotice(userId)
 }
 
+func (ns *NoticeService) QueryUserAllNotice(id int) ([]dao.Notice, error) {
+	return dao.QueryUserAllNotice(id)
+}
+
 func (ns *NoticeService) QueryAllNotices() ([]dao.Notice, error) {
 	return dao.QueryAllNotices()
 }