daihengshun/ArmedPolice
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat：完善项目

Browse Source
This commit is contained in:
henry
2021-11-10 11:26:40 +08:00
parent fb77e15579
commit 095bdcfe4c
10 changed files with 263 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app/model/work_instance.go
View File

@ -4,6 +4,7 @@ import (
"ArmedPolice/app/common/model"
"ArmedPolice/serve/orm"
"fmt"
"strings"
"time"
)
@ -18,6 +19,7 @@ type WorkInstanceInfo struct {
EquipmentCode string `json:"equipment_code"`
EquipmentTitle string `json:"equipment_title"`
BreakdownTitle string `json:"breakdown_title"`
ScheduleTitle string `json:"schedule_title"`
Priority int `json:"priority"`
Status int `json:"status"`
CreatedAt time.Time `json:"created_at"`
@ -34,8 +36,9 @@ func (m *WorkInstance) Instances(page, pageSize int, count *int64, where ...*mod
db := orm.GetDB().Table(m.TableName()+" AS w").
Select("w.id", "w.title", "e.code AS equipment_code", "e.title AS equipment_title", "w.priority",
"(SELECT GROUP_CONCAT(s_b.title) FROM ( SELECT id, title FROM sys_breakdown) AS s_b WHERE FIND_IN_SET( s_b.id, w.breakdown )) AS breakdown_title",
"w.status", "w.created_at").
"s.title AS schedule_title", "w.status", "w.created_at").
Joins(fmt.Sprintf("LEFT JOIN %s AS e ON w.equipment_id = e.id", model.NewManageEquipment().TableName())).
Joins(fmt.Sprintf("LEFT JOIN %s AS s ON w.schedule = s.id", model.NewWorkSchedule().TableName())).
Where("w.is_deleted = ?", model.DeleteStatusForNot)
if len(where) > 0 {
@ -62,15 +65,14 @@ func (m *WorkInstance) Persons(uid uint64, kind model.WorkScheduleKind, page, pa
db := orm.GetDB().Table(model.NewWorkProgress().TableName()+" AS p").
Select("w.id", "w.title", "e.code AS equipment_code", "e.title AS equipment_title", "w.priority",
"(SELECT GROUP_CONCAT(s_b.title) FROM ( SELECT id, title FROM sys_breakdown) AS s_b WHERE FIND_IN_SET( s_b.id, w.breakdown )) AS breakdown_title",
"w.status", "w.created_at").
"s.title AS schedule_title", "w.status", "w.created_at").
Joins(fmt.Sprintf("LEFT JOIN %s AS w ON p.work_id = w.id", m.TableName())).
Joins(fmt.Sprintf("LEFT JOIN %s AS e ON w.equipment_id = e.id", model.NewManageEquipment().TableName())).
Joins(fmt.Sprintf("LEFT JOIN (SELECT id FROM %s WHERE kind = %d ORDER BY stage ASC, step ASC limit 1) AS s ON p.schedule_id = s.id",
Joins(fmt.Sprintf("LEFT JOIN (SELECT id, title FROM %s WHERE kind = %d ORDER BY stage ASC, step ASC limit 1) AS s ON p.schedule_id = s.id",
mWorkSchedule.TableName(), kind)).
Where("p.is_deleted = ? AND w.is_deleted = ?", model.DeleteStatusForNot, model.DeleteStatusForNot).
Where("p.uid = ?", uid).
Where("s.id > ?", 0).
Group("w.id")
Where("s.id > ?", 0)
if len(where) > 0 {
for _, wo := range where {
@ -90,12 +92,27 @@ func (m *WorkInstance) Persons(uid uint64, kind model.WorkScheduleKind, page, pa
// Workbench 个人信息
func (m *WorkInstance) Workbench(condition *WorkbenchCondition, page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*WorkInstanceInfo, error) {
mWorkSchedule := model.NewWorkSchedule()
_condition := fmt.Sprintf(`CASE %s
WHEN %d THEN
(SELECT GROUP_CONCAT(a.id) FROM (SELECT id FROM %s WHERE target = %d AND target_value IN (%s)) AS a)
WHEN %d THEN
(SELECT GROUP_CONCAT(a.id) FROM (SELECT id FROM %s WHERE target = %d AND target_value IN (%s)) AS a)
ELSE "" END`, "s.target",
model.WorkScheduleTargetForPerson,
mWorkSchedule.TableName(), model.WorkScheduleTargetForPerson, condition.UID,
model.WorkScheduleTargetForRole,
mWorkSchedule.TableName(), model.WorkScheduleTargetForRole, strings.Join(condition.RoleIDs, ","))
db := orm.GetDB().Table(m.TableName()+" AS w").
Select("w.id", "w.title", "e.code AS equipment_code", "e.title AS equipment_title", "w.priority",
"(SELECT GROUP_CONCAT(s_b.title) FROM ( SELECT id, title FROM sys_breakdown) AS s_b WHERE FIND_IN_SET( s_b.id, w.breakdown )) AS breakdown_title",
"w.status", "w.created_at").
"(SELECT GROUP_CONCAT(s_b.title) FROM (SELECT id, title FROM sys_breakdown) AS s_b WHERE FIND_IN_SET( s_b.id, w.breakdown )) AS breakdown_title",
"s.title AS schedule_title", "w.status", "w.created_at").
Joins(fmt.Sprintf("LEFT JOIN %s AS e ON w.equipment_id = e.id", model.NewManageEquipment().TableName())).
Where("w.is_deleted = ?", model.DeleteStatusForNot)
Joins(fmt.Sprintf("LEFT JOIN %s AS s ON w.schedule = s.id", mWorkSchedule.TableName())).
Where("w.is_deleted = ?", model.DeleteStatusForNot).
Where(fmt.Sprintf("FIND_IN_SET(w.schedule, %s)", _condition))
if len(where) > 0 {
for _, wo := range where {
@ -104,9 +121,9 @@ func (m *WorkInstance) Workbench(condition *WorkbenchCondition, page, pageSize i
}
out := make([]*WorkInstanceInfo, 0)
//if err := orm.GetDB().Table(mWorkProgress.TableName()).Where("is_deleted = ?", model.DeleteStatusForNot).Count(count).Error; err != nil {
// return nil, err
//}
if err := db.Count(count).Error; err != nil {
return nil, err
}
if err := db.Order("w.id " + model.OrderModeToDesc).Offset((page - 1) * pageSize).Limit(pageSize).Scan(&out).Error; err != nil {
return nil, err
}

23
app/model/work_schedule.go
View File

@ -11,6 +11,11 @@ type WorkSchedule struct {
*model.WorkSchedule
}
type WorkSchedules struct {
*model.WorkSchedule
TargetValueTitle string `json:"target_value_title"`
}
// WorkScheduleInfo 工单流程信息
type WorkScheduleInfo struct {
ID uint64 `json:"id"`
@ -98,20 +103,20 @@ func (m *WorkSchedule) NextSchedule(isAssets bool) (*WorkScheduleInfo, error) {
}
// Schedules 流程信息
func (m *WorkSchedule) Schedules() ([]*model.WorkSchedule, error) {
sql := `SELECT s.id, s.kind, s.title, s.stage, s.step, s.target,
func (m *WorkSchedule) Schedules() ([]*WorkSchedules, error) {
sql := `SELECT s.id, s.kind, s.title, s.stage, s.step, s.target, s.target_value,
CASE s.target
WHEN 1 THEN
WHEN %d THEN
(SELECT GROUP_CONCAT(u_d.name) FROM ( SELECT u.uuid, u.name FROM %s AS u WHERE u.is_deleted = %d) AS u_d WHERE FIND_IN_SET( u_d.uuid, s.target_value ))
WHEN 2 THEN
WHEN %d THEN
(SELECT GROUP_CONCAT(r_d.name) FROM (SELECT r.id, r.name FROM %s AS r WHERE r.is_deleted = %d) AS r_d WHERE FIND_IN_SET( r_d.id, s.target_value ))
ELSE ""
END AS target_value, s.is_countersign, s.created_at
ELSE "" END AS target_value_title, s.is_countersign, s.created_at
FROM %s AS s WHERE s.is_deleted = %d ORDER BY s.kind ASC, s.stage ASC, s.step ASC`
out := make([]*model.WorkSchedule, 0)
out := make([]*WorkSchedules, 0)
err := orm.GetDB().Raw(fmt.Sprintf(sql, model.NewSysUser().TableName(), model.DeleteStatusForNot,
model.NewSysRole().TableName(), model.DeleteStatusForNot, m.TableName(), model.DeleteStatusForNot)).Scan(&out).Error
err := orm.GetDB().Raw(fmt.Sprintf(sql, model.WorkScheduleTargetForPerson, model.NewSysUser().TableName(), model.DeleteStatusForNot,
model.WorkScheduleTargetForRole, model.NewSysRole().TableName(), model.DeleteStatusForNot,
m.TableName(), model.DeleteStatusForNot)).Scan(&out).Error
return out, err
}