Merge branch 'master' of http://39.98.150.180/antissoft/lvqianmeiye_ERP

李宇
2 parents ca55440e d7925aaa
Showing 25 changed files with 1540 additions and 400 deletions
antis-ncc-admin/src/api/extend/salaryCalculation.js
antis-ncc-admin/src/views/salaryCalculation/index.vue
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbListOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqStatistics/DepartmentInfo/DepartmentInfo.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqStatisticsDepartmentConsumePerformance/LqStatisticsDepartmentConsumePerformanceInfoOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqStatisticsDepartmentConsumePerformance/LqStatisticsDepartmentConsumePerformanceListOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqStatisticsDepartmentConsumePerformance/LqStatisticsDepartmentConsumePerformanceListQueryInput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqStatisticsStoreConsumePerformance/LqStatisticsStoreConsumePerformanceInfoOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqStatisticsStoreConsumePerformance/LqStatisticsStoreConsumePerformanceListOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqStatisticsStoreConsumePerformance/LqStatisticsStoreConsumePerformanceListQueryInput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkListQueryInput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhJksyj/LqXhJksyjCrInput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhKjbsyj/LqXhKjbsyjCrInput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhPxmx/LqXhPxmxInfoOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_statistics_department_consume_performance/LqStatisticsDepartmentConsumePerformanceEntity.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_statistics_store_consume_performance/LqStatisticsStoreConsumePerformanceEntity.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_hyhk/LqXhHyhkEntity.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_jksyj/LqXhJksyjEntity.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_kjbsyj/LqXhKjbsyjEntity.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_pxmx/LqXhPxmxEntity.cs
@@ -26,3 +26,21 @@ export function saveTechPerformanceStatistics(statisticsMonth) {
     data: { statisticsMonth }
   })
 }
+
+// 保存门店耗卡业绩统计数据
+export function saveStoreConsumePerformanceStatistics(statisticsMonth) {
+  return request({
+    url: '/api/Extend/LqStatistics/save-store-consume-performance-stats',
+    method: 'POST',
+    data: { statisticsMonth }
+  })
+}
+
+// 保存个人消耗业绩统计数据
+export function saveDepartmentConsumePerformanceStatistics(statisticsMonth) {
+  return request({
+    url: '/api/Extend/LqStatistics/save-department-consume-performance-stats',
+    method: 'POST',
+    data: { statisticsMonth }
+  })
+}
 <template>
   <div class="salary-calculation-container">
-    <!-- 页面头部 -->
-    <div class="header-card">
-      <h1 class="title">工资计算与统计系统</h1>
-      <p class="subtitle">智能生成各类业绩统计数据，一键完成工资计算</p>
-    </div>
-
-    <!-- 月份选择区域 -->
-    <el-card class="box-card month-selector-card">
-      <div slot="header" class="clearfix">
-        <span><i class="el-icon-date"></i> 选择统计月份</span>
-        <el-button style="float: right; padding: 3px 0" type="text" @click="resetMonth">重置</el-button>
-      </div>
-      <div class="month-picker-wrapper">
-        <el-date-picker
-          v-model="statisticsMonth"
-          type="month"
-          placeholder="选择月份"
-          format="yyyy年MM月"
-          value-format="yyyyMM"
-          :clearable="false"
-          class="month-picker"
-        >
-        </el-date-picker>
-      </div>
-    </el-card>
-
     <!-- 主要内容区域 - 左右布局 -->
     <div class="main-content">
       <!-- 左侧：统计操作区域 -->
       <div class="left-panel">
-        <!-- 一键计算工资 -->
-        <el-card class="box-card calculate-card">
-          <div slot="header" class="clearfix">
-            <span><i class="el-icon-cpu"></i> 一键计算工资</span>
-          </div>
-          <div class="calculate-content">
-            <p class="calculate-desc">按顺序执行所有统计方法，生成完整的工资数据</p>
-            <el-button
-              type="primary"
-              size="large"
-              :loading="isCalculating"
-              @click="handleCalculateSalary"
-              class="calculate-button"
-              :disabled="!statisticsMonth"
-            >
-              <i class="el-icon-magic-stick"></i> 
-              {{ isCalculating ? '计算中...' : '一键计算工资' }}
-            </el-button>
-            <div v-if="calculationProgress.length > 0" class="progress-info">
-              <div class="progress-title">计算进度：</div>
-              <div v-for="(step, index) in calculationProgress" :key="index" class="progress-step">
-                <i :class="getProgressIcon(step.status)" :style="{ color: getProgressColor(step.status) }"></i>
-                <span :class="{ 'completed': step.status === 'completed', 'failed': step.status === 'failed' }">
-                  {{ step.name }}
-                </span>
-              </div>
+        <!-- 顶部控制区域 - 同一行显示 -->
+        <div class="top-controls-row">
+          <!-- 月份选择区域 -->
+          <el-card class="box-card month-selector-card">
+            <div slot="header" class="clearfix">
+              <span><i class="el-icon-date"></i> 选择统计月份</span>
+              <el-button style="float: right; padding: 3px 0" type="text" @click="resetMonth">重置</el-button>
             </div>
-          </div>
-        </el-card>
+            <div class="month-picker-wrapper">
+              <el-date-picker
+                v-model="statisticsMonth"
+                type="month"
+                placeholder="选择月份"
+                format="yyyy年MM月"
+                value-format="yyyyMM"
+                :clearable="false"
+                class="month-picker"
+              >
+              </el-date-picker>
+            </div>
+          </el-card>
+
+          <!-- 一键计算工资 -->
+          <el-card class="box-card calculate-card">
+            <div slot="header" class="clearfix">
+              <span><i class="el-icon-cpu"></i> 一键计算工资</span>
+            </div>
+            <div class="calculate-content">
+              <p class="calculate-desc">按顺序执行所有统计方法，生成完整的工资数据</p>
+              <el-button
+                type="primary"
+                size="large"
+                :loading="isCalculating"
+                @click="handleCalculateSalary"
+                class="calculate-button"
+                :disabled="!statisticsMonth"
+              >
+                <i class="el-icon-magic-stick"></i> 
+                {{ isCalculating ? '计算中...' : '一键计算工资' }}
+              </el-button>
+            </div>
+          </el-card>
+        </div>
         <!-- 单独统计操作 -->
         <el-card class="box-card statistics-card">
@@ -114,6 +102,38 @@
               </el-button>
             </div>
+            <div class="stat-item purple-item">
+              <div class="stat-header">
+                <i class="el-icon-s-shop"></i>
+                <span>门店耗卡业绩</span>
+              </div>
+              <el-button
+                type="info"
+                :loading="loadingStates.storeConsumePerformance"
+                @click="handleStoreConsumePerformanceStatistics"
+                class="stat-button"
+                :disabled="!statisticsMonth"
+              >
+                立即统计
+              </el-button>
+            </div>
+
+            <div class="stat-item teal-item">
+              <div class="stat-header">
+                <i class="el-icon-user-solid"></i>
+                <span>个人消耗业绩</span>
+              </div>
+              <el-button
+                type="primary"
+                :loading="loadingStates.departmentConsumePerformance"
+                @click="handleDepartmentConsumePerformanceStatistics"
+                class="stat-button"
+                :disabled="!statisticsMonth"
+              >
+                立即统计
+              </el-button>
+            </div>
+
             <!-- 预留位置，用于未来添加更多统计方法 -->
             <div class="stat-item placeholder-item">
               <div class="stat-header">
@@ -134,17 +154,27 @@
       <!-- 右侧：结果显示区域 -->
       <div class="right-panel">
+        <!-- 计算进度区域 -->
+        <el-card class="box-card progress-card" v-if="calculationProgress.length > 0">
+          <div slot="header" class="clearfix">
+            <span><i class="el-icon-time"></i> 计算进度</span>
+          </div>
+          <div class="progress-content">
+            <div v-for="(step, index) in calculationProgress" :key="index" class="progress-step">
+              <i :class="getProgressIcon(step.status)" :style="{ color: getProgressColor(step.status) }"></i>
+              <span :class="{ 'completed': step.status === 'completed', 'failed': step.status === 'failed' }">
+                {{ step.name }}
+              </span>
+            </div>
+          </div>
+        </el-card>
+
         <el-card class="box-card result-card">
           <div slot="header" class="clearfix">
             <span><i class="el-icon-document"></i> 统计结果</span>
-            <div class="header-actions">
-              <el-button type="text" @click="exportResults" :disabled="results.length === 0">
-                <i class="el-icon-download"></i> 导出
-              </el-button>
-              <el-button type="text" @click="clearResults">
-                <i class="el-icon-delete"></i> 清空
-              </el-button>
-            </div>
+            <el-button type="text" @click="clearResults">
+              <i class="el-icon-delete"></i> 清空
+            </el-button>
           </div>
           <div class="result-list" ref="resultList">
             <div v-if="results.length === 0" class="no-results">
@@ -171,7 +201,9 @@
 import {
   saveGoldTriangleStatistics,
   savePersonalPerformanceStatistics,
-  saveTechPerformanceStatistics
+  saveTechPerformanceStatistics,
+  saveStoreConsumePerformanceStatistics,
+  saveDepartmentConsumePerformanceStatistics
 } from '@/api/extend/salaryCalculation'
 export default {
@@ -182,7 +214,9 @@ export default {
       loadingStates: {
         goldTriangle: false,
         personalPerformance: false,
-        techPerformance: false
+        techPerformance: false,
+        storeConsumePerformance: false,
+        departmentConsumePerformance: false
       },
       results: [], // 存储统计结果，最多保留10条
       isCalculating: false, // 一键计算状态
@@ -220,14 +254,6 @@ export default {
       }
       return json
     },
-    exportResults() {
-      if (this.results.length === 0) {
-        this.$message.warning('没有可导出的结果')
-        return
-      }
-      // 这里可以实现导出功能
-      this.$message.success('导出功能开发中...')
-    },
     // 一键计算工资
     async handleCalculateSalary() {
@@ -256,6 +282,16 @@ export default {
           name: '科技部开单业绩统计',
           method: 'handleTechPerformanceStatistics',
           type: 'tech-performance'
+        },
+        {
+          name: '门店耗卡业绩统计',
+          method: 'handleStoreConsumePerformanceStatistics',
+          type: 'store-consume-performance'
+        },
+        {
+          name: '个人消耗业绩统计',
+          method: 'handleDepartmentConsumePerformanceStatistics',
+          type: 'department-consume-performance'
         }
       ]
@@ -428,6 +464,62 @@ export default {
       } finally {
         this.loadingStates.techPerformance = false
       }
+    },
+
+    // 门店耗卡业绩统计
+    async handleStoreConsumePerformanceStatistics() {
+      this.loadingStates.storeConsumePerformance = true
+      try {
+        const response = await saveStoreConsumePerformanceStatistics(this.statisticsMonth)
+        this.addResult({
+          type: 'store-consume-performance',
+          title: '门店耗卡业绩统计',
+          success: true,
+          data: response.data,
+          time: new Date().toLocaleString()
+        })
+        this.$message.success('门店耗卡业绩统计完成')
+      } catch (error) {
+        this.addResult({
+          type: 'store-consume-performance',
+          title: '门店耗卡业绩统计',
+          success: false,
+          data: error.message || '统计失败',
+          time: new Date().toLocaleString()
+        })
+        this.$message.error('门店耗卡业绩统计失败')
+        throw error
+      } finally {
+        this.loadingStates.storeConsumePerformance = false
+      }
+    },
+
+    // 个人消耗业绩统计
+    async handleDepartmentConsumePerformanceStatistics() {
+      this.loadingStates.departmentConsumePerformance = true
+      try {
+        const response = await saveDepartmentConsumePerformanceStatistics(this.statisticsMonth)
+        this.addResult({
+          type: 'department-consume-performance',
+          title: '个人消耗业绩统计',
+          success: true,
+          data: response.data,
+          time: new Date().toLocaleString()
+        })
+        this.$message.success('个人消耗业绩统计完成')
+      } catch (error) {
+        this.addResult({
+          type: 'department-consume-performance',
+          title: '个人消耗业绩统计',
+          success: false,
+          data: error.message || '统计失败',
+          time: new Date().toLocaleString()
+        })
+        this.$message.error('个人消耗业绩统计失败')
+        throw error
+      } finally {
+        this.loadingStates.departmentConsumePerformance = false
+      }
     }
   }
 }
