修改维护工单管理的查询代码结构 并且连表支持查询duedateinterval及日检、周检、月检、年检

web/controllers/pm_wo_controller.go

@@ -90,8 +90,11 @@ func GetPmWoList(ctx iris.Context) {
 	data.Assetid, _ = ctx.URLParamInt("assetid")
 	data.Descr = ctx.URLParam("assetname")
 	searchtime := ctx.URLParam("searchtime")
-	duedateinterval, _ := ctx.URLParamInt("duedateinterval")
-
+	var duedateinterval int
+	duedateinterval, err = ctx.URLParamInt("duedateinterval")
+	if err != nil {
+		duedateinterval = 0
+	}
 
 	result, count, err := data.GetPage(pageSize, pageIndex, searchtime, duedateinterval)
 	if err != nil {

web/models/pm_wo_model.go

@@ -2,7 +2,6 @@ package models
 
 import (
 	"LAPP_GAAS_GFrame_BACKEND/db"
-	"LAPP_GAAS_GFrame_BACKEND/grmi"
 	"LAPP_GAAS_GFrame_BACKEND/utils"
 	"LAPP_GAAS_GFrame_BACKEND/web/middleware/glog"
 	"context"
@@ -243,8 +242,13 @@ func (t *PmWo) GetPage(pageSize int, pageIndex int, searchtime string, duehourin
 		query = query.In("pm_wo.status", statusLi)
 	}
 	if duehourinterval != 0 {
-		table = table.In("pm_service.duedateinterval", duehourinterval)
-		query = query.In("pm_service.duedateinterval", duehourinterval)
+		table = table.Where("pm_service.duedateinterval = ?", duehourinterval)
+		query = query.Where("pm_service.duedateinterval = ?", duehourinterval)
+	}
+	if !utils.ValueIsEmpty(t.Descr) {
+		descr := "%" + t.Descr + "%"
+		table = table.And("pm_wo.descr like ?", descr)
+		query = query.And("pm_wo.descr like ?", descr)
 	}
 	offset := (pageIndex - 1) * pageSize
 
@@ -258,9 +262,9 @@ func (t *PmWo) GetPage(pageSize int, pageIndex int, searchtime string, duehourin
 		return data, 0, err
 	}
 	now := time.Now()
-	for _, item := range data {
+	for index, item := range data {
 		closeTimeStr := item.Schedendtime
-		closeTime, err := time.ParseInLocation(grmi.URLDateTimeFormat, closeTimeStr, utils.TimezoneLocation)
+		closeTime, err := time.ParseInLocation("20060102150405", closeTimeStr, utils.TimezoneLocation)
 		if err != nil {
 			continue
 		}
@@ -269,6 +273,7 @@ func (t *PmWo) GetPage(pageSize int, pageIndex int, searchtime string, duehourin
 		} else {
 			item.UrgencyDegree = UngencyStatusYes
 		}
+		data[index] = item
 	}
 	return data, int(count), nil
 }