fixbug: 今日工单数量

Nats/Nats.go

@@ -34,14 +34,14 @@ func NatsInit() {
 		type T_R struct {
 			Code                  int16  `xml:"Code"`
 			Msg                   string `xml:"Msg"`
-			WorkOrderNum          int64  // 工单数量
+			TodayWorkOrderNum     int64  // 工单数量
 			UntreatedWorkOrderNum int64  // 未处理工单数量
 		}
 
 		var t_R T_R
-
-		t_R.WorkOrderNum = WorkOrder.Read_WorkOrder_ALL_T_State_Count(string(m.Data), 0)
-		t_R.UntreatedWorkOrderNum = WorkOrder.Read_WorkOrder_ALL_T_State_Count(string(m.Data), 2)
+		today := time.Now().Format("2006-01-02") + " 00:00:00"
+		t_R.TodayWorkOrderNum = WorkOrder.Read_WorkOrder_ALL_T_State_Count(string(m.Data), 0, today)
+		t_R.UntreatedWorkOrderNum = WorkOrder.Read_WorkOrder_ALL_T_State_Count(string(m.Data), 2, "")
 
 		t_R.Code = 200
 		t_R.Msg = "ok"

models/WorkOrder/WorkOrder.go

@@ -188,13 +188,17 @@ func Read_UserWorkOrder_List(T_uuid string, page int, page_z int) (t []WorkOrder
 	return t, cnt
 }
 
-func Read_WorkOrder_ALL_T_State_Count(T_pids string, T_handle int) (cnt int64) {
+func Read_WorkOrder_ALL_T_State_Count(T_pids string, T_handle int, Time_start string) (cnt int64) {
 	o := orm.NewOrm()
 	qs := o.QueryTable(new(WorkOrder))
 	cond := orm.NewCondition()
 
 	cond1 := cond.And("T_State__gt", 0)
 
+	if len(Time_start) > 0 {
+		cond1 = cond1.And("CreateTime__gte", Time_start)
+	}
+
 	if len(T_pids) > 0 && T_pids != "*" {
 		list := lib.SplitStringIds(T_pids, "P")
 		cond1 = cond1.And("T_pid__in", list)