@@ -440,27 +532,6 @@ export default {
   min-height: calc(100vh - 50px);
   font-family: 'Arial', sans-serif;
-  .header-card {
-    background: linear-gradient(135deg, #409EFF, #79BBFF);
-    color: #fff;
-    padding: 30px;
-    border-radius: 15px;
-    margin-bottom: 20px;
-    text-align: center;
-    box-shadow: 0 8px 20px rgba(0, 123, 255, 0.2);
-
-    .title {
-      font-size: 2.5em;
-      margin-bottom: 10px;
-      font-weight: bold;
-    }
-
-    .subtitle {
-      font-size: 1.1em;
-      opacity: 0.9;
-    }
-  }
-
   .box-card {
     border-radius: 10px;
     margin-bottom: 20px;
@@ -480,115 +551,92 @@ export default {
     }
   }
-  .month-selector-card {
-    .month-picker-wrapper {
-      display: flex;
-      justify-content: center;
-      align-items: center;
-    }
-    .month-picker {
-      width: 100%;
-      max-width: 300px;
-    }
-  }
-
-  // 主要内容区域 - 左右布局
-  .main-content {
+  // 顶部控制区域 - 同一行显示两个卡片
+  .top-controls-row {
     display: flex;
     gap: 20px;
-    min-height: 600px;
-
-    .left-panel {
-      flex: 1;
-      min-width: 0; // 防止flex子项溢出
-    }
+    margin-bottom: 20px;
-    .right-panel {
+    .month-selector-card, .calculate-card {
       flex: 1;
       min-width: 0;
     }
-  }
-
-  // 一键计算工资卡片
-  .calculate-card {
-    margin-bottom: 20px;
-    background: linear-gradient(135deg, #67C23A, #85CE61);
-    color: white;
-
-    ::v-deep .el-card__header {
-      background: rgba(255, 255, 255, 0.1);
-      color: white;
-      border-bottom: 1px solid rgba(255, 255, 255, 0.2);
-    }
-    .calculate-content {
-      text-align: center;
-
-      .calculate-desc {
-        color: rgba(255, 255, 255, 0.9);
-        margin-bottom: 20px;
-        font-size: 1.1em;
+    .month-selector-card {
+      .month-picker-wrapper {
+        display: flex;
+        justify-content: flex-start;
+        align-items: center;
       }
-
-      .calculate-button {
+      .month-picker {
         width: 100%;
-        height: 60px;
-        font-size: 1.3em;
-        font-weight: bold;
-        border-radius: 10px;
-        background: rgba(255, 255, 255, 0.2);
-        border: 2px solid rgba(255, 255, 255, 0.3);
-        color: white;
+        max-width: 200px;
+      }
+    }
-        &:hover:not(:disabled) {
-          background: rgba(255, 255, 255, 0.3);
-          border-color: rgba(255, 255, 255, 0.5);
-        }
+    .calculate-card {
+      background: linear-gradient(135deg, #67C23A, #85CE61);
+      color: white;
-        &:disabled {
-          opacity: 0.6;
-        }
+      ::v-deep .el-card__header {
+        background: rgba(255, 255, 255, 0.1);
+        color: white;
+        border-bottom: 1px solid rgba(255, 255, 255, 0.2);
       }
-      .progress-info {
-        margin-top: 20px;
-        text-align: left;
+      .calculate-content {
+        text-align: center;
-        .progress-title {
-          font-weight: bold;
-          margin-bottom: 10px;
+        .calculate-desc {
           color: rgba(255, 255, 255, 0.9);
+          margin-bottom: 15px;
+          font-size: 0.95em;
+          line-height: 1.4;
         }
-        .progress-step {
-          display: flex;
-          align-items: center;
-          margin-bottom: 8px;
-          font-size: 0.95em;
+        .calculate-button {
+          width: 100%;
+          height: 40px;
+          font-size: 1em;
+          font-weight: bold;
+          border-radius: 6px;
+          background: rgba(255, 255, 255, 0.2);
+          border: 2px solid rgba(255, 255, 255, 0.3);
+          color: white;
-          i {
-            margin-right: 8px;
-            font-size: 1.1em;
+          &:hover:not(:disabled) {
+            background: rgba(255, 255, 255, 0.3);
+            border-color: rgba(255, 255, 255, 0.5);
           }
-          span {
-            color: rgba(255, 255, 255, 0.9);
-
-            &.completed {
-              color: #fff;
-              font-weight: bold;
-            }
-
-            &.failed {
-              color: #ffeb3b;
-              font-weight: bold;
-            }
+          &:disabled {
+            opacity: 0.6;
           }
         }
       }
     }
   }
+  // 主要内容区域 - 左右布局
+  .main-content {
+    display: flex;
+    gap: 20px;
+    min-height: 600px;
+
+    .left-panel {
+      flex: 1;
+      min-width: 0; // 防止flex子项溢出
+    }
+
+    .right-panel {
+      flex: 1;
+      min-width: 0;
+      display: flex;
+      flex-direction: column;
+    }
+  }
+
+
   // 统计操作卡片
   .statistics-card {
     .statistics-grid {
@@ -648,6 +696,16 @@ export default {
           .stat-header i { color: #E6A23C; }
         }
+        &.purple-item {
+          border-color: #909399;
+          .stat-header i { color: #909399; }
+        }
+
+        &.teal-item {
+          border-color: #17A2B8;
+          .stat-header i { color: #17A2B8; }
+        }
+
         &.placeholder-item {
           border-color: #C0C4CC;
           background: #f5f7fa;
@@ -657,17 +715,64 @@ export default {
     }
   }
+  // 进度卡片
+  .progress-card {
+    margin-bottom: 20px;
+    background: linear-gradient(135deg, #E6F7FF, #BAE7FF);
+    border: 1px solid #91D5FF;
+
+    .progress-content {
+      .progress-step {
+        display: flex;
+        align-items: center;
+        margin-bottom: 12px;
+        padding: 8px 12px;
+        background: rgba(255, 255, 255, 0.7);
+        border-radius: 6px;
+        font-size: 0.95em;
+
+        &:last-child {
+          margin-bottom: 0;
+        }
+
+        i {
+          margin-right: 10px;
+          font-size: 1.1em;
+        }
+
+        span {
+          color: #333;
+          font-weight: 500;
+
+          &.completed {
+            color: #67C23A;
+            font-weight: bold;
+          }
+
+          &.failed {
+            color: #F56C6C;
+            font-weight: bold;
+          }
+        }
+      }
+    }
+  }
+
   // 结果显示卡片
   .result-card {
-    height: 100%;
+    flex: 1;
+    display: flex;
+    flex-direction: column;
-    .header-actions {
+    ::v-deep .el-card__body {
+      flex: 1;
       display: flex;
-      gap: 10px;
+      flex-direction: column;
+      padding: 20px;
     }
     .result-list {
-      max-height: 500px;
+      flex: 1;
       overflow-y: auto;
       padding-right: 10px;
@@ -701,6 +806,10 @@ export default {
         background-color: #f9f9f9;
         box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
+        &:last-child {
+          margin-bottom: 0;
+        }
+
         &.success-item {
           border-color: #67C23A;
         }
@@ -764,14 +873,13 @@ export default {
     padding: 10px;
   }
-  .header-card {
-    padding: 20px;
-    .title {
-      font-size: 1.8em;
-    }
-    .subtitle {
-      font-size: 0.9em;
-    }
+  .top-controls-row {
+    flex-direction: column;
+    gap: 15px;
+  }
+
+  .month-selector-card, .calculate-card {
+    width: 100%;
   }
   .statistics-grid {
@@ -11,52 +11,52 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb
         /// 开单编号
         /// </summary>
         public string id { get; set; }
-        
+
         /// <summary>
         /// 单据门店
         /// </summary>
         public string djmd { get; set; }
-        
+
         /// <summary>
         /// 金三角
         /// </summary>
         public string jsj { get; set; }
-        
+
         /// <summary>
         /// 开单日期
         /// </summary>
         public DateTime? kdrq { get; set; }
-        
+
         /// <summary>
         /// 顾客类型
         /// </summary>
         public string gjlx { get; set; }
-        
+
         /// <summary>
         /// 合作机构
         /// </summary>
         public string hgjg { get; set; }
-        
+
         /// <summary>
         /// 整单业绩
         /// </summary>
         public decimal zdyj { get; set; }
-        
+
         /// <summary>
         /// 实付业绩
         /// </summary>
         public decimal sfyj { get; set; }
-        
+
         /// <summary>
         /// 欠款
         /// </summary>
         public decimal qk { get; set; }
-        
+
         /// <summary>
         /// 储扣方式
         /// </summary>
         public string ckfs { get; set; }
-        
+
         /// <summary>
         /// 储扣总金额
         /// </summary>
@@ -66,76 +66,80 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb
         /// 付款方式
         /// </summary>
         public string fkfs { get; set; }
-        
+
         /// <summary>
         /// 付款医院
         /// </summary>
         public string fkyy { get; set; }
-        
+
         /// <summary>
         /// 付款判断
         /// </summary>
         public string fkpd { get; set; }
-        
+
         /// <summary>
         /// 客户来源
         /// </summary>
         public string khly { get; set; }
-        
+
         /// <summary>
         /// 推荐人
         /// </summary>
         public string tjr { get; set; }
-        
+
         /// <summary>
         /// 是否首开订单
         /// </summary>
         public string sfskdd { get; set; }
-        
+
         /// <summary>
         /// 简介
         /// </summary>
         public string jj { get; set; }
-        
+
         /// <summary>
         /// 备注
         /// </summary>
         public string bz { get; set; }
-        
+
         /// <summary>
         /// 开单会员
         /// </summary>
         public string kdhy { get; set; }
-        
+
         /// <summary>
         /// 开单会员名称
         /// </summary>
         public string kdhyc { get; set; }
-        
+
         /// <summary>
         /// 开单会员手机号
         /// </summary>
         public string kdhysjh { get; set; }
-        
+
         /// <summary>
         /// 健康师业绩
         /// </summary>
         public string jksyj { get; set; }
-        
+
         /// <summary>
         /// 科技部老师业绩
         /// </summary>
         public string kjblsyj { get; set; }
-        
+
         /// <summary>
         /// 品项信息
         /// </summary>
         public string pxxx { get; set; }
-        
+
         /// <summary>
         /// 方案其他
         /// </summary>
         public string F_FIleUrl { get; set; }
-        
+
+        /// <summary>
+        /// 是否有效
+        /// </summary>
+        public int IsEffective { get; set; }
     }
 }
+using System;
+
+namespace NCC.Extend.Entitys.Dto.LqStatistics.DepartmentInfo
+{
+    /// <summary>
+    /// 部门信息
+    /// </summary>
+    public class DepartmentInfo
+    {
+        /// <summary>
+        /// 部门ID
+        /// </summary>
+        public string DepartmentId { get; set; }
+
+        /// <summary>
+        /// 部门名称
+        /// </summary>
+        public string DepartmentName { get; set; }
+
+        /// <summary>
+        /// 父部门ID
+        /// </summary>
+        public string ParentId { get; set; }
+    }
+}
 \ No newline at end of file
+using System;
+
+namespace NCC.Extend.Entitys.Dto.LqStatisticsDepartmentConsumePerformance
+{
+    /// <summary>
+    /// 个人消耗业绩统计详情输出
+    /// </summary>
+    public class LqStatisticsDepartmentConsumePerformanceInfoOutput
+    {
+        /// <summary>
+        /// 主键ID
+        /// </summary>
+        public string Id { get; set; }
+
+        /// <summary>
+        /// 岗位类型(健康师, 科技部老师)
+        /// </summary>
+        public string DepartmentType { get; set; }
+
+        /// <summary>
+        /// 用户ID
+        /// </summary>
+        public string UserId { get; set; }
+
+        /// <summary>
+        /// 用户账号
+        /// </summary>
+        public string UserCode { get; set; }
+
+        /// <summary>
+        /// 用户姓名
+        /// </summary>
+        public string UserName { get; set; }
+
+        /// <summary>
+        /// 门店ID
+        /// </summary>
+        public string StoreId { get; set; }
+
+        /// <summary>
+        /// 门店编码
+        /// </summary>
+        public string StoreCode { get; set; }
+
+        /// <summary>
+        /// 门店名称
+        /// </summary>
+        public string StoreName { get; set; }
+
+        /// <summary>
+        /// 统计月份(YYYYMM格式)
+        /// </summary>
+        public string StatisticsMonth { get; set; }
+
+        /// <summary>
+        /// 消耗业绩
+        /// </summary>
+        public decimal ConsumePerformance { get; set; }
+
+        /// <summary>
+        /// 消耗数量
+        /// </summary>
+        public decimal ConsumeQuantity { get; set; }
+
+        /// <summary>
+        /// 手工费
+        /// </summary>
+        public decimal ManualFee { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? CreateTime { get; set; }
+
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        public DateTime? UpdateTime { get; set; }
+    }
+}
+using System;
+
+namespace NCC.Extend.Entitys.Dto.LqStatisticsDepartmentConsumePerformance
+{
+    /// <summary>
+    /// 个人消耗业绩统计列表输出
+    /// </summary>
+    public class LqStatisticsDepartmentConsumePerformanceListOutput
+    {
+        /// <summary>
+        /// 主键ID
+        /// </summary>
+        public string Id { get; set; }
+
+        /// <summary>
+        /// 岗位类型(健康师, 科技部老师)
+        /// </summary>
+        public string DepartmentType { get; set; }
+
+        /// <summary>
+        /// 用户ID
+        /// </summary>
+        public string UserId { get; set; }
+
+        /// <summary>
+        /// 用户账号
+        /// </summary>
+        public string UserCode { get; set; }
+
+        /// <summary>
+        /// 用户姓名
+        /// </summary>
+        public string UserName { get; set; }
+
+        /// <summary>
+        /// 门店ID
+        /// </summary>
+        public string StoreId { get; set; }
+
+        /// <summary>
+        /// 门店编码
+        /// </summary>
+        public string StoreCode { get; set; }
+
+        /// <summary>
+        /// 门店名称
+        /// </summary>
+        public string StoreName { get; set; }
+
+        /// <summary>
+        /// 统计月份(YYYYMM格式)
+        /// </summary>
+        public string StatisticsMonth { get; set; }
+
+        /// <summary>
+        /// 消耗业绩
+        /// </summary>
+        public decimal ConsumePerformance { get; set; }
+
+        /// <summary>
+        /// 消耗数量
+        /// </summary>
+        public decimal ConsumeQuantity { get; set; }
+
+        /// <summary>
+        /// 手工费
+        /// </summary>
+        public decimal ManualFee { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? CreateTime { get; set; }
+
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        public DateTime? UpdateTime { get; set; }
+    }
+}
 \ No newline at end of file
+using NCC.Common.Filter;
+
+namespace NCC.Extend.Entitys.Dto.LqStatisticsDepartmentConsumePerformance
+{
+    /// <summary>
+    /// 个人消耗业绩统计列表查询输入
+    /// </summary>
+    public class LqStatisticsDepartmentConsumePerformanceListQueryInput : PageInputBase
+    {
+        /// <summary>
+        /// 岗位类型(健康师, 科技部老师)
+        /// </summary>
+        public string DepartmentType { get; set; }
+
+        /// <summary>
+        /// 用户ID
+        /// </summary>
+        public string UserId { get; set; }
+
+        /// <summary>
+        /// 用户账号
+        /// </summary>
+        public string UserCode { get; set; }
+
+        /// <summary>
+        /// 用户姓名
+        /// </summary>
+        public string UserName { get; set; }
+
+        /// <summary>
+        /// 门店ID
+        /// </summary>
+        public string StoreId { get; set; }
+
+        /// <summary>
+        /// 门店编码
+        /// </summary>
+        public string StoreCode { get; set; }
+
+        /// <summary>
+        /// 门店名称
+        /// </summary>
+        public string StoreName { get; set; }
+
+        /// <summary>
+        /// 统计月份(YYYYMM格式)
+        /// </summary>
+        public string StatisticsMonth { get; set; }
+
+        /// <summary>
+        /// 开始月份(YYYYMM格式)
+        /// </summary>
+        public string StartMonth { get; set; }
+
+        /// <summary>
+        /// 结束月份(YYYYMM格式)
+        /// </summary>
+        public string EndMonth { get; set; }
+    }
+}
+using System;
+
+namespace NCC.Extend.Entitys.Dto.LqStatisticsStoreConsumePerformance
+{
+    /// <summary>
+    /// 门店耗卡业绩统计详情输出
+    /// </summary>
+    public class LqStatisticsStoreConsumePerformanceInfoOutput
+    {
+        /// <summary>
+        /// 主键ID
+        /// </summary>
+        public string id { get; set; }
+
+        /// <summary>
+        /// 门店ID
+        /// </summary>
+        public string storeId { get; set; }
+
+        /// <summary>
+        /// 门店编码
+        /// </summary>
+        public string storeCode { get; set; }
+
+        /// <summary>
+        /// 门店名称
+        /// </summary>
+        public string storeName { get; set; }
+
+        /// <summary>
+        /// 统计月份(YYYYMM格式)
+        /// </summary>
+        public string statisticsMonth { get; set; }
+
+        /// <summary>
+        /// 消耗业绩
+        /// </summary>
+        public decimal consumePerformance { get; set; }
+
+        /// <summary>
+        /// 消耗数量
+        /// </summary>
+        public decimal consumeQuantity { get; set; }
+
+        /// <summary>
+        /// 手工费
+        /// </summary>
+        public decimal manualFee { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? createTime { get; set; }
+
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        public DateTime? updateTime { get; set; }
+    }
+}
 \ No newline at end of file
+using System;
+
+namespace NCC.Extend.Entitys.Dto.LqStatisticsStoreConsumePerformance
+{
+    /// <summary>
+    /// 门店耗卡业绩统计列表输出
+    /// </summary>
+    public class LqStatisticsStoreConsumePerformanceListOutput
+    {
+        /// <summary>
+        /// 主键ID
+        /// </summary>
+        public string id { get; set; }
+
+        /// <summary>
+        /// 门店ID
+        /// </summary>
+        public string storeId { get; set; }
+
+        /// <summary>
+        /// 门店编码
+        /// </summary>
+        public string storeCode { get; set; }
+
+        /// <summary>
+        /// 门店名称
+        /// </summary>
+        public string storeName { get; set; }
+
+        /// <summary>
+        /// 统计月份(YYYYMM格式)
+        /// </summary>
+        public string statisticsMonth { get; set; }
+
+        /// <summary>
+        /// 消耗业绩
+        /// </summary>
+        public decimal consumePerformance { get; set; }
+
+        /// <summary>
+        /// 消耗数量
+        /// </summary>
+        public decimal consumeQuantity { get; set; }
+
+        /// <summary>
+        /// 手工费
+        /// </summary>
+        public decimal manualFee { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? createTime { get; set; }
+
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        public DateTime? updateTime { get; set; }
+    }
+}
 \ No newline at end of file
+using NCC.Common.Filter;
+
+namespace NCC.Extend.Entitys.Dto.LqStatisticsStoreConsumePerformance
+{
+    /// <summary>
+    /// 门店耗卡业绩统计列表查询输入
+    /// </summary>
+    public class LqStatisticsStoreConsumePerformanceListQueryInput : PageInputBase
+    {
+        /// <summary>
+        /// 门店ID
+        /// </summary>
+        public string storeId { get; set; }
+
+        /// <summary>
+        /// 门店编码
+        /// </summary>
+        public string storeCode { get; set; }
+
+        /// <summary>
+        /// 门店名称
+        /// </summary>
+        public string storeName { get; set; }
+
+        /// <summary>
+        /// 统计月份(YYYYMM格式)
+        /// </summary>
+        public string statisticsMonth { get; set; }
+
+        /// <summary>
+        /// 开始月份(YYYYMM格式)
+        /// </summary>
+        public string startMonth { get; set; }
+
+        /// <summary>
+        /// 结束月份(YYYYMM格式)
+        /// </summary>
+        public string endMonth { get; set; }
+    }
+}
 \ No newline at end of file
@@ -23,66 +23,56 @@ namespace NCC.Extend.Entitys.Dto.LqXhHyhk
         /// 耗卡编号
         /// </summary>
         public string id { get; set; }
-        
+
         /// <summary>
         /// 门店
         /// </summary>
         public string md { get; set; }
-        
+
         /// <summary>
         /// 门店编号
         /// </summary>
         public string mdbh { get; set; }
-        
+
         /// <summary>
         /// 门店名称
         /// </summary>
         public string mdmc { get; set; }
-        
+
         /// <summary>
         /// 会员
         /// </summary>
         public string hy { get; set; }
-        
+
         /// <summary>
         /// 会员账号
         /// </summary>
         public string hyzh { get; set; }
-        
+
         /// <summary>
         /// 会员名称
         /// </summary>
         public string hymc { get; set; }
-        
+
         /// <summary>
         /// 顾客类型
         /// </summary>
         public string gklx { get; set; }
-        
-        /// <summary>
-        /// 消费金额
-        /// </summary>
-        public string xfje { get; set; }
-        
-        /// <summary>
-        /// 手工费用
-        /// </summary>
-        public string sgfy { get; set; }
-        
+
         /// <summary>
         /// 是否有科技部
         /// </summary>
         public string sfykjb { get; set; }
-        
+
         /// <summary>
         /// 耗卡时间
         /// </summary>
         public string hksj { get; set; }
-        
+
         /// <summary>
         /// 操作人员
         /// </summary>
         public string czry { get; set; }
-        
+
     }
 }
@@ -11,31 +11,31 @@ namespace NCC.Extend.Entitys.Dto.LqXhJksyj
         /// 业绩编号
         /// </summary>
         public string id { get; set; }
-        
+
         /// <summary>
         /// 关联开单编号
         /// </summary>
         public string glkdbh { get; set; }
-        
+
         /// <summary>
         /// 健康师
         /// </summary>
         public string jks { get; set; }
-        
+
         /// <summary>
         /// 健康师姓名
         /// </summary>
         public string jksxm { get; set; }
-        
+
         /// <summary>
         /// 健康师账号
         /// </summary>
         public string jkszh { get; set; }
-        
+
         /// <summary>
         /// 健康师业绩
         /// </summary>
-        public string jksyj { get; set; }
+        public decimal jksyj { get; set; }
         /// <summary>
         /// 业绩时间
@@ -35,7 +35,7 @@ namespace NCC.Extend.Entitys.Dto.LqXhKjbsyj
         /// <summary>
         /// 科技部老师业绩
         /// </summary>
-        public string kjblsyj { get; set; }
+        public decimal kjblsyj { get; set; }
         /// <summary>
         /// 业绩时间
@@ -56,11 +56,6 @@ namespace NCC.Extend.Entitys.Dto.LqXhPxmx
         public int? projectNumber { get; set; }
         /// <summary>
-        /// 是否有效
-        /// </summary>
-        public int? isEnabled { get; set; }
-
-        /// <summary>
         /// 来源类型（开卡/赠送/其他）
         /// </summary>
         public string sourceType { get; set; }
@@ -71,6 +66,11 @@ namespace NCC.Extend.Entitys.Dto.LqXhPxmx
         public decimal totalPrice { get; set; }
         /// <summary>
+        /// 是否有效
+        /// </summary>
+        public int? isEffective { get; set; }
+
+        /// <summary>
         /// 健康师业绩列表
         /// </summary>
         public List<LqXhJksyjInfoOutput> lqXhJksyjList { get; set; }
+using System;
+using NCC.Common.Const;
+using SqlSugar;
+
+namespace NCC.Extend.Entitys.lq_statistics_department_consume_performance
+{
+    /// <summary>
+    /// 个人消耗业绩统计
+    /// </summary>
+    [SugarTable("lq_statistics_department_consume_performance")]
+    [Tenant(ClaimConst.TENANT_ID)]
+    public class LqStatisticsDepartmentConsumePerformanceEntity
+    {
+        /// <summary>
+        /// 主键ID
+        /// </summary>
+        [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)]
+        public string Id { get; set; }
+
+        /// <summary>
+        /// 岗位类型(健康师, 科技部老师)
+        /// </summary>
+        [SugarColumn(ColumnName = "F_DepartmentType")]
+        public string DepartmentType { get; set; }
+
+        /// <summary>
+        /// 用户ID
+        /// </summary>
+        [SugarColumn(ColumnName = "F_UserId")]
+        public string UserId { get; set; }
+
+        /// <summary>
+        /// 用户账号
+        /// </summary>
+        [SugarColumn(ColumnName = "F_UserCode")]
+        public string UserCode { get; set; }
+
+        /// <summary>
+        /// 用户姓名
+        /// </summary>
+        [SugarColumn(ColumnName = "F_UserName")]
+        public string UserName { get; set; }
+
+        /// <summary>
+        /// 门店ID
+        /// </summary>
+        [SugarColumn(ColumnName = "F_StoreId")]
+        public string StoreId { get; set; }
+
+        /// <summary>
+        /// 门店编码
+        /// </summary>
+        [SugarColumn(ColumnName = "F_StoreCode")]
+        public string StoreCode { get; set; }
+
+        /// <summary>
+        /// 门店名称
+        /// </summary>
+        [SugarColumn(ColumnName = "F_StoreName")]
+        public string StoreName { get; set; }
+
+        /// <summary>
+        /// 统计月份(YYYYMM格式)
+        /// </summary>
+        [SugarColumn(ColumnName = "F_StatisticsMonth")]
+        public string StatisticsMonth { get; set; }
+
+        /// <summary>
+        /// 消耗业绩
+        /// </summary>
+        [SugarColumn(ColumnName = "F_ConsumePerformance")]
+        public decimal ConsumePerformance { get; set; }
+
+        /// <summary>
+        /// 消耗数量
+        /// </summary>
+        [SugarColumn(ColumnName = "F_ConsumeQuantity")]
+        public decimal ConsumeQuantity { get; set; }
+
+        /// <summary>
+        /// 手工费
+        /// </summary>
+        [SugarColumn(ColumnName = "F_ManualFee")]
+        public decimal ManualFee { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [SugarColumn(ColumnName = "F_CreateTime")]
+        public DateTime? CreateTime { get; set; }
+
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        [SugarColumn(ColumnName = "F_UpdateTime")]
+        public DateTime? UpdateTime { get; set; }
+    }
+}
+using System;
+using NCC.Common.Const;
+using SqlSugar;
+
+namespace NCC.Extend.Entitys.lq_statistics_store_consume_performance
+{
+    /// <summary>
+    /// 门店耗卡业绩统计
+    /// </summary>
+    [SugarTable("lq_statistics_store_consume_performance")]
+    [Tenant(ClaimConst.TENANT_ID)]
+    public class LqStatisticsStoreConsumePerformanceEntity
+    {
+        /// <summary>
+        /// 主键ID
+        /// </summary>
+        [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)]
+        public string Id { get; set; }
+
+        /// <summary>
+        /// 门店ID
+        /// </summary>
+        [SugarColumn(ColumnName = "F_StoreId")]
+        public string StoreId { get; set; }
+
+        /// <summary>
+        /// 门店编码
+        /// </summary>
+        [SugarColumn(ColumnName = "F_StoreCode")]
+        public string StoreCode { get; set; }
+
+        /// <summary>
+        /// 门店名称
+        /// </summary>
+        [SugarColumn(ColumnName = "F_StoreName")]
+        public string StoreName { get; set; }
+
+        /// <summary>
+        /// 统计月份(YYYYMM格式)
+        /// </summary>
+        [SugarColumn(ColumnName = "F_StatisticsMonth")]
+        public string StatisticsMonth { get; set; }
+
+        /// <summary>
+        /// 消耗业绩
+        /// </summary>
+        [SugarColumn(ColumnName = "F_ConsumePerformance")]
+        public decimal ConsumePerformance { get; set; }
+
+        /// <summary>
+        /// 消耗数量
+        /// </summary>
+        [SugarColumn(ColumnName = "F_ConsumeQuantity")]
+        public decimal ConsumeQuantity { get; set; }
+
+        /// <summary>
+        /// 手工费
+        /// </summary>
+        [SugarColumn(ColumnName = "F_ManualFee")]
+        public decimal ManualFee { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [SugarColumn(ColumnName = "F_CreateTime")]
+        public DateTime? CreateTime { get; set; }
+
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        [SugarColumn(ColumnName = "F_UpdateTime")]
+        public DateTime? UpdateTime { get; set; }
+    }
+}
 \ No newline at end of file
@@ -63,13 +63,13 @@ namespace NCC.Extend.Entitys.lq_xh_hyhk
         /// 消费金额
         /// </summary>
         [SugarColumn(ColumnName = "xfje")]
-        public string Xfje { get; set; }
+        public decimal? Xfje { get; set; }
         /// <summary>
         /// 手工费用
         /// </summary>
         [SugarColumn(ColumnName = "sgfy")]
-        public string Sgfy { get; set; }
+        public decimal? Sgfy { get; set; }
         /// <summary>
         /// 是否有科技部
@@ -77,23 +77,6 @@ namespace NCC.Extend.Entitys.lq_xh_hyhk
         [SugarColumn(ColumnName = "sfykjb")]
         public string Sfykjb { get; set; }
-        /// <summary>
-        /// 健康师业绩
-        /// </summary>
-        [SugarColumn(ColumnName = "jksyj")]
-        public string Jksyj { get; set; }
-
-        /// <summary>
-        /// 科技部业绩
-        /// </summary>
-        [SugarColumn(ColumnName = "kjbyj")]
-        public string Kjbyj { get; set; }
-
-        /// <summary>
-        /// 品项信息
-        /// </summary>
-        [SugarColumn(ColumnName = "pxxx")]
-        public string Pxxx { get; set; }
         /// <summary>
         /// 耗卡时间
@@ -108,15 +91,27 @@ namespace NCC.Extend.Entitys.lq_xh_hyhk
         public string Czry { get; set; }
         /// <summary>
+        /// 签名文件
+        /// </summary>
+        [SugarColumn(ColumnName = "F_SignatureFile")]
+        public string SignatureFile { get; set; }
+
+        /// <summary>
         /// 创建时间
         /// </summary>
         [SugarColumn(ColumnName = "F_CreateTime")]
-        public DateTime CreateTime { get; set; }
+        public DateTime? CreateTime { get; set; }
         /// <summary>
         /// 修改时间
         /// </summary>
         [SugarColumn(ColumnName = "F_UpdateTime")]
-        public DateTime UpdateTime { get; set; }
+        public DateTime? UpdateTime { get; set; }
+
+        /// <summary>
+        /// 是否有效
+        /// </summary>
+        [SugarColumn(ColumnName = "F_IsEffective")]
+        public int? IsEffective { get; set; } = 1;
     }
 }
@@ -16,65 +16,71 @@ namespace NCC.Extend.Entitys.lq_xh_jksyj
         /// </summary>
         [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)]
         public string Id { get; set; }
-        
+
         /// <summary>
         /// 关联开单编号
         /// </summary>
-        [SugarColumn(ColumnName = "glkdbh")]        
+        [SugarColumn(ColumnName = "glkdbh")]
         public string Glkdbh { get; set; }
-        
+
         /// <summary>
         /// 健康师
         /// </summary>
-        [SugarColumn(ColumnName = "jks")]        
+        [SugarColumn(ColumnName = "jks")]
         public string Jks { get; set; }
-        
+
         /// <summary>
         /// 健康师姓名
         /// </summary>
-        [SugarColumn(ColumnName = "jksxm")]        
+        [SugarColumn(ColumnName = "jksxm")]
         public string Jksxm { get; set; }
-        
+
         /// <summary>
         /// 健康师账号
         /// </summary>
-        [SugarColumn(ColumnName = "jkszh")]        
+        [SugarColumn(ColumnName = "jkszh")]
         public string Jkszh { get; set; }
-        
+
         /// <summary>
         /// 健康师业绩
         /// </summary>
-        [SugarColumn(ColumnName = "jksyj")]        
-        public string Jksyj { get; set; }
-        
+        [SugarColumn(ColumnName = "jksyj")]
+        public decimal? Jksyj { get; set; }
+
         /// <summary>
         /// 业绩时间
         /// </summary>
-        [SugarColumn(ColumnName = "yjsj")]        
+        [SugarColumn(ColumnName = "yjsj")]
         public DateTime? Yjsj { get; set; }
         /// <summary>
         /// 金三角id
         /// </summary>
-        [SugarColumn(ColumnName = "F_jsjid")]        
+        [SugarColumn(ColumnName = "F_jsjid")]
         public string JsjId { get; set; }
         /// <summary>
         /// 耗卡品项id
         /// </summary>
-        [SugarColumn(ColumnName = "F_kdpxid")]        
+        [SugarColumn(ColumnName = "F_kdpxid")]
         public string Kdpxid { get; set; }
         /// <summary>
         /// 手工费
         /// </summary>
-        [SugarColumn(ColumnName = "F_LaborCost")]        
+        [SugarColumn(ColumnName = "F_LaborCost")]
         public decimal? LaborCost { get; set; }
         /// <summary>
         /// 耗卡品项次数
         /// </summary>
-        [SugarColumn(ColumnName = "F_kdpxNumber")]        
+        [SugarColumn(ColumnName = "F_kdpxNumber")]
         public decimal? KdpxNumber { get; set; }
+
+        /// <summary>
+        /// 是否有效
+        /// </summary>
+        [SugarColumn(ColumnName = "F_IsEffective")]
+        public int? IsEffective { get; set; } = 1;
     }
 }
 \ No newline at end of file
@@ -45,7 +45,7 @@ namespace NCC.Extend.Entitys.lq_xh_kjbsyj
         /// 科技部老师业绩
         /// </summary>
         [SugarColumn(ColumnName = "kjblsyj")]
-        public string Kjblsyj { get; set; }
+        public decimal? Kjblsyj { get; set; }
         /// <summary>
         /// 业绩时间
@@ -70,5 +70,11 @@ namespace NCC.Extend.Entitys.lq_xh_kjbsyj
         /// </summary>
         [SugarColumn(ColumnName = "F_hdpxNumber")]
         public decimal? HdpxNumber { get; set; }
+
+        /// <summary>
+        /// 是否有效
+        /// </summary>
+        [SugarColumn(ColumnName = "F_IsEffective")]
+        public int? IsEffective { get; set; } = 1;
     }
 }
 \ No newline at end of file
@@ -66,12 +66,6 @@ namespace NCC.Extend.Entitys.lq_xh_pxmx
         public int ProjectNumber { get; set; }
         /// <summary>
-        /// 是否有效
-        /// </summary>
-        [SugarColumn(ColumnName = "F_IsEnabled")]
-        public int? IsEnabled { get; set; }
-
-        /// <summary>
         /// 来源类型
         /// </summary>
         [SugarColumn(ColumnName = "F_SourceType")]
@@ -82,5 +76,11 @@ namespace NCC.Extend.Entitys.lq_xh_pxmx
         /// </summary>
         [SugarColumn(ColumnName = "F_TotalPrice")]
         public decimal TotalPrice { get; set; }
+
+        /// <summary>
+        /// 是否有效
+        /// </summary>
+        [SugarColumn(ColumnName = "F_IsEffective")]
+        public int? IsEffective { get; set; } = 1;
     }
 }
@@ -234,7 +234,7 @@ namespace NCC.Extend.LqKdKdjlb
                     jksyj = it.Jksyj,
                     kjblsyj = it.Kjblsyj,
                     pxxx = it.Pxxx,
-                    F_FIleUrl = it.F_FIleUrl,
+                    IsEffective = it.IsEffective,
                 })
                 .MergeTable()
                 .OrderBy(sidx + " " + input.sort)
@@ -28,7 +28,7 @@ namespace NCC.Extend.LqMdXdbhsj
     /// <summary>
     /// 门店新店保护时间服务
     /// </summary>
-    [ApiDescriptionSettings(Tag = "Extend", Name = "LqMdXdbhsj", Order = 201)]
+    [ApiDescriptionSettings(Tag = "绿纤门店信息服务", Name = "LqMdXdbhsj", Order = 201)]
     [Route("api/Extend/[controller]")]
     public class LqMdXdbhsjService : ILqMdXdbhsjService, IDynamicApiController, ITransient
     {
@@ -46,6 +46,7 @@ namespace NCC.Extend.LqMdXdbhsj
             _userManager = userManager;
         }
+        #region 门店新店保护时间信息
         /// <summary>
         /// 获取门店新店保护时间信息
         /// </summary>
@@ -58,7 +59,9 @@ namespace NCC.Extend.LqMdXdbhsj
             var output = entity.Adapt<LqMdXdbhsjInfoOutput>();
             return output;
         }
+        #endregion
+        #region 门店新店保护时间列表
         /// <summary>
         /// 获取门店新店保护时间列表
         /// </summary>
@@ -88,7 +91,9 @@ namespace NCC.Extend.LqMdXdbhsj
                 .ToPagedListAsync(input.currentPage, input.pageSize);
             return PageResult<LqMdXdbhsjListOutput>.SqlSugarPageResult(data);
         }
+        #endregion
+        #region 新建门店新店保护时间
         /// <summary>
         /// 新建门店新店保护时间
         /// </summary>
@@ -105,7 +110,7 @@ namespace NCC.Extend.LqMdXdbhsj
             // 验证时间逻辑
             if (entity.Bhkssj >= entity.Bhjssj)
             {
-                throw NCCException.Oh(ErrorCode.COM1000, "保护开始时间必须早于保护结束时间");
+                throw NCCException.Oh("保护开始时间必须早于保护结束时间");
             }
             // 检查是否存在重叠的保护时间
@@ -118,14 +123,16 @@ namespace NCC.Extend.LqMdXdbhsj
             if (exists)
             {
-                throw NCCException.Oh(ErrorCode.COM1000, "该门店在指定时间段内已存在保护时间设置");
+                throw NCCException.Oh("该门店在指定时间段内已存在保护时间设置");
             }
             var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync();
             if (!(isOk > 0))
                 throw NCCException.Oh(ErrorCode.COM1000);
         }
+        #endregion
+        #region 更新门店新店保护时间
         /// <summary>
         /// 更新门店新店保护时间
         /// </summary>
@@ -161,7 +168,9 @@ namespace NCC.Extend.LqMdXdbhsj
             if (!(isOk > 0))
                 throw NCCException.Oh(ErrorCode.COM1001);
         }
+        #endregion
+        #region 删除门店新店保护时间
         /// <summary>
         /// 删除门店新店保护时间
         /// </summary>
@@ -175,7 +184,9 @@ namespace NCC.Extend.LqMdXdbhsj
             if (!(isOk > 0))
                 throw NCCException.Oh(ErrorCode.COM1002);
         }
+        #endregion
+        #region 获取门店新店保护时间下拉选择数据
         /// <summary>
         /// 获取门店新店保护时间下拉选择数据
         /// </summary>
@@ -194,7 +205,9 @@ namespace NCC.Extend.LqMdXdbhsj
                 .ToListAsync();
             return new { list = list };
         }
+        #endregion
+        #region 根据门店ID获取当前有效的保护时间
         /// <summary>
         /// 根据门店ID获取当前有效的保护时间
         /// </summary>
@@ -205,7 +218,6 @@ namespace NCC.Extend.LqMdXdbhsj
         {
             var now = DateTime.Now;
             var entity = await _db.Queryable<LqMdXdbhsjEntity>().Where(p => p.Mdid == mdid && p.Sfqy == 1).Where(p => p.Bhkssj <= now && p.Bhjssj >= now).FirstAsync();
-
             if (entity == null)
             {
                 return new { hasProtection = false, message = "该门店当前无保护时间设置" };
@@ -214,5 +226,6 @@ namespace NCC.Extend.LqMdXdbhsj
             var output = entity.Adapt<LqMdXdbhsjInfoOutput>();
             return new { hasProtection = true, data = output };
         }
+        #endregion
     }
 }
@@ -28,7 +28,7 @@ namespace NCC.Extend.LqMdxx
     /// <summary>
     /// 门店信息服务
     /// </summary>
-    [ApiDescriptionSettings(Tag = "绿纤门店信息服务",Name = "LqMdxx", Order = 200)]
+    [ApiDescriptionSettings(Tag = "绿纤门店信息服务", Name = "LqMdxx", Order = 200)]
     [Route("api/Extend/[controller]")]
     public class LqMdxxService : ILqMdxxService, IDynamicApiController, ITransient
     {
@@ -39,15 +39,14 @@ namespace NCC.Extend.LqMdxx
         /// <summary>
         /// 初始化一个<see cref="LqMdxxService"/>类型的新实例
         /// </summary>
-        public LqMdxxService(
-            ISqlSugarRepository<LqMdxxEntity> lqMdxxRepository,
-            IUserManager userManager)
+        public LqMdxxService(ISqlSugarRepository<LqMdxxEntity> lqMdxxRepository, IUserManager userManager)
         {
-            _lqMdxxRepository = lqMdxxRepository;            
+            _lqMdxxRepository = lqMdxxRepository;
             _db = _lqMdxxRepository.Context;
             _userManager = userManager;
         }
+        #region 门店信息
         /// <summary>
         /// 获取门店信息
         /// </summary>
@@ -60,12 +59,14 @@ namespace NCC.Extend.LqMdxx
             var output = entity.Adapt<LqMdxxInfoOutput>();
             return output;
         }
+        #endregion
+        #region 门店信息列表
         /// <summary>
-		/// 获取门店信息列表
-		/// </summary>
-		/// <param name="input">请求参数</param>
-		/// <returns></returns>
+        /// 获取门店信息列表
+        /// </summary>
+        /// <param name="input">请求参数</param>
+        /// <returns></returns>
         [HttpGet("")]
         public async Task<dynamic> GetList([FromQuery] LqMdxxListQueryInput input)
         {
@@ -90,37 +91,39 @@ namespace NCC.Extend.LqMdxx
                 .WhereIF(!string.IsNullOrEmpty(input.gsmc), p => p.Gsmc.Contains(input.gsmc))
                 .WhereIF(!string.IsNullOrEmpty(input.fr), p => p.Fr.Contains(input.fr))
                 .WhereIF(!string.IsNullOrEmpty(input.ywsb), p => p.Ywsb.Equals(input.ywsb))
-                .Select(it=> new LqMdxxListOutput
+                .Select(it => new LqMdxxListOutput
                 {
                     id = it.Id,
-                    mdbm=it.Mdbm,
-                    djmdbh=it.Djmdbh,
-                    djmd=it.Djmd,
-                    dm=it.Dm,
-                    cs=it.Cs,
-                    dz=it.Dz,
-                    xm=it.Xm,
-                    dhhm=it.Dhhm,
-                    zj=it.Zj,
-                    kysj=it.Kysj,
-                    zxzt=it.Zxzt,
-                    gsmc=it.Gsmc,
-                    fr=it.Fr,
-                    ywsb=it.Ywsb,
-                    jyb=it.Jyb,
-                    kjb=it.Kjb,
-                    dxmb=it.Dxmb,
-                    syb=it.Syb,
-                    xsyj=it.Xsyj,
-                    xhyj=it.Xhyj,
-                    xms=it.Xms,
-                    rt1=it.Rt1,
-                    rt2=it.Rt2,
-                    rc=it.Rc,
-                }).MergeTable().OrderBy(sidx+" "+input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
-                return PageResult<LqMdxxListOutput>.SqlSugarPageResult(data);
+                    mdbm = it.Mdbm,
+                    djmdbh = it.Djmdbh,
+                    djmd = it.Djmd,
+                    dm = it.Dm,
+                    cs = it.Cs,
+                    dz = it.Dz,
+                    xm = it.Xm,
+                    dhhm = it.Dhhm,
+                    zj = it.Zj,
+                    kysj = it.Kysj,
+                    zxzt = it.Zxzt,
+                    gsmc = it.Gsmc,
+                    fr = it.Fr,
+                    ywsb = it.Ywsb,
+                    jyb = it.Jyb,
+                    kjb = it.Kjb,
+                    dxmb = it.Dxmb,
+                    syb = it.Syb,
+                    xsyj = it.Xsyj,
+                    xhyj = it.Xhyj,
+                    xms = it.Xms,
+                    rt1 = it.Rt1,
+                    rt2 = it.Rt2,
+                    rc = it.Rc,
+                }).MergeTable().OrderBy(sidx + " " + input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
+            return PageResult<LqMdxxListOutput>.SqlSugarPageResult(data);
         }
+        #endregion
+        #region 新建门店信息
         /// <summary>
         /// 新建门店信息
         /// </summary>
@@ -135,7 +138,9 @@ namespace NCC.Extend.LqMdxx
             var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync();
             if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1000);
         }
+        #endregion
+        #region 获取门店信息无分页列表
         /// <summary>
 		/// 获取门店信息无分页列表
 		/// </summary>
@@ -165,27 +170,29 @@ namespace NCC.Extend.LqMdxx
                 .WhereIF(!string.IsNullOrEmpty(input.gsmc), p => p.Gsmc.Contains(input.gsmc))
                 .WhereIF(!string.IsNullOrEmpty(input.fr), p => p.Fr.Contains(input.fr))
                 .WhereIF(!string.IsNullOrEmpty(input.ywsb), p => p.Ywsb.Equals(input.ywsb))
-                .Select(it=> new LqMdxxListOutput
+                .Select(it => new LqMdxxListOutput
                 {
                     id = it.Id,
-                    mdbm=it.Mdbm,
-                    djmdbh=it.Djmdbh,
-                    djmd=it.Djmd,
-                    dm=it.Dm,
-                    cs=it.Cs,
-                    dz=it.Dz,
-                    xm=it.Xm,
-                    dhhm=it.Dhhm,
-                    zj=it.Zj,
-                    kysj=it.Kysj,
-                    zxzt=it.Zxzt,
-                    gsmc=it.Gsmc,
-                    fr=it.Fr,
-                    ywsb=it.Ywsb,
-                }).MergeTable().OrderBy(sidx+" "+input.sort).ToListAsync();
-                return data;
+                    mdbm = it.Mdbm,
+                    djmdbh = it.Djmdbh,
+                    djmd = it.Djmd,
+                    dm = it.Dm,
+                    cs = it.Cs,
+                    dz = it.Dz,
+                    xm = it.Xm,
+                    dhhm = it.Dhhm,
+                    zj = it.Zj,
+                    kysj = it.Kysj,
+                    zxzt = it.Zxzt,
+                    gsmc = it.Gsmc,
+                    fr = it.Fr,
+                    ywsb = it.Ywsb,
+                }).MergeTable().OrderBy(sidx + " " + input.sort).ToListAsync();
+            return data;
         }
+        #endregion
+        #region 导出门店信息
         /// <summary>
 		/// 导出门店信息
 		/// </summary>
@@ -205,7 +212,7 @@ namespace NCC.Extend.LqMdxx
             {
                 exportData = await this.GetNoPagingList(input);
             }
-            List<ParamsModel> paramList = "[{\"value\":\"主键\",\"field\":\"id\"},{\"value\":\"门店编码\",\"field\":\"mdbm\"},{\"value\":\"单据门店编号\",\"field\":\"djmdbh\"},{\"value\":\"单据门店\",\"field\":\"djmd\"},{\"value\":\"店名\",\"field\":\"dm\"},{\"value\":\"城市\",\"field\":\"cs\"},{\"value\":\"地址\",\"field\":\"dz\"},{\"value\":\"姓名\",\"field\":\"xm\"},{\"value\":\"电话号码\",\"field\":\"dhhm\"},{\"value\":\"座机\",\"field\":\"zj\"},{\"value\":\"开业时间\",\"field\":\"kysj\"},{\"value\":\"最新状态\",\"field\":\"zxzt\"},{\"value\":\"工商名称\",\"field\":\"gsmc\"},{\"value\":\"法人\",\"field\":\"fr\"},{\"value\":\"有无社保\",\"field\":\"ywsb\"},]".ToList<ParamsModel>();           
+            List<ParamsModel> paramList = "[{\"value\":\"主键\",\"field\":\"id\"},{\"value\":\"门店编码\",\"field\":\"mdbm\"},{\"value\":\"单据门店编号\",\"field\":\"djmdbh\"},{\"value\":\"单据门店\",\"field\":\"djmd\"},{\"value\":\"店名\",\"field\":\"dm\"},{\"value\":\"城市\",\"field\":\"cs\"},{\"value\":\"地址\",\"field\":\"dz\"},{\"value\":\"姓名\",\"field\":\"xm\"},{\"value\":\"电话号码\",\"field\":\"dhhm\"},{\"value\":\"座机\",\"field\":\"zj\"},{\"value\":\"开业时间\",\"field\":\"kysj\"},{\"value\":\"最新状态\",\"field\":\"zxzt\"},{\"value\":\"工商名称\",\"field\":\"gsmc\"},{\"value\":\"法人\",\"field\":\"fr\"},{\"value\":\"有无社保\",\"field\":\"ywsb\"},]".ToList<ParamsModel>();
             ExcelConfig excelconfig = new ExcelConfig();
             excelconfig.FileName = "门店信息.xls";
             excelconfig.HeadFont = "微软雅黑";
@@ -231,7 +238,9 @@ namespace NCC.Extend.LqMdxx
             };
             return output;
         }
+        #endregion
+        #region 批量删除门店信息
         /// <summary>
         /// 批量删除门店信息
         /// </summary>
@@ -248,7 +257,7 @@ namespace NCC.Extend.LqMdxx
                     //开启事务
                     _db.BeginTran();
                     //批量删除门店信息
-                    await _db.Deleteable<LqMdxxEntity>().In(d => d.Id,ids).ExecuteCommandAsync();
+                    await _db.Deleteable<LqMdxxEntity>().In(d => d.Id, ids).ExecuteCommandAsync();
                     //关闭事务
                     _db.CommitTran();
                 }
@@ -260,7 +269,9 @@ namespace NCC.Extend.LqMdxx
                 }
             }
         }
