Merge branch 'wwq' into dev

pkg/service/cron/cron.go

@@ -118,6 +118,17 @@ func ExportExcelExecutionResult(c *gin.Context) {
 		service.Error(c, errors.New("网络超时,请重试"))
 		return
 	}
+	userListRes, err := service.AccountFieeProvider.UserList(context.Background(), &account.UserListRequest{
+		Domain: "app",
+	})
+	if err != nil {
+		service.Error(c, errors.New("用户查询失败"))
+		return
+	}
+	idFindSubName := make(map[uint64]string)
+	for _, v := range userListRes.UserList {
+		idFindSubName[v.Id] = v.SubNum
+	}
 
 	titleList := []string{
 		"任务标题", "艺人编号", "艺人姓名", "内容类型", "内容标题", "执行结果", "原因",
@@ -126,7 +137,7 @@ func ExportExcelExecutionResult(c *gin.Context) {
 	for _, task := range res.Data {
 		data := []interface{}{
 			task.TaskTitle,
-			task.ArtistId,
+			idFindSubName[uint64(task.ArtistId)],
 			task.ArtistName,
 			task.ContentTypeDescription,
 			task.WorkTitle,
@@ -347,7 +358,7 @@ func readExcel(excelPath string) ([]excelData, error) {
 		subName := getCellValue(f, sheetName, i, 0)
 		name := getCellValue(f, sheetName, i, 1)
 		data := excelData{
-			Line:    uint(i),
+			Line:    uint(i - 1),
 			SubName: subName,
 			Name:    name,
 		}