opms_admin/app/handler/dict.go

@@ -144,6 +144,21 @@ func (h *DictHandler) GetDictDataByType(ctx context.Context, req *model.GetDictR
 	return nil
 }
 
+// GetDictDataByTypes 批量根据字典类型获取字典项明细
+func (h *DictHandler) GetDictDataByTypes(ctx context.Context, req *model.GetDictsReq, rsp *comm_def.CommonMsg) error {
+	dictService, err := service.NewDictDataService(ctx)
+	if err != nil {
+		return err
+	}
+
+	dicts, err := dictService.GetDictWithDataByTypes(req)
+	if err != nil {
+		return err
+	}
+	rsp.Data = dicts
+	return nil
+}
+
 // CreateDictData 添加字典明细
 func (h *DictHandler) CreateDictData(ctx context.Context, req *model.DictDataAddReq, rsp *comm_def.CommonMsg) error {
 	// 参数校验

opms_admin/app/handler/user.go

@@ -266,6 +266,23 @@ func (h *UserHandler) GetUserByRole(ctx context.Context, req *model.SysUserRoleR
 	return nil
 }
 
+func (h *UserHandler) GetUsersByRoleKeys(ctx context.Context, req *model.SysUserRoleKeysReq, rsp *comm_def.CommonMsg) error {
+	if len(req.RoleKeys) == 0 && len(req.RoleIds) == 0 {
+		return myerrors.TipsError("角色编码和角色ID不能同时为空")
+	}
+	userService, err := service.NewUserService(ctx)
+	if err != nil {
+		return err
+	}
+
+	list, err := userService.GetUsersByRoleKeys(req.RoleKeys, req.RoleIds)
+	if err != nil {
+		return err
+	}
+	rsp.Data = list
+	return nil
+}
+
 //// GetDictList 获取用户列表字典项（返回字典数据形式，一般用来绑定用户的下拉列表）
 //func (e *UserHandler) GetDictList(ctx context.Context, req *user_def.DictSelectReq, rsp *comm_def.CommonMsg) error {
 //	// 获取租户码

opms_admin/app/model/opsdev/ops_event_task.go

@@ -0,0 +1,147 @@
+package opsdev
+
+import (
+    "dashoo.cn/opms_libary/request"
+    "dashoo.cn/opms_parent/app/model/opsdev/internal"
+    "github.com/gogf/gf/os/gtime"
+)
+
+// OpsEventTask is the golang structure for table ops_event_task.
+type OpsEventTask internal.OpsEventTask
+
+// ----------------------
+//  任务状态常量定义
+// ----------------------
+// Task Status
+const (
+    // 待处理
+    TaskStatusTodo       = "10"
+    // 处理中
+    TaskStatusProcessing = "20"
+    // 暂停
+    TaskStatusPaused     = "25"
+    // 已完成
+    TaskStatusCompleted  = "30"
+    // 阻塞
+    TaskStatusBlocked    = "70"
+    // 作废
+    TaskStatusCancelled  = "90"
+)
+
+// Task Type
+const (
+    // 需求评审
+    TaskTypeReqReview     = "10"
+    // 功能开发
+    TaskTypeFeatureDev    = "20"
+    // 功能测试
+    TaskTypeFeatureTest   = "30"
+    // 系统发版
+    TaskTypeSystemRelease = "40"
+)
+
+// Priority
+const (
+    PriorityUrgent = "10" // 紧急
+    PriorityHigh   = "20" // 高
+    PriorityMedium = "30" // 中
+    PriorityLow    = "40" // 低
+)
+
+// ----------------------
+// 传输对象 (DTOs)
+// ----------------------
+
+// OpsEventTaskSearchReq - 列表查询请求，嵌入分页
+type OpsEventTaskSearchReq struct {
+    request.PageReq
+    ProjectId  int        `json:"projectId"`
+    TaskTitle  string     `json:"taskTitle"`
+    TaskType   []string   `json:"taskType"`
+    TaskStatus []string   `json:"taskStatus"`
+    Priority   []string   `json:"priority"`
+    OpsUserName string    `json:"opsUserName"`
+    SortFields []SortField `json:"sortFields"`
+}
+
+// OpsEventTaskAddReq - 创建请求
+type OpsEventTaskAddReq struct {
+    ProjectId int     `json:"projectId"` // 必填
+    TaskTitle string  `json:"taskTitle"` // 必填
+    TaskDesc  string  `json:"taskDesc"`
+    TaskType  string  `json:"taskType"`  // 必填
+    Priority  string  `json:"priority"`  // 必填
+    Remark    string  `json:"remark"`
+}
+
+// OpsEventTaskUpdateReq - 更新请求
+type OpsEventTaskUpdateReq struct {
+    Id        int     `json:"id"`
+    TaskTitle string  `json:"taskTitle"`
+    TaskDesc  string  `json:"taskDesc"`
+    TaskType  string  `json:"taskType"`
+    Priority  string  `json:"priority"`
+    Remark    string  `json:"remark"`
+}
+
+// OpsEventTaskScheduleReq - 排期请求
+type OpsEventTaskScheduleReq struct {
+    Id               int       `json:"id"`
+    OpsUserId        int       `json:"opsUserId"`
+    OpsUserName      string    `json:"opsUserName"`
+    PlanStartTime    string    `json:"planStartTime"`
+    PlanEndTime      string    `json:"planEndTime"`
+    EstimateWorkHour float64   `json:"estimateWorkHour"`
+}
+
+// OpsEventTaskCompleteReq - 完成请求
+type OpsEventTaskCompleteReq struct {
+    Id              int        `json:"id"`
+    ActualWorkHour  float64    `json:"actualWorkHour"`
+    Remark          string     `json:"remark"`
+    Attachments     []Attachment `json:"attachments"`
+}
+
+// OpsEventTaskStatusReq - 状态变更请求（暂停/阻塞/取消）
+type OpsEventTaskStatusReq struct {
+    Id     int    `json:"id"`
+    Remark string `json:"remark"`
+}
+
+// OpsEventTaskRsp - API 响应结构
+type OpsEventTaskRsp struct {
+    OpsEventTask
+    ProjectName string `json:"projectName"`
+}
+
+// OpsEventTaskRecordSearchReq - 记录查询
+type OpsEventTaskRecordSearchReq struct {
+    TaskId int `json:"taskId"`
+}
+
+// OpsEventTaskRecordWithAttachments - 记录带附件
+type OpsEventTaskRecordWithAttachments struct {
+    OpsEventTaskRecord
+    Attachments []*Attachment `json:"attachments"`
+}
+
+// SortField - 排序字段
+type SortField struct {
+    Field string `json:"field"`
+    Order string `json:"order"`
+}
+
+// Attachment - 附件信息
+type Attachment struct {
+    FileName string `json:"fileName"`
+    FileUrl  string `json:"fileUrl"`
+    FileType string `json:"fileType"`
+}
+
+// OpsEventTaskRecord - 任务记录的简化 DTO（与业务无关，仅为 DTO 演示）
+type OpsEventTaskRecord struct {
+    Id        int       `json:"id"`
+    TaskId    int       `json:"taskId"`
+    Action    string    `json:"action"`
+    CreatedTime *gtime.Time `json:"createdTime"`
+}

opms_admin/app/model/sys_dict_data.go

@@ -30,6 +30,14 @@ type GetDictReq struct {
 	Ctx          context.Context
 }
 
+// GetDictsReq 批量获取多个字典信息
+type GetDictsReq struct {
+	DictTypes []string `p:"dictTypes" v:"required#字典类型不能为空"`
+}
+
+// DictsRes 批量字典响应
+type DictsRes map[string]*DictRes
+
 // DictRes 完整的一个字典信息
 type DictRes struct {
 	Info   *DictTypeRes   `json:"info"`
@@ -43,6 +51,7 @@ type DictTypeRes struct {
 
 // DictDataRes 字典数据
 type DictDataRes struct {
+	DictType  string `json:"dictType"`
 	DictValue string `json:"key"`
 	DictLabel string `json:"value"`
 	IsDefault int    `json:"isDefault"`

opms_admin/app/model/sys_user.go

@@ -137,3 +137,9 @@ type DeptIdReq struct {
 	DeptId  int  `json:"dept_id,omitempty"`
 	Include bool `json:"include,omitempty"`
 }
+
+// SysUserRoleKeysReq 根据角色编码查询用户请求
+type SysUserRoleKeysReq struct {
+	RoleKeys []string `json:"roleKeys"` // 角色编码列表，如：["ProjectManager", "ProjectDeliveryManager"]
+	RoleIds  []int    `json:"roleIds"`  // 角色ID列表，如：[1011, 1012]
+}

opms_admin/app/service/sys_dict_data.go

@@ -99,6 +99,32 @@ func (s *DictDataService) GetDictWithDataByType(req *model.GetDictReq) (dict *mo
 	return
 }
 
+// GetDictWithDataByTypes 批量通过字典键类型获取选项
+func (s *DictDataService) GetDictWithDataByTypes(req *model.GetDictsReq) (dicts model.DictsRes, err error) {
+	dicts = make(model.DictsRes)
+	if len(req.DictTypes) == 0 {
+		return dicts, nil
+	}
+
+	var values []*model.DictDataRes
+	err = s.Dao.Where(s.Dao.C.DictType+" IN(?)", req.DictTypes).
+		Where(s.Dao.C.Status, "10").
+		Order(s.Dao.C.DictSort + " asc," + s.Dao.C.DictCode + " asc").
+		Scan(&values)
+	if err != nil {
+		g.Log().Error(err)
+		return nil, myerrors.TipsError("批量获取字典数据失败")
+	}
+
+	for _, dt := range req.DictTypes {
+		dicts[dt] = &model.DictRes{Values: make([]*model.DictDataRes, 0)}
+	}
+	for _, v := range values {
+		dicts[v.DictType].Values = append(dicts[v.DictType].Values, v)
+	}
+	return dicts, nil
+}
+
 // CheckDictTypeUniqueAll 检查字典类型是否唯一
 func (s *DictDataService) CheckDictTypeUniqueAll(dictType string) bool {
 	dict, err := s.Dao.FindOne(s.Dao.C.DictType+"=?", dictType)

opms_admin/app/service/sys_user.go

@@ -220,6 +220,49 @@ func (s *UserService) GetUserByRole(roleId int) (userList []*model.SysUser, err
 	return userList, err
 }
 
+func (s *UserService) GetUsersByRoleKeys(roleKeys []string, roleIds []int) (userList []*model.SysUser, err error) {
+	var allRoleIds []int
+
+	if len(roleKeys) > 0 {
+		roleIdsFromKeys, err := dao.NewSysRoleDao(s.Tenant).
+			Fields(dao.SysRole.C.Id).
+			WhereIn(dao.SysRole.C.RoleKey, roleKeys).
+			Where(dao.SysRole.C.Status, "10").
+			Array()
+		if err != nil {
+			return nil, err
+		}
+		allRoleIds = append(allRoleIds, gconv.Ints(roleIdsFromKeys)...)
+	}
+
+	if len(roleIds) > 0 {
+		allRoleIds = append(allRoleIds, roleIds...)
+	}
+
+	if len(allRoleIds) == 0 {
+		return make([]*model.SysUser, 0), nil
+	}
+
+	userIds, err := dao.NewSysUserRoleDao(s.Tenant).
+		Fields(dao.SysUserRole.C.UserId).
+		WhereIn(dao.SysUserRole.C.RoleId, allRoleIds).
+		Array()
+	if err != nil {
+		return nil, err
+	}
+
+	if len(userIds) == 0 {
+		return make([]*model.SysUser, 0), nil
+	}
+
+	userList = make([]*model.SysUser, 0)
+	err = s.Dao.FieldsEx(s.Dao.C.Password, s.Dao.C.UserSalt).
+		Where(s.Dao.C.Status, "10").
+		WhereIn(s.Dao.C.Id, gconv.Ints(userIds)).
+		Scan(&userList)
+	return userList, err
+}
+
 // GetAdminUserByUsernamePassword 后台登陆验证
 func (s *UserService) GetAdminUserByUsernamePassword(ctx context.Context, req *model.LoginParamsReq) (user *model.LoginUserRes, err error) {
 	user, err = s.GetUserByUsernamePassword(ctx, req)

opms_admin/config/config.toml

@@ -1,11 +1,11 @@
 # 应用系统设置
 [setting]
     logpath = "./log/admin"
-    bind-addr = "127.0.0.1:8001"
+    bind-addr = "192.168.0.188:8001"
     need-advertise-addr = false
-    srv-name = "dashoo.opms.admin-0.0.1"
+    srv-name = "dashoo.opms.admin-0.0.1-cj"
     env = "dev"
-    websocket-addr = "127.0.0.1:8899"
+    websocket-addr = "192.168.0.188:8899"
 
 [logger.websocket]
     path   = "./log/websocket"
@@ -18,7 +18,8 @@
 # 微服务注册中心配置
 [service_registry]
     registry = "consul" # consul 或 peer2peer
-    server-addr = "127.0.0.1:8500"
+#    server-addr = "192.168.0.39:8500"
+    server-addr = "192.168.0.221:18500"
 
 # 数据库连接
 [database]
@@ -27,14 +28,13 @@
         createdAt = "created_time"
         updatedAt = "updated_time"
         deletedAt = "deleted_time"
-        link = "mysql:root:Dashoo#190801@ali@tcp(192.168.0.252:3306)/dashoo_crm"
+        link = "mysql:oms_u:S3TFPnthe3SaJpmV@tcp(sh-cdb-3dhdnseg.sql.tencentcdb.com:59463)/dashoo_oms"
     [[database.8b9ec443]]
         Debug = true
         createdAt = "created_time"
         updatedAt = "updated_time"
         deletedAt = "deleted_time"
-        link = "mysql:opms:Bgt5^yhn@tcp(rm-bp1j647875x906s19go.mysql.rds.aliyuncs.com:3306)/opms?loc=Local&parseTime=true"
-
+        link = "mysql:oms_u:S3TFPnthe3SaJpmV@tcp(sh-cdb-3dhdnseg.sql.tencentcdb.com:59463)/dashoo_oms"
 # token认证设置
 [gtoken]
     # 缓存模式 1 gcache 2 gredis
@@ -55,6 +55,7 @@
     aes-key="oUjmeWea8Ow1jsdK4UHoDthy6EMQKq3RGbM2rEeTgnm"
     token="WaasHsYk8V3wqwN5xRGsCmiiRDB"
 
+
 [email]
     From="likai@dashoo.cn"
     host="hwsmtp.exmail.qq.com"

opms_parent/README.md

@@ -34,5 +34,5 @@
 
 
 
-/gf gen dao -mode opsdev -t ops_delivery_project  -l "mysql:opms:Bgt5^yhn@tcp(rm-bp1j647875x906s19go.mysql.rds.aliyuncs.com:3306)/opms" 
+/gf gen dao -mode opsdev -t ops_event_task  -l "mysql:opms:Bgt5^yhn@tcp(rm-bp1j647875x906s19go.mysql.rds.aliyuncs.com:3306)/opms" 
 

opms_parent/app/dao/opsdev/internal/ops_event_task.go

@@ -31,6 +31,7 @@ type opsEventTaskColumns struct {
 	EventId          string // 关联事件ID（event表id）
 	EventType        string // 关联事件类型（10 交付 20 运维）
 	ProjectId        string // 交付项目ID
+	ProjectName      string // 项目名称
 	TaskNo           string // 任务编码
 	TaskTitle        string // 任务标题
 	TaskDesc         string // 任务描述
@@ -71,6 +72,7 @@ var (
 			EventId:          "event_id",
 			EventType:        "event_type",
 			ProjectId:        "project_id",
+			ProjectName:      "project_name",
 			TaskNo:           "task_no",
 			TaskTitle:        "task_title",
 			TaskDesc:         "task_desc",
@@ -113,6 +115,7 @@ func NewOpsEventTaskDao(tenant string) OpsEventTaskDao {
 			EventId:          "event_id",
 			EventType:        "event_type",
 			ProjectId:        "project_id",
+			ProjectName:      "project_name",
 			TaskNo:           "task_no",
 			TaskTitle:        "task_title",
 			TaskDesc:         "task_desc",

opms_parent/app/dao/opsdev/internal/ops_event_task_work_hour.go

@@ -0,0 +1,435 @@
+// ==========================================================================
+// This is auto-generated by gf cli tool. DO NOT EDIT THIS FILE MANUALLY.
+// ==========================================================================
+
+package internal
+
+import (
+	"context"
+	"database/sql"
+	"time"
+
+	"dashoo.cn/opms_parent/app/model/opsdev"
+	"github.com/gogf/gf/database/gdb"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/frame/gmvc"
+)
+
+// OpsEventTaskWorkHourDao is the manager for logic model data accessing
+// and custom defined data operations functions management.
+type OpsEventTaskWorkHourDao struct {
+	gmvc.M
+	DB      gdb.DB
+	Table   string
+	Columns opsEventTaskWorkHourColumns
+}
+
+// OpsEventTaskWorkHourColumns defines and stores column names for table ops_event_task_work_hour.
+type opsEventTaskWorkHourColumns struct {
+	Id             string // ID
+	TaskId         string // 关联事件ID（event表id）
+	OpsUserId      string // 执行人ID
+	OpsUserName    string // 执行人姓名
+	ActualWorkDate string // 工作日期
+	ActualWorkHour string // 工作时长（小时）
+	Remark         string // 工作说明
+	CreatedBy      string // 创建人ID
+	CreatedName    string // 创建人
+	CreatedTime    string // 创建时间
+	UpdatedBy      string // 更新人ID
+	UpdatedName    string // 更新人
+	UpdatedTime    string // 更新时间
+	DeletedTime    string // 删除时间
+}
+
+var (
+	// OpsEventTaskWorkHour is globally public accessible object for table ops_event_task_work_hour operations.
+	OpsEventTaskWorkHour = OpsEventTaskWorkHourDao{
+		M:     g.DB("default").Model("ops_event_task_work_hour").Safe(),
+		DB:    g.DB("default"),
+		Table: "ops_event_task_work_hour",
+		Columns: opsEventTaskWorkHourColumns{
+			Id:             "id",
+			TaskId:         "task_id",
+			OpsUserId:      "ops_user_id",
+			OpsUserName:    "ops_user_name",
+			ActualWorkDate: "actual_work_date",
+			ActualWorkHour: "actual_work_hour",
+			Remark:         "remark",
+			CreatedBy:      "created_by",
+			CreatedName:    "created_name",
+			CreatedTime:    "created_time",
+			UpdatedBy:      "updated_by",
+			UpdatedName:    "updated_name",
+			UpdatedTime:    "updated_time",
+			DeletedTime:    "deleted_time",
+		},
+	}
+)
+
+func NewOpsEventTaskWorkHourDao(tenant string) OpsEventTaskWorkHourDao {
+	var dao OpsEventTaskWorkHourDao
+	dao = OpsEventTaskWorkHourDao{
+		M:     g.DB(tenant).Model("ops_event_task_work_hour").Safe(),
+		DB:    g.DB(tenant),
+		Table: "ops_event_task_work_hour",
+		Columns: opsEventTaskWorkHourColumns{
+			Id:             "id",
+			TaskId:         "task_id",
+			OpsUserId:      "ops_user_id",
+			OpsUserName:    "ops_user_name",
+			ActualWorkDate: "actual_work_date",
+			ActualWorkHour: "actual_work_hour",
+			Remark:         "remark",
+			CreatedBy:      "created_by",
+			CreatedName:    "created_name",
+			CreatedTime:    "created_time",
+			UpdatedBy:      "updated_by",
+			UpdatedName:    "updated_name",
+			UpdatedTime:    "updated_time",
+			DeletedTime:    "deleted_time",
+		},
+	}
+	return dao
+}
+
+// Ctx is a chaining function, which creates and returns a new DB that is a shallow copy
+// of current DB object and with given context in it.
+// Note that this returned DB object can be used only once, so do not assign it to
+// a global or package variable for long using.
+func (d *OpsEventTaskWorkHourDao) Ctx(ctx context.Context) *OpsEventTaskWorkHourDao {
+	return &OpsEventTaskWorkHourDao{M: d.M.Ctx(ctx)}
+}
+
+// As sets an alias name for current table.
+func (d *OpsEventTaskWorkHourDao) As(as string) *OpsEventTaskWorkHourDao {
+	return &OpsEventTaskWorkHourDao{M: d.M.As(as)}
+}
+
+// TX sets the transaction for current operation.
+func (d *OpsEventTaskWorkHourDao) TX(tx *gdb.TX) *OpsEventTaskWorkHourDao {
+	return &OpsEventTaskWorkHourDao{M: d.M.TX(tx)}
+}
+
+// Master marks the following operation on master node.
+func (d *OpsEventTaskWorkHourDao) Master() *OpsEventTaskWorkHourDao {
+	return &OpsEventTaskWorkHourDao{M: d.M.Master()}
+}
+
+// Slave marks the following operation on slave node.
+// Note that it makes sense only if there's any slave node configured.
+func (d *OpsEventTaskWorkHourDao) Slave() *OpsEventTaskWorkHourDao {
+	return &OpsEventTaskWorkHourDao{M: d.M.Slave()}
+}
+
+// Args sets custom arguments for model operation.
+func (d *OpsEventTaskWorkHourDao) Args(args ...interface{}) *OpsEventTaskWorkHourDao {
+	return &OpsEventTaskWorkHourDao{M: d.M.Args(args...)}
+}
+
+// LeftJoin does "LEFT JOIN ... ON ..." statement on the model.
+// The parameter <table> can be joined table and its joined condition,
+// and also with its alias name, like:
+// Table("user").LeftJoin("user_detail", "user_detail.uid=user.uid")
+// Table("user", "u").LeftJoin("user_detail", "ud", "ud.uid=u.uid")
+func (d *OpsEventTaskWorkHourDao) LeftJoin(table ...string) *OpsEventTaskWorkHourDao {
+	return &OpsEventTaskWorkHourDao{M: d.M.LeftJoin(table...)}
+}
+
+// RightJoin does "RIGHT JOIN ... ON ..." statement on the model.
+// The parameter <table> can be joined table and its joined condition,
+// and also with its alias name, like:
+// Table("user").RightJoin("user_detail", "user_detail.uid=user.uid")
+// Table("user", "u").RightJoin("user_detail", "ud", "ud.uid=u.uid")
+func (d *OpsEventTaskWorkHourDao) RightJoin(table ...string) *OpsEventTaskWorkHourDao {
+	return &OpsEventTaskWorkHourDao{M: d.M.RightJoin(table...)}
+}
+
+// InnerJoin does "INNER JOIN ... ON ..." statement on the model.
+// The parameter <table> can be joined table and its joined condition,
+// and also with its alias name, like:
+// Table("user").InnerJoin("user_detail", "user_detail.uid=user.uid")
+// Table("user", "u").InnerJoin("user_detail", "ud", "ud.uid=u.uid")
+func (d *OpsEventTaskWorkHourDao) InnerJoin(table ...string) *OpsEventTaskWorkHourDao {
+	return &OpsEventTaskWorkHourDao{M: d.M.InnerJoin(table...)}
+}
+
+// Fields sets the operation fields of the model, multiple fields joined using char ','.
+// The parameter <fieldNamesOrMapStruct> can be type of string/map/*map/struct/*struct.
+func (d *OpsEventTaskWorkHourDao) Fields(fieldNamesOrMapStruct ...interface{}) *OpsEventTaskWorkHourDao {
+	return &OpsEventTaskWorkHourDao{M: d.M.Fields(fieldNamesOrMapStruct...)}
+}
+
+// FieldsEx sets the excluded operation fields of the model, multiple fields joined using char ','.
+// The parameter <fieldNamesOrMapStruct> can be type of string/map/*map/struct/*struct.
+func (d *OpsEventTaskWorkHourDao) FieldsEx(fieldNamesOrMapStruct ...interface{}) *OpsEventTaskWorkHourDao {
+	return &OpsEventTaskWorkHourDao{M: d.M.FieldsEx(fieldNamesOrMapStruct...)}
+}
+
+// Option sets the extra operation option for the model.
+func (d *OpsEventTaskWorkHourDao) Option(option int) *OpsEventTaskWorkHourDao {
+	return &OpsEventTaskWorkHourDao{M: d.M.Option(option)}
+}
+
+// OmitEmpty sets OPTION_OMITEMPTY option for the model, which automatically filers
+// the data and where attributes for empty values.
+func (d *OpsEventTaskWorkHourDao) OmitEmpty() *OpsEventTaskWorkHourDao {
+	return &OpsEventTaskWorkHourDao{M: d.M.OmitEmpty()}
+}
+
+// Filter marks filtering the fields which does not exist in the fields of the operated table.
+func (d *OpsEventTaskWorkHourDao) Filter() *OpsEventTaskWorkHourDao {
+	return &OpsEventTaskWorkHourDao{M: d.M.Filter()}
+}
+
+// Where sets the condition statement for the model. The parameter <where> can be type of
+// string/map/gmap/slice/struct/*struct, etc. Note that, if it's called more than one times,
+// multiple conditions will be joined into where statement using "AND".
+// Eg:
+// Where("uid=10000")
+// Where("uid", 10000)
+// Where("money>? AND name like ?", 99999, "vip_%")
+// Where("uid", 1).Where("name", "john")
+// Where("status IN (?)", g.Slice{1,2,3})
+// Where("age IN(?,?)", 18, 50)
+// Where(User{ Id : 1, UserName : "john"})
+func (d *OpsEventTaskWorkHourDao) Where(where interface{}, args ...interface{}) *OpsEventTaskWorkHourDao {
+	return &OpsEventTaskWorkHourDao{M: d.M.Where(where, args...)}
+}
+
+// WherePri does the same logic as M.Where except that if the parameter <where>
+// is a single condition like int/string/float/slice, it treats the condition as the primary
+// key value. That is, if primary key is "id" and given <where> parameter as "123", the
+// WherePri function treats the condition as "id=123", but M.Where treats the condition
+// as string "123".
+func (d *OpsEventTaskWorkHourDao) WherePri(where interface{}, args ...interface{}) *OpsEventTaskWorkHourDao {
+	return &OpsEventTaskWorkHourDao{M: d.M.WherePri(where, args...)}
+}
+
+// And adds "AND" condition to the where statement.
+func (d *OpsEventTaskWorkHourDao) And(where interface{}, args ...interface{}) *OpsEventTaskWorkHourDao {
+	return &OpsEventTaskWorkHourDao{M: d.M.And(where, args...)}
+}
+
+// Or adds "OR" condition to the where statement.
+func (d *OpsEventTaskWorkHourDao) Or(where interface{}, args ...interface{}) *OpsEventTaskWorkHourDao {
+	return &OpsEventTaskWorkHourDao{M: d.M.Or(where, args...)}
+}
+
+// Group sets the "GROUP BY" statement for the model.
+func (d *OpsEventTaskWorkHourDao) Group(groupBy string) *OpsEventTaskWorkHourDao {
+	return &OpsEventTaskWorkHourDao{M: d.M.Group(groupBy)}
+}
+
+// Order sets the "ORDER BY" statement for the model.
+func (d *OpsEventTaskWorkHourDao) Order(orderBy ...string) *OpsEventTaskWorkHourDao {
+	return &OpsEventTaskWorkHourDao{M: d.M.Order(orderBy...)}
+}
+
+// Limit sets the "LIMIT" statement for the model.
+// The parameter <limit> can be either one or two number, if passed two number is passed,
+// it then sets "LIMIT limit[0],limit[1]" statement for the model, or else it sets "LIMIT limit[0]"
+// statement.
+func (d *OpsEventTaskWorkHourDao) Limit(limit ...int) *OpsEventTaskWorkHourDao {
+	return &OpsEventTaskWorkHourDao{M: d.M.Limit(limit...)}
+}
+
+// Offset sets the "OFFSET" statement for the model.
+// It only makes sense for some databases like SQLServer, PostgreSQL, etc.
+func (d *OpsEventTaskWorkHourDao) Offset(offset int) *OpsEventTaskWorkHourDao {
+	return &OpsEventTaskWorkHourDao{M: d.M.Offset(offset)}
+}
+
+// Page sets the paging number for the model.
+// The parameter <page> is started from 1 for paging.
+// Note that, it differs that the Limit function start from 0 for "LIMIT" statement.
+func (d *OpsEventTaskWorkHourDao) Page(page, limit int) *OpsEventTaskWorkHourDao {
+	return &OpsEventTaskWorkHourDao{M: d.M.Page(page, limit)}
+}
+
+// Batch sets the batch operation number for the model.
+func (d *OpsEventTaskWorkHourDao) Batch(batch int) *OpsEventTaskWorkHourDao {
+	return &OpsEventTaskWorkHourDao{M: d.M.Batch(batch)}
+}
+
+// Cache sets the cache feature for the model. It caches the result of the sql, which means
+// if there's another same sql request, it just reads and returns the result from cache, it
+// but not committed and executed into the database.
+//
+// If the parameter <duration> < 0, which means it clear the cache with given <name>.
+// If the parameter <duration> = 0, which means it never expires.
+// If the parameter <duration> > 0, which means it expires after <duration>.
+//
+// The optional parameter <name> is used to bind a name to the cache, which means you can later
+// control the cache like changing the <duration> or clearing the cache with specified <name>.
+//
+// Note that, the cache feature is disabled if the model is operating on a transaction.
+func (d *OpsEventTaskWorkHourDao) Cache(duration time.Duration, name ...string) *OpsEventTaskWorkHourDao {
+	return &OpsEventTaskWorkHourDao{M: d.M.Cache(duration, name...)}
+}
+
+// Data sets the operation data for the model.
+// The parameter <data> can be type of string/map/gmap/slice/struct/*struct, etc.
+// Eg:
+// Data("uid=10000")
+// Data("uid", 10000)
+// Data(g.Map{"uid": 10000, "name":"john"})
+// Data(g.Slice{g.Map{"uid": 10000, "name":"john"}, g.Map{"uid": 20000, "name":"smith"})
+func (d *OpsEventTaskWorkHourDao) Data(data ...interface{}) *OpsEventTaskWorkHourDao {
+	return &OpsEventTaskWorkHourDao{M: d.M.Data(data...)}
+}
+
+// All does "SELECT FROM ..." statement for the model.
+// It retrieves the records from table and returns the result as []*model.OpsEventTaskWorkHour.
+// It returns nil if there's no record retrieved with the given conditions from table.
+//
+// The optional parameter <where> is the same as the parameter of M.Where function,
+// see M.Where.
+func (d *OpsEventTaskWorkHourDao) All(where ...interface{}) ([]*opsdev.OpsEventTaskWorkHour, error) {
+	all, err := d.M.All(where...)
+	if err != nil {
+		return nil, err
+	}
+	var entities []*opsdev.OpsEventTaskWorkHour
+	if err = all.Structs(&entities); err != nil && err != sql.ErrNoRows {
+		return nil, err
+	}
+	return entities, nil
+}
+
+// One retrieves one record from table and returns the result as *model.OpsEventTaskWorkHour.
+// It returns nil if there's no record retrieved with the given conditions from table.
+//
+// The optional parameter <where> is the same as the parameter of M.Where function,
+// see M.Where.
+func (d *OpsEventTaskWorkHourDao) One(where ...interface{}) (*opsdev.OpsEventTaskWorkHour, error) {
+	one, err := d.M.One(where...)
+	if err != nil {
+		return nil, err
+	}
+	var entity *opsdev.OpsEventTaskWorkHour
+	if err = one.Struct(&entity); err != nil && err != sql.ErrNoRows {
+		return nil, err
+	}
+	return entity, nil
+}
+
+// FindOne retrieves and returns a single Record by M.WherePri and M.One.
+// Also see M.WherePri and M.One.
+func (d *OpsEventTaskWorkHourDao) FindOne(where ...interface{}) (*opsdev.OpsEventTaskWorkHour, error) {
+	one, err := d.M.FindOne(where...)
+	if err != nil {
+		return nil, err
+	}
+	var entity *opsdev.OpsEventTaskWorkHour
+	if err = one.Struct(&entity); err != nil && err != sql.ErrNoRows {
+		return nil, err
+	}
+	return entity, nil
+}
+
+// FindAll retrieves and returns Result by by M.WherePri and M.All.
+// Also see M.WherePri and M.All.
+func (d *OpsEventTaskWorkHourDao) FindAll(where ...interface{}) ([]*opsdev.OpsEventTaskWorkHour, error) {
+	all, err := d.M.FindAll(where...)
+	if err != nil {
+		return nil, err
+	}
+	var entities []*opsdev.OpsEventTaskWorkHour
+	if err = all.Structs(&entities); err != nil && err != sql.ErrNoRows {
+		return nil, err
+	}
+	return entities, nil
+}
+
+// Struct retrieves one record from table and converts it into given struct.
+// The parameter <pointer> should be type of *struct/**struct. If type **struct is given,
+// it can create the struct internally during converting.
+//
+// The optional parameter <where> is the same as the parameter of Model.Where function,
+// see Model.Where.
+//
+// Note that it returns sql.ErrNoRows if there's no record retrieved with the given conditions
+// from table and <pointer> is not nil.
+//
+// Eg:
+// user := new(User)
+// err  := dao.User.Where("id", 1).Struct(user)
+//
+// user := (*User)(nil)
+// err  := dao.User.Where("id", 1).Struct(&user)
+func (d *OpsEventTaskWorkHourDao) Struct(pointer interface{}, where ...interface{}) error {
+	return d.M.Struct(pointer, where...)
+}
+
+// Structs retrieves records from table and converts them into given struct slice.
+// The parameter <pointer> should be type of *[]struct/*[]*struct. It can create and fill the struct
+// slice internally during converting.
+//
+// The optional parameter <where> is the same as the parameter of Model.Where function,
+// see Model.Where.
+//
+// Note that it returns sql.ErrNoRows if there's no record retrieved with the given conditions
+// from table and <pointer> is not empty.
+//
+// Eg:
+// users := ([]User)(nil)
+// err   := dao.User.Structs(&users)
+//
+// users := ([]*User)(nil)
+// err   := dao.User.Structs(&users)
+func (d *OpsEventTaskWorkHourDao) Structs(pointer interface{}, where ...interface{}) error {
+	return d.M.Structs(pointer, where...)
+}
+
+// Scan automatically calls Struct or Structs function according to the type of parameter <pointer>.
+// It calls function Struct if <pointer> is type of *struct/**struct.
+// It calls function Structs if <pointer> is type of *[]struct/*[]*struct.
+//
+// The optional parameter <where> is the same as the parameter of Model.Where function,
+// see Model.Where.
+//
+// Note that it returns sql.ErrNoRows if there's no record retrieved and given pointer is not empty or nil.
+//
+// Eg:
+// user  := new(User)
+// err   := dao.User.Where("id", 1).Scan(user)
+//
+// user  := (*User)(nil)
+// err   := dao.User.Where("id", 1).Scan(&user)
+//
+// users := ([]User)(nil)
+// err   := dao.User.Scan(&users)
+//
+// users := ([]*User)(nil)
+// err   := dao.User.Scan(&users)
+func (d *OpsEventTaskWorkHourDao) Scan(pointer interface{}, where ...interface{}) error {
+	return d.M.Scan(pointer, where...)
+}
+
+// Chunk iterates the table with given size and callback function.
+func (d *OpsEventTaskWorkHourDao) Chunk(limit int, callback func(entities []*opsdev.OpsEventTaskWorkHour, err error) bool) {
+	d.M.Chunk(limit, func(result gdb.Result, err error) bool {
+		var entities []*opsdev.OpsEventTaskWorkHour
+		err = result.Structs(&entities)
+		if err == sql.ErrNoRows {
+			return false
+		}
+		return callback(entities, err)
+	})
+}
+
+// LockUpdate sets the lock for update for current operation.
+func (d *OpsEventTaskWorkHourDao) LockUpdate() *OpsEventTaskWorkHourDao {
+	return &OpsEventTaskWorkHourDao{M: d.M.LockUpdate()}
+}
+
+// LockShared sets the lock in share mode for current operation.
+func (d *OpsEventTaskWorkHourDao) LockShared() *OpsEventTaskWorkHourDao {
+	return &OpsEventTaskWorkHourDao{M: d.M.LockShared()}
+}
+
+// Unscoped enables/disables the soft deleting feature.
+func (d *OpsEventTaskWorkHourDao) Unscoped() *OpsEventTaskWorkHourDao {
+	return &OpsEventTaskWorkHourDao{M: d.M.Unscoped()}
+}

opms_parent/app/dao/opsdev/ops_event_task_work_hour.go

@@ -0,0 +1,36 @@
+// ============================================================================
+// This is auto-generated by gf cli tool only once. Fill this file as you wish.
+// ============================================================================
+
+package opsdev
+
+import (
+	"dashoo.cn/opms_parent/app/dao/opsdev/internal"
+)
+
+// opsEventTaskWorkHourDao is the manager for logic model data accessing
+// and custom defined data operations functions management. You can define
+// methods on it to extend its functionality as you wish.
+type opsEventTaskWorkHourDao struct {
+	internal.OpsEventTaskWorkHourDao
+}
+
+var (
+	// OpsEventTaskWorkHour is globally public accessible object for table ops_event_task_work_hour operations.
+	OpsEventTaskWorkHour = opsEventTaskWorkHourDao{
+		internal.OpsEventTaskWorkHour,
+	}
+)
+
+type OpsEventTaskWorkHourDao struct {
+	internal.OpsEventTaskWorkHourDao
+}
+
+func NewOpsEventTaskWorkHourDao(tenant string) *OpsEventTaskWorkHourDao {
+	dao := internal.NewOpsEventTaskWorkHourDao(tenant)
+	return &OpsEventTaskWorkHourDao{
+		dao,
+	}
+}
+
+// Fill with you ideas below.

opms_parent/app/handler/base/distributor_contact.go

@@ -2,6 +2,7 @@ package base
 
 import (
 	"context"
+
 	model "dashoo.cn/opms_parent/app/model/base"
 	service "dashoo.cn/opms_parent/app/service/base"
 

opms_parent/app/handler/base/distributor_target.go

@@ -2,6 +2,7 @@ package base
 
 import (
 	"context"
+
 	model "dashoo.cn/opms_parent/app/model/base"
 	service "dashoo.cn/opms_parent/app/service/base"
 

opms_parent/app/handler/base/region.go

@@ -2,6 +2,7 @@ package base
 
 import (
 	"context"
+
 	"github.com/gogf/gf/util/gvalid"
 
 	"dashoo.cn/common_definition/comm_def"

opms_parent/app/handler/contract/ctr_contract_sale_target.go

@@ -2,6 +2,7 @@ package contract
 
 import (
 	"context"
+
 	"dashoo.cn/common_definition/comm_def"
 	model "dashoo.cn/opms_parent/app/model/contract"
 	service "dashoo.cn/opms_parent/app/service/contract"

opms_parent/app/handler/cust/cust_customer_bid_record.go

@@ -2,6 +2,7 @@ package cust
 
 import (
 	"context"
+
 	model "dashoo.cn/opms_parent/app/model/cust"
 	service "dashoo.cn/opms_parent/app/service/cust"
 	"github.com/gogf/gf/frame/g"

opms_parent/app/handler/cust/cust_customer_invoice_header.go

@@ -2,6 +2,7 @@ package cust
 
 import (
 	"context"
+
 	model "dashoo.cn/opms_parent/app/model/cust"
 	service "dashoo.cn/opms_parent/app/service/cust"
 

opms_parent/app/handler/cust/product_consult_record.go

@@ -2,6 +2,7 @@ package cust
 
 import (
 	"context"
+
 	model "dashoo.cn/opms_parent/app/model/cust"
 	service "dashoo.cn/opms_parent/app/service/cust"
 

opms_parent/app/handler/dingtalk/ding_event.go

@@ -2,6 +2,9 @@ package dingtalk
 
 import (
 	"context"
+	"database/sql"
+	"fmt"
+
 	"dashoo.cn/opms_libary/plugin/dingtalk"
 	dingContext "dashoo.cn/opms_libary/plugin/dingtalk/context"
 	"dashoo.cn/opms_libary/plugin/dingtalk/message"
@@ -14,8 +17,6 @@ import (
 	projService "dashoo.cn/opms_parent/app/service/proj"
 	workService "dashoo.cn/opms_parent/app/service/work"
 	workflowServer "dashoo.cn/opms_parent/app/service/workflow"
-	"database/sql"
-	"fmt"
 	"github.com/gogf/gf/os/glog"
 	"github.com/gogf/gf/util/gconv"
 )

opms_parent/app/handler/home/home.go

@@ -2,6 +2,7 @@ package home
 
 import (
 	"context"
+
 	"dashoo.cn/common_definition/comm_def"
 	model "dashoo.cn/opms_parent/app/model/home"
 	service "dashoo.cn/opms_parent/app/service/home"

opms_parent/app/handler/opsdev/delivery_project.go

@@ -28,6 +28,20 @@ func (h *DeliveryProjectHandler) GetList(ctx context.Context, req *opsdevmodel.O
 	return nil
 }
 
+// GetListAll 获取所有交付项目列表（不带权限校验，用于下拉选择等场景）
+func (h *DeliveryProjectHandler) GetListAll(ctx context.Context, req *opsdevmodel.OpsDeliveryProjectSearchReq, rsp *comm_def.CommonMsg) error {
+	srv, err := opsdevSrv.NewDeliveryProjectService(ctx)
+	if err != nil {
+		return err
+	}
+	total, list, err := srv.GetListAll(req)
+	if err != nil {
+		return err
+	}
+	rsp.Data = g.Map{"list": list, "total": total}
+	return nil
+}
+
 // GetEntityById 根据ID获取详情
 func (h *DeliveryProjectHandler) GetEntityById(ctx context.Context, req *comm_def.IdReq, rsp *comm_def.CommonMsg) error {
 	srv, err := opsdevSrv.NewDeliveryProjectService(ctx)

opms_parent/app/handler/opsdev/delivery_project_event.go

@@ -4,11 +4,11 @@ import (
 	"context"
 
 	"dashoo.cn/common_definition/comm_def"
+	"dashoo.cn/opms_libary/myerrors"
 	eventmodel "dashoo.cn/opms_parent/app/model/opsdev"
 	services "dashoo.cn/opms_parent/app/service/opsdev"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/util/gvalid"
-	"dashoo.cn/opms_libary/myerrors"
 )
 
 // DeliveryProjectEventHandler 交付项目事件接口处理类
@@ -51,7 +51,7 @@ func (h *DeliveryProjectEventHandler) Create(ctx context.Context, req *eventmode
 		return err
 	}
 
-	rsp.Data = g.Map{"msg": "新增成功"}
+	rsp.Data = g.Map{"message": "新增成功"}
 	return nil
 }
 
@@ -73,7 +73,7 @@ func (h *DeliveryProjectEventHandler) UpdateById(ctx context.Context, req *event
 		return err
 	}
 
-	rsp.Data = g.Map{"msg": "更新成功"}
+	rsp.Data = g.Map{"message": "更新成功"}
 	return nil
 }
 
@@ -95,7 +95,7 @@ func (h *DeliveryProjectEventHandler) DeleteByIds(ctx context.Context, req *even
 		return err
 	}
 
-	rsp.Data = g.Map{"msg": "删除成功"}
+	rsp.Data = g.Map{"message": "删除成功"}
 	return nil
 }
 
@@ -186,7 +186,7 @@ func (h *DeliveryProjectEventHandler) AddRecord(ctx context.Context, req *eventm
 		return err
 	}
 
-	rsp.Data = g.Map{"msg": "添加成功"}
+	rsp.Data = g.Map{"message": "添加成功"}
 	return nil
 }
 
@@ -208,6 +208,6 @@ func (h *DeliveryProjectEventHandler) Cancel(ctx context.Context, req *eventmode
 		return err
 	}
 
-	rsp.Data = g.Map{"msg": "作废成功"}
+	rsp.Data = g.Map{"message": "作废成功"}
 	return nil
-}
+}

opms_parent/app/handler/opsdev/ops_event_task.go

@@ -4,9 +4,9 @@ import (
 	"context"
 
 	"dashoo.cn/common_definition/comm_def"
+	"dashoo.cn/opms_libary/myerrors"
 	opsdevmodel "dashoo.cn/opms_parent/app/model/opsdev"
 	services "dashoo.cn/opms_parent/app/service/opsdev"
-	"dashoo.cn/opms_libary/myerrors"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/util/gvalid"
 )
@@ -40,7 +40,7 @@ func (h *OpsEventTaskHandler) Create(ctx context.Context, req *opsdevmodel.OpsEv
 	if err := s.Create(req); err != nil {
 		return err
 	}
-	rsp.Data = g.Map{"msg": "新增成功"}
+	rsp.Data = g.Map{"message": "新增成功"}
 	return nil
 }
 
@@ -56,7 +56,7 @@ func (h *OpsEventTaskHandler) UpdateById(ctx context.Context, req *opsdevmodel.O
 	if err := s.UpdateById(req); err != nil {
 		return err
 	}
-	rsp.Data = g.Map{"msg": "更新成功"}
+	rsp.Data = g.Map{"message": "更新成功"}
 	return nil
 }
 
@@ -72,7 +72,7 @@ func (h *OpsEventTaskHandler) DeleteByIds(ctx context.Context, req *opsdevmodel.
 	if err := s.DeleteByIds(req.Ids); err != nil {
 		return err
 	}
-	rsp.Data = g.Map{"msg": "删除成功"}
+	rsp.Data = g.Map{"message": "删除成功"}
 	return nil
 }
 
@@ -105,7 +105,7 @@ func (h *OpsEventTaskHandler) Schedule(ctx context.Context, req *opsdevmodel.Ops
 	if err := s.Schedule(req); err != nil {
 		return err
 	}
-	rsp.Data = g.Map{"msg": "排期成功"}
+	rsp.Data = g.Map{"message": "排期成功"}
 	return nil
 }
 
@@ -121,13 +121,12 @@ func (h *OpsEventTaskHandler) Start(ctx context.Context, req *opsdevmodel.OpsEve
 	if err := s.Start(req); err != nil {
 		return err
 	}
-	rsp.Data = g.Map{"msg": "任务已开始"}
+	rsp.Data = g.Map{"message": "任务已开始"}
 	return nil
 }
 
 // Complete 完成
 func (h *OpsEventTaskHandler) Complete(ctx context.Context, req *opsdevmodel.OpsEventTaskCompleteReq, rsp *comm_def.CommonMsg) error {
-	g.Log().Infof("Handler received req: %+v", req)
 	if err := gvalid.CheckStruct(ctx, req, nil); err != nil {
 		return myerrors.ValidError(err.Error())
 	}
@@ -138,7 +137,7 @@ func (h *OpsEventTaskHandler) Complete(ctx context.Context, req *opsdevmodel.Ops
 	if err := s.Complete(req); err != nil {
 		return err
 	}
-	rsp.Data = g.Map{"msg": "任务已完成"}
+	rsp.Data = g.Map{"message": "任务已完成"}
 	return nil
 }
 
@@ -154,7 +153,7 @@ func (h *OpsEventTaskHandler) Pause(ctx context.Context, req *opsdevmodel.OpsEve
 	if err := s.Pause(req); err != nil {
 		return err
 	}
-	rsp.Data = g.Map{"msg": "任务已暂停"}
+	rsp.Data = g.Map{"message": "任务已暂停"}
 	return nil
 }
 
@@ -170,7 +169,7 @@ func (h *OpsEventTaskHandler) Block(ctx context.Context, req *opsdevmodel.OpsEve
 	if err := s.Block(req); err != nil {
 		return err
 	}
-	rsp.Data = g.Map{"msg": "任务已阻塞"}
+	rsp.Data = g.Map{"message": "任务已阻塞"}
 	return nil
 }
 
@@ -186,7 +185,7 @@ func (h *OpsEventTaskHandler) Cancel(ctx context.Context, req *opsdevmodel.OpsEv
 	if err := s.Cancel(req); err != nil {
 		return err
 	}
-	rsp.Data = g.Map{"msg": "任务已作废"}
+	rsp.Data = g.Map{"message": "任务已作废"}
 	return nil
 }
 
@@ -253,6 +252,39 @@ func (h *OpsEventTaskHandler) AddRecord(ctx context.Context, req *opsdevmodel.Op
 	if err := s.AddRecord(req); err != nil {
 		return err
 	}
-	rsp.Data = g.Map{"msg": "添加成功"}
+	rsp.Data = g.Map{"message": "添加成功"}
+	return nil
+}
+
+// AddWorkHour 添加工时登记
+func (h *OpsEventTaskHandler) AddWorkHour(ctx context.Context, req *opsdevmodel.OpsEventTaskWorkHourAddReq, rsp *comm_def.CommonMsg) error {
+	if err := gvalid.CheckStruct(ctx, req, nil); err != nil {
+		return myerrors.ValidError(err.Error())
+	}
+	s, err := services.NewOpsEventTaskService(ctx)
+	if err != nil {
+		return err
+	}
+	if err := s.AddWorkHour(req); err != nil {
+		return err
+	}
+	rsp.Data = g.Map{"message": "工时登记成功"}
+	return nil
+}
+
+// GetWorkHourList 获取工时登记列表
+func (h *OpsEventTaskHandler) GetWorkHourList(ctx context.Context, req *opsdevmodel.OpsEventTaskWorkHourListReq, rsp *comm_def.CommonMsg) error {
+	if err := gvalid.CheckStruct(ctx, req, nil); err != nil {
+		return myerrors.ValidError(err.Error())
+	}
+	s, err := services.NewOpsEventTaskService(ctx)
+	if err != nil {
+		return err
+	}
+	list, err := s.GetWorkHourList(req)
+	if err != nil {
+		return err
+	}
+	rsp.Data = g.Map{"list": list}
 	return nil
 }

opms_parent/app/handler/opsdev/project_inventory.go

@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"dashoo.cn/common_definition/comm_def"
+	"dashoo.cn/opms_libary/myerrors"
 	"dashoo.cn/opms_parent/app/model/opsdev"
 	opssrv "dashoo.cn/opms_parent/app/service/opsdev"
 	"github.com/gogf/gf/frame/g"
@@ -40,7 +41,7 @@ func (h *ProjectInventoryHandler) GetProjectManagers(ctx context.Context, req *o
 
 func (h *ProjectInventoryHandler) GetContractProducts(ctx context.Context, req *opsdev.ContractProductReq, rsp *comm_def.CommonMsg) error {
 	if err := gvalid.CheckStruct(ctx, req, nil); err != nil {
-		return err
+		return myerrors.ValidError(err.Error())
 	}
 	srv, err := opssrv.NewProjectInventoryService(ctx)
 	if err != nil {

opms_parent/app/handler/plat/followup_comment.go

@@ -2,6 +2,7 @@ package plat
 
 import (
 	"context"
+
 	"dashoo.cn/opms_libary/myerrors"
 
 	"dashoo.cn/common_definition/comm_def"

opms_parent/app/handler/plat/questionnaire.go

@@ -2,6 +2,7 @@ package plat
 
 import (
 	"context"
+
 	"dashoo.cn/common_definition/comm_def"
 	model "dashoo.cn/opms_parent/app/model/plat"
 	server "dashoo.cn/opms_parent/app/service/plat"

opms_parent/app/handler/proj/business.go

@@ -2,6 +2,7 @@ package base
 
 import (
 	"context"
+
 	"dashoo.cn/opms_libary/multipart"
 	"dashoo.cn/opms_libary/myerrors"
 	"github.com/gogf/gf/frame/g"

opms_parent/app/handler/proj/business_contact.go

@@ -2,6 +2,7 @@ package base
 
 import (
 	"context"
+
 	"dashoo.cn/common_definition/comm_def"
 	"dashoo.cn/opms_libary/myerrors"
 	"github.com/gogf/gf/frame/g"

opms_parent/app/handler/proj/business_file.go

@@ -2,6 +2,7 @@ package base
 
 import (
 	"context"
+
 	"dashoo.cn/common_definition/comm_def"
 	"dashoo.cn/opms_libary/myerrors"
 	"github.com/gogf/gf/util/gvalid"

opms_parent/app/handler/proj/business_team.go

@@ -2,6 +2,7 @@ package base
 
 import (
 	"context"
+
 	"dashoo.cn/common_definition/comm_def"
 	"dashoo.cn/opms_libary/myerrors"
 	"github.com/gogf/gf/util/gvalid"

opms_parent/app/handler/sysreport/sys_report.go

@@ -2,6 +2,7 @@ package sysreport
 
 import (
 	"context"
+
 	"dashoo.cn/common_definition/comm_def"
 	model "dashoo.cn/opms_parent/app/model/contract"
 	"dashoo.cn/opms_parent/app/model/sys_report"

opms_parent/app/handler/sysreport/sys_role_report.go

@@ -2,6 +2,7 @@ package sysreport
 
 import (
 	"context"
+
 	"dashoo.cn/common_definition/comm_def"
 	model "dashoo.cn/opms_parent/app/model/contract"
 	"dashoo.cn/opms_parent/app/model/sys_report"

opms_parent/app/handler/sysreport/work_order_report.go

@@ -2,6 +2,7 @@ package sysreport
 
 import (
 	"context"
+
 	"dashoo.cn/common_definition/comm_def"
 	"dashoo.cn/opms_parent/app/model/sys_report"
 	service "dashoo.cn/opms_parent/app/service/sys_report"

opms_parent/app/handler/train/sale_apply.go

@@ -2,6 +2,7 @@ package train
 
 import (
 	"context"
+
 	"dashoo.cn/common_definition/comm_def"
 	model "dashoo.cn/opms_parent/app/model/train"
 	service "dashoo.cn/opms_parent/app/service/train"

opms_parent/app/handler/train/sale_apply_summary.go

@@ -2,6 +2,7 @@ package train
 
 import (
 	"context"
+
 	"dashoo.cn/common_definition/comm_def"
 	model "dashoo.cn/opms_parent/app/model/train"
 	service "dashoo.cn/opms_parent/app/service/train"

opms_parent/app/handler/train/train_head_office.go

@@ -2,6 +2,7 @@ package train
 
 import (
 	"context"
+
 	"dashoo.cn/common_definition/comm_def"
 	"dashoo.cn/opms_libary/myerrors"
 	"github.com/gogf/gf/frame/g"

opms_parent/app/handler/work/work_order.go

@@ -2,6 +2,7 @@ package work
 
 import (
 	"context"
+
 	"dashoo.cn/opms_libary/multipart"
 	"dashoo.cn/opms_libary/myerrors"
 	"github.com/gogf/gf/util/gconv"

opms_parent/app/handler/work/work_order_type.go

@@ -2,6 +2,7 @@ package work
 
 import (
 	"context"
+
 	"dashoo.cn/common_definition/comm_def"
 	"dashoo.cn/opms_libary/myerrors"
 	"github.com/gogf/gf/frame/g"

opms_parent/app/model/opsdev/internal/ops_event_task.go

@@ -14,6 +14,7 @@ type OpsEventTask struct {
 	EventId          int         `orm:"event_id"           json:"eventId"`          // 关联事件ID（event表id）
 	EventType        string      `orm:"event_type"         json:"eventType"`        // 关联事件类型（10 交付 20 运维）
 	ProjectId        int         `orm:"project_id"         json:"projectId"`        // 交付项目ID
+	ProjectName      string      `orm:"project_name"       json:"projectName"`      // 项目名称
 	TaskNo           string      `orm:"task_no"            json:"taskNo"`           // 任务编码
 	TaskTitle        string      `orm:"task_title"         json:"taskTitle"`        // 任务标题
 	TaskDesc         string      `orm:"task_desc"          json:"taskDesc"`         // 任务描述

opms_parent/app/model/opsdev/internal/ops_event_task_work_hour.go

@@ -0,0 +1,27 @@
+// ==========================================================================
+// This is auto-generated by gf cli tool. DO NOT EDIT THIS FILE MANUALLY.
+// ==========================================================================
+
+package internal
+
+import (
+	"github.com/gogf/gf/os/gtime"
+)
+
+// OpsEventTaskWorkHour is the golang structure for table ops_event_task_work_hour.
+type OpsEventTaskWorkHour struct {
+	Id             int         `orm:"id,primary"       json:"id"`             // ID
+	TaskId         int         `orm:"task_id"          json:"taskId"`         // 关联事件ID（event表id）
+	OpsUserId      int         `orm:"ops_user_id"      json:"opsUserId"`      // 执行人ID
+	OpsUserName    string      `orm:"ops_user_name"    json:"opsUserName"`    // 执行人姓名
+	ActualWorkDate *gtime.Time `orm:"actual_work_date" json:"actualWorkDate"` // 工作日期
+	ActualWorkHour float64     `orm:"actual_work_hour" json:"actualWorkHour"` // 工作时长（小时）
+	Remark         string      `orm:"remark"           json:"remark"`         // 工作说明
+	CreatedBy      int         `orm:"created_by"       json:"createdBy"`      // 创建人ID
+	CreatedName    string      `orm:"created_name"     json:"createdName"`    // 创建人
+	CreatedTime    *gtime.Time `orm:"created_time"     json:"createdTime"`    // 创建时间
+	UpdatedBy      int         `orm:"updated_by"       json:"updatedBy"`      // 更新人ID
+	UpdatedName    string      `orm:"updated_name"     json:"updatedName"`    // 更新人
+	UpdatedTime    *gtime.Time `orm:"updated_time"     json:"updatedTime"`    // 更新时间
+	DeletedTime    *gtime.Time `orm:"deleted_time"     json:"deletedTime"`    // 删除时间
+}

opms_parent/app/model/opsdev/operation.go

@@ -45,7 +45,7 @@ type OpsOperationEventReq struct {
 
 // UpdateOpsOperationEventReq 运维事件更新请求
 type UpdateOpsOperationEventReq struct {
-	Id int `json:"id" v:"min:1#ID不能为空"` // 主键
+	Id int64 `json:"id" v:"min:1#ID不能为空"` // 主键
 	OpsOperationEventReq
 }
 
@@ -71,8 +71,8 @@ type OpsOperationEventRecordWithAttachments struct {
 
 // OpsOperationEventAttachmentReq 附件上传请求
 type OpsOperationEventAttachmentReq struct {
-	EventId       int    `json:"eventId"       v:"min:1#事件ID不能为空"`    // 事件ID
-	EventRecordId int    `json:"eventRecordId"`                       // 事件记录ID
+	EventId       int64  `json:"eventId"       v:"min:1#事件ID不能为空"`    // 事件ID
+	EventRecordId int64  `json:"eventRecordId"`                       // 事件记录ID
 	FileName      string `json:"fileName"      v:"required#文件名不能为空"`  // 文件名
 	FileUrl       string `json:"fileUrl"       v:"required#文件地址不能为空"` // 文件地址
 	FileType      string `json:"fileType"`                            // 文件类型

opms_parent/app/model/opsdev/ops_delivery_project.go

@@ -74,11 +74,6 @@ type OpsDeliveryProjectUpdateReq struct {
 	Remark           string `json:"remark"`
 }
 
-// OpsDeliveryProjectDeleteReq 删除请求
-type OpsDeliveryProjectDeleteReq struct {
-	Ids []int `json:"ids" v:"required#ID不能为空"`
-}
-
 // AssignDeliveryUserReq 指派/改派交付负责人请求
 type AssignDeliveryUserReq struct {
 	ProjectId        int    `json:"projectId" v:"required#项目ID不能为空"`      // 项目ID
@@ -93,4 +88,3 @@ type AssignDeliveryUserReq struct {
 	Remark           string `json:"remark"`                                     // 备注
 }
 
-// Fill with you ideas below.

opms_parent/app/model/opsdev/ops_delivery_project_event.go

@@ -37,7 +37,7 @@ type OpsDeliveryProjectEventSearchReq struct {
 	DeliveryEventResult []string `json:"deliveryEventResult"` // 事件结果（多选）
 	FeedbackSource      string   `json:"feedbackSource"`      // 反馈来源
 	FeedbackReporter    string   `json:"feedbackReporter"`    // 反馈人
-	OpsUserName         string   `json:"opsUserName"`         // 负责人
+	OpsUserName         []string `json:"opsUserName"`         // 负责人（多选）
 	FeedbackDateStart   string   `json:"feedbackDateStart"`   // 反馈时间开始
 	FeedbackDateEnd     string   `json:"feedbackDateEnd"`     // 反馈时间结束
 	CompleteTimeStart   string   `json:"completeTimeStart"`   // 处理时间开始
@@ -54,6 +54,11 @@ type OpsDeliveryProjectEventAddReq struct {
 	FeedbackSource      string `json:"feedbackSource" v:"required#反馈来源不能为空"`     // 反馈来源
 	FeedbackReporter    string `json:"feedbackReporter" v:"required#反馈人不能为空"`    // 反馈人
 	OnSite              string `json:"onSite"`                                     // 是否现场
+	OpsUserId           int    `json:"opsUserId"`                                  // 执行人ID
+	OpsUserName         string `json:"opsUserName"`                                // 执行人姓名
+	Attribute1          string `json:"attribute1"`                                 // 物流单号
+	CompleteTime        string `json:"completeTime"`                               // 执行时间
+	ActualWorkHour      float64 `json:"actualWorkHour"`                            // 实际工作量（小时）
 	Attachments         []OpsDeliveryProjectEventAttachmentReq `json:"attachments"` // 附件列表
 }
 
@@ -73,6 +78,7 @@ type OpsDeliveryProjectEventUpdateReq struct {
 	CompleteDesc        string  `json:"completeDesc"`        // 处理说明（处理/关闭时传入）
 	CompleteTime        string  `json:"completeTime"`        // 完成时间（处理/关闭时传入）
 	ActualWorkHour      float64 `json:"actualWorkHour"`      // 实际工作量（处理/关闭时传入）
+	Attribute1          string  `json:"attribute1"`          // 物流单号
 }
 
 // OpsDeliveryProjectEventDeleteReq 删除请求

opms_parent/app/model/opsdev/ops_delivery_project_event_attachment.go

@@ -11,4 +11,3 @@ import (
 // OpsDeliveryProjectEventAttachment is the golang structure for table ops_delivery_project_event_attachment.
 type OpsDeliveryProjectEventAttachment internal.OpsDeliveryProjectEventAttachment
 
-// Fill with you ideas below.

opms_parent/app/model/opsdev/ops_delivery_project_event_record.go

@@ -11,4 +11,3 @@ import (
 // OpsDeliveryProjectEventRecord is the golang structure for table ops_delivery_project_event_record.
 type OpsDeliveryProjectEventRecord internal.OpsDeliveryProjectEventRecord
 
-// Fill with you ideas below.

opms_parent/app/model/opsdev/ops_event_task.go

@@ -25,11 +25,14 @@ const (
 
 // Task Type Constants
 const (
-	TaskTypeReqReview     = "10" // 需求评审
-	TaskTypeFeatureDev    = "20" // 功能开发
-	TaskTypeFeatureTest   = "30" // 功能测试
-	TaskTypeBug           = "35" // BUG
-	TaskTypeSystemRelease = "40" // 系统发版
+	TaskTypeReqReview         = "10" // 需求评审
+	TaskTypeFeatureDev        = "20" // 功能开发
+	TaskTypeFeatureTest       = "30" // 功能测试
+	TaskTypeBug               = "35" // BUG
+	TaskTypeSystemRelease     = "40" // 系统发版
+	TaskTypeSystemReleaseEvt  = "38" // 系统发版（事件关联自动创建）
+	TaskTypeHardwareDeliver   = "42" // 硬件发货
+	TaskTypeHardwareInstall   = "41" // 硬件安装
 )
 
 // Priority Constants
@@ -56,13 +59,14 @@ type Attachment struct {
 // OpsEventTaskSearchReq 任务列表查询请求
 type OpsEventTaskSearchReq struct {
 	request.PageReq
-	ProjectId        int         `json:"projectId"`        // 项目ID
-	TaskTitle        string      `json:"taskTitle"`        // 任务标题（模糊查询）
-	TaskType         []string    `json:"taskType"`         // 任务类型（多选）
-	TaskStatus       []string    `json:"taskStatus"`       // 任务状态（多选）
-	Priority         []string    `json:"priority"`         // 优先级（多选）
-	OpsUserName      string      `json:"opsUserName"`      // 执行人姓名（模糊查询）
-	SortFields       []SortField `json:"sortFields"`       // 排序字段
+	ProjectId           int         `json:"projectId"`           // 项目ID
+	EventId             int         `json:"eventId"`             // 关联事件ID
+	TaskTitle           string      `json:"taskTitle"`           // 任务标题（模糊查询）
+	TaskType            []string    `json:"taskType"`            // 任务类型（多选）
+	TaskStatus          []string    `json:"taskStatus"`          // 任务状态（多选）
+	Priority            []string    `json:"priority"`            // 优先级（多选）
+	OpsUserName         []string    `json:"opsUserName"`         // 执行人姓名（多选）
+	SortFields          []SortField `json:"sortFields"`          // 排序字段
 	// 计划结束日期范围
 	PlanEndDateStart string `json:"planEndDateStart"` // 计划结束开始日期
 	PlanEndDateEnd   string `json:"planEndDateEnd"`   // 计划结束结束日期
@@ -72,6 +76,8 @@ type OpsEventTaskSearchReq struct {
 	// 完成日期范围
 	CompleteTimeStart string `json:"completeTimeStart"` // 完成开始日期
 	CompleteTimeEnd   string `json:"completeTimeEnd"`   // 完成结束日期
+	// 发布版本为空查询（用于发版任务选择未发版任务）
+	ReleaseVersionEmpty bool `json:"releaseVersionEmpty"` // 是否查询release_version为空的任务
 }
 
 // OpsEventTaskAddReq 新增任务请求
@@ -93,6 +99,7 @@ type OpsEventTaskAddReq struct {
 	EventId          int          `json:"eventId"`                                     // 关联事件ID
 	EventType        string       `json:"eventType"`                                   // 关联事件类型
 	TaskParentId     int          `json:"taskParentId"`                                // 父任务ID
+	Attribute2       string       `json:"attribute2"`                                  // 历史遗留（10-是 20-否）
 	Attachments      []Attachment `json:"attachments"`                                 // 附件列表
 }
 
@@ -112,6 +119,7 @@ type OpsEventTaskUpdateReq struct {
 	DefectType       string  `json:"defectType"`                   // 缺陷类型（10前端 20后端）
 	ReleaseVersion   string  `json:"releaseVersion"`               // 发布版本
 	Remark           string  `json:"remark"`                       // 备注
+	Attribute2       string  `json:"attribute2"`                   // 历史遗留（10-是 20-否）
 }
 
 // OpsEventTaskScheduleReq 任务排期请求
@@ -194,6 +202,7 @@ type OpsEventTaskRsp struct {
 	FunctionName   string `json:"functionName"`   // 功能模块
 	DefectType     string `json:"defectType"`     // 缺陷类型
 	ReleaseVersion string `json:"releaseVersion"` // 发布版本
+	Attribute2     string `json:"attribute2"`     // 历史遗留（10-是 20-否）
 	// 关联信息
 	ProjectName string `json:"projectName"` // 项目名称
 	ContractNo  string `json:"contractNo"`  // 合同编号
@@ -222,11 +231,6 @@ type IdReq struct {
 	Id int `json:"id" v:"required#ID不能为空"` // ID
 }
 
-// IdsReq 批量ID请求
-type IdsReq struct {
-	Ids []int64 `json:"ids" v:"required#ID列表不能为空"` // ID列表
-}
-
 // OpsEventTaskReleaseListReq 查询发布版本关联任务请求
 type OpsEventTaskReleaseListReq struct {
 	ReleaseTaskId int `json:"releaseTaskId" v:"required#发版任务ID不能为空"` // 发版任务ID
@@ -244,3 +248,27 @@ type OpsEventTaskReleaseRsp struct {
 	ProjectId   int    `json:"projectId"`   // 项目ID
 	CreatedTime string `json:"createdTime"` // 创建时间
 }
+
+// OpsEventTaskWorkHourAddReq 添加工时登记请求
+type OpsEventTaskWorkHourAddReq struct {
+	TaskId      int     `json:"taskId" v:"required#任务ID不能为空"`      // 任务ID
+	WorkDate    string  `json:"workDate" v:"required#工作日期不能为空"`    // 工作日期
+	ActualHour  float64 `json:"actualHour" v:"required#实际工时不能为空"` // 实际工时
+	Remark      string  `json:"remark" v:"required#工作进展不能为空"`     // 工作进展
+}
+
+// OpsEventTaskWorkHourListReq 查询工时登记列表请求
+type OpsEventTaskWorkHourListReq struct {
+	TaskId int `json:"taskId" v:"required#任务ID不能为空"` // 任务ID
+}
+
+// OpsEventTaskWorkHourRsp 工时登记响应
+type OpsEventTaskWorkHourRsp struct {
+	Id             int     `json:"id"`             // ID
+	TaskId         int     `json:"taskId"`         // 任务ID
+	WorkDate       string  `json:"workDate"`       // 工作日期
+	ActualHour     float64 `json:"actualHour"`     // 实际工时
+	Remark         string  `json:"remark"`         // 工作进展
+	CreatedName    string  `json:"createdName"`    // 登记人
+	CreatedTime    string  `json:"createdTime"`    // 登记时间
+}

opms_parent/app/model/opsdev/ops_event_task_attachment.go

@@ -11,4 +11,3 @@ import (
 // OpsEventTaskAttachment is the golang structure for table ops_event_task_attachment.
 type OpsEventTaskAttachment internal.OpsEventTaskAttachment
 
-// Fill with you ideas below.

opms_parent/app/model/opsdev/ops_event_task_record.go

@@ -11,4 +11,3 @@ import (
 // OpsEventTaskRecord is the golang structure for table ops_event_task_record.
 type OpsEventTaskRecord internal.OpsEventTaskRecord
 
-// Fill with you ideas below.

opms_parent/app/model/opsdev/ops_event_task_release.go

@@ -11,4 +11,3 @@ import (
 // OpsEventTaskRelease is the golang structure for table ops_event_task_release.
 type OpsEventTaskRelease internal.OpsEventTaskRelease
 
-// Fill with you ideas below.

opms_parent/app/model/opsdev/ops_event_task_work_hour.go

@@ -0,0 +1,13 @@
+// ==========================================================================
+// This is auto-generated by gf cli tool. Fill this file as you wish.
+// ==========================================================================
+
+package opsdev
+
+import (
+	"dashoo.cn/opms_parent/app/model/opsdev/internal"
+)
+
+// OpsEventTaskWorkHour is the golang structure for table ops_event_task_work_hour.
+type OpsEventTaskWorkHour internal.OpsEventTaskWorkHour
+

opms_parent/app/model/opsdev/ops_operation_event.go

@@ -11,4 +11,3 @@ import (
 // OpsOperationEvent is the golang structure for table ops_operation_event.
 type OpsOperationEvent internal.OpsOperationEvent
 
-// Fill with you ideas below.

opms_parent/app/model/opsdev/ops_operation_event_attachment.go

@@ -11,4 +11,3 @@ import (
 // OpsOperationEventAttachment is the golang structure for table ops_operation_event_attachment.
 type OpsOperationEventAttachment internal.OpsOperationEventAttachment
 
-// Fill with you ideas below.

opms_parent/app/model/opsdev/ops_operation_event_record.go

@@ -11,4 +11,3 @@ import (
 // OpsOperationEventRecord is the golang structure for table ops_operation_event_record.
 type OpsOperationEventRecord internal.OpsOperationEventRecord
 
-// Fill with you ideas below.

opms_parent/app/service/opsdev/delivery_project.go

@@ -78,7 +78,84 @@ func (s *DeliveryProjectService) GetList(req *opsdevmodel.OpsDeliveryProjectSear
 		m = m.Where("project_status", req.Status)
 	}
 	if req.ProductLine != "" {
-		m = m.Where("product_line", req.ProductLine)
+		productLineList := strings.Split(req.ProductLine, ",")
+		m = m.Where("product_line", productLineList)
+	}
+	if req.DeliveryUserId > 0 {
+		m = m.Where("delivery_user_id", req.DeliveryUserId)
+	}
+	if req.SalesUserId > 0 {
+		m = m.Where("sales_user_id", req.SalesUserId)
+	}
+
+	// 获取总数
+	total, err := m.Count()
+	if err != nil {
+		return 0, nil, err
+	}
+
+	// 分页查询
+	if req.PageNum <= 0 {
+		req.PageNum = 1
+	}
+	if req.PageSize <= 0 {
+		req.PageSize = 20
+	}
+
+	// 排序
+	orderBy := "created_time desc"
+	if req.SortField != "" && req.SortOrder != "" {
+		orderBy = req.SortField + " " + req.SortOrder
+	}
+
+	var list []*opsdevmodel.OpsDeliveryProject
+	err = m.Page(req.PageNum, req.PageSize).Order(orderBy).Scan(&list)
+	if err != nil {
+		return 0, nil, err
+	}
+
+	return int64(total), list, nil
+}
+
+// GetListAll 获取所有项目列表（不带权限校验，仅用于下拉选择等场景）
+func (s *DeliveryProjectService) GetListAll(req *opsdevmodel.OpsDeliveryProjectSearchReq) (int64, []*opsdevmodel.OpsDeliveryProject, error) {
+	m := s.Dao.Ctx(s.Ctx)
+
+	// 项目状态筛选（支持多选，逗号分隔）
+	if req.ProjectStatus != "" {
+		statusList := strings.Split(req.ProjectStatus, ",")
+		if len(statusList) > 0 {
+			m = m.Where("project_status", statusList)
+		}
+	}
+
+	// 项目名称模糊查询
+	if req.ProjectName != "" {
+		m = m.Where("project_name like ?", "%"+req.ProjectName+"%")
+	}
+
+	// 销售负责人模糊查询
+	if req.SalesUserName != "" {
+		m = m.Where("sales_user_name like ?", "%"+req.SalesUserName+"%")
+	}
+
+	// 交付负责人模糊查询
+	if req.DeliveryUserName != "" {
+		m = m.Where("delivery_user_name like ?", "%"+req.DeliveryUserName+"%")
+	}
+
+	// 关键词搜索（项目名称、合同编号）
+	if req.KeyWords != "" {
+		m = m.Where("project_name like ? OR contract_no like ?", "%"+req.KeyWords+"%", "%"+req.KeyWords+"%")
+	}
+
+	// 其他查询条件
+	if req.Status != "" {
+		m = m.Where("project_status", req.Status)
+	}
+	if req.ProductLine != "" {
+		productLineList := strings.Split(req.ProductLine, ",")
+		m = m.Where("product_line", productLineList)
 	}
 	if req.DeliveryUserId > 0 {
 		m = m.Where("delivery_user_id", req.DeliveryUserId)

opms_parent/app/service/opsdev/delivery_project_event.go

@@ -2,6 +2,7 @@ package opsdev
 
 import (
 	"context"
+	"fmt"
 	"strings"
 
 	"dashoo.cn/opms_libary/myerrors"
@@ -14,6 +15,17 @@ import (
 	"github.com/gogf/gf/util/gconv"
 )
 
+// eventTypeToAutoTaskType 交付事件类型→自动创建研发任务类型的映射
+var eventTypeToAutoTaskType = map[string]string{
+	"31": eventmodel.TaskTypeReqReview,        // 需求评审 → 需求评审
+	"32": eventmodel.TaskTypeFeatureDev,       // 功能调整 → 功能开发
+	"33": eventmodel.TaskTypeFeatureDev,       // 二开需求 → 功能开发
+	"35": eventmodel.TaskTypeFeatureDev,       // 系统缺陷 → 功能开发
+	"38": eventmodel.TaskTypeSystemReleaseEvt, // 系统发版 → 系统发版(事件)
+	"40": eventmodel.TaskTypeSystemReleaseEvt, // 硬件发货 → 系统发版(事件)
+	"41": eventmodel.TaskTypeSystemReleaseEvt, // 硬件安装 → 系统发版(事件)
+}
+
 // DeliveryProjectEventService 交付项目事件业务逻辑实现类
 type DeliveryProjectEventService struct {
 	*service.ContextService
@@ -84,9 +96,9 @@ func (s *DeliveryProjectEventService) GetList(req *eventmodel.OpsDeliveryProject
 		db = db.Where(s.EventDao.Columns.FeedbackReporter+" like ?", "%"+req.FeedbackReporter+"%")
 	}
 
-	// 负责人模糊查询
-	if req.OpsUserName != "" {
-		db = db.Where(s.EventDao.Columns.OpsUserName+" like ?", "%"+req.OpsUserName+"%")
+	// 负责人筛选（多选精确匹配）
+	if len(req.OpsUserName) > 0 {
+		db = db.Where(s.EventDao.Columns.OpsUserName+" in (?)", req.OpsUserName)
 	}
 
 	// 反馈时间范围
@@ -147,6 +159,36 @@ func (s *DeliveryProjectEventService) GetList(req *eventmodel.OpsDeliveryProject
 		return 0, nil, myerrors.DbError("数据转换失败")
 	}
 
+	if len(list) > 0 {
+		projectIds := make([]int, 0, len(list))
+		for _, item := range list {
+			if item.ProjectId > 0 {
+				projectIds = append(projectIds, item.ProjectId)
+			}
+		}
+
+		if len(projectIds) > 0 {
+			var projects []*eventmodel.OpsDeliveryProject
+			err := s.ProjectDao.Fields(
+				s.ProjectDao.Columns.Id,
+				s.ProjectDao.Columns.ProjectName,
+			).WhereIn(s.ProjectDao.Columns.Id, projectIds).Scan(&projects)
+			if err != nil {
+				g.Log().Error(err)
+			} else {
+				projectMap := make(map[int]string)
+				for _, p := range projects {
+					projectMap[p.Id] = p.ProjectName
+				}
+				for _, item := range list {
+					if name, ok := projectMap[item.ProjectId]; ok {
+						item.ProjectName = name
+					}
+				}
+			}
+		}
+	}
+
 	return
 }
 
@@ -174,18 +216,43 @@ func (s *DeliveryProjectEventService) Create(req *eventmodel.OpsDeliveryProjectE
 	// 生成事件编码
 	eventNo := s.generateEventNo()
 
-	// 构造数据
+	// 硬件发货(40)和硬件安装(41)默认状态为处理中(20)
+	status := "10" // 待处理
+	if req.DeliveryEventType == "40" || req.DeliveryEventType == "41" {
+		status = "20"
+	}
+
+	// 构造数据，负责人默认为当前登录人，允许前端传入
+	opsUserId := s.GetCxtUserId()
+	opsUserName := s.GetCxtUserName()
+	if req.OpsUserId > 0 {
+		opsUserId = req.OpsUserId
+		opsUserName = req.OpsUserName
+	}
+
 	data := g.Map{
 		s.EventDao.Columns.ProjectId:           req.ProjectId,
 		s.EventDao.Columns.DeliveryEventNo:     eventNo,
 		s.EventDao.Columns.DeliveryEventTitle:  req.DeliveryEventTitle,
 		s.EventDao.Columns.DeliveryEventDesc:   req.DeliveryEventDesc,
 		s.EventDao.Columns.DeliveryEventType:   req.DeliveryEventType,
-		s.EventDao.Columns.DeliveryEventStatus: "10", // 待处理
+		s.EventDao.Columns.DeliveryEventStatus: status,
 		s.EventDao.Columns.FeedbackSource:      req.FeedbackSource,
 		s.EventDao.Columns.FeedbackReporter:    req.FeedbackReporter,
 		s.EventDao.Columns.FeedbackDate:        gtime.Now(),
 		s.EventDao.Columns.OnSite:              req.OnSite,
+		s.EventDao.Columns.OpsUserId:           opsUserId,
+		s.EventDao.Columns.OpsUserName:         opsUserName,
+	}
+
+	if req.Attribute1 != "" {
+		data[s.EventDao.Columns.Attribute1] = req.Attribute1
+	}
+	if req.CompleteTime != "" {
+		data[s.EventDao.Columns.CompleteTime] = req.CompleteTime
+	}
+	if req.ActualWorkHour > 0 {
+		data[s.EventDao.Columns.ActualWorkHour] = req.ActualWorkHour
 	}
 
 	// 补齐审计字段
@@ -216,18 +283,25 @@ func (s *DeliveryProjectEventService) Create(req *eventmodel.OpsDeliveryProjectE
 		}
 		service.SetCreatedInfo(recordData, s.GetCxtUserId(), s.GetCxtUserName())
 
-		_, err = s.RecordDao.TX(tx).Data(recordData).Insert()
+		recordResult, err := s.RecordDao.TX(tx).Data(recordData).Insert()
 		if err != nil {
 			g.Log().Error(err)
 			return myerrors.DbError("新增事件过程记录失败")
 		}
 
+		recordId, err := recordResult.LastInsertId()
+		if err != nil {
+			g.Log().Error(err)
+			return myerrors.DbError("获取过程记录ID失败")
+		}
+
 		// 3. 保存附件信息
 		if len(req.Attachments) > 0 {
 			for _, att := range req.Attachments {
 				attData := g.Map{
 					s.AttachmentDao.Columns.DeliveryEventId: eventId,
 					s.AttachmentDao.Columns.EventId:         eventId,
+					s.AttachmentDao.Columns.EventRecordId:   recordId,
 					s.AttachmentDao.Columns.FileName:        att.FileName,
 					s.AttachmentDao.Columns.FileUrl:         att.FileUrl,
 					s.AttachmentDao.Columns.FileType:        att.FileType,
@@ -242,6 +316,47 @@ func (s *DeliveryProjectEventService) Create(req *eventmodel.OpsDeliveryProjectE
 			}
 		}
 
+		// 4. 特定事件类型自动创建研发任务
+		if taskType, ok := eventTypeToAutoTaskType[req.DeliveryEventType]; ok {
+			taskNo := s.generateTaskNo()
+			taskData := g.Map{
+				s.TaskDao.Columns.TaskNo:        taskNo,
+				s.TaskDao.Columns.ProjectId:     req.ProjectId,
+				s.TaskDao.Columns.ProjectName:   s.getProjectName(req.ProjectId),
+				s.TaskDao.Columns.TaskTitle:     req.DeliveryEventTitle,
+				s.TaskDao.Columns.TaskDesc:      req.DeliveryEventDesc,
+				s.TaskDao.Columns.FunctionName:  req.DeliveryEventTitle,
+				s.TaskDao.Columns.TaskType:      taskType,
+				s.TaskDao.Columns.TaskStatus:    eventmodel.TaskStatusTodo,
+				s.TaskDao.Columns.Priority:      "20",
+				s.TaskDao.Columns.EventId:       int(eventId),
+				s.TaskDao.Columns.EventType:     eventmodel.EventTypeDelivery,
+			}
+			service.SetCreatedInfo(taskData, s.GetCxtUserId(), s.GetCxtUserName())
+
+			taskResult, err := s.TaskDao.TX(tx).Data(taskData).Insert()
+			if err != nil {
+				g.Log().Error(err)
+				return myerrors.DbError("自动创建研发任务失败")
+			}
+
+			taskId, _ := taskResult.LastInsertId()
+
+			taskRecordData := g.Map{
+				s.TaskRecordDao.Columns.TaskId:         taskId,
+				s.TaskRecordDao.Columns.HandleUserId:   s.GetCxtUserId(),
+				s.TaskRecordDao.Columns.HandleUserName: s.GetCxtUserName(),
+				s.TaskRecordDao.Columns.HandleContent:  "自动创建任务<br/>说明: 由交付事件自动创建 (" + req.DeliveryEventTitle + ")",
+			}
+			service.SetCreatedInfo(taskRecordData, s.GetCxtUserId(), s.GetCxtUserName())
+
+			_, err = s.TaskRecordDao.TX(tx).Data(taskRecordData).Insert()
+			if err != nil {
+				g.Log().Error(err)
+				return myerrors.DbError("新增任务过程记录失败")
+			}
+		}
+
 		return nil
 	})
 }
@@ -262,13 +377,25 @@ func (s *DeliveryProjectEventService) UpdateById(req *eventmodel.OpsDeliveryProj
 	// 构造更新数据 - 从请求中动态构建，支持前端传来的任何有效字段
 	data := g.Map{}
 
-	// 基础字段（编辑时可能更新）
-	data[s.EventDao.Columns.DeliveryEventTitle] = req.DeliveryEventTitle
-	data[s.EventDao.Columns.DeliveryEventDesc] = req.DeliveryEventDesc
-	data[s.EventDao.Columns.DeliveryEventType] = req.DeliveryEventType
-	data[s.EventDao.Columns.FeedbackSource] = req.FeedbackSource
-	data[s.EventDao.Columns.FeedbackReporter] = req.FeedbackReporter
-	data[s.EventDao.Columns.OnSite] = req.OnSite
+	// 基础字段（编辑时可能更新，但关闭/处理事件时不传这些字段）
+	if req.DeliveryEventTitle != "" {
+		data[s.EventDao.Columns.DeliveryEventTitle] = req.DeliveryEventTitle
+	}
+	if req.DeliveryEventDesc != "" {
+		data[s.EventDao.Columns.DeliveryEventDesc] = req.DeliveryEventDesc
+	}
+	if req.DeliveryEventType != "" {
+		data[s.EventDao.Columns.DeliveryEventType] = req.DeliveryEventType
+	}
+	if req.FeedbackSource != "" {
+		data[s.EventDao.Columns.FeedbackSource] = req.FeedbackSource
+	}
+	if req.FeedbackReporter != "" {
+		data[s.EventDao.Columns.FeedbackReporter] = req.FeedbackReporter
+	}
+	if req.OnSite != "" {
+		data[s.EventDao.Columns.OnSite] = req.OnSite
+	}
 
 	// 处理状态和结果字段（关闭事件时传入）
 	if req.DeliveryEventStatus != "" {
@@ -295,6 +422,11 @@ func (s *DeliveryProjectEventService) UpdateById(req *eventmodel.OpsDeliveryProj
 		data[s.EventDao.Columns.OpsUserName] = req.OpsUserName
 	}
 
+	// 物流单号
+	if req.Attribute1 != "" {
+		data[s.EventDao.Columns.Attribute1] = req.Attribute1
+	}
+
 	// 补齐审计字段
 	service.SetUpdatedInfo(data, s.GetCxtUserId(), s.GetCxtUserName())
 
@@ -400,6 +532,7 @@ func (s *DeliveryProjectEventService) Cancel(req *eventmodel.OpsDeliveryProjectE
 			for _, att := range req.Attachments {
 				attData := g.Map{
 					s.AttachmentDao.Columns.DeliveryEventId: req.Id,
+					s.AttachmentDao.Columns.EventId:         req.Id,
 					s.AttachmentDao.Columns.EventRecordId:   recordId,
 					s.AttachmentDao.Columns.FileName:        att.FileName,
 					s.AttachmentDao.Columns.FileUrl:         att.FileUrl,
@@ -605,13 +738,14 @@ func (s *DeliveryProjectEventService) AddRecord(req *eventmodel.OpsDeliveryProje
 		// 2. 保存附件
 		if len(req.Attachments) > 0 {
 			for _, att := range req.Attachments {
-				attData := g.Map{
-					s.AttachmentDao.Columns.DeliveryEventId: req.DeliveryEventId,
-					s.AttachmentDao.Columns.EventRecordId:   recordId,
-					s.AttachmentDao.Columns.FileName:        att.FileName,
-					s.AttachmentDao.Columns.FileUrl:         att.FileUrl,
-					s.AttachmentDao.Columns.FileType:        att.FileType,
-				}
+			attData := g.Map{
+				s.AttachmentDao.Columns.DeliveryEventId: req.DeliveryEventId,
+				s.AttachmentDao.Columns.EventId:         req.DeliveryEventId,
+				s.AttachmentDao.Columns.EventRecordId:   recordId,
+				s.AttachmentDao.Columns.FileName:        att.FileName,
+				s.AttachmentDao.Columns.FileUrl:         att.FileUrl,
+				s.AttachmentDao.Columns.FileType:        att.FileType,
+			}
 				service.SetCreatedInfo(attData, s.GetCxtUserId(), s.GetCxtUserName())
 
 				_, err = s.AttachmentDao.TX(tx).Data(attData).Insert()
@@ -626,6 +760,49 @@ func (s *DeliveryProjectEventService) AddRecord(req *eventmodel.OpsDeliveryProje
 	})
 }
 
+// generateTaskNo 生成任务编号（与OpsEventTaskService保持统一格式）
+func (s *DeliveryProjectEventService) generateTaskNo() string {
+	now := gtime.Now()
+	prefix := "TSK" + now.Format("Ymd")
+
+	var maxNoResult struct {
+		TaskNo string
+	}
+	err := s.TaskDao.Where(s.TaskDao.Columns.TaskNo+" like ?", prefix+"%").
+		Order(s.TaskDao.Columns.TaskNo + " desc").
+		Fields(s.TaskDao.Columns.TaskNo).
+		Scan(&maxNoResult)
+	if err != nil || maxNoResult.TaskNo == "" {
+		return prefix + "0001"
+	}
+
+	maxNoStr := maxNoResult.TaskNo
+	if len(maxNoStr) >= len(prefix)+4 {
+		seq := maxNoStr[len(prefix):]
+		seqNum := gconv.Int(seq)
+		seqNum++
+		return prefix + fmt.Sprintf("%04d", seqNum)
+	}
+
+	return prefix + "0001"
+}
+
+// getProjectName 根据项目ID获取项目名称
+func (s *DeliveryProjectEventService) getProjectName(projectId int) string {
+	if projectId <= 0 {
+		return ""
+	}
+	var project eventmodel.OpsDeliveryProject
+	err := s.ProjectDao.FieldsEx(s.ProjectDao.Columns.DeletedTime).
+		WherePri(s.ProjectDao.Columns.Id, projectId).
+		Scan(&project)
+	if err != nil {
+		g.Log().Error(err)
+		return ""
+	}
+	return project.ProjectName
+}
+
 // generateEventNo 生成事件编码
 func (s *DeliveryProjectEventService) generateEventNo() string {
 	// 格式: EVT + 年月日 + 4位序号
@@ -633,23 +810,24 @@ func (s *DeliveryProjectEventService) generateEventNo() string {
 	prefix := "EVT" + now.Format("Ymd")
 
 	// 查询当天最大序号
-	var maxNo string
-	err := s.EventDao.Where(s.EventDao.Columns.DeliveryEventNo+" like ?", prefix+"%").Order(s.EventDao.Columns.DeliveryEventNo + " desc").Fields(s.EventDao.Columns.DeliveryEventNo).Scan(&maxNo)
-	if err != nil {
-		return prefix + "0001"
-	}
-
-	if maxNo == "" {
+	var maxNoResult struct {
+		DeliveryEventNo string
+	}
+	err := s.EventDao.Where(s.EventDao.Columns.DeliveryEventNo+" like ?", prefix+"%").
+		Order(s.EventDao.Columns.DeliveryEventNo + " desc").
+		Fields(s.EventDao.Columns.DeliveryEventNo).
+		Scan(&maxNoResult)
+	if err != nil || maxNoResult.DeliveryEventNo == "" {
 		return prefix + "0001"
 	}
 
 	// 提取序号并+1
-	if len(maxNo) >= len(prefix)+4 {
-		seq := maxNo[len(prefix):]
-		var seqNum int
-		gconv.Struct(seq, &seqNum)
+	maxNoStr := maxNoResult.DeliveryEventNo
+	if len(maxNoStr) >= len(prefix)+4 {
+		seq := maxNoStr[len(prefix):]
+		seqNum := gconv.Int(seq)
 		seqNum++
-		return prefix + gconv.String(seqNum)
+		return prefix + fmt.Sprintf("%04d", seqNum)
 	}
 
 	return prefix + "0001"

opms_parent/app/service/opsdev/ops_event_task.go

@@ -18,11 +18,14 @@ import (
 // OpsEventTaskService 任务业务逻辑实现类
 type OpsEventTaskService struct {
 	*service.ContextService
-	TaskDao       *opsdevdao.OpsEventTaskDao
-	RecordDao     *opsdevdao.OpsEventTaskRecordDao
-	AttachmentDao *opsdevdao.OpsEventTaskAttachmentDao
-	ProjectDao    *opsdevdao.OpsDeliveryProjectDao
-	ReleaseDao    *opsdevdao.OpsEventTaskReleaseDao
+	TaskDao        *opsdevdao.OpsEventTaskDao
+	RecordDao      *opsdevdao.OpsEventTaskRecordDao
+	AttachmentDao  *opsdevdao.OpsEventTaskAttachmentDao
+	ProjectDao     *opsdevdao.OpsDeliveryProjectDao
+	ReleaseDao     *opsdevdao.OpsEventTaskReleaseDao
+	WorkHourDao    *opsdevdao.OpsEventTaskWorkHourDao
+	EventDao       *opsdevdao.OpsDeliveryProjectEventDao
+	EventRecordDao *opsdevdao.OpsDeliveryProjectEventRecordDao
 }
 
 // NewOpsEventTaskService 初始化service
@@ -36,6 +39,9 @@ func NewOpsEventTaskService(ctx context.Context) (svc *OpsEventTaskService, err
 	svc.AttachmentDao = opsdevdao.NewOpsEventTaskAttachmentDao(svc.Tenant)
 	svc.ProjectDao = opsdevdao.NewOpsDeliveryProjectDao(svc.Tenant)
 	svc.ReleaseDao = opsdevdao.NewOpsEventTaskReleaseDao(svc.Tenant)
+	svc.WorkHourDao = opsdevdao.NewOpsEventTaskWorkHourDao(svc.Tenant)
+	svc.EventDao = opsdevdao.NewOpsDeliveryProjectEventDao(svc.Tenant)
+	svc.EventRecordDao = opsdevdao.NewOpsDeliveryProjectEventRecordDao(svc.Tenant)
 	return svc, nil
 }
 
@@ -48,6 +54,11 @@ func (s *OpsEventTaskService) GetList(req *opsdevmodel.OpsEventTaskSearchReq) (t
 		db = db.Where(s.TaskDao.Columns.ProjectId, req.ProjectId)
 	}
 
+	// 关联事件ID筛选
+	if req.EventId > 0 {
+		db = db.Where(s.TaskDao.Columns.EventId, req.EventId)
+	}
+
 	// 任务标题模糊查询
 	if req.TaskTitle != "" {
 		db = db.Where(s.TaskDao.Columns.TaskTitle+" like ?", "%"+req.TaskTitle+"%")
@@ -68,9 +79,14 @@ func (s *OpsEventTaskService) GetList(req *opsdevmodel.OpsEventTaskSearchReq) (t
 		db = db.Where(s.TaskDao.Columns.Priority+" in (?)", req.Priority)
 	}
 
-	// 执行人模糊查询
-	if req.OpsUserName != "" {
-		db = db.Where(s.TaskDao.Columns.OpsUserName+" like ?", "%"+req.OpsUserName+"%")
+	// 执行人筛选（多选）
+	if len(req.OpsUserName) > 0 {
+		db = db.Where(s.TaskDao.Columns.OpsUserName+" in (?)", req.OpsUserName)
+	}
+
+	// 发布版本为空筛选（用于发版任务选择未发版任务）
+	if req.ReleaseVersionEmpty {
+		db = db.Where(s.TaskDao.Columns.ReleaseVersion + " is null")
 	}
 
 	// 计划结束日期范围筛选
@@ -139,22 +155,6 @@ func (s *OpsEventTaskService) GetList(req *opsdevmodel.OpsEventTaskSearchReq) (t
 		return 0, nil, myerrors.DbError("数据转换失败")
 	}
 
-	// 填充项目名称
-	for _, item := range list {
-		if item.ProjectId > 0 {
-			var project opsdevmodel.OpsDeliveryProject
-			err := s.ProjectDao.FieldsEx(s.ProjectDao.Columns.DeletedTime).
-				WherePri(s.ProjectDao.Columns.Id, item.ProjectId).
-				Scan(&project)
-			if err != nil {
-				g.Log().Error(err)
-			} else if project.Id > 0 {
-				item.ProjectName = project.ProjectName
-				item.ContractNo = project.ContractNo
-			}
-		}
-	}
-
 	return
 }
 
@@ -162,15 +162,17 @@ func (s *OpsEventTaskService) GetList(req *opsdevmodel.OpsEventTaskSearchReq) (t
 func (s *OpsEventTaskService) getSortColumnName(field string) string {
 	// 前端字段名到数据库列名的映射
 	fieldMap := map[string]string{
-		"taskTitle":     s.TaskDao.Columns.TaskTitle,
-		"taskType":      s.TaskDao.Columns.TaskType,
-		"taskStatus":    s.TaskDao.Columns.TaskStatus,
-		"priority":      s.TaskDao.Columns.Priority,
-		"opsUserName":   s.TaskDao.Columns.OpsUserName,
-		"planStartTime": s.TaskDao.Columns.PlanStartTime,
-		"planEndTime":   s.TaskDao.Columns.PlanEndTime,
-		"completeTime":  s.TaskDao.Columns.CompleteTime,
-		"createdTime":   s.TaskDao.Columns.CreatedTime,
+		"taskTitle":      s.TaskDao.Columns.TaskTitle,
+		"functionName":   s.TaskDao.Columns.FunctionName,
+		"taskType":       s.TaskDao.Columns.TaskType,
+		"taskStatus":     s.TaskDao.Columns.TaskStatus,
+		"priority":       s.TaskDao.Columns.Priority,
+		"opsUserName":    s.TaskDao.Columns.OpsUserName,
+		"planStartTime":  s.TaskDao.Columns.PlanStartTime,
+		"planEndTime":    s.TaskDao.Columns.PlanEndTime,
+		"completeTime":   s.TaskDao.Columns.CompleteTime,
+		"releaseVersion": s.TaskDao.Columns.ReleaseVersion,
+		"createdTime":    s.TaskDao.Columns.CreatedTime,
 	}
 
 	if colName, ok := fieldMap[field]; ok {
@@ -179,14 +181,38 @@ func (s *OpsEventTaskService) getSortColumnName(field string) string {
 	return ""
 }
 
+const maxTaskNoRetries = 3
+
+// isDuplicateEntryError 判断是否为数据库唯一键冲突
+func isDuplicateEntryError(err error) bool {
+	if err == nil {
+		return false
+	}
+	return strings.Contains(strings.ToLower(err.Error()), "duplicate entry")
+}
+
 // Create 新增任务，包含事务控制和过程记录
-func (s *OpsEventTaskService) Create(req *opsdevmodel.OpsEventTaskAddReq) error {
+func (s *OpsEventTaskService) Create(req *opsdevmodel.OpsEventTaskAddReq) (err error) {
 	// 判断任务状态：如果执行人、计划开始时间、计划结束时间都填写了，则状态为处理中，否则为待处理
 	taskStatus := opsdevmodel.TaskStatusTodo
 	if req.OpsUserId > 0 && req.PlanStartTime != "" && req.PlanEndTime != "" {
 		taskStatus = opsdevmodel.TaskStatusProcessing
 	}
 
+	for i := 0; i < maxTaskNoRetries; i++ {
+		err = s.doCreate(req, taskStatus)
+		if err == nil {
+			return nil
+		}
+		if !isDuplicateEntryError(err) {
+			return err
+		}
+	}
+	return myerrors.DbError("任务编号生成冲突，请稍后重试")
+}
+
+// doCreate 执行新增任务（可在任务编号冲突时重试）
+func (s *OpsEventTaskService) doCreate(req *opsdevmodel.OpsEventTaskAddReq, taskStatus string) error {
 	// 生成任务编号
 	taskNo := s.generateTaskNo()
 
@@ -194,6 +220,7 @@ func (s *OpsEventTaskService) Create(req *opsdevmodel.OpsEventTaskAddReq) error
 	data := g.Map{
 		s.TaskDao.Columns.TaskNo:           taskNo,
 		s.TaskDao.Columns.ProjectId:        req.ProjectId,
+		s.TaskDao.Columns.ProjectName:      s.getProjectName(req.ProjectId),
 		s.TaskDao.Columns.TaskTitle:        req.TaskTitle,
 		s.TaskDao.Columns.TaskDesc:         req.TaskDesc,
 		s.TaskDao.Columns.FunctionName:     req.FunctionName,
@@ -209,6 +236,7 @@ func (s *OpsEventTaskService) Create(req *opsdevmodel.OpsEventTaskAddReq) error
 		s.TaskDao.Columns.EventId:          req.EventId,
 		s.TaskDao.Columns.EventType:        req.EventType,
 		s.TaskDao.Columns.TaskParentId:     req.TaskParentId,
+		s.TaskDao.Columns.Attribute2:       req.Attribute2,
 	}
 
 	if req.PlanStartTime != "" {
@@ -227,6 +255,9 @@ func (s *OpsEventTaskService) Create(req *opsdevmodel.OpsEventTaskAddReq) error
 		result, err := s.TaskDao.TX(tx).Data(data).Insert()
 		if err != nil {
 			g.Log().Error(err)
+			if isDuplicateEntryError(err) {
+				return err
+			}
 			return myerrors.DbError("新增任务失败")
 		}
 
@@ -246,14 +277,14 @@ func (s *OpsEventTaskService) Create(req *opsdevmodel.OpsEventTaskAddReq) error
 		}
 		service.SetCreatedInfo(recordData, s.GetCxtUserId(), s.GetCxtUserName())
 
-		_, err = s.RecordDao.TX(tx).Data(recordData).Insert()
+		recordResult, err := s.RecordDao.TX(tx).Data(recordData).Insert()
 		if err != nil {
 			g.Log().Error(err)
 			return myerrors.DbError("新增任务过程记录失败")
 		}
 
 		// 获取过程记录ID
-		recordId, err := result.LastInsertId()
+		recordId, err := recordResult.LastInsertId()
 		if err != nil {
 			g.Log().Error(err)
 			return myerrors.DbError("获取过程记录ID失败")
@@ -301,21 +332,50 @@ func (s *OpsEventTaskService) UpdateById(req *opsdevmodel.OpsEventTaskUpdateReq)
 		return myerrors.TipsError("已完成或已作废状态的任务不允许编辑")
 	}
 
-	// 构造更新数据
-	data := g.Map{
-		s.TaskDao.Columns.TaskTitle:        req.TaskTitle,
-		s.TaskDao.Columns.TaskDesc:         req.TaskDesc,
-		s.TaskDao.Columns.FunctionName:     req.FunctionName,
-		s.TaskDao.Columns.TaskType:         req.TaskType,
-		s.TaskDao.Columns.Priority:         req.Priority,
-		s.TaskDao.Columns.OpsUserId:        req.OpsUserId,
-		s.TaskDao.Columns.OpsUserName:      req.OpsUserName,
-		s.TaskDao.Columns.PlanStartTime:    req.PlanStartTime,
-		s.TaskDao.Columns.PlanEndTime:      req.PlanEndTime,
-		s.TaskDao.Columns.EstimateWorkHour: req.EstimateWorkHour,
-		s.TaskDao.Columns.DefectType:       req.DefectType,
-		s.TaskDao.Columns.ReleaseVersion:   req.ReleaseVersion,
-		s.TaskDao.Columns.Remark:           req.Remark,
+	// 构造更新数据 - 只更新传入的非空字段
+	data := g.Map{}
+
+	if req.TaskTitle != "" {
+		data[s.TaskDao.Columns.TaskTitle] = req.TaskTitle
+	}
+	if req.TaskDesc != "" {
+		data[s.TaskDao.Columns.TaskDesc] = req.TaskDesc
+	}
+	if req.FunctionName != "" {
+		data[s.TaskDao.Columns.FunctionName] = req.FunctionName
+	}
+	if req.TaskType != "" {
+		data[s.TaskDao.Columns.TaskType] = req.TaskType
+	}
+	if req.Priority != "" {
+		data[s.TaskDao.Columns.Priority] = req.Priority
+	}
+	if req.OpsUserId > 0 {
+		data[s.TaskDao.Columns.OpsUserId] = req.OpsUserId
+	}
+	if req.OpsUserName != "" {
+		data[s.TaskDao.Columns.OpsUserName] = req.OpsUserName
+	}
+	if req.PlanStartTime != "" {
+		data[s.TaskDao.Columns.PlanStartTime] = req.PlanStartTime
+	}
+	if req.PlanEndTime != "" {
+		data[s.TaskDao.Columns.PlanEndTime] = req.PlanEndTime
+	}
+	if req.EstimateWorkHour > 0 {
+		data[s.TaskDao.Columns.EstimateWorkHour] = req.EstimateWorkHour
+	}
+	if req.DefectType != "" {
+		data[s.TaskDao.Columns.DefectType] = req.DefectType
+	}
+	if req.ReleaseVersion != "" {
+		data[s.TaskDao.Columns.ReleaseVersion] = req.ReleaseVersion
+	}
+	if req.Remark != "" {
+		data[s.TaskDao.Columns.Remark] = req.Remark
+	}
+	if req.Attribute2 != "" {
+		data[s.TaskDao.Columns.Attribute2] = req.Attribute2
 	}
 
 	// 补齐审计字段
@@ -382,20 +442,6 @@ func (s *OpsEventTaskService) GetById(id int) (*opsdevmodel.OpsEventTaskRsp, err
 		return nil, myerrors.DbError("数据转换失败")
 	}
 
-	// 查询关联的项目信息
-	if entity.ProjectId > 0 {
-		var project opsdevmodel.OpsDeliveryProject
-		err := s.ProjectDao.FieldsEx(s.ProjectDao.Columns.DeletedTime).
-			WherePri(s.ProjectDao.Columns.Id, entity.ProjectId).
-			Scan(&project)
-		if err != nil {
-			g.Log().Error(err)
-		} else if project.Id > 0 {
-			rsp.ProjectName = project.ProjectName
-			rsp.ContractNo = project.ContractNo
-		}
-	}
-
 	return &rsp, nil
 }
 
@@ -516,10 +562,12 @@ func (s *OpsEventTaskService) Start(req *opsdevmodel.OpsEventTaskStartReq) error
 }
 
 // Complete 完成任务
-func (s *OpsEventTaskService) Complete(req *opsdevmodel.OpsEventTaskCompleteReq) error {
+func (s *OpsEventTaskService) Complete(req *opsdevmodel.OpsEventTaskCompleteReq) (err error) {
+	g.Log().Infof("Handler received req: %+v", req)
+
 	// 校验数据是否存在
 	var entity opsdevmodel.OpsEventTask
-	err := s.TaskDao.FieldsEx(s.TaskDao.Columns.DeletedTime).WherePri(s.TaskDao.Columns.Id, req.Id).Scan(&entity)
+	err = s.TaskDao.FieldsEx(s.TaskDao.Columns.DeletedTime).WherePri(s.TaskDao.Columns.Id, req.Id).Scan(&entity)
 	if err != nil {
 		g.Log().Error(err)
 		return myerrors.DbError("查询任务数据失败")
@@ -533,6 +581,20 @@ func (s *OpsEventTaskService) Complete(req *opsdevmodel.OpsEventTaskCompleteReq)
 		return myerrors.TipsError("只有处理中的任务可以完成")
 	}
 
+	for i := 0; i < maxTaskNoRetries; i++ {
+		err = s.doComplete(req, &entity)
+		if err == nil {
+			return nil
+		}
+		if !isDuplicateEntryError(err) {
+			return err
+		}
+	}
+	return myerrors.DbError("任务编号生成冲突，请稍后重试")
+}
+
+// doComplete 执行完成任务（可在下游任务编号冲突时重试）
+func (s *OpsEventTaskService) doComplete(req *opsdevmodel.OpsEventTaskCompleteReq, entity *opsdevmodel.OpsEventTask) error {
 	// 构造更新数据
 	data := g.Map{
 		s.TaskDao.Columns.TaskStatus:     opsdevmodel.TaskStatusCompleted, // 已完成
@@ -544,6 +606,18 @@ func (s *OpsEventTaskService) Complete(req *opsdevmodel.OpsEventTaskCompleteReq)
 	// 补齐审计字段
 	service.SetUpdatedInfo(data, s.GetCxtUserId(), s.GetCxtUserName())
 
+	// 预生成下游任务编号（避免事务内查询重复）
+	var devTaskNo, testTaskNo string
+	if entity.TaskType == opsdevmodel.TaskTypeReqReview {
+		devTaskNo = s.generateTaskNo()
+	}
+	if entity.TaskType == opsdevmodel.TaskTypeFeatureDev {
+		testTaskNo = s.generateTaskNo()
+	}
+	if entity.TaskType == opsdevmodel.TaskTypeBug {
+		testTaskNo = s.generateTaskNo()
+	}
+
 	// 使用事务
 	return s.TaskDao.Transaction(context.TODO(), func(ctx context.Context, tx *gdb.TX) error {
 		// 1. 更新任务状态
@@ -561,7 +635,7 @@ func (s *OpsEventTaskService) Complete(req *opsdevmodel.OpsEventTaskCompleteReq)
 				testResultText = "不通过"
 			}
 			handleContent = fmt.Sprintf("测试结果：%s <br/>测试时间：%s", testResultText, gtime.Now().Format("Y-m-d"))
-		} else if entity.TaskType == opsdevmodel.TaskTypeSystemRelease && req.IsReleaseComplete {
+		} else if entity.TaskType == opsdevmodel.TaskTypeSystemReleaseEvt && req.IsReleaseComplete {
 			// 系统发版完成记录
 			handleContent = "发版完成<br/>任务标题: " + entity.TaskTitle + "<br/>发版工时: " + gconv.String(req.ActualWorkHour) + "小时"
 			if req.Remark != "" {
@@ -615,7 +689,9 @@ func (s *OpsEventTaskService) Complete(req *opsdevmodel.OpsEventTaskCompleteReq)
 		// 4.1 需求评审完成时，自动创建功能开发任务
 		if entity.TaskType == opsdevmodel.TaskTypeReqReview {
 			devTaskData := g.Map{
+				s.TaskDao.Columns.TaskNo:       devTaskNo,
 				s.TaskDao.Columns.ProjectId:    entity.ProjectId,
+				s.TaskDao.Columns.ProjectName:  entity.ProjectName,
 				s.TaskDao.Columns.EventId:      entity.EventId,
 				s.TaskDao.Columns.EventType:    entity.EventType,
 				s.TaskDao.Columns.TaskTitle:    entity.TaskTitle,
@@ -631,6 +707,9 @@ func (s *OpsEventTaskService) Complete(req *opsdevmodel.OpsEventTaskCompleteReq)
 			devResult, err := s.TaskDao.TX(tx).Data(devTaskData).Insert()
 			if err != nil {
 				g.Log().Error(err)
+				if isDuplicateEntryError(err) {
+					return err
+				}
 				return myerrors.DbError("自动创建功能开发任务失败")
 			}
 
@@ -655,7 +734,9 @@ func (s *OpsEventTaskService) Complete(req *opsdevmodel.OpsEventTaskCompleteReq)
 		// 4.2 功能开发完成时，自动创建功能测试任务
 		if entity.TaskType == opsdevmodel.TaskTypeFeatureDev {
 			testTaskData := g.Map{
+				s.TaskDao.Columns.TaskNo:       testTaskNo,
 				s.TaskDao.Columns.ProjectId:    entity.ProjectId,
+				s.TaskDao.Columns.ProjectName:  entity.ProjectName,
 				s.TaskDao.Columns.EventId:      entity.EventId,
 				s.TaskDao.Columns.EventType:    entity.EventType,
 				s.TaskDao.Columns.TaskTitle:    entity.TaskTitle,
@@ -671,6 +752,9 @@ func (s *OpsEventTaskService) Complete(req *opsdevmodel.OpsEventTaskCompleteReq)
 			testResult, err := s.TaskDao.TX(tx).Data(testTaskData).Insert()
 			if err != nil {
 				g.Log().Error(err)
+				if isDuplicateEntryError(err) {
+					return err
+				}
 				return myerrors.DbError("自动创建功能测试任务失败")
 			}
 
@@ -692,8 +776,53 @@ func (s *OpsEventTaskService) Complete(req *opsdevmodel.OpsEventTaskCompleteReq)
 			}
 		}
 
+		// 4.2b BUG任务完成时，自动创建功能测试任务
+		if entity.TaskType == opsdevmodel.TaskTypeBug {
+			testTaskData := g.Map{
+				s.TaskDao.Columns.TaskNo:       testTaskNo,
+				s.TaskDao.Columns.ProjectId:    entity.ProjectId,
+				s.TaskDao.Columns.ProjectName:  entity.ProjectName,
+				s.TaskDao.Columns.EventId:      entity.EventId,
+				s.TaskDao.Columns.EventType:    entity.EventType,
+				s.TaskDao.Columns.TaskTitle:    entity.TaskTitle,
+				s.TaskDao.Columns.TaskDesc:     entity.TaskDesc,
+				s.TaskDao.Columns.FunctionName: entity.FunctionName,
+				s.TaskDao.Columns.TaskType:     opsdevmodel.TaskTypeFeatureTest, // 功能测试
+				s.TaskDao.Columns.TaskStatus:   opsdevmodel.TaskStatusTodo,      // 待处理
+				s.TaskDao.Columns.Priority:     entity.Priority,
+				s.TaskDao.Columns.TaskParentId: req.Id,
+			}
+			service.SetCreatedInfo(testTaskData, s.GetCxtUserId(), s.GetCxtUserName())
+
+			testResult, err := s.TaskDao.TX(tx).Data(testTaskData).Insert()
+			if err != nil {
+				g.Log().Error(err)
+				if isDuplicateEntryError(err) {
+					return err
+				}
+				return myerrors.DbError("自动创建功能测试任务失败")
+			}
+
+			testTaskId, _ := testResult.LastInsertId()
+
+			// 创建功能测试任务的过程记录
+			testRecordData := g.Map{
+				s.RecordDao.Columns.TaskId:         testTaskId,
+				s.RecordDao.Columns.HandleUserId:   s.GetCxtUserId(),
+				s.RecordDao.Columns.HandleUserName: s.GetCxtUserName(),
+				s.RecordDao.Columns.HandleContent:  "创建功能测试任务<br/>说明: 由BUG任务自动创建",
+			}
+			service.SetCreatedInfo(testRecordData, s.GetCxtUserId(), s.GetCxtUserName())
+
+			_, err = s.RecordDao.TX(tx).Data(testRecordData).Insert()
+			if err != nil {
+				g.Log().Error(err)
+				return myerrors.DbError("新增功能测试任务过程记录失败")
+			}
+		}
+
 		// 4.3 系统发版完成时，保存关联的研发任务到ops_event_task_release表
-		if entity.TaskType == opsdevmodel.TaskTypeSystemRelease && req.IsReleaseComplete && len(req.DevTaskIds) > 0 {
+		if entity.TaskType == opsdevmodel.TaskTypeSystemReleaseEvt && req.IsReleaseComplete && len(req.DevTaskIds) > 0 {
 			for _, devTaskId := range req.DevTaskIds {
 				releaseData := g.Map{
 					s.ReleaseDao.Columns.ReleaseTaskId: req.Id,
@@ -710,6 +839,41 @@ func (s *OpsEventTaskService) Complete(req *opsdevmodel.OpsEventTaskCompleteReq)
 			}
 		}
 
+		// 5. 任务完成时自动更新关联的交付事件状态为完成并生成过程记录
+		if entity.EventId > 0 && entity.EventType == opsdevmodel.EventTypeDelivery {
+			// 触发事件自动完成的任务类型：10(需求评审)、30(功能测试-通过)、38(系统发版)、40(系统发版/硬件发货)、41(硬件安装)
+			if s.shouldAutoCompleteEvent(entity.TaskType, req.TestResult) {
+				eventData := g.Map{
+					s.EventDao.Columns.DeliveryEventStatus: opsdevmodel.DeliveryEventStatusClosed,
+					s.EventDao.Columns.CompleteTime:        gtime.Now(),
+				}
+				service.SetUpdatedInfo(eventData, s.GetCxtUserId(), s.GetCxtUserName())
+
+				_, err := s.EventDao.TX(tx).FieldsEx(service.UpdateFieldEx...).
+					Data(eventData).
+					WherePri(s.EventDao.Columns.Id, entity.EventId).
+					Update()
+				if err != nil {
+					g.Log().Error(err)
+					return myerrors.DbError("自动更新事件状态失败")
+				}
+
+				eventRecordData := g.Map{
+					s.EventRecordDao.Columns.DeliveryEventId: entity.EventId,
+					s.EventRecordDao.Columns.HandleUserId:    s.GetCxtUserId(),
+					s.EventRecordDao.Columns.HandleUserName:  s.GetCxtUserName(),
+					s.EventRecordDao.Columns.HandleContent:   "研发任务已完成，自动关闭事件<br/>任务编号: " + entity.TaskNo + "<br/>任务标题: " + entity.TaskTitle,
+				}
+				service.SetCreatedInfo(eventRecordData, s.GetCxtUserId(), s.GetCxtUserName())
+
+				_, err = s.EventRecordDao.TX(tx).Data(eventRecordData).Insert()
+				if err != nil {
+					g.Log().Error(err)
+					return myerrors.DbError("新增事件过程记录失败")
+				}
+			}
+		}
+
 		return nil
 	})
 }
@@ -914,31 +1078,32 @@ func (s *OpsEventTaskService) GetRecords(req *opsdevmodel.OpsEventTaskRecordSear
 
 // generateTaskNo 生成任务编号
 func (s *OpsEventTaskService) generateTaskNo() string {
-	// 格式: TSK + 年月日 + 4位序号
+	// 格式: TSK + 年月日 + 4位序列号
 	now := gtime.Now()
 	prefix := "TSK" + now.Format("Ymd")
 
-	// 查询当天最大序号
-	var maxNo string
-	err := s.TaskDao.Where(s.TaskDao.Columns.TaskNo+" like ?", prefix+"%").Order(s.TaskDao.Columns.TaskNo + " desc").Fields(s.TaskDao.Columns.TaskNo).Scan(&maxNo)
+	// 使用数据库序列生成唯一序号（按天重置）
+	seqVal, err := s.TaskDao.DB.GetValue("SELECT next_day_reset_val('task_no_seq')")
 	if err != nil {
+		// 如果序列不存在或出错，使用备用方案：查询当天最大序号+1
+		var maxNoResult struct {
+			TaskNo string
+		}
+		err = s.TaskDao.Where(s.TaskDao.Columns.TaskNo+" like ?", prefix+"%").Order(s.TaskDao.Columns.TaskNo + " desc").Fields(s.TaskDao.Columns.TaskNo).Scan(&maxNoResult)
+		if err != nil || maxNoResult.TaskNo == "" {
+			return prefix + "0001"
+		}
+		maxNoStr := maxNoResult.TaskNo
+		if len(maxNoStr) >= len(prefix)+4 {
+			seq := maxNoStr[len(prefix):]
+			seqNum := gconv.Int(seq)
+			seqNum++
+			return prefix + fmt.Sprintf("%04d", seqNum)
+		}
 		return prefix + "0001"
 	}
 
-	if maxNo == "" {
-		return prefix + "0001"
-	}
-
-	// 提取序号并+1
-	if len(maxNo) >= len(prefix)+4 {
-		seq := maxNo[len(prefix):]
-		var seqNum int
-		gconv.Struct(seq, &seqNum)
-		seqNum++
-		return prefix + fmt.Sprintf("%04d", seqNum)
-	}
-
-	return prefix + "0001"
+	return prefix + fmt.Sprintf("%04d", seqVal.Int())
 }
 
 // 状态校验辅助方法
@@ -951,7 +1116,7 @@ func (s *OpsEventTaskService) canSchedule(status string) bool {
 }
 
 func (s *OpsEventTaskService) canStart(status string) bool {
-	return status == opsdevmodel.TaskStatusTodo || status == opsdevmodel.TaskStatusPaused
+	return status == opsdevmodel.TaskStatusTodo || status == opsdevmodel.TaskStatusPaused || status == opsdevmodel.TaskStatusBlocked
 }
 
 func (s *OpsEventTaskService) canComplete(status string) bool {
@@ -966,10 +1131,40 @@ func (s *OpsEventTaskService) canBlock(status string) bool {
 	return status == opsdevmodel.TaskStatusProcessing || status == opsdevmodel.TaskStatusPaused
 }
 
+// shouldAutoCompleteEvent 判断当前任务完成时是否应自动完成关联的交付事件
+func (s *OpsEventTaskService) shouldAutoCompleteEvent(taskType, testResult string) bool {
+	switch taskType {
+	case "10": // 需求评审 — 完成即触发
+		return true
+	case "30": // 功能测试 — 仅通过时触发
+		return testResult == "pass"
+	case "38": // 系统发版(事件关联) — 完成即触发
+		return true
+	default:
+		return false
+	}
+}
+
 func (s *OpsEventTaskService) canCancel(status string) bool {
 	return status != opsdevmodel.TaskStatusCompleted
 }
 
+// getProjectName 根据项目ID获取项目名称
+func (s *OpsEventTaskService) getProjectName(projectId int) string {
+	if projectId <= 0 {
+		return ""
+	}
+	var project opsdevmodel.OpsDeliveryProject
+	err := s.ProjectDao.FieldsEx(s.ProjectDao.Columns.DeletedTime).
+		WherePri(s.ProjectDao.Columns.Id, projectId).
+		Scan(&project)
+	if err != nil {
+		g.Log().Error(err)
+		return ""
+	}
+	return project.ProjectName
+}
+
 // GetAttachments 获取任务附件列表
 func (s *OpsEventTaskService) GetAttachments(taskId int) ([]*opsdevmodel.OpsEventTaskAttachment, error) {
 	var attachments []*opsdevmodel.OpsEventTaskAttachment
@@ -1083,3 +1278,103 @@ func (s *OpsEventTaskService) AddRecord(req *opsdevmodel.OpsEventTaskRecordAddRe
 		return nil
 	})
 }
+
+// AddWorkHour 添加工时登记（累加actual_work_hour并记录过程）
+func (s *OpsEventTaskService) AddWorkHour(req *opsdevmodel.OpsEventTaskWorkHourAddReq) error {
+	var entity opsdevmodel.OpsEventTask
+	err := s.TaskDao.FieldsEx(s.TaskDao.Columns.DeletedTime).WherePri(s.TaskDao.Columns.Id, req.TaskId).Scan(&entity)
+	if err != nil {
+		g.Log().Error(err)
+		return myerrors.DbError("查询任务数据失败")
+	}
+	if entity.Id <= 0 {
+		return myerrors.TipsError("任务数据不存在")
+	}
+	if !s.canAddWorkHour(entity.TaskStatus) {
+		return myerrors.TipsError("只有处理中的任务可以登记工时")
+	}
+
+	return s.TaskDao.Transaction(context.TODO(), func(ctx context.Context, tx *gdb.TX) error {
+		workHourData := g.Map{
+			s.WorkHourDao.Columns.TaskId:         req.TaskId,
+			s.WorkHourDao.Columns.OpsUserId:      s.GetCxtUserId(),
+			s.WorkHourDao.Columns.OpsUserName:    s.GetCxtUserName(),
+			s.WorkHourDao.Columns.ActualWorkDate: req.WorkDate,
+			s.WorkHourDao.Columns.ActualWorkHour: req.ActualHour,
+			s.WorkHourDao.Columns.Remark:         req.Remark,
+		}
+		service.SetCreatedInfo(workHourData, s.GetCxtUserId(), s.GetCxtUserName())
+		_, err := s.WorkHourDao.TX(tx).Data(workHourData).Insert()
+		if err != nil {
+			g.Log().Error(err)
+			return myerrors.DbError("工时登记失败")
+		}
+
+		newActualWorkHour := entity.ActualWorkHour + req.ActualHour
+		updateData := g.Map{
+			s.TaskDao.Columns.ActualWorkHour: newActualWorkHour,
+		}
+		service.SetUpdatedInfo(updateData, s.GetCxtUserId(), s.GetCxtUserName())
+		_, err = s.TaskDao.TX(tx).FieldsEx(service.UpdateFieldEx...).Data(updateData).WherePri(s.TaskDao.Columns.Id, req.TaskId).Update()
+		if err != nil {
+			g.Log().Error(err)
+			return myerrors.DbError("更新实际工时失败")
+		}
+
+		handleContent := fmt.Sprintf("工时登记<br/>工作日期: %s<br/>实际工时: %s小时<br/>工作进展: %s",
+			req.WorkDate, gconv.String(req.ActualHour), req.Remark)
+		recordData := g.Map{
+			s.RecordDao.Columns.TaskId:         req.TaskId,
+			s.RecordDao.Columns.HandleUserId:   s.GetCxtUserId(),
+			s.RecordDao.Columns.HandleUserName: s.GetCxtUserName(),
+			s.RecordDao.Columns.HandleContent:  handleContent,
+		}
+		service.SetCreatedInfo(recordData, s.GetCxtUserId(), s.GetCxtUserName())
+		_, err = s.RecordDao.TX(tx).Data(recordData).Insert()
+		if err != nil {
+			g.Log().Error(err)
+			return myerrors.DbError("新增过程记录失败")
+		}
+		return nil
+	})
+}
+
+// GetWorkHourList 获取工时登记列表
+func (s *OpsEventTaskService) GetWorkHourList(req *opsdevmodel.OpsEventTaskWorkHourListReq) ([]*opsdevmodel.OpsEventTaskWorkHourRsp, error) {
+	var entities []*opsdevmodel.OpsEventTaskWorkHour
+	err := s.WorkHourDao.FieldsEx(s.WorkHourDao.Columns.DeletedTime).
+		Where(s.WorkHourDao.Columns.TaskId, req.TaskId).
+		Order(s.WorkHourDao.Columns.CreatedTime + " desc").
+		Scan(&entities)
+	if err != nil {
+		g.Log().Error(err)
+		return nil, myerrors.DbError("查询工时登记列表失败")
+	}
+
+	list := make([]*opsdevmodel.OpsEventTaskWorkHourRsp, 0, len(entities))
+	for _, entity := range entities {
+		workDate := ""
+		if entity.ActualWorkDate != nil {
+			workDate = entity.ActualWorkDate.Format("Y-m-d")
+		}
+		createdTime := ""
+		if entity.CreatedTime != nil {
+			createdTime = entity.CreatedTime.Format("Y-m-d H:i:s")
+		}
+		list = append(list, &opsdevmodel.OpsEventTaskWorkHourRsp{
+			Id:          entity.Id,
+			TaskId:      entity.TaskId,
+			WorkDate:    workDate,
+			ActualHour:  entity.ActualWorkHour,
+			Remark:      entity.Remark,
+			CreatedName: entity.CreatedName,
+			CreatedTime: createdTime,
+		})
+	}
+	return list, nil
+}
+
+// canAddWorkHour 检查是否可以登记工时（仅处理中状态）
+func (s *OpsEventTaskService) canAddWorkHour(status string) bool {
+	return status == opsdevmodel.TaskStatusProcessing
+}

opms_parent/app/service/opsdev/project_inventory.go

@@ -42,7 +42,7 @@ func NewProjectInventoryService(ctx context.Context) (*ProjectInventoryService,
 // GetList 获取项目清单列表
 func (s *ProjectInventoryService) GetList(req *opsdev.ProjectInventorySearchReq) (int, []*opsdev.ProjectInventoryRsp, error) {
 	db := s.Dao.DB.Table("ops_delivery_project")
-	db = db.LeftJoin("ctr_contract", "ctr_contract.nbo_id = ops_delivery_project.contract_id")
+	db = db.LeftJoin("ctr_contract", "ctr_contract.id = ops_delivery_project.contract_id")
 	db = db.LeftJoin("cust_customer", "cust_customer.id = ops_delivery_project.cust_id")
 	db = db.Where("ops_delivery_project.deleted_time IS NULL")
 
@@ -139,12 +139,12 @@ func (s *ProjectInventoryService) GetList(req *opsdev.ProjectInventorySearchReq)
 		"ops_delivery_project.sales_user_name",
 		"ops_delivery_project.plan_delivery_time",
 		"ops_delivery_project.plan_accept_time",
-		"ctr_contract.id as contract_id",
-		"ctr_contract.contract_code as contract_no",
+		"ops_delivery_project.contract_id",
+		"ops_delivery_project.contract_no",
 		"ctr_contract.contract_amount",
 		"ctr_contract.collected_amount",
 		"ops_delivery_project.cust_id",
-		"cust_customer.cust_name",
+		"ops_delivery_project.cust_name",
 	).Scan(&records)
 	if err != nil {
 		return 0, nil, err
@@ -251,7 +251,7 @@ func (s *ProjectInventoryService) GetDeliveryNodes() []g.Map {
 // Export 导出项目清单
 func (s *ProjectInventoryService) Export(ctx context.Context, req *opsdev.ProjectInventoryExportReq) (content *opsdev.ProjectInventoryExportContent, err error) {
 	db := s.Dao.DB.Table("ops_delivery_project")
-	db = db.LeftJoin("ctr_contract", "ctr_contract.nbo_id = ops_delivery_project.contract_id")
+	db = db.LeftJoin("ctr_contract", "ctr_contract.id = ops_delivery_project.contract_id")
 	db = db.LeftJoin("cust_customer", "cust_customer.id = ops_delivery_project.cust_id")
 	db = db.Where("ops_delivery_project.deleted_time IS NULL")
 
@@ -325,10 +325,10 @@ func (s *ProjectInventoryService) Export(ctx context.Context, req *opsdev.Projec
 		"ops_delivery_project.sales_user_name",
 		"ops_delivery_project.plan_delivery_time",
 		"ops_delivery_project.plan_accept_time",
-		"ctr_contract.contract_code as contract_no",
+		"ops_delivery_project.contract_no",
 		"ctr_contract.contract_amount",
 		"ctr_contract.collected_amount",
-		"cust_customer.cust_name",
+		"ops_delivery_project.cust_name",
 	).Scan(&records)
 	if err != nil {
 		return nil, err

opms_parent/config/config.toml

@@ -1,10 +1,10 @@
 # 应用系统设置
 [setting]
     logpath = "/tmp/log/admin"
-    bind-addr = "192.168.0.227:8002"
-    bind-mutipart-addr = "192.168.0.227:9999"
+    bind-addr = "192.168.0.188:8002"
+    bind-mutipart-addr = "192.168.0.188:9999"
     need-advertise-addr = false
-    srv-name = "dashoo.opms.parent-0.0.2"
+    srv-name = "dashoo.opms.parent-0.0.2-cj"
     env = "dev"
     swagger = true
 
@@ -32,8 +32,8 @@
         link = "mysql:oms_u:S3TFPnthe3SaJpmV@tcp(sh-cdb-3dhdnseg.sql.tencentcdb.com:59463)/dashoo_oms"
 
 [micro_srv]
-    auth = "dashoo.opms.admin-0.0.1"
-    tenant = "default"
+    auth = "dashoo.opms.admin-0.0.1-cj"
+    tenant = "8b9ec443"
 
 [cron]
     deliver_order_enabled = false

opms_parent/main.go

@@ -15,7 +15,7 @@ import (
 	"dashoo.cn/opms_parent/app/handler/opsdev"
 	"dashoo.cn/opms_parent/app/handler/partner"
 	"dashoo.cn/opms_parent/app/handler/plat"
-	projHandler "dashoo.cn/opms_parent/app/handler/proj"
+	base4 "dashoo.cn/opms_parent/app/handler/proj"
 	"dashoo.cn/opms_parent/app/handler/sysreport"
 	"dashoo.cn/opms_parent/app/handler/train"
 	"dashoo.cn/opms_parent/app/handler/work"
@@ -49,10 +49,10 @@ func main() {
 	s.RegisterName("TaskLog", new(plat.TaskLogHandler), "")
 	s.RegisterName("TaskProgress", new(plat.TaskProgressHandler), "")
 	s.RegisterName("PunchRecords", new(plat.PunchRecordsHandler), "")
-	s.RegisterName("Business", new(projHandler.BusinessHandler), "")
-	s.RegisterName("BusinessContact", new(projHandler.BusinessContactHandler), "")
-	s.RegisterName("BusinessFile", new(projHandler.BusinessFileHandler), "")
-	s.RegisterName("BusinessTeam", new(projHandler.BusinessTeamHandler), "")
+	s.RegisterName("Business", new(base4.BusinessHandler), "")
+	s.RegisterName("BusinessContact", new(base4.BusinessContactHandler), "")
+	s.RegisterName("BusinessFile", new(base4.BusinessFileHandler), "")
+	s.RegisterName("BusinessTeam", new(base4.BusinessTeamHandler), "")
 	s.RegisterName("CtrContract", new(contract.CtrContract), "")
 	s.RegisterName("CtrContractCollectionPlan", new(contract.CtrContractCollectionPlan), "")
 	s.RegisterName("CtrContractCollection", new(contract.CtrContractCollection), "")
@@ -77,7 +77,7 @@ func main() {
 	s.RegisterName("Questionnaire", new(plat.QuestionnaireHandler), "")
 	s.RegisterName("TableColsConfig", new(plat.TableColsConfigHandler), "")
 	s.RegisterName("ContractReport", new(contract.ContractReportHandler), "")
-	s.RegisterName("BusinessReport", new(projHandler.BusinessReportHandler), "")
+	s.RegisterName("BusinessReport", new(base4.BusinessReportHandler), "")
 	s.RegisterName("ProductConsultRecord", new(cust.ProductConsultRecordHandler), "")
 	s.RegisterName("TrainHead", new(train.TrainHeadHander), "")
 	s.RegisterName("SaleApply", new(train.SaleApplyHandler), "")
@@ -88,8 +88,8 @@ func main() {
 	s.RegisterName("DeliveryProjectEvent", new(opsdev.DeliveryProjectEventHandler), "")
 	s.RegisterName("ProjectInventory", new(opsdev.ProjectInventoryHandler), "")
 	s.RegisterName("CtrContractEvent", new(contract.CtrContractEvent), "")
-    // 注册 OPS 任务处理器
-    s.RegisterName("OpsEventTask", new(opsdev.OpsEventTaskHandler), "")
+	// 注册 OPS 任务处理器
+	s.RegisterName("OpsEventTask", new(opsdev.OpsEventTaskHandler), "")
 
 	// 首页
 	s.RegisterName("Home", new(home.HomeHandler), "")
@@ -98,7 +98,7 @@ func main() {
 	s.RegisterName("DingEvent", new(dingtalk.DingHandler), "")
 
 	dynamic.Invoker.Register(new(contract.CtrContractHandler))
-	dynamic.Invoker.Register(new(projHandler.BusinessHandler))
+	dynamic.Invoker.Register(new(base4.BusinessHandler))
 	dynamic.Invoker.Register(new(work.WorkOrderHandler))
 	// 注册服务对象
 	//s.RegisterName("Auth", new(handler.Auth), "")

opms_parent/schema/function.sql

@@ -50,6 +50,21 @@ BEGIN
 END $
 DELIMITER ;
 
+-- 添加日期字段（用于按天重置）
+alter table plat_sequence add `day` date DEFAULT NULL COMMENT '日期' after `year`;
+
+-- 创建按天重置序列号的函数
+DROP FUNCTION IF EXISTS next_day_reset_val;
+DELIMITER $
+CREATE FUNCTION next_day_reset_val (seq_name VARCHAR(50)) RETURNS INTEGER LANGUAGE SQL DETERMINISTIC CONTAINS SQL SQL SECURITY DEFINER COMMENT '' BEGIN
+    -- 如果日期不是今天，重置序列为0
+    UPDATE plat_sequence SET current_value=0, `day`=CURDATE() WHERE `day` IS NULL OR `day` != CURDATE();
+    -- 递增序列号
+    UPDATE plat_sequence SET current_value=current_value+increment WHERE name = seq_name;
+    RETURN currval(seq_name);
+END $
+DELIMITER ;
+
 -- INSERT INTO plat_sequence VALUES ('customer_code', 1000, 1, '', 1000, '系统管理员', '2023-02-09 10:27:42', null, null, null, null);
 -- INSERT INTO plat_sequence VALUES ('contract_code', 1000, 1, '', 1000, '系统管理员', '2023-02-09 10:27:42', null, null, null, null);
 -- INSERT INTO plat_sequence VALUES ('consult_code', 1000, 1, null, '', 1000, '系统管理员', '2023-02-09 10:27:42', null, null, null, null);