+        #endregion
+        #region 更新门店信息
         /// <summary>
         /// 更新门店信息
         /// </summary>
@@ -275,7 +286,9 @@ namespace NCC.Extend.LqMdxx
             var isOk = await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
             if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1001);
         }
+        #endregion
+        #region 更新门店目标字段
         /// <summary>
         /// 更新门店目标字段
         /// </summary>
@@ -286,8 +299,8 @@ namespace NCC.Extend.LqMdxx
         public async Task UpdateTargets(string id, [FromBody] LqMdxxTargetUpdateInput input)
         {
             var isOk = await _db.Updateable<LqMdxxEntity>()
-                .SetColumns(it => new LqMdxxEntity 
-                { 
+                .SetColumns(it => new LqMdxxEntity
+                {
                     Xsyj = input.xsyj,
                     Xhyj = input.xhyj,
                     Xms = input.xms,
@@ -299,7 +312,9 @@ namespace NCC.Extend.LqMdxx
                 .ExecuteCommandAsync();
             if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1001);
         }
+        #endregion
+        #region 删除门店信息
         /// <summary>
         /// 删除门店信息
         /// </summary>
@@ -312,7 +327,9 @@ namespace NCC.Extend.LqMdxx
             var isOk = await _db.Deleteable<LqMdxxEntity>().Where(d => d.Id == id).ExecuteCommandAsync();
             if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1002);
         }
+        #endregion
+        #region 获取门店下拉选择数据
         /// <summary>
         /// 获取门店下拉选择数据
         /// </summary>
@@ -325,6 +342,6 @@ namespace NCC.Extend.LqMdxx
                 .ToListAsync();
             return new { list = list };
         }
