From f825e8d1f623dd4b6fabc2703d383d509c274401 Mon Sep 17 00:00:00 2001 From: henry Date: Mon, 22 Nov 2021 16:48:29 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=85=BC=E5=AE=B9Sqlite3=EF=BC=8C?= =?UTF-8?q?=E5=8E=BB=E9=99=A4Find=5Fin=5Fset=E5=87=BD=E6=95=B0=EF=BC=8C?= =?UTF-8?q?=E5=B0=86=E6=95=B0=E6=8D=AE=E6=8B=86=E5=88=86=E8=AF=BB=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controller/manage/supplier.go | 27 ++++++++++++++------------- app/controller/work/instance.go | 18 ++++++++++-------- app/model/work_repair.go | 4 +--- app/model/work_schedule.go | 4 ++-- json/work_schedule.json | 28 ++++++++++++++-------------- 5 files changed, 41 insertions(+), 40 deletions(-) diff --git a/app/controller/manage/supplier.go b/app/controller/manage/supplier.go index 437bcb3..c4a3261 100644 --- a/app/controller/manage/supplier.go +++ b/app/controller/manage/supplier.go @@ -43,20 +43,21 @@ func (c *Supplier) List(name, mobile string, kind model2.ManageSupplierKind, pag Order: model2.NewOrder("id", model2.OrderModeToDesc), }} if c.TenantID > 0 { + // TODO：因不支持此写法，故删除此写法 // 根据单位由下往上查看信息 - tenantInfo, err := model.NewSysTenant().Parent(c.TenantID) - - if err != nil { - return nil, err - } - tenantIDs := make([]uint64, 0) - - for _, v := range tenantInfo { - tenantIDs = append(tenantIDs, v.ID) - } - where = append(where, &model2.ModelWhereOrder{ - Where: model2.NewWhereIn("tenant_id", tenantIDs), - }) + //tenantInfo, err := model.NewSysTenant().Parent(c.TenantID) + // + //if err != nil { + // return nil, err + //} + //tenantIDs := make([]uint64, 0) + // + //for _, v := range tenantInfo { + // tenantIDs = append(tenantIDs, v.ID) + //} + //where = append(where, &model2.ModelWhereOrder{ + // Where: model2.NewWhereIn("tenant_id", tenantIDs), + //}) } if name != "" { where = append(where, &model2.ModelWhereOrder{ diff --git a/app/controller/work/instance.go b/app/controller/work/instance.go index b564b32..fa9612e 100644 --- a/app/controller/work/instance.go +++ b/app/controller/work/instance.go @@ -104,7 +104,7 @@ func (c *Instance) material(tx *gorm.DB, material []*InstanceLaunchParamsForMate workMaterials := make([]*model2.WorkMaterial, 0) for _, v := range material { - if v.ID <= 0 || v.SupplierID <= 0 || v.Number <= 0 { + if v.ID <= 0 || v.SupplierID <= 0 { return errors.New("操作错误，器材参数不完全") } workMaterials = append(workMaterials, &model2.WorkMaterial{ @@ -120,13 +120,15 @@ func (c *Instance) material(tx *gorm.DB, material []*InstanceLaunchParamsForMate for _, v := range workMaterials { v.WorkID = workID - if err := model2.UpdatesWhere(mManageMaterialSupplier.ManageMaterialSupplier, map[string]interface{}{ - "frozen_stock": gorm.Expr("frozen_stock + ?", v.MaterialNumber), "updated_at": now, - }, []*model2.ModelWhere{ - model2.NewWhere("material_id", v.MaterialID), - model2.NewWhere("supplier_id", v.MaterialSupplierID), - }, tx); err != nil { - return err + if v.MaterialNumber > 0 { + if err := model2.UpdatesWhere(mManageMaterialSupplier.ManageMaterialSupplier, map[string]interface{}{ + "frozen_stock": gorm.Expr("frozen_stock + ?", v.MaterialNumber), "updated_at": now, + }, []*model2.ModelWhere{ + model2.NewWhere("material_id", v.MaterialID), + model2.NewWhere("supplier_id", v.MaterialSupplierID), + }, tx); err != nil { + return err + } } } mWorkMaterial := model.NewWorkMaterial() diff --git a/app/model/work_repair.go b/app/model/work_repair.go index 323bf7c..05352d3 100644 --- a/app/model/work_repair.go +++ b/app/model/work_repair.go @@ -57,9 +57,7 @@ func (m *WorkRepair) Repairs(page, pageSize int, count *int64, where ...*model.M // Detail 维修工单信息 func (m *WorkRepair) Detail(id uint64) (*WorkRepairInfo, error) { db := orm.GetDB().Table(m.TableName()+" r"). - Select("r.id", "r.order_no", "r.work_id", "r.status", - "r.created_at"). - Where("r.id = ?", id) + Select("r.*").Where("r.id = ?", id) out := new(WorkRepairInfo) diff --git a/app/model/work_schedule.go b/app/model/work_schedule.go index c1c23c4..56d7adc 100644 --- a/app/model/work_schedule.go +++ b/app/model/work_schedule.go @@ -151,9 +151,9 @@ func (m *WorkSchedule) WorkSchedules(kind model.WorkScheduleKind, condition *Wor sql := `SELECT id FROM %s WHERE (CASE target WHEN %d THEN -( SELECT GROUP_CONCAT( a.id SEPARATOR ',' ) FROM ( SELECT id FROM work_schedule WHERE target = 1 AND target_value IN (%s)) AS a ) +( SELECT GROUP_CONCAT( a.id ) FROM ( SELECT id FROM work_schedule WHERE target = 1 AND target_value IN (%s)) AS a ) WHEN %d THEN -(SELECT GROUP_CONCAT( a.id SEPARATOR ',' ) FROM ( SELECT id FROM work_schedule WHERE target = 2 AND target_value IN (%s)) AS a ) +(SELECT GROUP_CONCAT( a.id ) FROM ( SELECT id FROM work_schedule WHERE target = 2 AND target_value IN (%s)) AS a ) ELSE "" END) != '' AND kind = %d AND is_deleted = %d` diff --git a/json/work_schedule.json b/json/work_schedule.json index 12f69a9..f538535 100644 --- a/json/work_schedule.json +++ b/json/work_schedule.json @@ -5,8 +5,8 @@ "title": "发起工单", "stage": 1, "step": 1, - "target": 1, - "target_value": "2098151543063711744", + "target": 2, + "target_value": "9", "is_countersign": 0, "is_deleted": 0 }, @@ -16,8 +16,8 @@ "title": "业务科室审批", "stage": 1, "step": 2, - "target": 1, - "target_value": "2098151543063711744", + "target": 2, + "target_value": "8", "is_countersign": 0, "is_deleted": 0 }, @@ -27,8 +27,8 @@ "title": "分管领导审批", "stage": 1, "step": 3, - "target": 1, - "target_value": "2098151543063711744", + "target": 2, + "target_value": "7", "is_countersign": 0, "is_deleted": 0 }, @@ -38,8 +38,8 @@ "title": "总修理队审批", "stage": 2, "step": 1, - "target": 1, - "target_value": "2098151543063711744", + "target": 2, + "target_value": "5", "is_countersign": 0, "is_deleted": 0 }, @@ -49,8 +49,8 @@ "title": "总业务科室审批", "stage": 2, "step": 2, - "target": 1, - "target_value": "2098151543063711744", + "target": 2, + "target_value": "4", "is_countersign": 0, "is_deleted": 0 }, @@ -60,8 +60,8 @@ "title": "总分管领导审批", "stage": 2, "step": 3, - "target": 1, - "target_value": "2098151543063711744", + "target": 2, + "target_value": "3", "is_countersign": 0, "is_deleted": 0 }, @@ -71,8 +71,8 @@ "title": "省武警总队审批", "stage": 3, "step": 1, - "target": 1, - "target_value": "2098151543063711744", + "target": 2, + "target_value": "2", "is_countersign": 0, "is_deleted": 0 }