From b966b805631beba62bc3b4e32621da671b0ae4ee Mon Sep 17 00:00:00 2001
From: Park Byung Eun <geekdev@naver.com>
Date: Thu, 4 Aug 2022 06:29:42 +0000
Subject: [PATCH] =?UTF-8?q?=EC=A4=91=EB=B3=B5=EB=A1=9C=EA=B7=B8=EC=9D=B8?=
 =?UTF-8?q?=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apps/report/sessionin-overlap/api.ts      |   2 +-
 .../apps/report/sessionin-overlap/data.ts     | 179 ++++++++--
 .../components/list.component.html            | 319 +++---------------
 .../components/list.component.ts              |  19 +-
 .../models/sessionin-overlap.ts               |  27 +-
 5 files changed, 218 insertions(+), 328 deletions(-)

diff --git a/src/app/mock-api/apps/report/sessionin-overlap/api.ts b/src/app/mock-api/apps/report/sessionin-overlap/api.ts
index b7b73f0..ef4d177 100644
--- a/src/app/mock-api/apps/report/sessionin-overlap/api.ts
+++ b/src/app/mock-api/apps/report/sessionin-overlap/api.ts
@@ -44,7 +44,7 @@ export class ReportSessioninOverlapMockApi {
         );
 
         // Sort the sessioninOverlaps