-
+        #endregion
     }
 }
@@ -13,7 +13,10 @@ using NCC.Dependency;
 using NCC.DynamicApiController;
 using NCC.Extend.Entitys.Dto.LqMdxx;
 using NCC.Extend.Entitys.Dto.LqStatistics;
+using NCC.Extend.Entitys.Dto.LqStatistics.DepartmentInfo;
+using NCC.Extend.Entitys.Dto.LqStatisticsStoreConsumePerformance;
 using NCC.Extend.Entitys.Dto.LqStatisticsTechPerformance;
+using NCC.Extend.Entitys.Dto.LqStatisticsDepartmentConsumePerformance;
 using NCC.Extend.Entitys.Dto.LqYcsdJsj;
 using NCC.Extend.Entitys.lq_hytk_kjbsyj;
 using NCC.Extend.Entitys.lq_jinsanjiao_user;
@@ -26,7 +29,9 @@ using NCC.Extend.Entitys.lq_ycsd_jsj;
 using NCC.Extend.Entitys.lq_yjmxb;
 using NCC.Extend.Entitys.lq_statistics_gold_triangle;
 using NCC.Extend.Entitys.lq_statistics_personal_performance;
+using NCC.Extend.Entitys.lq_statistics_store_consume_performance;
 using NCC.Extend.Entitys.lq_statistics_tech_performance;
