feat(wm-revenue): #49 报装进度查询+统计报表+首页概览完整实现

frontend/src/api/install.ts

@@ -0,0 +1,99 @@
+import request from './request'
+
+const API = '/api/revenue/install'
+
+export interface InstallApplication {
+  id?: number
+  applicationNo?: string
+  applicantName: string
+  applicantPhone: string
+  applicantIdCard?: string
+  customerType: string
+  address: string
+  area: string
+  areaCode?: string
+  waterUsageType?: string
+  caliber?: string
+  status?: string
+  currentStep?: number
+  totalSteps?: number
+  applyTime?: string
+  expectedComplete?: string
+  actualComplete?: string
+  rejectReason?: string
+  assigneeId?: number
+  assigneeName?: string
+  remark?: string
+}
+
+export interface InstallProgress {
+  id: number
+  applicationId: number
+  stepNumber: number
+  stepName: string
+  stepStatus: string
+  operatorId?: number
+  operatorName?: string
+  completeTime?: string
+  remark?: string
+}
+
+// 列表查询
+export function getInstallList(params: any) {
+  return request.get(`${API}/list`, { params })
+}
+
+// 获取详情
+export function getInstallDetail(id: number) {
+  return request.get(`${API}/${id}`)
+}
+
+// 创建申请
+export function createInstall(data: InstallApplication) {
+  return request.post(API, data)
+}
+
+// 更新申请
+export function updateInstall(id: number, data: InstallApplication) {
+  return request.put(`${API}/${id}`, data)
+}
+
+// 更新状态
+export function updateInstallStatus(id: number, status: string, remark?: string) {
+  return request.post(`${API}/${id}/status`, { status, remark })
+}
+
+// 删除
+export function deleteInstall(id: number) {
+  return request.delete(`${API}/${id}`)
+}
+
+// 获取进度时间线
+export function getInstallTimeline(id: number) {
+  return request.get(`${API}/${id}/timeline`)
+}
+
+// 获取进度概览
+export function getInstallProgress(id: number) {
+  return request.get(`${API}/${id}/progress`)
+}
+
+// 更新进度节点
+export function updateInstallProgress(id: number, stepNumber: number, data: any) {
+  return request.post(`${API}/${id}/progress/${stepNumber}`, data)
+}
+
+// 获取统计数据
+export function getInstallStats() {
+  return request.get(`${API}/stats`)
+}
+
+// 获取首页概览
+export function getInstallDashboard() {
+  return request.get(`${API}/dashboard`)
+}
+
+// 获取区域列表
+export function getInstallAreas() {
+  return request.get(`${API}/areas`)
+}

frontend/src/router/index.ts

@@ -16,6 +16,9 @@ const routes = [
       { path: 'cs/knowledge', name: 'csKnowledge', component: () => import('@/views/cs/KnowledgeBaseView.vue') },
       { path: 'cs/announcement', name: 'csAnnouncement', component: () => import('@/views/cs/AnnouncementView.vue') },
       { path: 'cs/kpi', name: 'csKpi', component: () => import('@/views/cs/KpiDashboardView.vue') },
+      { path: 'install/dashboard', name: 'installDashboard', component: () => import('@/views/install/InstallDashboard.vue') },
+      { path: 'install/list', name: 'installList', component: () => import('@/views/install/InstallListView.vue') },
+      { path: 'install/stats', name: 'installStats', component: () => import('@/views/install/InstallStatsView.vue') },
     ]
   },
   { path: '/:pathMatch(.*)*', redirect: '/dashboard' }

frontend/src/views/install/InstallDashboard.vue

@@ -0,0 +1,183 @@
+<template>
+  <div class="install-dashboard">
+    <h2>报装概览</h2>
+
+    <el-row :gutter="20">
+      <el-col :span="6" v-for="card in dashboardCards" :key="card.title">
+        <el-card shadow="hover" class="dash-card">
+          <div class="dash-icon" :style="{ background: card.bg }">
+            <el-icon :size="28" :color="card.color">
+              <component :is="card.icon" />
+            </el-icon>
+          </div>
+          <div class="dash-info">
+            <div class="dash-value" :style="{ color: card.color }">{{ card.value }}</div>
+            <div class="dash-title">{{ card.title }}</div>
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
+
+    <!-- 补充信息 -->
+    <el-row :gutter="16" style="margin-top:20px">
+      <el-col :span="12">
+        <el-card shadow="never">
+          <template #header>快速统计</template>
+          <el-descriptions :column="2" border>
+            <el-descriptions-item label="总申请数">{{ dashData.totalCount || 0 }}</el-descriptions-item>
+            <el-descriptions-item label="本月新增">{{ dashData.monthCount || 0 }}</el-descriptions-item>
+            <el-descriptions-item label="今日新增">{{ dashData.todayCount || 0 }}</el-descriptions-item>
+            <el-descriptions-item label="平均处理天数">{{ dashData.avgProcessDays || 0 }} 天</el-descriptions-item>
+          </el-descriptions>
+        </el-card>
+      </el-col>
+      <el-col :span="12">
+        <el-card shadow="never">
+          <template #header>处理效率</template>
+          <div class="efficiency-bar">
+            <div class="eff-label">平均处理天数</div>
+            <el-progress
+              :percentage="efficiencyPercent"
+              :stroke-width="20"
+              :color="efficiencyColor"
+              :format="() => `${dashData.avgProcessDays || 0}天`"
+            />
+            <div class="eff-hint">
+              <span style="color:#67c23a">◀ 高效</span>
+              <span style="color:#f56c6c">低效 ▶</span>
+            </div>
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, computed, onMounted } from 'vue'
+import { Calendar, Document, CircleCheck, Clock } from '@element-plus/icons-vue'
+
+const dashData = ref<any>({})
+
+const dashboardCards = computed(() => [
+  {
+    title: '今日新增',
+    value: dashData.value.todayCount || 0,
+    color: '#409eff',
+    bg: 'rgba(64,158,255,0.1)',
+    icon: Calendar
+  },
+  {
+    title: '在办数量',
+    value: dashData.value.inProgressCount || 0,
+    color: '#e6a23c',
+    bg: 'rgba(230,162,60,0.1)',
+    icon: Document
+  },
+  {
+    title: '完工数量',
+    value: dashData.value.finishedCount || 0,
+    color: '#67c23a',
+    bg: 'rgba(103,194,58,0.1)',
+    icon: CircleCheck
+  },
+  {
+    title: '平均处理天数',
+    value: `${dashData.value.avgProcessDays || 0}天`,
+    color: '#909399',
+    bg: 'rgba(144,147,153,0.1)',
+    icon: Clock
+  }
+])
+
+const efficiencyPercent = computed(() => {
+  const days = dashData.value.avgProcessDays || 0
+  // 30天以内算高效，超过60天算低效
+  if (days <= 30) return Math.min(100, Math.round((days / 30) * 50))
+  if (days <= 60) return 50 + Math.round(((days - 30) / 30) * 50)
+  return 100
+})
+
+const efficiencyColor = computed(() => {
+  const days = dashData.value.avgProcessDays || 0
+  if (days <= 15) return '#67c23a'
+  if (days <= 30) return '#409eff'
+  if (days <= 45) return '#e6a23c'
+  return '#f56c6c'
+})
+
+async function loadDashboard() {
+  try {
+    const res = await fetch('/api/revenue/install/dashboard')
+    const json = await res.json()
+    if (json.code === 200) {
+      dashData.value = json.data
+    }
+  } catch (e) {
+    console.error('加载概览数据失败', e)
+  }
+}
+
+onMounted(() => {
+  loadDashboard()
+})
+</script>
+
+<style scoped>
+.install-dashboard { padding: 0; }
+
+.dash-card {
+  display: flex;
+  align-items: center;
+}
+.dash-card :deep(.el-card__body) {
+  display: flex;
+  align-items: center;
+  gap: 16px;
+  padding: 20px;
+  width: 100%;
+}
+
+.dash-icon {
+  width: 56px;
+  height: 56px;
+  border-radius: 12px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-shrink: 0;
+}
+
+.dash-info {
+  flex: 1;
+}
+
+.dash-value {
+  font-size: 28px;
+  font-weight: bold;
+  line-height: 1.2;
+}
+
+.dash-title {
+  color: #666;
+  margin-top: 4px;
+  font-size: 13px;
+}
+
+.efficiency-bar {
+  padding: 10px 0;
+}
+
+.eff-label {
+  margin-bottom: 12px;
+  font-size: 14px;
+  color: #333;
+}
+
+.eff-hint {
+  display: flex;
+  justify-content: space-between;
+  margin-top: 8px;
+  font-size: 12px;
+}
+</style>

