1

handler/assignments.go

@@ -52,34 +52,35 @@ func generateTable() error {
 			male = append(male, i)
 		}
 	}
-	//为女生宿舍分配负责人：
-	for i := 0; i < 4; i++ {
-		for _, x := range female {
-			if (x.Arranged == false) && (x.Access < model.FRESH) {
-				table[i] = append(table[i], x.Name)
-				x.Arranged = true
-			}
-		}
-	}
-	//男生负责人：
-	for i := 0; i < 7; i++ {
-		for _, x := range male {
-			if (x.Arranged == false) && (x.Access < model.FRESH) {
-				table[i] = append(table[i], x.Name)
-				x.Arranged = true
-			}
-		}
-	}
-	//女生成员
+
+	//为女生分配负责人
 	for c, i := range female {
-		if i.Arranged == false {
-			table[(c % 4)] = append(table[(c%4)], i.Name)
+		if i.Access < model.FRESH { //是正式成员
+			table[c%4] = append(table[c%4], i.Name) //轮流分配到女生片区
+			i.Arranged = true
+		}
+
+	}
+	//分配剩下的所有女生到女生片区
+	for c, i := range female {
+		if i.Arranged != true {
+			table[c%4] = append(table[c%4], i.Name)
+			i.Arranged = true
 		}
 	}
-	//男生成员
+
+	//为男生分配负责人
+	for c, i := range male {
+		if i.Access < model.FRESH {
+			table[(c%3)+4] = append(table[(c%3)+4], i.Name)
+			i.Arranged = true
+		}
+	}
+
+	//分配剩下的所有男生
 	for c, i := range male {
 		if i.Arranged == false {
-			table[(c % 7)] = append(table[(c%7)], i.Name)
+			table[c%7] = append(table[c%7], i.Name)
 		}
 	}
 	fmt.Printf("today:%v\n", today)

member.csv

@@ -1,101 +1,101 @@
 姓名,工号,性别,权限,有空
-王小明,10001,1,7,1
-李芳,10002,1,6,2
-张强,10003,0,3,5
-赵丽,10004,1,3,4
-孙浩,10005,1,7,5
-刘芳,10006,1,6,6
-陈伟,10007,1,6,7
-杨磊,10008,1,7,1
-张晓婷,10009,1,6,2
-王志,10010,1,6,3
-李军,10011,1,7,4
-赵玉,10012,0,2,5
-马琳,10013,1,7,6
-高飞,10014,1,7,7
-王凯,10015,1,6,1
-陈颖,10016,1,3,2
-刘宁,10017,1,6,3
-孙伟,10018,1,7,4
-周杰,10019,1,6,5
-张丽,10020,1,7,6
-李明,10021,1,6,7
-陈强,10022,0,3,5
-王芳,10023,1,7,2
-赵强,10024,1,7,3
-李欣,10025,1,7,4
-刘强,10026,1,6,5
-张飞,10027,1,7,6
-陈飞,10028,0,6,5
-李刚,10029,1,7,1
-赵勇,10030,1,6,2
-孙明,10031,1,7,3
-周飞,10032,1,6,4
-高伟,10033,1,7,5
-张晓明,10034,1,3,6
-赵伟,10035,1,7,7
-孙丽,10036,1,6,1
-王晓,10037,1,7,2
-陈霞,10038,0,2,3
-赵华,10039,1,7,4
-杨伟,10040,1,6,5
-张浩,10041,1,7,6
-李霞,10042,1,6,7
-刘伟,10043,1,7,1
-张伟,10044,1,6,2
-陈军,10045,1,6,3
-周丽,10046,1,7,4
-王宁,10047,0,2,5
-刘丽,10048,1,7,6
-赵强,10049,1,7,7
-孙宁,10050,1,6,1
-李丽,10051,1,7,2
-陈宁,10052,1,6,3
-赵明,10053,1,7,4
-高霞,10054,1,7,5
-张凯,10055,0,1,6
-孙霞,10056,1,7,7
-陈宁,10057,1,6,1
-刘军,10058,1,7,2
-王飞,10059,1,7,3
-张杰,10060,1,6,4
-赵刚,10061,1,7,5
-李晓明,10062,1,6,6
-高明,10063,1,7,7
-杨霞,10064,1,7,1
-王军,10065,1,6,2
-张霞,10066,1,6,3
-孙勇,10067,1,7,4
-赵丽华,10068,1,7,5
-刘伟华,10069,1,6,6
-杨强,10070,0,3,7
-李军华,10071,1,7,1
-张飞翔,10072,1,7,2
-陈小明,10073,1,6,3
-王志华,10074,1,7,4
-李浩,10075,1,6,5
-赵宁,10076,1,7,6
-刘宁华,10077,1,7,7
-孙杰,10078,1,6,1
-高磊,10079,1,7,2
-张宁,10080,1,6,3
-杨宁,10081,1,7,4
-陈丽,10082,0,3,5
-王丽,10083,1,7,6
-赵志华,10084,1,6,7
-孙丽华,10085,1,7,1
-刘志,10086,1,6,2
-张霞华,10087,1,7,3
-王磊,10088,1,7,4
-陈小杰,10089,1,6,5
-李宁华,10090,1,7,6
-赵丽杰,10091,1,7,7
-孙军,10092,1,6,1
-高志,10093,1,7,2
-张霞明,10094,1,6,3
-赵明华,10095,0,0,4
-陈志华,10096,1,6,5
-王丽华,10097,1,7,6
-李强,10098,1,7,7
-赵晓,10099,1,6,1
-杨磊明,10100,1,7,2
+m-10001,10001,1,6,1
+m-10002,10002,1,7,2
+m-10003,10003,1,7,3
+m-10004,10004,1,7,4
+m-10005,10005,1,6,5
+m-10006,10006,1,7,6
+m-10007,10007,1,6,7
+m-10008,10008,1,6,1
+m-10009,10009,1,7,2
+m-10010,10010,1,6,3
+m-10011,10011,1,6,4
+m-10012,10012,1,6,5
+m-zs-10013,10013,1,2,6
+m-10014,10014,1,6,7
+m-10015,10015,1,6,1
+m-10016,10016,1,7,2
+m-zs-10017,10017,1,2,3
+m-10018,10018,1,6,4
+m-10019,10019,1,7,5
+m-10020,10020,1,7,6
+m-10021,10021,1,7,7
+m-10022,10022,1,7,1
+m-zs-10023,10023,1,3,2
+m-10024,10024,1,7,3
+m-10025,10025,1,6,4
+m-10026,10026,1,7,5
+m-10027,10027,1,6,6
+m-10028,10028,1,7,7
+m-10029,10029,1,7,1
+m-10030,10030,1,6,2
+m-10031,10031,1,7,3
+m-10032,10032,1,7,4
+m-10033,10033,1,7,5
+m-10034,10034,1,6,6
+m-10035,10035,1,6,7
+m-10036,10036,1,6,1
+m-10037,10037,1,7,2
+m-10038,10038,1,7,3
+m-10039,10039,1,7,4
+m-zs-10040,10040,1,0,5
+m-10041,10041,1,7,6
+m-10042,10042,1,7,7
+m-10043,10043,1,6,1
+m-10044,10044,1,7,2
+m-zs-10045,10045,1,2,3
+m-10046,10046,1,6,4
+m-10047,10047,1,7,5
+m-10048,10048,1,6,6
+m-10049,10049,1,7,7
+m-10050,10050,1,7,1
+m-10051,10051,1,6,2
+m-10052,10052,1,7,3
+m-10053,10053,1,7,4
+m-10054,10054,1,6,5
+m-10055,10055,1,7,6
+m-10056,10056,1,6,7
+m-10057,10057,1,7,1
+m-10058,10058,1,7,2
+m-10059,10059,1,7,3
+m-zs-10060,10060,1,3,4
+m-10061,10061,1,7,5
+m-10062,10062,1,6,6
+m-10063,10063,1,7,7
+m-10064,10064,1,6,1
+m-10065,10065,1,7,2
+m-10066,10066,1,7,3
+m-10067,10067,1,7,4
+m-10068,10068,1,6,5
+m-10069,10069,1,6,6
+m-zs-10070,10070,1,1,7
+m-10071,10071,1,6,1
+m-10072,10072,1,7,2
+m-10073,10073,1,7,3
+m-10074,10074,1,6,4
+m-zs-10075,10075,1,3,5
+f-zs-10076,10076,0,3,6
+f-10077,10077,0,6,7
+f-10078,10078,0,6,1
+f-10079,10079,0,6,2
+f-10080,10080,0,6,3
+f-10081,10081,0,7,4
+f-10082,10082,0,7,5
+f-10083,10083,0,6,6
+f-10084,10084,0,6,7
+f-10085,10085,0,6,1
+f-10086,10086,0,7,2
+f-10087,10087,0,6,3
+f-10088,10088,0,7,4
+f-10089,10089,0,7,5
+f-10090,10090,0,7,6
+f-zs-10091,10091,0,3,7
+f-10092,10092,0,7,1
+f-10093,10093,0,6,2
+f-zs-10094,10094,0,3,3
+f-10095,10095,0,7,4
+f-10096,10096,0,6,5
+f-10097,10097,0,6,6
+f-10098,10098,0,7,7
+f-10099,10099,0,7,1
+f-10100,10100,0,7,2