+using NCC.Extend.Entitys.lq_statistics_department_consume_performance;
 using NCC.Extend.Entitys.lq_xmzl;
 using NCC.Extend.Entitys.Dto.LqStatisticsPersonalPerformance;
 using NCC.Extend.Entitys.v_tech_teacher_flow;
@@ -1882,26 +1887,386 @@ namespace NCC.Extend.LqStatistics
         #endregion
+        #region 门店耗卡业绩统计
+
+        /// <summary>
+        /// 【4】保存门店耗卡业绩统计数据
+        /// </summary>
+        /// <remarks>
+        /// 统计指定月份各门店的耗卡业绩数据，包括消耗业绩、消耗数量、手工费
+        /// 
+        /// 示例请求：
+        /// ```json
+        /// {
+        ///   "statisticsMonth": "202501"
+        /// }
+        /// ```
+        /// 
+        /// 参数说明：
+        /// - statisticsMonth: 统计月份，格式为YYYYMM
+        /// </remarks>
+        /// <param name="input">统计月份输入参数</param>
+        /// <returns>保存结果</returns>
+        /// <response code="200">成功保存统计数据</response>
+        /// <response code="400">参数错误</response>
+        /// <response code="500">服务器错误</response>
+        [HttpPost("save-store-consume-performance-stats")]
+        public async Task<dynamic> SaveStoreConsumePerformanceStatistics([FromBody] SalaryStatisticsInput input)
+        {
+            if (input == null || string.IsNullOrEmpty(input.StatisticsMonth) || input.StatisticsMonth.Length != 6)
+            {
+                throw NCCException.Oh("统计月份格式错误，请使用YYYYMM格式");
+            }
+
+            var statisticsMonth = input.StatisticsMonth;
+
+            try
+            {
+                _logger.LogInformation($"开始统计门店耗卡业绩数据，月份：{statisticsMonth}");
+
+                // 使用数据库聚合方式，直接在数据库中完成所有统计计算
+                var sql = @"
+                    SELECT 
+                        hyhk.md AS StoreId,
+                        mdxx.mdbm AS StoreCode,
+                        hyhk.mdmc AS StoreName,
+                        @statisticsMonth AS StatisticsMonth,
+                        COALESCE(SUM(pxmx.F_TotalPrice), 0) AS ConsumePerformance,
+                        COALESCE(SUM(pxmx.F_ProjectNumber), 0) AS ConsumeQuantity,
+                        COALESCE(SUM(hyhk.sgfy), 0) AS ManualFee
+                    FROM lq_xh_hyhk hyhk
+                    LEFT JOIN lq_xh_pxmx pxmx ON hyhk.F_Id = pxmx.F_ConsumeInfoId AND pxmx.F_IsEffective = 1
+                    LEFT JOIN lq_mdxx mdxx ON hyhk.md = mdxx.F_Id
+                    WHERE hyhk.F_IsEffective = 1
+                        AND DATE_FORMAT(hyhk.hksj, '%Y%m') = @statisticsMonth
+                    GROUP BY hyhk.md, hyhk.mdmc, mdxx.mdbm
+                    HAVING ConsumePerformance > 0 OR ConsumeQuantity > 0 OR ManualFee > 0
+                    ORDER BY ConsumePerformance DESC";
+
+                // 执行SQL查询
+                var statisticsData = await _db.Ado.SqlQueryAsync<dynamic>(sql, new { statisticsMonth });
+
+                if (!statisticsData.Any())
+                {
+                    return new
+                    {
+                        Success = true,
+                        Message = $"未找到 {statisticsMonth} 月份的门店耗卡业绩统计数据",
+                        SavedCount = 0
+                    };
+                }
+
+                // 转换为实体对象
+                var entities = statisticsData.Select(data => new LqStatisticsStoreConsumePerformanceEntity
+                {
+                    Id = YitIdHelper.NextId().ToString(),
+                    StoreId = data.StoreId?.ToString() ?? "",
+                    StoreCode = data.StoreCode?.ToString() ?? "",
+                    StoreName = data.StoreName?.ToString() ?? "",
+                    StatisticsMonth = data.StatisticsMonth?.ToString() ?? statisticsMonth,
+                    ConsumePerformance = Convert.ToDecimal(data.ConsumePerformance ?? 0),
+                    ConsumeQuantity = Convert.ToDecimal(data.ConsumeQuantity ?? 0),
+                    ManualFee = Convert.ToDecimal(data.ManualFee ?? 0),
+                    CreateTime = DateTime.Now,
+                    UpdateTime = DateTime.Now
+                }).ToList();
+
+                // 使用事务确保数据一致性
+                var result = await _db.Ado.UseTranAsync(async () =>
+                {
+                    // 先删除该月份的历史数据
+                    await _db.Deleteable<LqStatisticsStoreConsumePerformanceEntity>()
+                        .Where(x => x.StatisticsMonth == statisticsMonth)
+                        .ExecuteCommandAsync();
+
+                    // 批量插入新数据
+                    return await _db.Insertable(entities).ExecuteCommandAsync();
+                });
+
+                var savedCount = result.IsSuccess ? result.Data : 0;
+                _logger.LogInformation($"成功保存门店耗卡业绩统计数据 - 月份: {statisticsMonth}, 记录数: {savedCount}");
+
+                return new
+                {
+                    Success = true,
+                    Message = $"成功保存 {savedCount} 条门店耗卡业绩统计数据",
+                    SavedCount = savedCount,
+                    StatisticsMonth = statisticsMonth
+                };
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, $"保存门店耗卡业绩统计数据失败 - 月份: {statisticsMonth}");
+                throw NCCException.Oh($"保存门店耗卡业绩统计数据失败: {ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 查询门店耗卡业绩统计数据
+        /// </summary>
+        /// <remarks>
+        /// 分页查询门店耗卡业绩统计数据，支持按门店、月份等条件筛选
+        /// 
+        /// 示例请求：
+        /// ```
+        /// GET /api/Extend/LqStatistics/get-store-consume-performance-stats?currentPage=1&amp;pageSize=10&amp;statisticsMonth=202501
+        /// ```
+        /// 
+        /// 参数说明：
+        /// - currentPage: 当前页码
+        /// - pageSize: 每页大小
+        /// - statisticsMonth: 统计月份筛选
+        /// - storeId: 门店ID筛选
+        /// - storeName: 门店名称筛选
+        /// </remarks>
+        /// <param name="input">查询参数</param>
+        /// <returns>分页的门店耗卡业绩统计数据</returns>
+        /// <response code="200">成功返回统计数据</response>
+        /// <response code="400">参数错误</response>
+        /// <response code="500">服务器错误</response>
+        [HttpGet("get-store-consume-performance-stats")]
+        public async Task<SqlSugarPagedList<LqStatisticsStoreConsumePerformanceEntity>> GetStoreConsumePerformanceStatistics([FromQuery] LqStatisticsStoreConsumePerformanceListQueryInput input)
+        {
+            try
+            {
+                var query = _db.Queryable<LqStatisticsStoreConsumePerformanceEntity>()
+                    .WhereIF(!string.IsNullOrEmpty(input.storeId), x => x.StoreId.Contains(input.storeId))
+                    .WhereIF(!string.IsNullOrEmpty(input.storeCode), x => x.StoreCode.Contains(input.storeCode))
+                    .WhereIF(!string.IsNullOrEmpty(input.storeName), x => x.StoreName.Contains(input.storeName))
+                    .WhereIF(!string.IsNullOrEmpty(input.statisticsMonth), x => x.StatisticsMonth == input.statisticsMonth)
+                    .WhereIF(!string.IsNullOrEmpty(input.startMonth), x => string.Compare(x.StatisticsMonth, input.startMonth) >= 0)
+                    .WhereIF(!string.IsNullOrEmpty(input.endMonth), x => string.Compare(x.StatisticsMonth, input.endMonth) <= 0)
+                    .OrderBy(x => x.StatisticsMonth, OrderByType.Desc)
+                    .OrderBy(x => x.StoreName, OrderByType.Asc);
+
+                var result = await query.ToPagedListAsync(input.currentPage, input.pageSize);
+                return result;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "查询门店耗卡业绩统计数据失败");
+                throw NCCException.Oh($"查询门店耗卡业绩统计数据失败: {ex.Message}");
+            }
+        }
+
+        #endregion
+
+        #region 个人消耗业绩统计
+
+        /// <summary>
+        /// 【5】保存个人消耗业绩统计数据
+        /// </summary>
+        /// <remarks>
+        /// 统计健康师和科技部老师的消耗业绩数据
+        /// 
+        /// 示例请求：
+        /// ```json
+        /// {
+        ///   "statisticsMonth": "202501"
+        /// }
+        /// ```
+        /// 
+        /// 参数说明：
+        /// - statisticsMonth: 统计月份(YYYYMM格式)
+        /// </remarks>
+        /// <param name="input">统计输入参数</param>
+        /// <returns>保存结果</returns>
+        /// <response code="200">成功保存个人消耗业绩统计数据</response>
+        /// <response code="400">参数错误</response>
+        /// <response code="500">服务器错误</response>
+        [HttpPost("save-department-consume-performance-stats")]
+        public async Task<dynamic> SaveDepartmentConsumePerformanceStatistics([FromBody] SalaryStatisticsInput input)
+        {
+            try
+            {
+                if (input == null || string.IsNullOrEmpty(input.StatisticsMonth) || input.StatisticsMonth.Length != 6)
+                {
+                    throw NCCException.Oh("统计月份格式错误，请使用YYYYMM格式");
+                }
+
+                var statisticsMonth = input.StatisticsMonth;
+                var allStatisticsData = new List<LqStatisticsDepartmentConsumePerformanceEntity>();
+
+                // 1. 统计健康师消耗业绩
+                var healthCoachSql = @"
+                    SELECT 
+                        '健康师' as F_DepartmentType,
+                        jksyj.jkszh as F_UserId,
+                        jksyj.jkszh as F_UserCode,
+                        jksyj.jksxm as F_UserName,
+                        hyhk.md as F_StoreId,
+                        md.mdbm as F_StoreCode,
+                        md.dm as F_StoreName,
+                        @statisticsMonth as F_StatisticsMonth,
+                        COALESCE(SUM(jksyj.jksyj), 0) as F_ConsumePerformance,
+                        COALESCE(SUM(jksyj.F_kdpxNumber), 0) as F_ConsumeQuantity,
+                        COALESCE(SUM(jksyj.F_LaborCost), 0) as F_ManualFee
+                    FROM lq_xh_jksyj jksyj
+                    INNER JOIN lq_xh_hyhk hyhk ON jksyj.glkdbh = hyhk.F_Id AND hyhk.F_IsEffective = 1
+                    LEFT JOIN lq_mdxx md ON hyhk.md = md.F_Id
+                    WHERE jksyj.F_IsEffective = 1
+                        AND DATE_FORMAT(hyhk.hksj, '%Y%m') = @statisticsMonth
+                    GROUP BY jksyj.jkszh, jksyj.jksxm, hyhk.md, md.mdbm, md.dm";
+
+                var healthCoachData = await _db.Ado.SqlQueryAsync<dynamic>(healthCoachSql, new { statisticsMonth });
+                foreach (var item in healthCoachData)
+                {
+                    allStatisticsData.Add(new LqStatisticsDepartmentConsumePerformanceEntity
+                    {
+                        Id = YitIdHelper.NextId().ToString(),
+                        DepartmentType = item.F_DepartmentType?.ToString(),
+                        UserId = item.F_UserId?.ToString(),
+                        UserCode = item.F_UserCode?.ToString(),
+                        UserName = item.F_UserName?.ToString(),
+                        StoreId = item.F_StoreId?.ToString(),
+                        StoreCode = item.F_StoreCode?.ToString(),
+                        StoreName = item.F_StoreName?.ToString(),
+                        StatisticsMonth = statisticsMonth,
+                        ConsumePerformance = Convert.ToDecimal(item.F_ConsumePerformance ?? 0),
+                        ConsumeQuantity = Convert.ToDecimal(item.F_ConsumeQuantity ?? 0),
+                        ManualFee = Convert.ToDecimal(item.F_ManualFee ?? 0),
+                        CreateTime = DateTime.Now
+                    });
+                }
+
+                // 2. 统计科技部老师消耗业绩
+                var techTeacherSql = @"
+                    SELECT 
+                        '科技部老师' as F_DepartmentType,
+                        kjbsyj.kjblszh as F_UserId,
+                        kjbsyj.kjblszh as F_UserCode,
+                        kjbsyj.kjblsxm as F_UserName,
+                        hyhk.md as F_StoreId,
+                        md.mdbm as F_StoreCode,
+                        md.dm as F_StoreName,
+                        @statisticsMonth as F_StatisticsMonth,
+                        COALESCE(SUM(kjbsyj.kjblsyj), 0) as F_ConsumePerformance,
+                        COALESCE(SUM(kjbsyj.F_hdpxNumber), 0) as F_ConsumeQuantity,
+                        COALESCE(SUM(kjbsyj.F_LaborCost), 0) as F_ManualFee
+                    FROM lq_xh_kjbsyj kjbsyj
+                    INNER JOIN lq_xh_hyhk hyhk ON kjbsyj.glkdbh = hyhk.F_Id AND hyhk.F_IsEffective = 1
+                    LEFT JOIN lq_mdxx md ON hyhk.md = md.F_Id
+                    WHERE kjbsyj.F_IsEffective = 1
+                        AND DATE_FORMAT(hyhk.hksj, '%Y%m') = @statisticsMonth
+                    GROUP BY kjbsyj.kjblszh, kjbsyj.kjblsxm, hyhk.md, md.mdbm, md.dm";
+
+                var techTeacherData = await _db.Ado.SqlQueryAsync<dynamic>(techTeacherSql, new { statisticsMonth });
+                foreach (var item in techTeacherData)
+                {
+                    allStatisticsData.Add(new LqStatisticsDepartmentConsumePerformanceEntity
+                    {
+                        Id = YitIdHelper.NextId().ToString(),
+                        DepartmentType = item.F_DepartmentType?.ToString(),
+                        UserId = item.F_UserId?.ToString(),
+                        UserCode = item.F_UserCode?.ToString(),
+                        UserName = item.F_UserName?.ToString(),
+                        StoreId = item.F_StoreId?.ToString(),
+                        StoreCode = item.F_StoreCode?.ToString(),
+                        StoreName = item.F_StoreName?.ToString(),
+                        StatisticsMonth = statisticsMonth,
+                        ConsumePerformance = Convert.ToDecimal(item.F_ConsumePerformance ?? 0),
+                        ConsumeQuantity = Convert.ToDecimal(item.F_ConsumeQuantity ?? 0),
+                        ManualFee = Convert.ToDecimal(item.F_ManualFee ?? 0),
+                        CreateTime = DateTime.Now
+                    });
+                }
+
+                // 3. 使用事务保存数据
+                var result = await _db.Ado.UseTranAsync(async () =>
+                {
+                    // 删除当月已存在的数据
+                    await _db.Deleteable<LqStatisticsDepartmentConsumePerformanceEntity>()
+                        .Where(x => x.StatisticsMonth == statisticsMonth)
+                        .ExecuteCommandAsync();
+
+                    // 批量插入新数据
+                    if (allStatisticsData.Any())
+                    {
+                        await _db.Insertable(allStatisticsData).ExecuteCommandAsync();
+                    }
+
+                    return allStatisticsData.Count;
+                });
+
+                var savedCount = result.IsSuccess ? result.Data : 0;
+
+                return new
+                {
+                    Success = true,
+                    Message = $"成功保存 {savedCount} 条个人消耗业绩统计数据",
+                    SavedCount = savedCount,
+                    StatisticsMonth = statisticsMonth
+                };
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "保存个人消耗业绩统计数据失败");
+                throw NCCException.Oh($"保存个人消耗业绩统计数据失败: {ex.Message}");
+            }
+        }
+
         /// <summary>