frontend/src/views/install/InstallListView.vue

@@ -0,0 +1,284 @@
+<template>
+  <div class="install-list">
+    <h2>报装申请管理</h2>
+
+    <!-- 筛选栏 -->
+    <el-card shadow="never" class="filter-card">
+      <el-form :inline="true" :model="filters">
+        <el-form-item label="状态">
+          <el-select v-model="filters.status" placeholder="全部状态" clearable style="width:140px">
+            <el-option label="待审核" value="pending_review" />
+            <el-option label="审批中" value="reviewing" />
+            <el-option label="施工中" value="constructing" />
+            <el-option label="已完工" value="completed" />
+            <el-option label="已通水" value="connected" />
+            <el-option label="已驳回" value="rejected" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="类型">
+          <el-select v-model="filters.customerType" placeholder="全部类型" clearable style="width:120px">
+            <el-option label="居民" value="residential" />
+            <el-option label="商业" value="commercial" />
+            <el-option label="工业" value="industrial" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="区域">
+          <el-input v-model="filters.area" placeholder="区域" clearable style="width:120px" />
+        </el-form-item>
+        <el-form-item label="搜索">
+          <el-input v-model="filters.keyword" placeholder="姓名/编号/地址/电话" clearable style="width:200px" />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="loadData">查询</el-button>
+          <el-button @click="resetFilters">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+
+    <!-- 列表 -->
+    <el-card shadow="never" style="margin-top:16px">
+      <el-table :data="tableData" v-loading="loading" stripe style="width:100%">
+        <el-table-column prop="applicationNo" label="申请编号" width="160" />
+        <el-table-column prop="applicantName" label="申请人" width="100" />
+        <el-table-column prop="applicantPhone" label="电话" width="130" />
+        <el-table-column prop="customerType" label="类型" width="80">
+          <template #default="{ row }">
+            <el-tag :type="typeTagMap[row.customerType]">{{ typeNameMap[row.customerType] }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="area" label="区域" width="100" />
+        <el-table-column prop="address" label="地址" min-width="180" show-overflow-tooltip />
+        <el-table-column prop="status" label="状态" width="100">
+          <template #default="{ row }">
+            <el-tag :type="statusTagMap[row.status]">{{ statusNameMap[row.status] }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="applyTime" label="申请时间" width="170">
+          <template #default="{ row }">
+            {{ formatDate(row.applyTime) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="进度" width="100">
+          <template #default="{ row }">
+            <el-progress :percentage="calcProgress(row)" :stroke-width="6" :show-text="true" />
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="200" fixed="right">
+          <template #default="{ row }">
+            <el-button link type="primary" @click="showDetail(row)">详情</el-button>
+            <el-button link type="primary" @click="showTimeline(row)">进度</el-button>
+            <el-button link type="success" v-if="row.status==='pending_review'" @click="handleApprove(row)">通过</el-button>
+            <el-button link type="danger" v-if="row.status==='pending_review'" @click="handleReject(row)">驳回</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <el-pagination
+        style="margin-top:16px; justify-content:flex-end"
+        v-model:current-page="currentPage"
+        v-model:page-size="pageSize"
+        :total="total"
+        :page-sizes="[10, 20, 50]"
+        layout="total, sizes, prev, pager, next"
+        @size-change="loadData"
+        @current-change="loadData"
+      />
+    </el-card>
+
+    <!-- 详情弹窗 -->
+    <el-dialog v-model="detailVisible" title="报装申请详情" width="600px">
+      <el-descriptions :column="2" border v-if="currentRow">
+        <el-descriptions-item label="申请编号">{{ currentRow.applicationNo }}</el-descriptions-item>
+        <el-descriptions-item label="申请人">{{ currentRow.applicantName }}</el-descriptions-item>
+        <el-descriptions-item label="电话">{{ currentRow.applicantPhone }}</el-descriptions-item>
+        <el-descriptions-item label="身份证">{{ currentRow.applicantIdCard || '-' }}</el-descriptions-item>
+        <el-descriptions-item label="类型">{{ typeNameMap[currentRow.customerType] }}</el-descriptions-item>
+        <el-descriptions-item label="状态">
+          <el-tag :type="statusTagMap[currentRow.status]">{{ statusNameMap[currentRow.status] }}</el-tag>
+        </el-descriptions-item>
+        <el-descriptions-item label="区域">{{ currentRow.area || '-' }}</el-descriptions-item>
+        <el-descriptions-item label="口径">{{ currentRow.caliber || '-' }}</el-descriptions-item>
+        <el-descriptions-item label="地址" :span="2">{{ currentRow.address }}</el-descriptions-item>
+        <el-descriptions-item label="申请时间">{{ formatDate(currentRow.applyTime) }}</el-descriptions-item>
+        <el-descriptions-item label="预计完工">{{ currentRow.expectedComplete || '-' }}</el-descriptions-item>
+        <el-descriptions-item label="备注" :span="2">{{ currentRow.remark || '-' }}</el-descriptions-item>
+        <el-descriptions-item label="驳回原因" :span="2" v-if="currentRow.rejectReason">
+          <span style="color:#f56c6c">{{ currentRow.rejectReason }}</span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </el-dialog>
+
+    <!-- 进度时间线弹窗 -->
+    <el-dialog v-model="timelineVisible" title="进度追踪" width="600px">
+      <div v-if="timelineData.length === 0" style="text-align:center;color:#999;padding:20px">暂无进度数据</div>
+      <el-timeline v-else>
+        <el-timeline-item
+          v-for="item in timelineData"
+          :key="item.id"
+          :type="timelineItemType(item.stepStatus)"
+          :timestamp="item.completeTime ? formatDate(item.completeTime) : '未完成'"
+          :hollow="item.stepStatus === 'pending'"
+        >
+          <h4>{{ item.stepName }}</h4>
+          <p v-if="item.operatorName">操作人: {{ item.operatorName }}</p>
+          <p v-if="item.remark">备注: {{ item.remark }}</p>
+        </el-timeline-item>
+      </el-timeline>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, onMounted } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+
+const loading = ref(false)
+const tableData = ref<any[]>([])
+const currentPage = ref(1)
+const pageSize = ref(10)
+const total = ref(0)
+
+const filters = reactive({
+  status: '',
+  customerType: '',
+  area: '',
+  keyword: ''
+})
+
+const statusNameMap: Record<string, string> = {
+  pending_review: '待审核', reviewing: '审批中', constructing: '施工中',
+  completed: '已完工', connected: '已通水', rejected: '已驳回'
+}
+const statusTagMap: Record<string, string> = {
+  pending_review: 'warning', reviewing: 'primary', constructing: 'info',
+  completed: 'success', connected: 'success', rejected: 'danger'
+}
+const typeNameMap: Record<string, string> = {
+  residential: '居民', commercial: '商业', industrial: '工业'
+}
+const typeTagMap: Record<string, string> = {
+  residential: 'primary', commercial: 'success', industrial: 'warning'
+}
+
+function formatDate(dt: string) {
+  if (!dt) return '-'
+  return new Date(dt).toLocaleString('zh-CN')
+}
+
+function calcProgress(row: any) {
+  if (!row.totalSteps || row.totalSteps === 0) return 0
+  return Math.round((row.currentStep / row.totalSteps) * 100)
+}
+
+async function loadData() {
+  loading.value = true
+  try {
+    const params = new URLSearchParams()
+    params.set('page', String(currentPage.value))
+    params.set('size', String(pageSize.value))
+    if (filters.status) params.set('status', filters.status)
+    if (filters.customerType) params.set('customerType', filters.customerType)
+    if (filters.area) params.set('area', filters.area)
+    if (filters.keyword) params.set('keyword', filters.keyword)
+
+    const res = await fetch(`/api/revenue/install/list?${params}`)
+    const json = await res.json()
+    if (json.code === 200) {
+      tableData.value = json.data.records || []
+      total.value = json.data.total || 0
+    } else {
+      ElMessage.error(json.message || '查询失败')
+    }
+  } catch (e) {
+    ElMessage.error('网络错误')
+  } finally {
+    loading.value = false
+  }
+}
+
+function resetFilters() {
+  filters.status = ''
+  filters.customerType = ''
+  filters.area = ''
+  filters.keyword = ''
+  currentPage.value = 1
+  loadData()
+}
+
+// 详情
+const detailVisible = ref(false)
+const currentRow = ref<any>(null)
+
+function showDetail(row: any) {
+  currentRow.value = row
+  detailVisible.value = true
+}
+
+// 进度时间线
+const timelineVisible = ref(false)
+const timelineData = ref<any[]>([])
+
+function timelineItemType(status: string) {
+  switch (status) {
+    case 'completed': return 'success'
+    case 'in_progress': return 'primary'
+    case 'skipped': return 'info'
+    default: return 'info'
+  }
+}
+
+async function showTimeline(row: any) {
+  try {
+    const res = await fetch(`/api/revenue/install/${row.id}/progress/overview`)
+    const json = await res.json()
+    if (json.code === 200) {
+      timelineData.value = json.data.timeline || []
+    } else {
+      timelineData.value = []
+    }
+    timelineVisible.value = true
+  } catch (e) {
+    ElMessage.error('获取进度失败')
+  }
+}
+
+async function handleApprove(row: any) {
+  try {
+    await ElMessageBox.confirm(`确认通过申请 ${row.applicationNo}？`, '审批确认')
+    const res = await fetch(`/api/revenue/install/${row.id}/approve`, { method: 'POST' })
+    const json = await res.json()
+    if (json.code === 200) {
+      ElMessage.success('审批通过')
+      loadData()
+    } else {
+      ElMessage.error(json.message || '操作失败')
+    }
+  } catch { /* cancelled */ }
+}
+
+async function handleReject(row: any) {
+  try {
+    const { value: reason } = await ElMessageBox.prompt('请输入驳回原因', '驳回申请', {
+      inputPattern: /.+/,
+      inputErrorMessage: '驳回原因不能为空'
+    })
+    const res = await fetch(`/api/revenue/install/${row.id}/reject?reason=${encodeURIComponent(reason)}`, { method: 'POST' })
+    const json = await res.json()
+    if (json.code === 200) {
+      ElMessage.success('已驳回')
+      loadData()
+    } else {
+      ElMessage.error(json.message || '操作失败')
+    }
+  } catch { /* cancelled */ }
+}
+
+onMounted(() => {
+  loadData()
+})
+</script>
+
+<style scoped>
+.install-list { padding: 0; }
+.filter-card { margin-bottom: 0; }
+</style>

frontend/src/views/install/InstallStatsView.vue

@@ -0,0 +1,190 @@
+<template>
+  <div class="install-stats">
+    <h2>报装统计报表</h2>
+
+    <!-- 统计卡片 -->
+    <el-row :gutter="16" style="margin-bottom:16px">
+      <el-col :span="4" v-for="card in summaryCards" :key="card.title">
+        <el-card shadow="hover">
+          <div class="stat-card">
+            <div class="stat-value" :style="{ color: card.color }">{{ card.value }}</div>
+            <div class="stat-title">{{ card.title }}</div>
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
+
+    <!-- 图表区域 -->
+    <el-row :gutter="16">
+      <el-col :span="12">
+        <el-card shadow="never">
+          <template #header>区域分布</template>
+          <div ref="areaChartRef" style="height:350px" />
+        </el-card>
+      </el-col>
+      <el-col :span="12">
+        <el-card shadow="never">
+          <template #header>类型分布</template>
+          <div ref="typeChartRef" style="height:350px" />
+        </el-card>
+      </el-col>
+    </el-row>
+
+    <el-row :gutter="16" style="margin-top:16px">
+      <el-col :span="12">
+        <el-card shadow="never">
+          <template #header>状态统计</template>
+          <div ref="statusChartRef" style="height:350px" />
+        </el-card>
+      </el-col>
+      <el-col :span="12">
+        <el-card shadow="never">
+          <template #header>月度趋势（最近12个月）</template>
+          <div ref="trendChartRef" style="height:350px" />
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, onMounted, computed } from 'vue'
+import * as echarts from 'echarts'
+
+const statsData = ref<any>({})
+const areaChartRef = ref()
+const typeChartRef = ref()
+const statusChartRef = ref()
+const trendChartRef = ref()
+
+const summaryCards = computed(() => [
+  { title: '总申请数', value: statsData.value.totalCount || 0, color: '#2a5298' },
+  { title: '待审核', value: statsData.value.pendingCount || 0, color: '#e6a23c' },
+  { title: '审批中', value: statsData.value.reviewingCount || 0, color: '#409eff' },
+  { title: '施工中', value: statsData.value.constructingCount || 0, color: '#909399' },
+  { title: '已通水', value: statsData.value.connectedCount || 0, color: '#67c23a' },
+  { title: '已驳回', value: statsData.value.rejectedCount || 0, color: '#f56c6c' },
+])
+
+async function loadStats() {
+  try {
+    const res = await fetch('/api/revenue/install/stats')
+    const json = await res.json()
+    if (json.code === 200) {
+      statsData.value = json.data
+      renderCharts()
+    }
+  } catch (e) {
+    console.error('加载统计数据失败', e)
+  }
+}
+
+function renderCharts() {
+  // 区域分布饼图
+  const areaChart = echarts.init(areaChartRef.value)
+  areaChart.setOption({
+    tooltip: { trigger: 'item', formatter: '{b}: {c} ({d}%)' },
+    legend: { orient: 'vertical', left: 'left' },
+    series: [{
+      name: '区域',
+      type: 'pie',
+      radius: ['40%', '70%'],
+      avoidLabelOverlap: false,
+      itemStyle: { borderRadius: 10, borderColor: '#fff', borderWidth: 2 },
+      label: { show: true, formatter: '{b}\n{d}%' },
+      data: statsData.value.areaDistribution || []
+    }]
+  })
+
+  // 类型柱状图
+  const typeChart = echarts.init(typeChartRef.value)
+  const typeData = statsData.value.typeDistribution || []
+  typeChart.setOption({
+    tooltip: { trigger: 'axis' },
+    xAxis: { type: 'category', data: typeData.map((d: any) => d.name) },
+    yAxis: { type: 'value', name: '数量' },
+    series: [{
+      type: 'bar',
+      data: typeData.map((d: any) => d.value),
+      barWidth: '40%',
+      itemStyle: {
+        borderRadius: [8, 8, 0, 0],
+        color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+          { offset: 0, color: '#83bff6' },
+          { offset: 0.5, color: '#188df0' },
+          { offset: 1, color: '#188df0' }
+        ])
+      }
+    }]
+  })
+
+  // 状态统计饼图
+  const statusChart = echarts.init(statusChartRef.value)
+  const statusColors: Record<string, string> = {
+    '待审核': '#e6a23c', '审批中': '#409eff', '施工中': '#909399',
+    '已完工': '#67c23a', '已通水': '#529b2e', '已驳回': '#f56c6c'
+  }
+  const statusData = (statsData.value.statusDistribution || []).map((d: any) => ({
+    ...d,
+    itemStyle: { color: statusColors[d.name] || '#ccc' }
+  }))
+  statusChart.setOption({
+    tooltip: { trigger: 'item', formatter: '{b}: {c} ({d}%)' },
+    legend: { bottom: 0 },
+    series: [{
+      name: '状态',
+      type: 'pie',
+      radius: '65%',
+      data: statusData,
+      emphasis: { itemStyle: { shadowBlur: 10, shadowOffsetX: 0, shadowColor: 'rgba(0, 0, 0, 0.5)' } }
+    }]
+  })
+
+  // 月度趋势折线图
+  const trendChart = echarts.init(trendChartRef.value)
+  const trendData = statsData.value.monthlyTrend || []
+  trendChart.setOption({
+    tooltip: { trigger: 'axis' },
+    legend: { data: ['总申请', '已通水'] },
+    xAxis: { type: 'category', data: trendData.map((d: any) => d.month), boundaryGap: false },
+    yAxis: { type: 'value', name: '数量' },
+    series: [
+      {
+        name: '总申请', type: 'line', smooth: true,
+        data: trendData.map((d: any) => d.total),
+        areaStyle: { color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+          { offset: 0, color: 'rgba(64,158,255,0.3)' },
+          { offset: 1, color: 'rgba(64,158,255,0.05)' }
+        ])}
+      },
+      {
+        name: '已通水', type: 'line', smooth: true,
+        data: trendData.map((d: any) => d.completed),
+        areaStyle: { color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+          { offset: 0, color: 'rgba(103,194,58,0.3)' },
+          { offset: 1, color: 'rgba(103,194,58,0.05)' }
+        ])}
+      }
+    ]
+  })
+
+  // 响应式
+  window.addEventListener('resize', () => {
+    areaChart.resize()
+    typeChart.resize()
+    statusChart.resize()
+    trendChart.resize()
+  })
+}
+
+onMounted(() => {
+  loadStats()
+})
+</script>
+
+<style scoped>
+.install-stats { padding: 0; }
+.stat-card { text-align: center; padding: 8px; }
+.stat-value { font-size: 28px; font-weight: bold; }
+.stat-title { color: #666; margin-top: 6px; font-size: 13px; }
+</style>

wm-revenue/src/main/java/com/water/revenue/controller/InstallController.java

@@ -0,0 +1,137 @@
+package com.water.revenue.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.water.common.core.result.R;
+import com.water.revenue.entity.InstallApplication;
+import com.water.revenue.entity.InstallProgress;
+import com.water.revenue.entity.InstallStats;
+import com.water.revenue.service.InstallProgressService;
+import com.water.revenue.service.InstallService;
+import com.water.revenue.service.InstallStatsService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 报装管理 Controller
+ * 包含：报装申请、进度追踪、统计报表、首页概览
+ */
+@Tag(name = "报装管理")
+@RestController
+@RequestMapping("/api/revenue/install")
+@RequiredArgsConstructor
+public class InstallController {
+
+    private final InstallService installService;
+    private final InstallProgressService progressService;
+    private final InstallStatsService statsService;
+
+    // ==================== 报装申请列表 ====================
+
+    @Operation(summary = "报装申请分页列表")
+    @GetMapping("/list")
+    public R<Page<InstallApplication>> list(
+            @RequestParam(defaultValue = "1") int page,
+            @RequestParam(defaultValue = "10") int size,
+            @RequestParam(required = false) String status,
+            @RequestParam(required = false) String customerType,
+            @RequestParam(required = false) String area,
+            @RequestParam(required = false) String keyword) {
+        return R.ok(installService.list(page, size, status, customerType, area, keyword));
+    }
+
+    @Operation(summary = "报装申请详情")
+    @GetMapping("/{id}")
+    public R<InstallApplication> detail(@PathVariable Long id) {
+        return R.ok(installService.getById(id));
+    }
+
+    @Operation(summary = "创建报装申请")
+    @PostMapping
+    public R<InstallApplication> create(@RequestBody InstallApplication application) {
+        return R.ok(installService.create(application));
+    }
+
+    @Operation(summary = "更新报装申请")
+    @PutMapping("/{id}")
+    public R<String> update(@PathVariable Long id, @RequestBody InstallApplication application) {
+        installService.update(id, application);
+        return R.ok("更新成功");
+    }
+
+    @Operation(summary = "删除报装申请")
+    @DeleteMapping("/{id}")
+    public R<String> delete(@PathVariable Long id) {
+        installService.delete(id);
+        return R.ok("删除成功");
+    }
+
+    @Operation(summary = "审批通过")
+    @PostMapping("/{id}/approve")
+    public R<String> approve(@PathVariable Long id, @RequestParam(required = false) String remark) {
+        installService.approve(id, remark);
+        return R.ok("审批通过");
+    }
+
+    @Operation(summary = "审批驳回")
+    @PostMapping("/{id}/reject")
+    public R<String> reject(@PathVariable Long id, @RequestParam String reason) {
+        installService.reject(id, reason);
+        return R.ok("已驳回");
+    }
+
+    // ==================== 进度追踪 ====================
+
+    @Operation(summary = "查询进度时间线")
+    @GetMapping("/{id}/progress")
+    public R<List<InstallProgress>> progressTimeline(@PathVariable Long id) {
+        return R.ok(progressService.getTimeline(id));
+    }
+
+    @Operation(summary = "进度概览（含时间线+百分比）")
+    @GetMapping("/{id}/progress/overview")
+    public R<Map<String, Object>> progressOverview(@PathVariable Long id) {
+        return R.ok(progressService.getProgressOverview(id));
+    }
+
+    @Operation(summary = "更新进度节点")
+    @PutMapping("/{id}/progress/{step}")
+    public R<InstallProgress> updateProgress(
+            @PathVariable Long id,
+            @PathVariable Integer step,
+            @RequestBody Map<String, Object> data) {
+        String stepStatus = (String) data.get("stepStatus");
+        Long operatorId = data.get("operatorId") != null ? ((Number) data.get("operatorId")).longValue() : null;
+        String operatorName = (String) data.get("operatorName");
+        String remark = (String) data.get("remark");
+        return R.ok(progressService.updateProgress(id, step, stepStatus, operatorId, operatorName, remark));
+    }
+
+    @Operation(summary = "添加进度节点")
+    @PostMapping("/{id}/progress")
+    public R<InstallProgress> addProgress(
+            @PathVariable Long id,
+            @RequestBody Map<String, Object> data) {
+        String stepName = (String) data.get("stepName");
+        Integer stepNumber = data.get("stepNumber") != null ? ((Number) data.get("stepNumber")).intValue() : null;
+        return R.ok(progressService.addProgress(id, stepName, stepNumber));
+    }
+
+    // ==================== 统计报表 ====================
+
+    @Operation(summary = "获取完整统计数据")
+    @GetMapping("/stats")
+    public R<InstallStats> stats() {
+        return R.ok(statsService.getStats());
+    }
+
+    @Operation(summary = "首页概览数据")
+    @GetMapping("/dashboard")
+    public R<Map<String, Object>> dashboard() {
+        return R.ok(statsService.getDashboardData());
+    }
+}

wm-revenue/src/main/java/com/water/revenue/entity/InstallApplication.java

@@ -0,0 +1,84 @@
+package com.water.revenue.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * 报装申请实体
+ */
+@Data
+@TableName("rev_install_application")
+public class InstallApplication {
+
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /** 申请编号 */
+    private String applicationNo;
+
+    /** 申请人姓名 */
+    private String applicantName;
+
+    /** 申请人电话 */
+    private String applicantPhone;
+
+    /** 申请人身份证 */
+    private String applicantIdCard;
+
+    /** 客户类型：residential-居民 commercial-商业 industrial-工业 */
+    private String customerType;
+
+    /** 地址 */
+    private String address;
+
+    /** 区域 */
+    private String area;
+
+    /** 区域编码 */
+    private String areaCode;
+
+    /** 用水类型 */
+    private String waterUsageType;
+
+    /** 口径 */
+    private String caliber;
+
+    /** 状态：pending_review-待审核 reviewing-审批中 constructing-施工中 completed-已完工 connected-已通水 rejected-已驳回 */
+    private String status;
+
+    /** 当前步骤 */
+    private Integer currentStep;
+
+    /** 总步骤数 */
+    private Integer totalSteps;
+
+    /** 申请时间 */
+    private LocalDateTime applyTime;
+
+    /** 预计完工时间 */
+    private LocalDate expectedComplete;
+
+    /** 实际完工时间 */
+    private LocalDateTime actualComplete;
+
+    /** 驳回原因 */
+    private String rejectReason;
+
+    /** 经办人ID */
+    private Long assigneeId;
+
+    /** 经办人姓名 */
+    private String assigneeName;
+
+    /** 备注 */
+    private String remark;
+
+    @TableLogic
+    private Integer deleted;
+
+    private LocalDateTime createdAt;
+
+    private LocalDateTime updatedAt;
+}

wm-revenue/src/main/java/com/water/revenue/entity/InstallProgress.java

@@ -0,0 +1,47 @@
+package com.water.revenue.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.time.LocalDateTime;
+
+/**
+ * 报装进度节点实体
+ */
+@Data
+@TableName("rev_install_progress")
+public class InstallProgress {
+
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /** 关联申请ID */
+    private Long applicationId;
+
+    /** 步骤序号 */
+    private Integer stepNumber;
+
+    /** 步骤名称 */
+    private String stepName;
+
+    /** 步骤状态：pending-待处理 in_progress-处理中 completed-已完成 skipped-已跳过 */
+    private String stepStatus;
+
+    /** 操作人ID */
+    private Long operatorId;
+
+    /** 操作人姓名 */
+    private String operatorName;
+
+    /** 完成时间 */
+    private LocalDateTime completeTime;
+
+    /** 备注 */
+    private String remark;
+
+    /** 附件URL列表（JSON数组） */
+    private String attachmentUrls;
+
+    private LocalDateTime createdAt;
+
+    private LocalDateTime updatedAt;
+}

wm-revenue/src/main/java/com/water/revenue/entity/InstallStats.java

@@ -0,0 +1,55 @@
+package com.water.revenue.entity;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 报装统计VO
+ */
+@Data
+public class InstallStats {
+
+    /** 总数 */
+    private Long totalCount;
+
+    /** 待审核数 */
+    private Long pendingCount;
+
+    /** 审批中数 */
+    private Long reviewingCount;
+
+    /** 施工中数 */
+    private Long constructingCount;
+
+    /** 已完工数 */
+    private Long completedCount;
+
+    /** 已通水数 */
+    private Long connectedCount;
+
+    /** 已驳回数 */
+    private Long rejectedCount;
+
+    /** 今日新增 */
+    private Long todayCount;
+
+    /** 本月新增 */
+    private Long monthCount;
+
+    /** 平均处理天数 */
+    private Double avgProcessDays;
+
+    /** 按区域分布 */
+    private List<Map<String, Object>> areaDistribution;
+
+    /** 按类型分布 */
+    private List<Map<String, Object>> typeDistribution;
+
+    /** 按状态分布 */
+    private List<Map<String, Object>> statusDistribution;
+
+    /** 月度趋势 */
+    private List<Map<String, Object>> monthlyTrend;
+}

wm-revenue/src/main/java/com/water/revenue/mapper/InstallApplicationMapper.java

@@ -0,0 +1,34 @@
+package com.water.revenue.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.water.revenue.entity.InstallApplication;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface InstallApplicationMapper extends BaseMapper<InstallApplication> {
+
+    /** 按区域统计 */
+    List<Map<String, Object>> countByArea();
+
+    /** 按类型统计 */
+    List<Map<String, Object>> countByType();
+
+    /** 按状态统计 */
+    List<Map<String, Object>> countByStatus();
+
+    /** 月度趋势（最近12个月） */
+    List<Map<String, Object>> monthlyTrend();
+
+    /** 今日新增 */
+    Long countToday();
+
+    /** 本月新增 */
+    Long countThisMonth();
+
+    /** 平均处理天数 */
+    Double avgProcessDays();
+}

wm-revenue/src/main/java/com/water/revenue/mapper/InstallProgressMapper.java

@@ -0,0 +1,15 @@
+package com.water.revenue.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.water.revenue.entity.InstallProgress;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface InstallProgressMapper extends BaseMapper<InstallProgress> {
+
+    /** 查询申请的进度时间线 */
+    List<InstallProgress> selectTimelineByApplicationId(@Param("applicationId") Long applicationId);
+}

wm-revenue/src/main/java/com/water/revenue/service/InstallProgressService.java

@@ -0,0 +1,127 @@
+package com.water.revenue.service;
+
+import com.water.revenue.entity.InstallApplication;
+import com.water.revenue.entity.InstallProgress;
+import com.water.revenue.mapper.InstallApplicationMapper;
+import com.water.revenue.mapper.InstallProgressMapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.*;
+
+/**
+ * 报装进度服务
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class InstallProgressService {
+
+    private final InstallProgressMapper progressMapper;
+    private final InstallApplicationMapper applicationMapper;
+
+    /**
+     * 查询进度时间线
+     */
+    public List<InstallProgress> getTimeline(Long applicationId) {
+        return progressMapper.selectTimelineByApplicationId(applicationId);
+    }
+
+    /**
+     * 更新进度节点
+     */
+    @Transactional
+    public InstallProgress updateProgress(Long applicationId, Integer stepNumber, String stepStatus,
+                                          Long operatorId, String operatorName, String remark) {
+        // 查找节点
+        InstallProgress progress = progressMapper.selectOne(
+            new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<InstallProgress>()
+                .eq(InstallProgress::getApplicationId, applicationId)
+                .eq(InstallProgress::getStepNumber, stepNumber));
+
+        if (progress == null) {
+            throw new RuntimeException("进度节点不存在");
+        }
+
+        progress.setStepStatus(stepStatus);
+        progress.setOperatorId(operatorId);
+        progress.setOperatorName(operatorName);
+        progress.setRemark(remark);
+        progress.setUpdatedAt(LocalDateTime.now());
+
+        if ("completed".equals(stepStatus)) {
+            progress.setCompleteTime(LocalDateTime.now());
+        }
+
+        progressMapper.updateById(progress);
+
+        // 更新申请表的当前步骤
+        InstallApplication app = applicationMapper.selectById(applicationId);
+        if (app != null) {
+            app.setCurrentStep(stepNumber);
+            app.setUpdatedAt(LocalDateTime.now());
+            applicationMapper.updateById(app);
+        }
+
+        log.info("更新进度: applicationId={}, step={}, status={}", applicationId, stepNumber, stepStatus);
+        return progress;
+    }
+
+    /**
+     * 添加进度节点
+     */
+    @Transactional
+    public InstallProgress addProgress(Long applicationId, String stepName, Integer stepNumber) {
+        InstallProgress progress = new InstallProgress();
+        progress.setApplicationId(applicationId);
+        progress.setStepName(stepName);
+        progress.setStepNumber(stepNumber);
+        progress.setStepStatus("pending");
+        progress.setCreatedAt(LocalDateTime.now());
+        progress.setUpdatedAt(LocalDateTime.now());
+
+        progressMapper.insert(progress);
+        log.info("添加进度节点: applicationId={}, step={}, name={}", applicationId, stepNumber, stepName);
+        return progress;
+    }
+
+    /**
+     * 获取进度概览（带时间线）
+     */
+    public Map<String, Object> getProgressOverview(Long applicationId) {
+        InstallApplication app = applicationMapper.selectById(applicationId);
+        if (app == null) {
+            throw new RuntimeException("申请不存在");
+        }
+
+        List<InstallProgress> timeline = getTimeline(applicationId);
+
+        // 计算进度百分比
+        long completedSteps = timeline.stream()
+            .filter(p -> "completed".equals(p.getStepStatus()))
+            .count();
+
+        double progressPercent = app.getTotalSteps() > 0
+            ? (double) completedSteps / app.getTotalSteps() * 100
+            : 0;
+
+        // 找出当前步骤
+        InstallProgress currentStep = timeline.stream()
+            .filter(p -> "in_progress".equals(p.getStepStatus()) || "pending".equals(p.getStepStatus()))
+            .findFirst()
+            .orElse(null);
+
+        Map<String, Object> result = new HashMap<>();
+        result.put("application", app);
+        result.put("timeline", timeline);
+        result.put("progressPercent", Math.round(progressPercent));
+        result.put("completedSteps", completedSteps);
+        result.put("totalSteps", app.getTotalSteps());
+        result.put("currentStep", currentStep);
+
+        return result;
+    }
+}

