From fbca53b0dce89a5f6496bf46cd5db682d8c638a6 Mon Sep 17 00:00:00 2001 From: huanghai <10402852@qq.com> Date: Fri, 14 Aug 2020 10:29:11 +0800 Subject: [PATCH] 'commit' --- dsBaseRpc/RpcService/BaseClass/BaseClassDao/BaseClassDao.go | 4 ++-- dsBaseRpc/RpcService/BaseClass/BaseClassProto/BaseClass.pb.go | 2 +- dsBaseRpc/RpcService/BaseClass/BaseClassProto/BaseClass.proto | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dsBaseRpc/RpcService/BaseClass/BaseClassDao/BaseClassDao.go b/dsBaseRpc/RpcService/BaseClass/BaseClassDao/BaseClassDao.go index e75dc716..a83d6aa7 100644 --- a/dsBaseRpc/RpcService/BaseClass/BaseClassDao/BaseClassDao.go +++ b/dsBaseRpc/RpcService/BaseClass/BaseClassDao/BaseClassDao.go @@ -217,10 +217,10 @@ func BacthSetClassGraduateStatus(in *BaseClassProto.BacthSetClassGraduateStageAr //1:恢复为正常班级 -3:毕业 //(1)批量设置班级中学生的状态为毕业状态 var flag int - if in.Status == -3 { + if in.Status == 2 { flag = 1 } else { - flag = -3 + flag = 2 } sql := `update t_base_student set b_use=? where class_id=? and b_use=?` _, err := db.SQL(sql, in.Status, in.Ids[i], flag).Execute() diff --git a/dsBaseRpc/RpcService/BaseClass/BaseClassProto/BaseClass.pb.go b/dsBaseRpc/RpcService/BaseClass/BaseClassProto/BaseClass.pb.go index 9f3ca196..1dda8882 100644 --- a/dsBaseRpc/RpcService/BaseClass/BaseClassProto/BaseClass.pb.go +++ b/dsBaseRpc/RpcService/BaseClass/BaseClassProto/BaseClass.pb.go @@ -41,7 +41,7 @@ type BacthSetClassGraduateStageArg struct { //一个或多个ID Ids []string `protobuf:"bytes,1,rep,name=Ids,proto3" json:"Ids,omitempty"` - //1:恢复为正常班级 -3:毕业 + //1:恢复为正常班级 2:毕业 Status int32 `protobuf:"varint,2,opt,name=Status,proto3" json:"Status,omitempty"` //操作人 ActionPersonId string `protobuf:"bytes,3,opt,name=ActionPersonId,proto3" json:"ActionPersonId,omitempty"` diff --git a/dsBaseRpc/RpcService/BaseClass/BaseClassProto/BaseClass.proto b/dsBaseRpc/RpcService/BaseClass/BaseClassProto/BaseClass.proto index a08b374d..2e3158db 100644 --- a/dsBaseRpc/RpcService/BaseClass/BaseClassProto/BaseClass.proto +++ b/dsBaseRpc/RpcService/BaseClass/BaseClassProto/BaseClass.proto @@ -36,7 +36,7 @@ service BaseClassManage { message BacthSetClassGraduateStageArg { //一个或多个ID repeated string Ids = 1; - //1:恢复为正常班级 -3:毕业 + //1:恢复为正常班级 2:毕业 int32 Status = 2; //操作人 string ActionPersonId = 3;