-        /// 部门信息
+        /// 查询个人消耗业绩统计数据
         /// </summary>
-        public class DepartmentInfo
+        /// <remarks>
+        /// 支持按部门类型、用户、门店、月份等条件查询个人消耗业绩统计数据
+        /// 
+        /// 示例请求：
+        /// ```
+        /// GET /api/Extend/LqStatistics/get-department-consume-performance-stats?departmentType=健康师&amp;statisticsMonth=202501&amp;currentPage=1&amp;pageSize=10
+        /// ```
+        /// 
+        /// 参数说明：
+        /// - departmentType: 部门类型(健康师, 科技部老师)
+        /// - userId: 用户ID
+        /// - userCode: 用户账号
+        /// - userName: 用户姓名
+        /// - storeId: 门店ID
+        /// - storeCode: 门店编码
+        /// - storeName: 门店名称
+        /// - statisticsMonth: 统计月份(YYYYMM格式)
+        /// - startMonth: 开始月份(YYYYMM格式)
+        /// - endMonth: 结束月份(YYYYMM格式)
+        /// - currentPage: 当前页码
+        /// - pageSize: 每页大小
+        /// </remarks>
+        /// <param name="input">查询参数</param>
+        /// <returns>分页查询结果</returns>
+        /// <response code="200">查询成功</response>
+        /// <response code="400">参数错误</response>
+        /// <response code="500">服务器错误</response>
+        [HttpGet("get-department-consume-performance-stats")]
+        public async Task<SqlSugarPagedList<LqStatisticsDepartmentConsumePerformanceEntity>> GetDepartmentConsumePerformanceStatistics([FromQuery] LqStatisticsDepartmentConsumePerformanceListQueryInput input)
         {
-            /// <summary>
-            /// 部门ID
-            /// </summary>
-            public string DepartmentId { get; set; }
-
-            /// <summary>
-            /// 部门名称
-            /// </summary>
-            public string DepartmentName { get; set; }
-
-            /// <summary>
-            /// 父部门ID
-            /// </summary>
-            public string ParentId { get; set; }
+            try
+            {
+                var query = _db.Queryable<LqStatisticsDepartmentConsumePerformanceEntity>()
+                    .WhereIF(!string.IsNullOrEmpty(input.DepartmentType), x => x.DepartmentType.Contains(input.DepartmentType))
+                    .WhereIF(!string.IsNullOrEmpty(input.UserId), x => x.UserId.Contains(input.UserId))
+                    .WhereIF(!string.IsNullOrEmpty(input.UserCode), x => x.UserCode.Contains(input.UserCode))
+                    .WhereIF(!string.IsNullOrEmpty(input.UserName), x => x.UserName.Contains(input.UserName))
+                    .WhereIF(!string.IsNullOrEmpty(input.StoreId), x => x.StoreId.Contains(input.StoreId))
+                    .WhereIF(!string.IsNullOrEmpty(input.StoreCode), x => x.StoreCode.Contains(input.StoreCode))
+                    .WhereIF(!string.IsNullOrEmpty(input.StoreName), x => x.StoreName.Contains(input.StoreName))
+                    .WhereIF(!string.IsNullOrEmpty(input.StatisticsMonth), x => x.StatisticsMonth == input.StatisticsMonth)
+                    .WhereIF(!string.IsNullOrEmpty(input.StartMonth), x => string.Compare(x.StatisticsMonth, input.StartMonth) >= 0)
+                    .WhereIF(!string.IsNullOrEmpty(input.EndMonth), x => string.Compare(x.StatisticsMonth, input.EndMonth) <= 0)
+                    .OrderBy(x => x.StatisticsMonth, OrderByType.Desc)
+                    .OrderBy(x => x.DepartmentType, OrderByType.Asc)
+                    .OrderBy(x => x.UserName, OrderByType.Asc);
+
+                var result = await query.ToPagedListAsync(input.currentPage, input.pageSize);
+                return result;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "查询个人消耗业绩统计数据失败");
+                throw NCCException.Oh($"查询个人消耗业绩统计数据失败: {ex.Message}");
+            }
         }
