diff --git a/modules/rtask/module.go b/modules/rtask/module.go index 41e212115..406b0a10c 100644 --- a/modules/rtask/module.go +++ b/modules/rtask/module.go @@ -176,7 +176,7 @@ func (this *ModuleRtask) getHandle(tt comm.TaskType) (handles []*rtaskCondHandle case comm.Rtype25, comm.Rtype30, comm.Rtype32, comm.Rtype33, comm.Rtype34, comm.Rtype36, comm.Rtype37, comm.Rtype40, - comm.Rtype46, comm.Rtype73, comm.Rtype76, comm.Rtype77, comm.Rtype79, comm.Rtype80, comm.Rtype83, + comm.Rtype46, comm.Rtype76, comm.Rtype79, comm.Rtype52, comm.Rtype55, comm.Rtype56, comm.Rtype82, comm.Rtype65, comm.Rtype66, comm.Rtype67, comm.Rtype68, comm.Rtype70, comm.Rtype140, comm.Rtype169, comm.Rtype170, comm.Rtype174, comm.Rtype179, comm.Rtype180: @@ -187,6 +187,14 @@ func (this *ModuleRtask) getHandle(tt comm.TaskType) (handles []*rtaskCondHandle } handles = append(handles, handle) this.registerVerifyHandle(v.Id, handle) + case comm.Rtype73, comm.Rtype77,comm.Rtype80, comm.Rtype83: + handle := &rtaskCondHandle{ + condId: v.Id, + verify: this.modelRtaskRecord.verifyThirdGreatEqualParam, + update: this.modelRtaskRecord.addUpdate, + } + handles = append(handles, handle) + this.registerVerifyHandle(v.Id, handle) case comm.Rtype41, comm.Rtype42: handle := &rtaskCondHandle{ condId: v.Id, diff --git a/modules/rtask/verifyHandle.go b/modules/rtask/verifyHandle.go index f1bef976b..4e068d044 100644 --- a/modules/rtask/verifyHandle.go +++ b/modules/rtask/verifyHandle.go @@ -107,19 +107,13 @@ func (this *ModelRtaskRecord) verifyThirdLessEqualParam(uid string, record *pb.D //参数比较,默认第一个参数soGreateEqual,其它soEqual switch paramLen { case 1: - ok, err = soGreatEqual(params[0], cfg.Data1) + ok=true return case 2: - if ok, err = soGreatEqual(params[0], cfg.Data1); !ok { - return - } if ok, err = soEqual(params[1], cfg.Data2); !ok { return } case 3: - if ok, err = soGreatEqual(params[0], cfg.Data1); !ok { - return - } if ok, err = soEqual(params[1], cfg.Data2); !ok { return } @@ -142,19 +136,13 @@ func (this *ModelRtaskRecord) verifyThirdGreatEqualParam(uid string, record *pb. //参数比较,默认第一个参数soGreateEqual,其它soEqual switch paramLen { case 1: - ok, err = soGreatEqual(params[0], cfg.Data1) + ok = true return case 2: - if ok, err = soGreatEqual(params[0], cfg.Data1); !ok { - return - } if ok, err = soEqual(params[1], cfg.Data2); !ok { return } case 3: - if ok, err = soGreatEqual(params[0], cfg.Data1); !ok { - return - } if ok, err = soEqual(params[1], cfg.Data2); !ok { return }