luyanming/fonchain-approval-fork
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改冲突

Browse Source
This commit is contained in:
jhc 2023-05-04 10:15:50 +08:00
parent a769dd08bf
commit 05cc84845d
2 changed files with 51 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkg/model/approval.go
View File

@ -51,7 +51,11 @@ type Approval struct {
BundlePayPrice *BundlePayPrice `gorm:"foreignKey:ApprovalID" json:"BundlePayPrice"` //关联的type
ExhibitionReward *ExhibitionReward `gorm:"foreignKey:ApprovalID" json:"ExhibitionReward"` //关联的type
ApprovalWorkFlows []*ApprovalWorkFlow `gorm:"foreignKey:ApprovalID" json:"ApprovalWorkFlows"`
<<<<<<< Updated upstream
ApprovalOA *ApprovalOA `gorm:"foreignKey:ApprovalID" json:"OA"`
=======
ApprovalOA *ApprovalOA `gorm:"foreignKey:ApprovalID" json:"oa"`
>>>>>>> Stashed changes
}
func (j *KeyInfos) Scan(src interface{}) error {
@ -73,6 +77,24 @@ const (
TypeBundle = "bundle"
TypeBundlePayPrice = "bundlePayPrice"
TypeArtExhibitionReward = "artExhibitionReward"
TypeOa = "oa" // oa 父类
/* 子类 */
TypeOaLeave = "oa_leave" // 事假
TypeOaSick = "oa_sick" // 病假
TypeOaAnnualLeave = "oa_annualLeave" // 年假
TypeOaDayOff = "oa_dayOff" // 调休
TypeOaMaritalLeave = "oa_maritalLeave" // 婚假
TypeOaMatingCheckLeave = "oa_matingCheckLeave" // 孕检假
TypeOaMaternityLeave = "oa_maternityLeave" // 产假
TypeOaPaternityLeave = "oa_paternityLeave" // 陪产假
TypeOaParentalLeave = "oa_parentalLeave" // 育儿假
TypeOaNursingLeave = "oa_nursingLeave" // 独生子女护理假
TypeOaFuneralLeave = "oa_funeralLeave" // 丧假
TypeOaMakeUp = "oa_makeUp" // 补卡
TypeOaOvertime = "oa_overtime" // 加班
TypeOaOutwork = "oa_outwork" // 外勤
TypeOaTurnover = "oa_turnover" // 离职
/* */
)
const (
StatusDoing = 1
@ -542,7 +564,7 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
modelObj = modelObj.Where(&Approval{Type: in.Type}).Where(
DB.Where(&Approval{NowUserId: in.UserID, Status: StatusDoing}). // 我需要审批的
Or(DB.Where("status = ?", StatusOk).Where("id in (?)", s1))) // 已完成，抄送给我的
Or(DB.Where("status = ?", StatusOk).Where("id in (?)", s1))) // 已完成，抄送给我的
modelObj.Count(&count)
if len(ids) > 0 { //根据具体id排序
@ -587,8 +609,8 @@ func MyApprovalWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
if in.UserID != 0 {
modelObj = modelObj.Where(
DB.Where("JSON_CONTAINS(approval_users,JSON_OBJECT('ID', ?))", in.UserID).
Where("status != ?", StatusDoing). //完成，我参与审批
Or(DB.Where("now_user_id", in.UserID).Where("status = ?", StatusDoing)). //进行中，当前审批人是我,
Where("status != ?", StatusDoing). //完成，我参与审批
Or(DB.Where("now_user_id", in.UserID).Where("status = ?", StatusDoing)). //进行中，当前审批人是我,
Or(DB.Where("JSON_CONTAINS(copy_users,JSON_OBJECT('ID', ?))", in.UserID).Where("status = ?", StatusOk))) //抄送人(完成抄送)
}
@ -644,8 +666,8 @@ func MyWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
if in.UserID != 0 {
modelObj = modelObj.Where(
DB.Where("JSON_CONTAINS(approval_users,JSON_OBJECT('ID', ?))", in.UserID).
Where("status != ?", StatusDoing). //完成，我参与审批
Or(DB.Where("now_user_id", in.UserID).Where("status = ?", StatusDoing)). //进行中，当前审批人是我,
Where("status != ?", StatusDoing). //完成，我参与审批
Or(DB.Where("now_user_id", in.UserID).Where("status = ?", StatusDoing)). //进行中，当前审批人是我,
Or(DB.Where("JSON_CONTAINS(copy_users,JSON_OBJECT('ID', ?))", in.UserID).Where("status = ?", StatusOk))) //抄送人(完成抄送)
}

24
pkg/model/approval_type.go
View File

@ -39,6 +39,7 @@ var TypeMap = map[string]string{
"show": "",
TypeBundlePayPrice: "",
TypeArtExhibitionReward: "",
<<<<<<< Updated upstream
"leave": "oa", // 事假
"sick": "oa", // 病假
@ -65,6 +66,25 @@ var TypeMap = map[string]string{
"parentalLeaveApply": "oa", // 育儿假申请
"nursingLeaveApply": "oa", // 独生子女护理假申请
/*=================================*/
// TODO 育儿假 等 额度 审批
TypeOaLeave: "oa", // 事假
TypeOaSick: "oa", // 病假
TypeOaAnnualLeave: "oa", // 年假
TypeOaDayOff: "oa", // 调休
TypeOaMaritalLeave: "oa", // 婚假
TypeOaMatingCheckLeave: "oa", // 孕检假
TypeOaMaternityLeave: "oa", // 产假
TypeOaPaternityLeave: "oa", // 陪产假
TypeOaParentalLeave: "oa", // 育儿假
TypeOaNursingLeave: "oa", // 独生子女护理假
TypeOaFuneralLeave: "oa", // 丧假
TypeOaMakeUp: "oa", // 补卡
TypeOaOvertime: "oa", // 加班
TypeOaOutwork: "oa", // 外勤
TypeOaTurnover: "oa", // 离职
}
var keyWordMap = map[string]string{
@ -158,6 +178,10 @@ func IsSystemKeyWork(title string) bool {
return isOk
}
// TODO
// 增加 逻辑 取出 value值 判断是否为 ""
// 为 "" 则为 系统
// 不为 "" 则为 自定义中特殊类型
func IsSystemType(title string) bool {
_, isOk := TypeMap[title]
return isOk