+        #endregion
+
+
     }
 }
@@ -128,9 +128,9 @@ namespace NCC.Extend.LqXhHyhk
                         memberId = pxmx.MemberId,
                         createTime = pxmx.CreateTIme,
                         projectNumber = pxmx.ProjectNumber,
-                        isEnabled = pxmx.IsEnabled,
                         sourceType = pxmx.SourceType,
                         totalPrice = pxmx.TotalPrice,
+                        isEffective = pxmx.IsEffective,
                     };
                     // 关联该品项的健康师业绩
@@ -183,8 +183,9 @@ namespace NCC.Extend.LqXhHyhk
                 .WhereIF(!string.IsNullOrEmpty(input.hyzh), p => p.Hyzh.Contains(input.hyzh))
                 .WhereIF(!string.IsNullOrEmpty(input.hymc), p => p.Hymc.Contains(input.hymc))
                 .WhereIF(!string.IsNullOrEmpty(input.gklx), p => p.Gklx.Equals(input.gklx))
-                .WhereIF(!string.IsNullOrEmpty(input.xfje), p => p.Xfje.Contains(input.xfje))
-                .WhereIF(!string.IsNullOrEmpty(input.sgfy), p => p.Sgfy.Contains(input.sgfy))
+                // 注意：xfje 和 sgfy 现在是 decimal 类型，不支持字符串模糊查询
+                // .WhereIF(!string.IsNullOrEmpty(input.xfje), p => SqlFunc.ToString(p.Xfje).Contains(input.xfje))
+                // .WhereIF(!string.IsNullOrEmpty(input.sgfy), p => SqlFunc.ToString(p.Sgfy).Contains(input.sgfy))
                 .WhereIF(!string.IsNullOrEmpty(input.sfykjb), p => p.Sfykjb.Equals(input.sfykjb))
                 .WhereIF(queryHksj != null, p => p.Hksj >= new DateTime(startHksj.ToDate().Year, startHksj.ToDate().Month, startHksj.ToDate().Day, 0, 0, 0))
                 .WhereIF(queryHksj != null, p => p.Hksj <= new DateTime(endHksj.ToDate().Year, endHksj.ToDate().Month, endHksj.ToDate().Day, 23, 59, 59))
