fix:个人素币收支

@@ -309,6 +309,7 @@ func (statisticsService *StatisticsService) EmployeesSuMoneyStatistics(employees
 	if err := employeesSuMoneyStatisticsCommand.ValidateCommand(); err != nil {
 	if err := employeesSuMoneyStatisticsCommand.ValidateCommand(); err != nil {
 		return nil, application.ThrowError(application.ARG_ERROR, err.Error())
 		return nil, application.ThrowError(application.ARG_ERROR, err.Error())
 	}
 	}
+
 	transactionContext, err := factory.CreateTransactionContext(nil)
 	transactionContext, err := factory.CreateTransactionContext(nil)
 	if err != nil {
 	if err != nil {
 		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
@@ -389,6 +390,7 @@ func (statisticsService *StatisticsService) ContributionsWealthRanking(contribut
 	if err := contributionsWealthRankingQuery.ValidateQuery(); err != nil {
 	if err := contributionsWealthRankingQuery.ValidateQuery(); err != nil {
 		return nil, application.ThrowError(application.ARG_ERROR, err.Error())
 		return nil, application.ThrowError(application.ARG_ERROR, err.Error())
 	}
 	}
+
 	transactionContext, err := factory.CreateTransactionContext(nil)
 	transactionContext, err := factory.CreateTransactionContext(nil)
 	if err != nil {
 	if err != nil {
 		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
@@ -400,6 +402,17 @@ func (statisticsService *StatisticsService) ContributionsWealthRanking(contribut
 		transactionContext.RollbackTransaction()
 		transactionContext.RollbackTransaction()
 	}()
 	}()
 
 
+	// 员工仓储初始化
+	var employeeRepository domain.EmployeeRepository
+	if value, err := factory.CreateEmployeeRepository(map[string]interface{}{
+		"transactionContext": transactionContext,
+	}); err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	} else {
+		employeeRepository = value
+	}
+
+	// 员工DAO初始化
 	var employeeDao *dao.EmployeeDao
 	var employeeDao *dao.EmployeeDao
 	if value, err := factory.CreateEmployeeDao(map[string]interface{}{
 	if value, err := factory.CreateEmployeeDao(map[string]interface{}{
 		"transactionContext": transactionContext,
 		"transactionContext": transactionContext,
@@ -425,8 +438,6 @@ func (statisticsService *StatisticsService) ContributionsWealthRanking(contribut
 
 
 		listListIntervalQuery := map[string]interface{} {
 		listListIntervalQuery := map[string]interface{} {
 			"companyId": contributionsWealthRankingQuery.CompanyId,
 			"companyId": contributionsWealthRankingQuery.CompanyId,
-			//"offset": 0,
-			//"limit": 1,
 		}
 		}
 
 
 		if _, listIntervals, err := listIntervalRepository.Find(listListIntervalQuery); err != nil {
 		if _, listIntervals, err := listIntervalRepository.Find(listListIntervalQuery); err != nil {
@@ -444,9 +455,8 @@ func (statisticsService *StatisticsService) ContributionsWealthRanking(contribut
 					contributionsWealthRankingQuery.StartTime = time.Date(0001, 01, 02, 0, 0, 0, 0, time.Local)
 					contributionsWealthRankingQuery.StartTime = time.Date(0001, 01, 02, 0, 0, 0, 0, time.Local)
 					contributionsWealthRankingQuery.EndTime = time.Date(0001, 01, 02, 23, 59, 59, 0, time.Local)
 					contributionsWealthRankingQuery.EndTime = time.Date(0001, 01, 02, 23, 59, 59, 0, time.Local)
 				}
 				}
-			} else {  // 配置了多个年榜
-				// 判断当前时间是否在榜单里
-					currentTime := time.Now().Local()
+			} else {  // 配置了多个年榜，判断当前时间是否在榜单里
+				currentTime := time.Now().Local()
 				for _, listInterval := range listIntervals {
 				for _, listInterval := range listIntervals {
 					if currentTime.After(listInterval.IntervalStartTime.Local()) && currentTime.Before(listInterval.IntervalEndTime.Local()) || currentTime.Equal(listInterval.IntervalStartTime.Local()) || currentTime.Equal(listInterval.IntervalEndTime.Local()) {   // 当前时间在榜单内
 					if currentTime.After(listInterval.IntervalStartTime.Local()) && currentTime.Before(listInterval.IntervalEndTime.Local()) || currentTime.Equal(listInterval.IntervalStartTime.Local()) || currentTime.Equal(listInterval.IntervalEndTime.Local()) {   // 当前时间在榜单内
 						contributionsWealthRankingQuery.StartTime = listInterval.IntervalStartTime.Local()
 						contributionsWealthRankingQuery.StartTime = listInterval.IntervalStartTime.Local()
@@ -469,6 +479,21 @@ func (statisticsService *StatisticsService) ContributionsWealthRanking(contribut
 		if err := transactionContext.CommitTransaction(); err != nil {
 		if err := transactionContext.CommitTransaction(); err != nil {
 			return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 			return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 		}
 		}
+
+		// TODO 排行榜姓名获取
+		//if count, employees, err := employeeRepository.Find(map[string]interface{}{
+		//	"companyId": contributionsWealthRankingQuery.CompanyId,
+		//	"offset": contributionsWealthRankingQuery.Offset,
+		//	"limit": contributionsWealthRankingQuery.Limit,
+		//}); err != nil {
+		//	return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+		//}
+		// 财富值排行榜
+
+
+		// 贡献值排行版
+
+
 		return contributionsWealthRankingStatistics, nil
 		return contributionsWealthRankingStatistics, nil
 	}
 	}
 }
 }

@@ -234,7 +234,7 @@ func (dao *EmployeeDao) CalculateSuMoneyTransactionRecord(uid int64, transaction
 	if err := tx.Model(suMoneyTransactionRecordModel).
 	if err := tx.Model(suMoneyTransactionRecordModel).
 		ColumnExpr("sum(su_money_transaction_record.su_money) AS expend_su_money").
 		ColumnExpr("sum(su_money_transaction_record.su_money) AS expend_su_money").
 		Where(`su_money_transaction_record.employee @> '{"uid":?}'`, uid).
 		Where(`su_money_transaction_record.employee @> '{"uid":?}'`, uid).
-		Where(`su_money_transaction_record.record_type IN (?)`, pg.In([]int{1, 4, 5})).
+		Where(`su_money_transaction_record.record_type IN (?)`, pg.In([]int{1, 4})).
 		Where(`su_money_transaction_record.create_time > ?`, transactionStartTime).
 		Where(`su_money_transaction_record.create_time > ?`, transactionStartTime).
 		Where(`su_money_transaction_record.create_time < ?`, transactionEndTime).
 		Where(`su_money_transaction_record.create_time < ?`, transactionEndTime).
 		Select(&expendSuMoney); err != nil {
 		Select(&expendSuMoney); err != nil {
@@ -261,8 +261,8 @@ func (dao *EmployeeDao) CalculateSuMoneyTransactionRecord(uid int64, transaction
 		return nil, err
 		return nil, err
 	}
 	}
 	return map[string]interface{}{
 	return map[string]interface{}{
-		"incomeSuMoney": incomeSuMoney + incomeSuMoneyExchangeRestore,  // 个人素币收入
-		"expendSuMoney": expendSuMoney, // 个人素币支出
+		"incomeSuMoney": incomeSuMoney,  // 个人素币收入
+		"expendSuMoney": expendSuMoney + (expendSuMoneyExchange - incomeSuMoneyExchangeRestore), // 个人素币支出
 	}, nil
 	}, nil
 }
 }
 
 
@@ -340,11 +340,12 @@ func (dao *EmployeeDao) ContributionsWealthRanking(queryOptions map[string]inter
 	queryWealth := tx.Model(suMoneyTransactionRecordModel)
 	queryWealth := tx.Model(suMoneyTransactionRecordModel)
 	queryWealth = queryWealth.Join("JOIN employees AS e ON e.uid = (su_money_transaction_record.employee->>'uid')::bigint")
 	queryWealth = queryWealth.Join("JOIN employees AS e ON e.uid = (su_money_transaction_record.employee->>'uid')::bigint")
 	queryWealth = queryWealth.ColumnExpr("su_money_transaction_record.employee->>'uid' AS uid")
 	queryWealth = queryWealth.ColumnExpr("su_money_transaction_record.employee->>'uid' AS uid")
-	queryWealth = queryWealth.ColumnExpr("su_money_transaction_record.employee->>'employeeName' AS employee_name")
+	//queryWealth = queryWealth.ColumnExpr("su_money_transaction_record.employee->>'employeeName' AS employee_name")
 	queryWealth = queryWealth.ColumnExpr("sum(case WHEN su_money_transaction_record.record_type IN (2, 3, 6) THEN su_money_transaction_record.su_money ELSE 0 end) - sum(case WHEN su_money_transaction_record.record_type IN (4, 1, 5) THEN su_money_transaction_record.su_money ELSE 0 end) AS employee_su_money")
 	queryWealth = queryWealth.ColumnExpr("sum(case WHEN su_money_transaction_record.record_type IN (2, 3, 6) THEN su_money_transaction_record.su_money ELSE 0 end) - sum(case WHEN su_money_transaction_record.record_type IN (4, 1, 5) THEN su_money_transaction_record.su_money ELSE 0 end) AS employee_su_money")
 	queryWealth = queryWealth.ColumnExpr("ROW_NUMBER() OVER (ORDER BY sum(case WHEN su_money_transaction_record.record_type IN (2, 3, 6) THEN su_money_transaction_record.su_money ELSE 0 end) - sum(case WHEN su_money_transaction_record.record_type IN (4, 1, 5) THEN su_money_transaction_record.su_money ELSE 0 end) DESC) AS ranking")
 	queryWealth = queryWealth.ColumnExpr("ROW_NUMBER() OVER (ORDER BY sum(case WHEN su_money_transaction_record.record_type IN (2, 3, 6) THEN su_money_transaction_record.su_money ELSE 0 end) - sum(case WHEN su_money_transaction_record.record_type IN (4, 1, 5) THEN su_money_transaction_record.su_money ELSE 0 end) DESC) AS ranking")
 	queryWealth = queryWealth.Where(`e.status = ?`, 1)
 	queryWealth = queryWealth.Where(`e.status = ?`, 1)
-	queryWealth = queryWealth.GroupExpr("su_money_transaction_record.employee->>'uid',su_money_transaction_record.employee->>'employeeName'")
+	//queryWealth = queryWealth.GroupExpr("su_money_transaction_record.employee->>'uid',su_money_transaction_record.employee->>'employeeName'")
+	queryWealth = queryWealth.GroupExpr("su_money_transaction_record.employee->>'uid'")
 	if companyId, ok := queryOptions["companyId"]; ok && (companyId.(int64) != 0) {
 	if companyId, ok := queryOptions["companyId"]; ok && (companyId.(int64) != 0) {
 		queryWealth = queryWealth.Where("e.company_id = ?", companyId)
 		queryWealth = queryWealth.Where("e.company_id = ?", companyId)
 	}
 	}
@@ -417,11 +418,12 @@ func (dao *EmployeeDao) ContributionsWealthRanking(queryOptions map[string]inter
 	queryContributions := tx.Model(suMoneyTransactionRecordModel)
 	queryContributions := tx.Model(suMoneyTransactionRecordModel)
 	queryContributions = queryContributions.Join("JOIN employees AS e ON e.uid = (su_money_transaction_record.employee->>'uid')::bigint")
 	queryContributions = queryContributions.Join("JOIN employees AS e ON e.uid = (su_money_transaction_record.employee->>'uid')::bigint")
 	queryContributions = queryContributions.ColumnExpr("su_money_transaction_record.employee->>'uid' AS uid")
 	queryContributions = queryContributions.ColumnExpr("su_money_transaction_record.employee->>'uid' AS uid")
-	queryContributions = queryContributions.ColumnExpr("su_money_transaction_record.employee->>'employeeName' AS employee_name")
+	//queryContributions = queryContributions.ColumnExpr("su_money_transaction_record.employee->>'employeeName' AS employee_name")
 	queryContributions = queryContributions.ColumnExpr("sum(case WHEN su_money_transaction_record.record_type IN (2, 3) THEN su_money_transaction_record.su_money ELSE 0 end) - sum(case WHEN su_money_transaction_record.record_type = 4 THEN su_money_transaction_record.su_money ELSE 0 end) AS employees_contributions")
 	queryContributions = queryContributions.ColumnExpr("sum(case WHEN su_money_transaction_record.record_type IN (2, 3) THEN su_money_transaction_record.su_money ELSE 0 end) - sum(case WHEN su_money_transaction_record.record_type = 4 THEN su_money_transaction_record.su_money ELSE 0 end) AS employees_contributions")
 	queryContributions = queryContributions.ColumnExpr("ROW_NUMBER() OVER (ORDER BY sum(case WHEN su_money_transaction_record.record_type IN (2, 3) THEN su_money_transaction_record.su_money ELSE 0 end) - sum(case WHEN su_money_transaction_record.record_type = 4 THEN su_money_transaction_record.su_money ELSE 0 end) DESC) AS ranking")
 	queryContributions = queryContributions.ColumnExpr("ROW_NUMBER() OVER (ORDER BY sum(case WHEN su_money_transaction_record.record_type IN (2, 3) THEN su_money_transaction_record.su_money ELSE 0 end) - sum(case WHEN su_money_transaction_record.record_type = 4 THEN su_money_transaction_record.su_money ELSE 0 end) DESC) AS ranking")
 	queryContributions = queryContributions.Where(`e.status = ?`, 1)
 	queryContributions = queryContributions.Where(`e.status = ?`, 1)
-	queryContributions = queryContributions.GroupExpr("su_money_transaction_record.employee->>'uid',su_money_transaction_record.employee->>'employeeName'")
+	//queryContributions = queryContributions.GroupExpr("su_money_transaction_record.employee->>'uid',su_money_transaction_record.employee->>'employeeName'")
+	queryContributions = queryContributions.GroupExpr("su_money_transaction_record.employee->>'uid'")
 	if companyId, ok := queryOptions["companyId"]; ok && (companyId.(int64) != 0) {
 	if companyId, ok := queryOptions["companyId"]; ok && (companyId.(int64) != 0) {
 		queryContributions = queryContributions.Where("e.company_id = ?", companyId)
 		queryContributions = queryContributions.Where("e.company_id = ?", companyId)
 	}
 	}