wm-revenue/src/main/java/com/water/revenue/service/InstallService.java

@@ -1,56 +1,137 @@
 package com.water.revenue.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.water.revenue.entity.InstallApplication;
+import com.water.revenue.mapper.InstallApplicationMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 
-import java.time.LocalDate;
-import java.util.*;
+import java.time.LocalDateTime;
 
+/**
+ * 报装申请服务
+ */
 @Slf4j
 @Service
 @RequiredArgsConstructor
 public class InstallService {
 
-    private final JdbcTemplate jdbcTemplate;
+    private final InstallApplicationMapper applicationMapper;
 
-    /** 预受理申请 */
-    public Map<String, Object> preApply(String name, String phone, String area, String address, String customerType, String caliber) {
-        String appNo = "INS-" + System.currentTimeMillis();
-        jdbcTemplate.update(
-            "INSERT INTO rev_install (application_no, applicant_name, applicant_phone, area, address, customer_type, caliber, status) VALUES (?,?,?,?,?,?,?,?)",
-            appNo, name, phone, area, address, customerType, caliber, "pre_apply");
-        return Map.of("applicationNo", appNo, "status", "pre_apply");
+    /**
+     * 分页列表（支持筛选和搜索）
+     */
+    public Page<InstallApplication> list(int page, int size, String status, String customerType,
+                                          String area, String keyword) {
+        LambdaQueryWrapper<InstallApplication> wrapper = new LambdaQueryWrapper<>();
+
+        if (StringUtils.hasText(status)) {
+            wrapper.eq(InstallApplication::getStatus, status);
+        }
+        if (StringUtils.hasText(customerType)) {
+            wrapper.eq(InstallApplication::getCustomerType, customerType);
+        }
+        if (StringUtils.hasText(area)) {
+            wrapper.like(InstallApplication::getArea, area);
+        }
+        if (StringUtils.hasText(keyword)) {
+            wrapper.and(w -> w.like(InstallApplication::getApplicantName, keyword)
+                    .or().like(InstallApplication::getApplicationNo, keyword)
+                    .or().like(InstallApplication::getAddress, keyword)
+                    .or().like(InstallApplication::getApplicantPhone, keyword));
+        }
+
+        wrapper.orderByDesc(InstallApplication::getApplyTime);
+
+        return applicationMapper.selectPage(new Page<>(page, size), wrapper);
     }
 
-    /** 工程申请 */
-    public Map<String, Object> engineeringApply(String appNo, Map<String, Object> engData) {
-        jdbcTemplate.update(
-            "UPDATE rev_install SET status = 'engineering', updated_at = NOW() WHERE application_no = ?",
-            appNo);
-        return Map.of("applicationNo", appNo, "status", "engineering");
+    /**
+     * 根据ID获取
+     */
+    public InstallApplication getById(Long id) {
+        return applicationMapper.selectById(id);
+    }
+
+    /**
+     * 创建报装申请
+     */
+    @Transactional
+    public InstallApplication create(InstallApplication application) {
+        // 生成申请编号
+        application.setApplicationNo("INS-" + System.currentTimeMillis());
+        application.setStatus("pending_review");
+        application.setCurrentStep(0);
+        application.setTotalSteps(5);
+        application.setApplyTime(LocalDateTime.now());
+        application.setCreatedAt(LocalDateTime.now());
+        application.setUpdatedAt(LocalDateTime.now());
+        application.setDeleted(0);
+
+        applicationMapper.insert(application);
+
+        log.info("创建报装申请: no={}, applicant={}", application.getApplicationNo(), application.getApplicantName());
+        return application;
     }
 
-    /** 派单到施工 */
-    public Map<String, Object> assignTask(String appNo, Long assigneeId) {
-        jdbcTemplate.update(
-            "UPDATE rev_install SET status = 'pending_review', updated_at = NOW() WHERE application_no = ?",
-            appNo);
-        return Map.of("applicationNo", appNo, "status", "pending_review", "assigneeId", assigneeId);
+    /**
+     * 更新报装申请
+     */
+    @Transactional
+    public void update(Long id, InstallApplication application) {
+        application.setId(id);
+        application.setUpdatedAt(LocalDateTime.now());
+        applicationMapper.updateById(application);
+        log.info("更新报装申请: id={}", id);
     }
 
-    /** 查询报装进度 */
-    public Map<String, Object> getProgress(String appNo) {
-        return jdbcTemplate.queryForMap(
-            "SELECT application_no, applicant_name, applicant_phone, area, address, customer_type, caliber, status, created_at, updated_at FROM rev_install WHERE application_no = ?",
-            appNo);
+    /**
+     * 删除报装申请（逻辑删除）
+     */
+    @Transactional
+    public void delete(Long id) {
+        applicationMapper.deleteById(id);
+        log.info("删除报装申请: id={}", id);
     }
 
-    /** 报装统计报表 */
-    public List<Map<String, Object>> getStatsReport(String area, LocalDate start, LocalDate end) {
-        return jdbcTemplate.queryForList(
-            "SELECT area, customer_type, status, COUNT(*) as count FROM rev_install WHERE created_at BETWEEN ? AND ? GROUP BY area, customer_type, status",
-            start, end);
+    /**
+     * 审批通过
+     */
+    @Transactional
+    public void approve(Long id, String remark) {
+        InstallApplication app = applicationMapper.selectById(id);
+        if (app == null) {
+            throw new RuntimeException("申请不存在");
+        }
+
+        app.setStatus("reviewing");
+        app.setCurrentStep(1);
+        app.setRemark(remark);
+        app.setUpdatedAt(LocalDateTime.now());
+        applicationMapper.updateById(app);
+
+        log.info("审批通过: id={}, no={}", id, app.getApplicationNo());
+    }
+
+    /**
+     * 审批驳回
+     */
+    @Transactional
+    public void reject(Long id, String reason) {
+        InstallApplication app = applicationMapper.selectById(id);
+        if (app == null) {
+            throw new RuntimeException("申请不存在");
+        }
+
+        app.setStatus("rejected");
+        app.setRejectReason(reason);
+        app.setUpdatedAt(LocalDateTime.now());
+        applicationMapper.updateById(app);
+
+        log.info("审批驳回: id={}, reason={}", id, reason);
     }
 }

wm-revenue/src/main/java/com/water/revenue/service/InstallStatsService.java

@@ -0,0 +1,92 @@
+package com.water.revenue.service;
+
+import com.water.revenue.entity.InstallStats;
+import com.water.revenue.mapper.InstallApplicationMapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 报装统计服务
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class InstallStatsService {
+
+    private final InstallApplicationMapper applicationMapper;
+
+    /**
+     * 获取完整统计数据
+     */
+    public InstallStats getStats() {
+        InstallStats stats = new InstallStats();
+
+        // 基础统计
+        stats.setAreaDistribution(applicationMapper.countByArea());
+        stats.setTypeDistribution(applicationMapper.countByType());
+        stats.setStatusDistribution(applicationMapper.countByStatus());
+        stats.setMonthlyTrend(applicationMapper.monthlyTrend());
+
+        // 计算总数
+        Long totalCount = 0L;
+        for (Map<String, Object> item : stats.getStatusDistribution()) {
+            totalCount += ((Number) item.get("value")).longValue();
+        }
+        stats.setTotalCount(totalCount);
+
+        // 按状态分类计数
+        for (Map<String, Object> item : stats.getStatusDistribution()) {
+            String name = (String) item.get("name");
+            Long value = ((Number) item.get("value")).longValue();
+            switch (name) {
+                case "待审核": stats.setPendingCount(value); break;
+                case "审批中": stats.setReviewingCount(value); break;
+                case "施工中": stats.setConstructingCount(value); break;
+                case "已完工": stats.setCompletedCount(value); break;
+                case "已通水": stats.setConnectedCount(value); break;
+                case "已驳回": stats.setRejectedCount(value); break;
+            }
+        }
+
+        // 今日新增
+        stats.setTodayCount(applicationMapper.countToday());
+
+        // 本月新增
+        stats.setMonthCount(applicationMapper.countThisMonth());
+
+        // 平均处理天数
+        Double avgDays = applicationMapper.avgProcessDays();
+        stats.setAvgProcessDays(avgDays != null ? Math.round(avgDays * 10.0) / 10.0 : 0.0);
+
+        return stats;
+    }
+
+    /**
+     * 首页概览数据
+     */
+    public Map<String, Object> getDashboardData() {
+        InstallStats stats = getStats();
+
+        // 在办数量（待审核+审批中+施工中）
+        long inProgressCount = (stats.getPendingCount() != null ? stats.getPendingCount() : 0)
+            + (stats.getReviewingCount() != null ? stats.getReviewingCount() : 0)
+            + (stats.getConstructingCount() != null ? stats.getConstructingCount() : 0);
+
+        // 完工数量（已完工+已通水）
+        long finishedCount = (stats.getCompletedCount() != null ? stats.getCompletedCount() : 0)
+            + (stats.getConnectedCount() != null ? stats.getConnectedCount() : 0);
+
+        return Map.of(
+            "todayCount", stats.getTodayCount() != null ? stats.getTodayCount() : 0,
+            "inProgressCount", inProgressCount,
+            "finishedCount", finishedCount,
+            "avgProcessDays", stats.getAvgProcessDays() != null ? stats.getAvgProcessDays() : 0,
+            "totalCount", stats.getTotalCount() != null ? stats.getTotalCount() : 0,
+            "monthCount", stats.getMonthCount() != null ? stats.getMonthCount() : 0
+        );
+    }
+}

wm-revenue/src/main/resources/db/V_install.sql

@@ -0,0 +1,56 @@
+-- 报装申请表
+CREATE TABLE IF NOT EXISTS rev_install_application (
+    id              BIGSERIAL PRIMARY KEY,
+    application_no  VARCHAR(50) NOT NULL UNIQUE,
+    applicant_name  VARCHAR(100) NOT NULL,
+    applicant_phone VARCHAR(20) NOT NULL,
+    applicant_id_card VARCHAR(20),
+    customer_type   VARCHAR(20) NOT NULL DEFAULT 'residential', -- residential/commercial/industrial
+    address         VARCHAR(500) NOT NULL,
+    area            VARCHAR(100),
+    area_code       VARCHAR(20),
+    water_usage_type VARCHAR(50),
+    caliber         VARCHAR(20),
+    status          VARCHAR(30) NOT NULL DEFAULT 'pending_review', -- pending_review/reviewing/constructing/completed/connected/rejected
+    current_step    INTEGER DEFAULT 0,
+    total_steps     INTEGER DEFAULT 5,
+    apply_time      TIMESTAMP DEFAULT NOW(),
+    expected_complete DATE,
+    actual_complete TIMESTAMP,
+    reject_reason   TEXT,
+    assignee_id     BIGINT,
+    assignee_name   VARCHAR(100),
+    remark          TEXT,
+    deleted         INTEGER DEFAULT 0,
+    created_at      TIMESTAMP DEFAULT NOW(),
+    updated_at      TIMESTAMP DEFAULT NOW()
+);
+
+CREATE INDEX IF NOT EXISTS idx_install_app_status ON rev_install_application(status);
+CREATE INDEX IF NOT EXISTS idx_install_app_area ON rev_install_application(area);
+CREATE INDEX IF NOT EXISTS idx_install_app_type ON rev_install_application(customer_type);
+CREATE INDEX IF NOT EXISTS idx_install_app_time ON rev_install_application(apply_time);
+CREATE INDEX IF NOT EXISTS idx_install_app_no ON rev_install_application(application_no);
+
+-- 报装进度节点表
+CREATE TABLE IF NOT EXISTS rev_install_progress (
+    id              BIGSERIAL PRIMARY KEY,
+    application_id  BIGINT NOT NULL REFERENCES rev_install_application(id),
+    step_number     INTEGER NOT NULL,
+    step_name       VARCHAR(100) NOT NULL,
+    step_status     VARCHAR(20) NOT NULL DEFAULT 'pending', -- pending/in_progress/completed/skipped
+    operator_id     BIGINT,
+    operator_name   VARCHAR(100),
+    complete_time   TIMESTAMP,
+    remark          TEXT,
+    attachment_urls TEXT,
+    created_at      TIMESTAMP DEFAULT NOW(),
+    updated_at      TIMESTAMP DEFAULT NOW()
+);
+
+CREATE INDEX IF NOT EXISTS idx_install_progress_app ON rev_install_progress(application_id);
+CREATE INDEX IF NOT EXISTS idx_install_progress_step ON rev_install_progress(application_id, step_number);
+
+-- 默认进度节点模板数据（申请提交时自动创建）
+COMMENT ON TABLE rev_install_application IS '报装申请表';
+COMMENT ON TABLE rev_install_progress IS '报装进度节点表';

wm-revenue/src/main/resources/mapper/InstallApplicationMapper.xml

@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.water.revenue.mapper.InstallApplicationMapper">
+
+    <resultMap id="BaseResultMap" type="com.water.revenue.entity.InstallApplication">
+        <id column="id" property="id" />
+        <result column="application_no" property="applicationNo" />
+        <result column="applicant_name" property="applicantName" />
+        <result column="applicant_phone" property="applicantPhone" />
+        <result column="applicant_id_card" property="applicantIdCard" />
+        <result column="customer_type" property="customerType" />
+        <result column="address" property="address" />
+        <result column="area" property="area" />
+        <result column="area_code" property="areaCode" />
+        <result column="water_usage_type" property="waterUsageType" />
+        <result column="caliber" property="caliber" />
+        <result column="status" property="status" />
+        <result column="current_step" property="currentStep" />
+        <result column="total_steps" property="totalSteps" />
+        <result column="apply_time" property="applyTime" />
+        <result column="expected_complete" property="expectedComplete" />
+        <result column="actual_complete" property="actualComplete" />
+        <result column="reject_reason" property="rejectReason" />
+        <result column="assignee_id" property="assigneeId" />
+        <result column="assignee_name" property="assigneeName" />
+        <result column="remark" property="remark" />
+        <result column="deleted" property="deleted" />
+        <result column="created_at" property="createdAt" />
+        <result column="updated_at" property="updatedAt" />
+    </resultMap>
+
+    <!-- 按区域统计 -->
+    <select id="countByArea" resultType="java.util.Map">
+        SELECT
+            area AS "name",
+            COUNT(*) AS "value"
+        FROM rev_install_application
+        WHERE deleted = 0
+        GROUP BY area
+        ORDER BY COUNT(*) DESC
+    </select>
+
+    <!-- 按类型统计 -->
+    <select id="countByType" resultType="java.util.Map">
+        SELECT
+            CASE customer_type
+                WHEN 'residential' THEN '居民'
+                WHEN 'commercial' THEN '商业'
+                WHEN 'industrial' THEN '工业'
+                ELSE '其他'
+            END AS "name",
+            COUNT(*) AS "value"
+        FROM rev_install_application
+        WHERE deleted = 0
+        GROUP BY customer_type
+        ORDER BY COUNT(*) DESC
+    </select>
+
+    <!-- 按状态统计 -->
+    <select id="countByStatus" resultType="java.util.Map">
+        SELECT
+            CASE status
+                WHEN 'pending_review' THEN '待审核'
+                WHEN 'reviewing' THEN '审批中'
+                WHEN 'constructing' THEN '施工中'
+                WHEN 'completed' THEN '已完工'
+                WHEN 'connected' THEN '已通水'
+                WHEN 'rejected' THEN '已驳回'
+                ELSE '未知'
+            END AS "name",
+            COUNT(*) AS "value"
+        FROM rev_install_application
+        WHERE deleted = 0
+        GROUP BY status
+        ORDER BY COUNT(*) DESC
+    </select>
+
+    <!-- 月度趋势（最近12个月） -->
+    <select id="monthlyTrend" resultType="java.util.Map">
+        SELECT
+            TO_CHAR(DATE_TRUNC('month', apply_time), 'YYYY-MM') AS "month",
+            COUNT(*) AS "total",
+            COUNT(CASE WHEN status = 'connected' THEN 1 END) AS "completed"
+        FROM rev_install_application
+        WHERE deleted = 0
+          AND apply_time >= DATE_TRUNC('month', NOW()) - INTERVAL '11 months'
+        GROUP BY DATE_TRUNC('month', apply_time)
+        ORDER BY DATE_TRUNC('month', apply_time)
+    </select>
+
+    <!-- 今日新增 -->
+    <select id="countToday" resultType="java.lang.Long">
+        SELECT COUNT(*)
+        FROM rev_install_application
+        WHERE deleted = 0
+          AND DATE(apply_time) = CURRENT_DATE
+    </select>
+
+    <!-- 本月新增 -->
+    <select id="countThisMonth" resultType="java.lang.Long">
+        SELECT COUNT(*)
+        FROM rev_install_application
+        WHERE deleted = 0
+          AND DATE_TRUNC('month', apply_time) = DATE_TRUNC('month', NOW())
+    </select>
+
+    <!-- 平均处理天数 -->
+    <select id="avgProcessDays" resultType="java.lang.Double">
+        SELECT AVG(EXTRACT(EPOCH FROM (actual_complete - DATE(apply_time))) / 86400.0)
+        FROM rev_install_application
+        WHERE deleted = 0
+          AND actual_complete IS NOT NULL
+    </select>
+
+</mapper>

wm-revenue/src/main/resources/mapper/InstallProgressMapper.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.water.revenue.mapper.InstallProgressMapper">
+
+    <resultMap id="BaseResultMap" type="com.water.revenue.entity.InstallProgress">
+        <id column="id" property="id" />
+        <result column="application_id" property="applicationId" />
+        <result column="step_number" property="stepNumber" />
+        <result column="step_name" property="stepName" />
+        <result column="step_status" property="stepStatus" />
+        <result column="operator_id" property="operatorId" />
+        <result column="operator_name" property="operatorName" />
+        <result column="complete_time" property="completeTime" />
+        <result column="remark" property="remark" />
+        <result column="attachment_urls" property="attachmentUrls" />
+        <result column="created_at" property="createdAt" />
+        <result column="updated_at" property="updatedAt" />
+    </resultMap>
+
+    <!-- 查询申请的进度时间线 -->
+    <select id="selectTimelineByApplicationId" resultMap="BaseResultMap">
+        SELECT *
+        FROM rev_install_progress
+        WHERE application_id = #{applicationId}
+        ORDER BY step_number ASC
+    </select>
+
+</mapper>

wm-revenue/src/test/java/com/water/revenue/InstallServiceTest.java

@@ -0,0 +1,203 @@
+package com.water.revenue;
+
+import com.water.revenue.entity.InstallApplication;
+import com.water.revenue.entity.InstallProgress;
+import com.water.revenue.entity.InstallStats;
+import com.water.revenue.mapper.InstallApplicationMapper;
+import com.water.revenue.mapper.InstallProgressMapper;
+import com.water.revenue.service.InstallProgressService;
+import com.water.revenue.service.InstallStatsService;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+class InstallServiceTest {
+
+    @Mock
+    private InstallApplicationMapper applicationMapper;
+
+    @Mock
+    private InstallProgressMapper progressMapper;
+
+    private InstallProgressService progressService;
+    private InstallStatsService statsService;
+
+    @BeforeEach
+    void setUp() {
+        progressService = new InstallProgressService(progressMapper, applicationMapper);
+        statsService = new InstallStatsService(applicationMapper);
+    }
+
+    @Nested
+    @DisplayName("进度查询测试")
+    class ProgressTests {
+
+        @Test
+        @DisplayName("查询进度时间线 - 正常返回")
+        void getTimeline_returnsList() {
+            Long appId = 1L;
+            List<InstallProgress> timeline = new ArrayList<>();
+            InstallProgress p1 = new InstallProgress();
+            p1.setStepNumber(1);
+            p1.setStepName("提交申请");
+            p1.setStepStatus("completed");
+            timeline.add(p1);
+
+            InstallProgress p2 = new InstallProgress();
+            p2.setStepNumber(2);
+            p2.setStepName("审核");
+            p2.setStepStatus("in_progress");
+            timeline.add(p2);
+
+            when(progressMapper.selectTimelineByApplicationId(appId)).thenReturn(timeline);
+
+            List<InstallProgress> result = progressService.getTimeline(appId);
+
+            assertNotNull(result);
+            assertEquals(2, result.size());
+            assertEquals("提交申请", result.get(0).getStepName());
+            assertEquals("审核", result.get(1).getStepName());
+            verify(progressMapper).selectTimelineByApplicationId(appId);
+        }
+
+        @Test
+        @DisplayName("获取进度概览 - 计算百分比")
+        void getProgressOverview_calculatesPercent() {
+            Long appId = 1L;
+
+            InstallApplication app = new InstallApplication();
+            app.setId(appId);
+            app.setApplicationNo("INS-001");
+            app.setTotalSteps(5);
+            app.setCurrentStep(3);
+
+            when(applicationMapper.selectById(appId)).thenReturn(app);
+
+            List<InstallProgress> timeline = new ArrayList<>();
+            for (int i = 1; i <= 5; i++) {
+                InstallProgress p = new InstallProgress();
+                p.setStepNumber(i);
+                p.setStepStatus(i <= 3 ? "completed" : "pending");
+                timeline.add(p);
+            }
+            when(progressMapper.selectTimelineByApplicationId(appId)).thenReturn(timeline);
+
+            Map<String, Object> result = progressService.getProgressOverview(appId);
+
+            assertNotNull(result);
+            assertEquals(app, result.get("application"));
+            assertEquals(timeline, result.get("timeline"));
+            assertEquals(60L, result.get("progressPercent")); // 3/5 = 60%
+            assertEquals(3L, result.get("completedSteps"));
+            assertEquals(5, result.get("totalSteps"));
+        }
+    }
+
+    @Nested
+    @DisplayName("统计报表测试")
+    class StatsTests {
+
+        @Test
+        @DisplayName("获取统计数据 - 完整数据")
+        void getStats_completeData() {
+            // Mock 区域分布
+            List<Map<String, Object>> areaDist = new ArrayList<>();
+            areaDist.add(Map.of("name", "城东片区", "value", 10L));
+            when(applicationMapper.countByArea()).thenReturn(areaDist);
+
+            // Mock 类型分布
+            List<Map<String, Object>> typeDist = new ArrayList<>();
+            typeDist.add(Map.of("name", "居民", "value", 8L));
+            when(applicationMapper.countByType()).thenReturn(typeDist);
+
+            // Mock 状态分布
+            List<Map<String, Object>> statusDist = new ArrayList<>();
+            statusDist.add(Map.of("name", "待审核", "value", 3L));
+            statusDist.add(Map.of("name", "审批中", "value", 2L));
+            statusDist.add(Map.of("name", "施工中", "value", 4L));
+            statusDist.add(Map.of("name", "已完工", "value", 5L));
+            statusDist.add(Map.of("name", "已通水", "value", 6L));
+            statusDist.add(Map.of("name", "已驳回", "value", 1L));
+            when(applicationMapper.countByStatus()).thenReturn(statusDist);
+
+            // Mock 月度趋势
+            when(applicationMapper.monthlyTrend()).thenReturn(new ArrayList<>());
+
+            // Mock 其他
+            when(applicationMapper.countToday()).thenReturn(2L);
+            when(applicationMapper.countThisMonth()).thenReturn(15L);
+            when(applicationMapper.avgProcessDays()).thenReturn(12.5);
+
+            InstallStats stats = statsService.getStats();
+
+            assertNotNull(stats);
+            assertEquals(21L, stats.getTotalCount()); // 3+2+4+5+6+1
+            assertEquals(3L, stats.getPendingCount());
+            assertEquals(2L, stats.getReviewingCount());
+            assertEquals(4L, stats.getConstructingCount());
+            assertEquals(5L, stats.getCompletedCount());
+            assertEquals(6L, stats.getConnectedCount());
+            assertEquals(1L, stats.getRejectedCount());
+            assertEquals(2L, stats.getTodayCount());
+            assertEquals(15L, stats.getMonthCount());
+            assertEquals(12.5, stats.getAvgProcessDays());
+        }
+
+        @Test
+        @DisplayName("获取首页概览 - 计算在办和完工数")
+        void getDashboardData_calculatesCorrectly() {
+            List<Map<String, Object>> statusDist = new ArrayList<>();
+            statusDist.add(Map.of("name", "待审核", "value", 3L));
+            statusDist.add(Map.of("name", "审批中", "value", 2L));
+            statusDist.add(Map.of("name", "施工中", "value", 4L));
+            statusDist.add(Map.of("name", "已完工", "value", 5L));
+            statusDist.add(Map.of("name", "已通水", "value", 6L));
+
+            when(applicationMapper.countByArea()).thenReturn(new ArrayList<>());
+            when(applicationMapper.countByType()).thenReturn(new ArrayList<>());
+            when(applicationMapper.countByStatus()).thenReturn(statusDist);
+            when(applicationMapper.monthlyTrend()).thenReturn(new ArrayList<>());
+            when(applicationMapper.countToday()).thenReturn(1L);
+            when(applicationMapper.countThisMonth()).thenReturn(10L);
+            when(applicationMapper.avgProcessDays()).thenReturn(10.0);
+
+            Map<String, Object> dashboard = statsService.getDashboardData();
+
+            assertNotNull(dashboard);
+            assertEquals(1L, dashboard.get("todayCount"));
+            assertEquals(9L, dashboard.get("inProgressCount")); // 3+2+4
+            assertEquals(11L, dashboard.get("finishedCount")); // 5+6
+            assertEquals(10.0, dashboard.get("avgProcessDays"));
+            assertEquals(20L, dashboard.get("totalCount")); // 3+2+4+5+6
+        }
+
+        @Test
+        @DisplayName("统计数据 - 空数据时正常处理")
+        void getStats_emptyData() {
+            when(applicationMapper.countByArea()).thenReturn(new ArrayList<>());
+            when(applicationMapper.countByType()).thenReturn(new ArrayList<>());
+            when(applicationMapper.countByStatus()).thenReturn(new ArrayList<>());
+            when(applicationMapper.monthlyTrend()).thenReturn(new ArrayList<>());
+            when(applicationMapper.countToday()).thenReturn(0L);
+            when(applicationMapper.countThisMonth()).thenReturn(0L);
+            when(applicationMapper.avgProcessDays()).thenReturn(null);
+
+            InstallStats stats = statsService.getStats();
+
+            assertNotNull(stats);
+            assertEquals(0L, stats.getTotalCount());
+            assertEquals(0.0, stats.getAvgProcessDays());
+        }
+    }
+}