@@ -199,8 +200,8 @@ namespace NCC.Extend.LqXhHyhk
                     hyzh = it.Hyzh,
                     hymc = it.Hymc,
                     gklx = it.Gklx,
-                    xfje = it.Xfje,
-                    sgfy = it.Sgfy,
+                    xfje = SqlFunc.ToString(it.Xfje),
+                    sgfy = SqlFunc.ToString(it.Sgfy),
                     sfykjb = it.Sfykjb,
                     hksj = it.Hksj,
                     czry = it.Czry,
@@ -285,7 +286,6 @@ namespace NCC.Extend.LqXhHyhk
                             BillingItemId = item.billingItemId,
                             CreateTIme = DateTime.Now,
                             MemberId = entity.Hy,
-                            IsEnabled = 0,
                             ProjectNumber = item.projectNumber ?? 1,
                             TotalPrice = (decimal)(item.pxjg * (item.projectNumber ?? 1)),
                             Px = item.px,
@@ -346,7 +346,18 @@ namespace NCC.Extend.LqXhHyhk
                 // 批量插入品项明细
                 if (allPxmxEntities.Any())
                 {
-                    await _db.Insertable(allPxmxEntities).ExecuteCommandAsync();
+                    // 分别处理插入和更新
+                    var existingEntities = allPxmxEntities.Where(e => !string.IsNullOrEmpty(e.Id)).ToList();
+                    var newEntities = allPxmxEntities.Where(e => string.IsNullOrEmpty(e.Id)).ToList();
+
+                    if (existingEntities.Any())
+                    {
+                        await _db.Updateable(existingEntities).ExecuteCommandAsync();
+                    }
+                    if (newEntities.Any())
+                    {
+                        await _db.Insertable(newEntities).ExecuteCommandAsync();
+                    }
                 }
                 // 批量插入健康师业绩
                 if (allJksyjEntities.Any())
@@ -394,8 +405,6 @@ namespace NCC.Extend.LqXhHyhk
                 .WhereIF(!string.IsNullOrEmpty(input.hyzh), p => p.Hyzh.Contains(input.hyzh))
                 .WhereIF(!string.IsNullOrEmpty(input.hymc), p => p.Hymc.Contains(input.hymc))
                 .WhereIF(!string.IsNullOrEmpty(input.gklx), p => p.Gklx.Equals(input.gklx))
-                .WhereIF(!string.IsNullOrEmpty(input.xfje), p => p.Xfje.Contains(input.xfje))
-                .WhereIF(!string.IsNullOrEmpty(input.sgfy), p => p.Sgfy.Contains(input.sgfy))
                 .WhereIF(!string.IsNullOrEmpty(input.sfykjb), p => p.Sfykjb.Equals(input.sfykjb))
                 .WhereIF(queryHksj != null, p => p.Hksj >= new DateTime(startHksj.ToDate().Year, startHksj.ToDate().Month, startHksj.ToDate().Day, 0, 0, 0))
                 .WhereIF(queryHksj != null, p => p.Hksj <= new DateTime(endHksj.ToDate().Year, endHksj.ToDate().Month, endHksj.ToDate().Day, 23, 59, 59))
@@ -410,8 +419,8 @@ namespace NCC.Extend.LqXhHyhk
                     hyzh = it.Hyzh,
                     hymc = it.Hymc,
                     gklx = it.Gklx,
-                    xfje = it.Xfje,
-                    sgfy = it.Sgfy,
+                    xfje = SqlFunc.ToString(it.Xfje),
+                    sgfy = SqlFunc.ToString(it.Sgfy),
                     sfykjb = it.Sfykjb,
                     hksj = it.Hksj,
                     czry = it.Czry,
@@ -510,7 +519,7 @@ namespace NCC.Extend.LqXhHyhk
         #region 更新会员耗卡
         /// <summary>
-        /// 更新会员耗卡
+        /// 更新会员耗卡,不会删除品项明细，只会更新或新增
         /// </summary>
         /// <param name="id">主键</param>
         /// <param name="input">参数</param>
@@ -531,8 +540,8 @@ namespace NCC.Extend.LqXhHyhk
                 await _db.Deleteable<LqXhJksyjEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
                 await _db.Deleteable<LqXhKjbsyjEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
-                //清空原有数据
-                await _db.Deleteable<LqXhPxmxEntity>().Where(u => u.ConsumeInfoId == id).ExecuteCommandAsync();
+                // 注意：品项明细表不做删除操作，只更新或新增
+                // await _db.Deleteable<LqXhPxmxEntity>().Where(u => u.ConsumeInfoId == id).ExecuteCommandAsync();
                 // 收集所有需要插入的实体，然后批量插入
                 var allPxmxEntities = new List<LqXhPxmxEntity>();
@@ -544,22 +553,43 @@ namespace NCC.Extend.LqXhHyhk
                 {
                     foreach (var item in input.lqXhPxmxList)
                     {
-                        // 创建品项明细实体
-                        var lqXhPxmxEntity = new LqXhPxmxEntity
+                        // 检查品项明细是否已存在
+                        var existingPxmx = await _db.Queryable<LqXhPxmxEntity>()
+                            .Where(p => p.Id == item.id)
+                            .FirstAsync();
+
+                        LqXhPxmxEntity lqXhPxmxEntity;
+                        if (existingPxmx != null)
                         {
-                            Id = YitIdHelper.NextId().ToString(),
-                            ConsumeInfoId = entity.Id,
-                            BillingItemId = item.billingItemId,
-                            CreateTIme = DateTime.Now,
-                            MemberId = entity.Hy,
-                            IsEnabled = 0,
-                            ProjectNumber = item.projectNumber ?? 1,
-                            TotalPrice = (decimal)(item.pxjg * (item.projectNumber ?? 1)),
-                            Px = item.px,
-                            Pxmc = item.pxmc,
-                            Pxjg = item.pxjg,
-                            SourceType = item.sourceType,
-                        };
+                            // 更新现有记录
+                            lqXhPxmxEntity = existingPxmx;
+                            // 注意：LqXhPxmxEntity 没有 UpdateTime 字段
+                            lqXhPxmxEntity.MemberId = entity.Hy;
+                            lqXhPxmxEntity.ProjectNumber = item.projectNumber ?? 1;
+                            lqXhPxmxEntity.TotalPrice = (decimal)(item.pxjg * (item.projectNumber ?? 1));
+                            lqXhPxmxEntity.Px = item.px;
+                            lqXhPxmxEntity.Pxmc = item.pxmc;
+                            lqXhPxmxEntity.Pxjg = item.pxjg;
+                            lqXhPxmxEntity.SourceType = item.sourceType;
+                        }
+                        else
+                        {
+                            // 创建新记录
+                            lqXhPxmxEntity = new LqXhPxmxEntity
+                            {
+                                Id = YitIdHelper.NextId().ToString(),
+                                ConsumeInfoId = entity.Id,
+                                BillingItemId = item.billingItemId,
+                                CreateTIme = DateTime.Now,
+                                MemberId = entity.Hy,
+                                ProjectNumber = item.projectNumber ?? 1,
+                                TotalPrice = (decimal)(item.pxjg * (item.projectNumber ?? 1)),
+                                Px = item.px,
+                                Pxmc = item.pxmc,
+                                Pxjg = item.pxjg,
+                                SourceType = item.sourceType,
+                            };
+                        }
                         allPxmxEntities.Add(lqXhPxmxEntity);
                         // 收集该品项关联的健康师业绩
@@ -614,7 +644,18 @@ namespace NCC.Extend.LqXhHyhk
                 // 批量插入品项明细
                 if (allPxmxEntities.Any())
                 {
-                    await _db.Insertable(allPxmxEntities).ExecuteCommandAsync();
+                    // 分别处理插入和更新
+                    var existingEntities = allPxmxEntities.Where(e => !string.IsNullOrEmpty(e.Id)).ToList();
+                    var newEntities = allPxmxEntities.Where(e => string.IsNullOrEmpty(e.Id)).ToList();
+
+                    if (existingEntities.Any())
+                    {
+                        await _db.Updateable(existingEntities).ExecuteCommandAsync();
+                    }
+                    if (newEntities.Any())
+                    {
+                        await _db.Insertable(newEntities).ExecuteCommandAsync();
+                    }
                 }
                 // 批量插入健康师业绩
                 if (allJksyjEntities.Any())