|
@@ -32895,7 +32895,6 @@ WHERE
|
|
|
public async Task<IActionResult> GroupProcessInitTest(int groupId, int currUserId)
|
|
public async Task<IActionResult> GroupProcessInitTest(int groupId, int currUserId)
|
|
|
{
|
|
{
|
|
|
return Ok(await _processOverviewRep.ProcessInitAsync(groupId, currUserId));
|
|
return Ok(await _processOverviewRep.ProcessInitAsync(groupId, currUserId));
|
|
|
-
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/// <summary>
|
|
/// <summary>
|
|
@@ -33021,8 +33020,15 @@ WHERE
|
|
|
[ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
|
|
[ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
|
|
|
public async Task<IActionResult> ConfProcessGroupNames()
|
|
public async Task<IActionResult> ConfProcessGroupNames()
|
|
|
{
|
|
{
|
|
|
|
|
+ var groupTypes = new List<int>() {
|
|
|
|
|
+ 302, // 成都-会务活动
|
|
|
|
|
+ 691, // 四川-会务活动
|
|
|
|
|
+ 762, // 四川-赛事项目收入
|
|
|
|
|
+ 1047 // 成都-赛事项目收入
|
|
|
|
|
+ };
|
|
|
|
|
+
|
|
|
var groupNames = await _sqlSugar.Queryable<Grp_DelegationInfo>()
|
|
var groupNames = await _sqlSugar.Queryable<Grp_DelegationInfo>()
|
|
|
- .Where(x => x.IsDel == 0)
|
|
|
|
|
|
|
+ .Where(x => x.IsDel == 0 && groupTypes.Contains(x.TeamDid))
|
|
|
.OrderByDescending(x => x.VisitDate)
|
|
.OrderByDescending(x => x.VisitDate)
|
|
|
.Select(x => new
|
|
.Select(x => new
|
|
|
{
|
|
{
|