-        if (sort === 'sku' || sort === 'name' || sort === 'active') {
+        if (sort === 'overlapCount') {
           sessioninOverlaps.sort((a, b) => {
             const fieldA = a[sort].toString().toUpperCase();
             const fieldB = b[sort].toString().toUpperCase();
diff --git a/src/app/mock-api/apps/report/sessionin-overlap/data.ts b/src/app/mock-api/apps/report/sessionin-overlap/data.ts
index f1f2c01..1dc5f38 100644
--- a/src/app/mock-api/apps/report/sessionin-overlap/data.ts
+++ b/src/app/mock-api/apps/report/sessionin-overlap/data.ts
@@ -2,32 +2,157 @@
 
 export const sessioninOverlaps = [
   {
-    id: 'on00',
-    totalPartnerCount: '5',
-    totalHoldingMoney: 303675,
-    totalComp: 108933,
-    total: 412608,
-    branchCount: 1,
-    divisionCount: 1,
-    officeCount: 1,
-    storeCount: 1,
-    memberCount: 1,
-    nickname: 'on00',
-    accountHolder: '11',
-    phoneNumber: '010-1111-1111',
-    calculateType: '롤링',
-    ownCash: 50000,
-    ownComp: 1711,
-    ownCoupon: 50000,
-    gameMoney: 0,
-    todayComp: 0,
-    totalDeposit: 0,
-    totalWithdraw: 0,
-    balance: 0,
-    registDate: '2022-06-12 15:38',
-    finalSigninDate: '',
-    ip: '',
-    state: '정상',
-    note: '',
+    id: '1',
+    overlapCount: '3',
+    ip: '192.181.111.11',
+    users: [
+      {
+        id: '7eb7c859-1347-4317-96b6-9476a7e2ba3c',
+        signinId: 'lala1',
+        nickname: '라라1',
+      },
+      {
+        id: '00b0292f-3d50-4669-a0c4-7a9d85efc98d',
+        signinId: 'onon6',
+        nickname: 'kakao',
+      },
+      {
+        id: 'b899ec30-b85a-40ab-bb1f-18a596d5c6de',
+        signinId: 'on04',
+        nickname: '라크라',
+      },
+    ],
+  },
+  {
+    id: '2',
+    overlapCount: '3',
+    ip: '212.181.111.11',
+    users: [
+      {
+        id: '7eb7c859-1347-4317-96b6-9476a7e2ba3c',
+        signinId: 'lala1',
+        nickname: '라라1',
+      },
+      {
+        id: '00b0292f-3d50-4669-a0c4-7a9d85efc98d',
+        signinId: 'onon6',
+        nickname: 'kakao',
+      },
+      {
+        id: 'b899ec30-b85a-40ab-bb1f-18a596d5c6de',
+        signinId: 'on04',
+        nickname: '라크라',
+      },
+    ],
+  },
+  {
+    id: '3',
+    overlapCount: '3',
+    ip: '192.181.111.11',
+    users: [
+      {
+        id: '7eb7c859-1347-4317-96b6-9476a7e2ba3c',
+        signinId: 'lala1',
+        nickname: '라라1',
+      },
+      {
+        id: '00b0292f-3d50-4669-a0c4-7a9d85efc98d',
+        signinId: 'onon6',
+        nickname: 'kakao',
+      },
+      {
+        id: 'b899ec30-b85a-40ab-bb1f-18a596d5c6de',
+        signinId: 'on04',
+        nickname: '라크라',
+      },
+    ],
+  },
+  {
+    id: '4',
+    overlapCount: '3',
+    ip: '192.181.111.11',
+    users: [
+      {
+        id: '7eb7c859-1347-4317-96b6-9476a7e2ba3c',
+        signinId: 'lala1',
+        nickname: '라라1',
+      },
+      {
+        id: '00b0292f-3d50-4669-a0c4-7a9d85efc98d',
+        signinId: 'onon6',
+        nickname: 'kakao',
+      },
+      {
+        id: 'b899ec30-b85a-40ab-bb1f-18a596d5c6de',
+        signinId: 'on04',
+        nickname: '라크라',
+      },
+    ],
+  },
+  {
+    id: '5',
+    overlapCount: '3',
+    ip: '192.181.111.11',
+    users: [
+      {
+        id: '7eb7c859-1347-4317-96b6-9476a7e2ba3c',
+        signinId: 'lala1',
+        nickname: '라라1',
+      },
+      {
+        id: '00b0292f-3d50-4669-a0c4-7a9d85efc98d',
+        signinId: 'onon6',
+        nickname: 'kakao',
+      },
+      {
+        id: 'b899ec30-b85a-40ab-bb1f-18a596d5c6de',
+        signinId: 'on04',
+        nickname: '라크라',
+      },
+    ],
+  },
+  {
+    id: '6',
+    overlapCount: '3',
+    ip: '192.181.111.11',
+    users: [
+      {
+        id: '7eb7c859-1347-4317-96b6-9476a7e2ba3c',
+        signinId: 'lala1',
+        nickname: '라라1',
+      },
+      {
+        id: '00b0292f-3d50-4669-a0c4-7a9d85efc98d',
+        signinId: 'onon6',
+        nickname: 'kakao',
+      },
+      {
+        id: 'b899ec30-b85a-40ab-bb1f-18a596d5c6de',
+        signinId: 'on04',
+        nickname: '라크라',
+      },
+    ],
+  },
+  {
+    id: '7',
+    overlapCount: '3',
+    ip: '192.181.111.11',
+    users: [
+      {
+        id: '7eb7c859-1347-4317-96b6-9476a7e2ba3c',
+        signinId: 'lala1',
+        nickname: '라라1',
+      },
+      {
+        id: '00b0292f-3d50-4669-a0c4-7a9d85efc98d',
+        signinId: 'onon6',
+        nickname: 'kakao',
+      },
+      {
+        id: 'b899ec30-b85a-40ab-bb1f-18a596d5c6de',
+        signinId: 'on04',
+        nickname: '라크라',
+      },
+    ],
   },
 ];
diff --git a/src/app/modules/admin/report/sessionin-overlap/components/list.component.html b/src/app/modules/admin/report/sessionin-overlap/components/list.component.html
index 6e2c6dc..c4c7556 100644
--- a/src/app/modules/admin/report/sessionin-overlap/components/list.component.html
+++ b/src/app/modules/admin/report/sessionin-overlap/components/list.component.html
@@ -13,110 +13,25 @@
     <div class="text-4xl font-extrabold tracking-tight">중복로그인</div>
     <!-- Actions -->
     <div class="flex shrink-0 items-center mt-6 sm:mt-0 sm:ml-4">
-      <!-- Memo -->
-      <!-- <mat-form-field>
-        <ng-container *ngIf="sessioninOverlaps$ | async as sessioninOverlaps">
-          <ng-container
-            *ngFor="let sessioninOverlap of sessioninOverlaps; trackBy: __trackByFn"
-          >
-            <div
-              class="inventory-grid grid items-center gap-4 py-3 px-6 md:px-8 border-b"
-            >
-              <fieldset>
-                총 파트너수:{{ sessioninOverlap.totalPartnerCount }} 총 보유머니:{{
-                  sessioninOverlap.totalHoldingMoney
-                }}
-                총 콤프:{{ sessioninOverlap.totalComp }} 총 합계:{{
-                  sessioninOverlap.total
-                }}
-              </fieldset>
-            </div>
-          </ng-container>
-        </ng-container>
-      </mat-form-field> -->
-
-      <!-- SelectBox -->
-      <mat-form-field>
-        <mat-select placeholder="리스트수">
-          <mat-option value="40">40</mat-option>
-          <mat-option value="60">60</mat-option>
-          <mat-option value="80">80</mat-option>
-          <mat-option value="100">100</mat-option>
-        </mat-select>
-      </mat-form-field>
-      <mat-form-field>
-        <mat-select placeholder="레벨">
-          <mat-option value="level1">LV.1</mat-option>
-          <mat-option value="level2">LV.2</mat-option>
-          <mat-option value="level3">LV.3</mat-option>
-          <mat-option value="level4">LV.4</mat-option>
-        </mat-select>
-      </mat-form-field>
-      <mat-form-field>
-        <mat-select placeholder="상태">
-          <mat-option value="">정상</mat-option>
-          <mat-option value="">대기</mat-option>
-          <mat-option value="">탈퇴</mat-option>
-          <mat-option value="">휴면</mat-option>
-          <mat-option value="">블랙</mat-option>
-          <mat-option value="">정지</mat-option>
-        </mat-select>
-      </mat-form-field>
-      <mat-form-field>
-        <mat-select placeholder="제한">
-          <mat-option value="">카지노제한</mat-option>
-          <mat-option value="">슬롯제한</mat-option>
-        </mat-select>
-      </mat-form-field>
-      <mat-form-field>
-        <mat-select placeholder="입금">
-          <mat-option value="">계좌입금</mat-option>
-        </mat-select>
-      </mat-form-field>
-      <mat-form-field>
-        <mat-select placeholder="내용">
-          <mat-option value="">카지노콤프</mat-option>
-          <mat-option value="">슬롯콤프</mat-option>
-          <mat-option value="">배팅콤프</mat-option>
-          <mat-option value="">첫충콤프</mat-option>
-        </mat-select>
-      </mat-form-field>
-      <!-- <mat-form-field>
-        <mat-select placeholder="입금">
-          <mat-option value="">계좌입금</mat-option>
-        </mat-select>
-      </mat-form-field>
-      <mat-form-field>
-        <mat-select placeholder="아이디">
-          <mat-option value="">아이디</mat-option>
-          <mat-option value="">닉네임</mat-option>
-          <mat-option value="">이름</mat-option>
-          <mat-option value="">사이트</mat-option>
-          <mat-option value="">파트너수동지급</mat-option>
-        </mat-select>
-      </mat-form-field>
-      <mat-form-field>
-        <mat-select placeholder="가입일 정렬">
-          <mat-option value="">가입일 정렬</mat-option>
-          <mat-option value="">아이디 정렬</mat-option>
-          <mat-option value="">닉네임 정렬</mat-option>
-          <mat-option value="">캐쉬 정렬</mat-option>
-          <mat-option value="">콤프 정렬</mat-option>
-          <mat-option value="">쿠폰 정렬</mat-option>
-          <mat-option value="">입금 정렬</mat-option>
-          <mat-option value="">출금 정렬</mat-option>
-          <mat-option value="">차익 정렬</mat-option>
-        </mat-select>
-      </mat-form-field>
-      <mat-form-field>
-        <mat-select placeholder="내림차순">
-          <mat-option value="">내림차순</mat-option>
-          <mat-option value="">오름차순</mat-option>
-        </mat-select>
-      </mat-form-field> -->
       <!-- Search -->
+
+      <button mat-icon-button (click)="__onClickSearch()">
+        <mat-icon [svgIcon]="'heroicons_outline:search'"></mat-icon>
+      </button>
+    </div>
+  </div>
+
+  <!-- Search -->
+  <div
+    *ngIf="__isSearchOpened"
+    class="relative flex flex-col sm:flex-row flex-0 sm:items-center sm:justify-between py-4 px-6 md:px-8 border-b"
+  >
+    <!-- Actions -->
+    <div fxLayout="row wrap" class="items-center mt-6 sm:mt-0 sm:ml-0">
+      <!-- Search button -->
       <mat-form-field
-        class="fuse-mat-dense fuse-mat-no-subscript fuse-mat-rounded min-w-64"
+        fxFlex
+        class="fuse-mat-rounded min-w-64 bet-mat-form-field-wrapper-mb-0 mr-2"
       >
         <mat-icon
           class="icon-size-5"
@@ -127,21 +42,20 @@
           matInput
           [formControl]="searchInputControl"
           [autocomplete]="'off'"
-          [placeholder]="'Search'"
+          [placeholder]="'Search user'"
         />
       </mat-form-field>
       <!-- Add user button -->
       <button
-        class="ml-4"
+        fxFlex
         mat-flat-button
+        style="position: fixed; margin-top: 4px"
         [color]="'primary'"
         (click)="__createProduct()"
       >
-        <!-- <mat-icon [svgIcon]="'heroicons_outline:plus'"></mat-icon> -->
-        <span class="ml-2 mr-1">검색하기</span>
+        <mat-icon [svgIcon]="'heroicons_outline:search'"></mat-icon>
+        <span class="ml-2 mr-1">Search</span>
       </button>
-      <button>엑셀저장</button>
-      <button>카지노머니확인</button>
     </div>
   </div>
 
@@ -152,36 +66,16 @@
       class="flex flex-col flex-auto sm:mb-18 overflow-hidden sm:overflow-y-auto"
     >
       <ng-container *ngIf="sessioninOverlaps$ | async as sessioninOverlaps">
-        <ng-container
-          *ngIf="sessioninOverlaps.length > 0; else noSessioninOverlap"
-        >
+        <ng-container *ngIf="sessioninOverlaps.length > 0; else noUser">
           <div class="grid">
             <!-- Header -->
             <div
-              class="inventory-grid z-10 sticky top-0 grid gap-4 py-4 px-6 md:px-8 shadow text-md font-semibold text-secondary bg-gray-50 dark:bg-black dark:bg-opacity-5"
-              matSort
-              matSortDisableClear
+              class="sessionin-overlap-grid z-10 sticky top-0 grid gap-4 py-4 px-6 md:px-8shadow text-md font-semibold text-secondary bg-gray-50 dark:bg-black dark:bg-opacity-5"
             >
-              <div class="hidden sm:block"><mat-checkbox></mat-checkbox></div>
-              <div class="hidden sm:block">요율</div>
-              <div class="hidden sm:block">상부트리</div>
-              <div class="hidden sm:block">관리</div>
-              <div class="hidden sm:block">매장수</div>
-              <div class="hidden sm:block">회원수</div>
-              <div class="hidden sm:block">아이디</div>
-              <div class="hidden sm:block">닉네임</div>
-              <div class="hidden sm:block">예금주</div>
-              <div class="hidden sm:block">연락처</div>
-              <div class="hidden sm:block">정산</div>
-              <div class="hidden sm:block">보유금</div>
-              <div class="hidden sm:block">게임중머니</div>
-              <div class="hidden sm:block">카지노->캐쉬</div>
-              <div class="hidden sm:block">금일콤프</div>
-              <div class="hidden sm:block">총입출</div>
-              <div class="hidden sm:block">로그</div>
-              <div class="hidden sm:block">상태</div>
-              <div class="hidden sm:block">회원수</div>
-              <div class="hidden sm:block">비고</div>
+              <div class="hidden lg:block">CNT</div>
+              <div class="hidden lg:block">IP</div>
+
+              <div class="hidden lg:block">아이디</div>
             </div>
             <!-- Rows -->
             <ng-container
@@ -189,150 +83,35 @@
             >
               <ng-container
                 *ngFor="
-                  let sessioninOverlap of sessioninOverlaps;
+                  let info of sessioninOverlaps;
+                  let i = index;
                   trackBy: __trackByFn
                 "
               >
                 <div
-                  class="inventory-grid grid items-center gap-4 py-3 px-6 md:px-8 border-b"
+                  class="sessionin-overlap-grid grid items-center gap-4 py-3 px-6 md:px-8 border-b"
                 >
-                  <div class="hidden sm:block truncate">
-                    <mat-checkbox></mat-checkbox>
+                  <!-- CNT -->
+                  <div class="hidden lg:block">
+                    {{ info.overlapCount }}
                   </div>
-                  <!-- rate -->
-                  <div class="hidden sm:block truncate">
-                    <button
-                      mat-button
-                      color="primary"
-                      matTooltip="요율확인
-                                카지노-바카라: 0%
-                                카지노-룰렛: 0%
-                                카지노-드레곤타이거: 0%
-                                카지노-그외: 0%
-                                슬롯: 0%
-                                카지노루징: 0%
-                                슬롯루징: 0%"
-                    >
-                      요율
-                    </button>
-                    <div class="hidden sm:block truncate">
-                      <!-- 관리 -->
-                      <button mat-flat-button [color]="'primary'">
-                        <mat-form-field>
-                          <mat-select placeholder="관리">
-                            <mat-option value="">보유금지급/회수</mat-option>
-                            <mat-option value="">수수료설정</mat-option>
-                            <mat-option value="">콤프지급/회수</mat-option>
-                            <mat-option value="">쿠폰머니지급/회수</mat-option>
-                            <mat-option value="">쪽지보내기</mat-option>
-                            <mat-option value="">베팅리스트</mat-option>
-                            <mat-option value="">강제로그아웃</mat-option>
-                          </mat-select>
-                        </mat-form-field>
-                      </button>
-                    </div>
+                  <!-- IP -->
+                  <div class="hidden lg:block">
+                    {{ info.ip }}
                   </div>
-                  <!-- 매장수 -->
-                  <div class="hidden sm:block truncate">
-                    <button mat-flat-button [color]="'primary'">
-                      {{ sessioninOverlap.branchCount }}
-                    </button>
-                    <button mat-flat-button [color]="'primary'">
-                      {{ sessioninOverlap.divisionCount }}
-                    </button>
-                    <button mat-flat-button [color]="'primary'">
-                      {{ sessioninOverlap.officeCount }}
-                    </button>
-                    <button mat-flat-button [color]="'primary'">
-                      {{ sessioninOverlap.storeCount }}
-                    </button>
-                  </div>
-                  <!-- 회원수 -->
-                  <div class="hidden sm:block truncate">
-                    <button mat-flat-button [color]="'primary'">
-                      {{ sessioninOverlap.memberCount }}
-                    </button>
-                  </div>
-                  <!-- id -->
-                  <ng-container *ngIf="users$ | async as users">
+
+                  <!-- 아이디-->
+                  <div class="hidden lg:block">
                     <ng-container
-                      *ngFor="let user of users; trackBy: __trackByFn"
+                      *ngFor="
+                        let user of info.users;
+                        let i = index;
+                        trackBy: __trackByFn
+                      "
                     >
-                      <div
-                        class="hidden sm:block truncate"
-                        (click)="viewUserDetail(user.id!)"
-                      >
-                        {{ sessioninOverlap.id }}
-                      </div>
+                      <span *ngIf="i !== 0"><b>&nbsp;|&nbsp;</b></span>
+                      <span>{{ user.nickname }}</span>
                     </ng-container>
-                  </ng-container>
-                  <!-- nickname -->
-                  <div class="hidden sm:block truncate">
-                    {{ sessioninOverlap.nickname }}
-                  </div>
-                  <!-- accountHolder -->
-                  <div class="hidden sm:block truncate">
-                    {{ sessioninOverlap.accountHolder }}
-                  </div>
-                  <!-- 연락처 -->
-                  <div class="hidden sm:block truncate">
-                    {{ sessioninOverlap.phoneNumber }}
-                  </div>
-                  <!-- 정산 -->
-                  <div class="hidden sm:block truncate">
-                    {{ sessioninOverlap.calculateType }}
-                  </div>
-                  <!-- 보유금 -->
-                  <div class="hidden sm:block truncate">
-                    캐쉬{{ sessioninOverlap.ownCash }} 콤프{{
-                      sessioninOverlap.ownComp
-                    }}
-                    쿠폰{{ sessioninOverlap.ownCoupon }}
-                  </div>
-                  <!-- gameMoney -->
-                  <div class="hidden sm:block truncate">
-                    {{ sessioninOverlap.gameMoney }}
-                  </div>
-                  <!-- casinoCash -->
-                  <div class="hidden sm:block truncate">
-                    <button mat-flat-button [color]="'primary'">
-                      게임머니확인
-                    </button>
-                    <button mat-flat-button [color]="'primary'">
-                      게임머니회수
-                    </button>
-                  </div>
-                  <!-- todayComp -->
-                  <div class="hidden sm:block truncate">
-                    {{ sessioninOverlap.todayComp }}P
-                  </div>
-                  <!-- 총입출 -->
-                  <div class="hidden sm:block truncate">
-                    입금{{ sessioninOverlap.totalDeposit }} 출금{{
-                      sessioninOverlap.totalWithdraw
-                    }}
-                    차익{{ sessioninOverlap.balance }}
-                  </div>
-                  <!-- log -->
-                  <div class="hidden sm:block truncate">
-                    가입{{ sessioninOverlap.registDate }} 최종{{
-                      sessioninOverlap.finalSigninDate
-                    }}
-                    IP{{ sessioninOverlap.ip }}
-                  </div>
-                  <!-- state -->
-                  <div class="hidden sm:block truncate">
-                    {{ sessioninOverlap.state }}
-                  </div>
-                  <!-- 회원수 -->
-                  <div class="hidden sm:block truncate">
-                    {{ sessioninOverlap.memberCount }}
-                  </div>
-                  <!-- 비고 -->
-                  <div class="hidden sm:block truncate">
-                    <button mat-flat-button [color]="'primary'">
-                      {{ sessioninOverlap.note }}
-                    </button>
                   </div>
                 </div>
               </ng-container>
@@ -351,11 +130,11 @@
         </ng-container>
       </ng-container>
 
-      <ng-template #noSessioninOverlap>
+      <ng-template #noUser>
         <div
           class="p-8 sm:p-16 border-t text-4xl font-semibold tracking-tight text-center"
         >
-          There are no sessionin overlaps!
+          There are no data!
         </div>
       </ng-template>
     </div>
diff --git a/src/app/modules/admin/report/sessionin-overlap/components/list.component.ts b/src/app/modules/admin/report/sessionin-overlap/components/list.component.ts
index cedf22f..5829838 100644
--- a/src/app/modules/admin/report/sessionin-overlap/components/list.component.ts
+++ b/src/app/modules/admin/report/sessionin-overlap/components/list.component.ts
@@ -41,19 +41,19 @@ import { Router } from '@angular/router';
   styles: [
     /* language=SCSS */
     `
-      .inventory-grid {
-        grid-template-columns: 60px auto 40px;
+      .sessionin-overlap-grid {
+        grid-template-columns: 60px 200px auto;
 
         @screen sm {
-          grid-template-columns: 60px 60px 60px 60px 60px 60px auto 60px;
+          grid-template-columns: 60px 200px auto;
         }
 
         @screen md {
-          grid-template-columns: 60px 60px 60px 60px 60px 60px auto 60px 60px;
+          grid-template-columns: 60px 200px auto;
         }
 
         @screen lg {
-          grid-template-columns: 60px 70px 70px 70px 70px 100px 60px 60px auto 60px 60px 60px 60px;
+          grid-template-columns: 60px 200px auto;
         }
       }
     `,
@@ -74,6 +74,8 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
   selectedSessioninOverlap?: SessioninOverlap;
   pagination?: SessioninOverlapPagination;
 
+  __isSearchOpened = false;
+
   private _unsubscribeAll: Subject<any> = new Subject<any>();
 
   /**
@@ -174,6 +176,13 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
   // @ Private methods
   // -----------------------------------------------------------------------------------------------------
 
+  /**
+   * toggle the search
+   * Used in 'bar'
+   */
+  __onClickSearch(): void {
+    this.__isSearchOpened = !this.__isSearchOpened;
+  }
   /**
    * Create product
    */
diff --git a/src/app/modules/admin/report/sessionin-overlap/models/sessionin-overlap.ts b/src/app/modules/admin/report/sessionin-overlap/models/sessionin-overlap.ts
index 574f138..c97557b 100644
--- a/src/app/modules/admin/report/sessionin-overlap/models/sessionin-overlap.ts
+++ b/src/app/modules/admin/report/sessionin-overlap/models/sessionin-overlap.ts
@@ -1,29 +1,6 @@
 export interface SessioninOverlap {
   id?: string;
-  totalPartnerCount?: number;
-  totalHoldingMoney?: number;
-  totalComp?: number;
-  total?: number;
-  branchCount?: number;
-  divisionCount?: number;
-  officeCount?: number;
-  storeCount?: number;
-  memberCount?: number;
-  nickname?: string;
-  accountHolder?: string;
-  phoneNumber?: string;
-  calculateType?: string;
-  ownCash?: number;
-  ownComp?: number;
-  ownCoupon?: number;
-  gameMoney?: number;
-  todayComp?: number;
-  totalDeposit?: number;
-  totalWithdraw?: number;
-  balance?: number;
-  registDate?: string;
-  finalSigninDate?: string;
+  overlapCount?: string;
   ip?: string;
-  state?: string;
-  note?: string;
+  users?: any[];
 }