fix:增加活动倒计时结束判断

@@ -358,9 +358,7 @@ func (cashPoolService *CashPoolService) ListExchangeCashActivity(listExchangeCas
 	if count, activities, err := exchangeActivityRepository.Find(tool_funs.SimpleStructToMap(listExchangeCashActivityQuery)); err != nil {
 	if count, activities, err := exchangeActivityRepository.Find(tool_funs.SimpleStructToMap(listExchangeCashActivityQuery)); err != nil {
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 	} else {
 	} else {
-		// TODO 更新兑换活动结束倒计时，增加倒计时结束判断
 		for _, activity := range activities {
 		for _, activity := range activities {
-
 			var timeNow = time.Now()
 			var timeNow = time.Now()
 			var deadline = activity.Deadline
 			var deadline = activity.Deadline
 			var t1 = time.Date(timeNow.Year(), timeNow.Month(), timeNow.Day(), 0, 0, 0, 0, time.Local)
 			var t1 = time.Date(timeNow.Year(), timeNow.Month(), timeNow.Day(), 0, 0, 0, 0, time.Local)
@@ -372,6 +370,12 @@ func (cashPoolService *CashPoolService) ListExchangeCashActivity(listExchangeCas
 				Deadline: activity.Deadline,
 				Deadline: activity.Deadline,
 			}
 			}
 
 
+			// 倒计时结束
+			if t2.Before(t1) {
+				updateExchangeCashActivity.CountDown = 0
+				updateExchangeCashActivity.Deadline = activity.Deadline
+			}
+
 			if err := activity.Update(tool_funs.SimpleStructToMap(updateExchangeCashActivity)); err != nil {
 			if err := activity.Update(tool_funs.SimpleStructToMap(updateExchangeCashActivity)); err != nil {
 				return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
 				return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
 			}
 			}

@@ -283,7 +283,7 @@ func (dao *EmployeeDao) CalculateEmployeesSuMoney(companyId int, startTime time.
 //	}, nil
 //	}, nil
 //}
 //}
 
 
-// TODO 排行榜统计，增加分页
+// 排行榜统计
 func (dao *EmployeeDao) CalculateEmployeesRankingList(companyId int, startTime time.Time, endTime time.Time, offset int, limit int) (map[string]interface{}, error) {
 func (dao *EmployeeDao) CalculateEmployeesRankingList(companyId int, startTime time.Time, endTime time.Time, offset int, limit int) (map[string]interface{}, error) {
 	var retWealth []struct {
 	var retWealth []struct {
 		Uid int
 		Uid int

@@ -137,7 +137,7 @@ func (controller *StatisticsController) EmployeesContributionsStatistics() {
 	controller.ServeJSON()
 	controller.ServeJSON()
 }
 }
 
 
-// TODO 合并员工财富值、贡献值排行榜
+// 员工财富值、贡献值排行榜
 func (controller *StatisticsController) RankingListStatistics() {
 func (controller *StatisticsController) RankingListStatistics() {
 	statisticsService := service.NewStatisticsService(nil)
 	statisticsService := service.NewStatisticsService(nil)
 	employeesRankingListStatisticsCommand := &command.EmployeesRankingListStatisticsCommand{}
 	employeesRankingListStatisticsCommand := &command.EmployeesRankingListStatisticsCommand{}

@@ -341,7 +341,7 @@ func (controller *SuMoneyController) ImportExchangeList () {
 		fmt.Println(err)
 		fmt.Println(err)
 		return
 		return
 	}
 	}
-	// TODO 增加导入失败原因返回
+	// TODO 增加非空校验，导入失败原因返回
 	var response utils.JsonResponse
 	var response utils.JsonResponse
 	dataList := make([]interface{}, 0)
 	dataList := make([]interface{}, 0)
 	rows, _ := xlsx.GetRows("Sheet1")
 	rows, _ := xlsx.GetRows("Sheet1")
@@ -353,9 +353,9 @@ func (controller *SuMoneyController) ImportExchangeList () {
 		if i > 2 {
 		if i > 2 {
 			for _, _ = range row {
 			for _, _ = range row {
 				createExchangeCashPersonCommand.ExchangeCashActivityId = activityId
 				createExchangeCashPersonCommand.ExchangeCashActivityId = activityId
-				// TODO 非空校验
-				if row[0] == "" || createExchangeCashPersonCommand.PersonAccount == "" || createExchangeCashPersonCommand.ExchangedSuMoney == 0{
-					controller.Ctx.WriteString( "空字段" )
+				r2, _ := strconv.ParseFloat(row[2], 64)
+				if row[0] == "" || row[1] == "" || r2 == 0 {
+					controller.Ctx.WriteString("单元格包含空字段")
 					return
 					return
 				}
 				}
 				createExchangeCashPersonCommand.Operator = operator
 				createExchangeCashPersonCommand.Operator = operator
@@ -402,7 +402,6 @@ func (controller *SuMoneyController) ExportExchangeList() {
 	cashPoolService := service.NewCashPoolService(nil)
 	cashPoolService := service.NewCashPoolService(nil)
 	exportExchangeCashListCommand := &command.ExportExchangeCashListCommand{}
 	exportExchangeCashListCommand := &command.ExportExchangeCashListCommand{}
 	json.Unmarshal(controller.Ctx.Input.GetData("requestBody").([]byte), exportExchangeCashListCommand)
 	json.Unmarshal(controller.Ctx.Input.GetData("requestBody").([]byte), exportExchangeCashListCommand)
-	fmt.Print(exportExchangeCashListCommand, "\n")
 	// 列标题
 	// 列标题
 	titles := []string{
 	titles := []string{
 		"姓名","手机账号","已兑换现金","已兑换素币",
 		"姓名","手机账号","已兑换现金","已兑换素币",
@@ -423,7 +422,6 @@ func (controller *SuMoneyController) ExportExchangeList() {
 		}
 		}
 		data = append(data, p)
 		data = append(data, p)
 	}
 	}
-	fmt.Print(data, "\n")
 	var response utils.JsonResponse
 	var response utils.JsonResponse
 	if err != nil {
 	if err != nil {
 		response = utils.ResponseError(controller.Ctx, err)
 		response = utils.ResponseError(controller.Ctx, err)
@@ -457,21 +455,17 @@ func (controller *SuMoneyController) ExportExchangeList() {
 			}
 			}
 		}
 		}
 		f.SetActiveSheet(index)
 		f.SetActiveSheet(index)
-
 		// 创建下载文件夹
 		// 创建下载文件夹
 		mkErr :=os.Mkdir("download", os.ModePerm)
 		mkErr :=os.Mkdir("download", os.ModePerm)
 		if err!=nil{
 		if err!=nil{
 			fmt.Println(mkErr)
 			fmt.Println(mkErr)
 		}
 		}
-
 		//保存为文件
 		//保存为文件
 		f.Path="download/素币兑换清单.xlsx"
 		f.Path="download/素币兑换清单.xlsx"
 		if err := f.Save(); err != nil {
 		if err := f.Save(); err != nil {
 			fmt.Println(err)
 			fmt.Println(err)
 		}
 		}
-
 		controller.Ctx.Output.Download(f.Path,"素币兑换清单.xlsx")
 		controller.Ctx.Output.Download(f.Path,"素币兑换清单.xlsx")
-
 		// 下载完成删除文件
 		// 下载完成删除文件
 		removeErr := os.Remove(f.Path)
 		removeErr := os.Remove(f.Path)
 		if err != nil {
 		if err != nil {