修复bug

admin-pc/.env

@@ -1,5 +1,5 @@
 NODE_ENV=production
-VUE_APP_PLATFORM_NAME=陌美人后台管理系统
+VUE_APP_PLATFORM_NAME=VTribe管理系统
 # 开启单点登录
 VUE_APP_SSO=false
 # 开启微应用模式

admin-pc/.env.development

@@ -1,5 +1,5 @@
 NODE_ENV=development
-VUE_APP_API_BASE_URL=http://localhost:8001/popularize-admin/
+VUE_APP_API_BASE_URL=https://popularize-admin.hhlm1688.com/popularize-admin/
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
 

admin-pc/.env.production

@@ -1,4 +1,4 @@
 NODE_ENV=production
-VUE_APP_API_BASE_URL=http://localhost:8001/popularize-admin/
+VUE_APP_API_BASE_URL=https://popularize-admin.hhlm1688.com/popularize-admin/
 VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

admin-pc/src/views/dashboard/Analysis.vue

@@ -1,292 +1,472 @@
 <template>
+  <div class="page-header-index-wide">
+    <a-row :gutter="24">
+      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
+        <chart-card :loading="loading" title="受理量" :total="cardCount.sll | NumberFormat">
+          <a-tooltip title="指标说明" slot="action">
+            <a-icon type="info-circle-o" />
+          </a-tooltip>
+          <div>
+            <mini-area :data-source="chartData.sll" />
+          </div>
+          <template slot="footer">今日受理量：<span>{{ todaySll }}</span></template>
+        </chart-card>
+      </a-col>
+      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
+        <chart-card :loading="loading" title="办结量" :total="cardCount.bjl | NumberFormat">
+          <a-tooltip title="指标说明" slot="action">
+            <a-icon type="info-circle-o" />
+          </a-tooltip>
+          <div>
+            <mini-area :data-source="chartData.bjl"/>
+          </div>
+          <template slot="footer">今日办结量：<span>{{ todayBjl }}</span></template>
+        </chart-card>
+      </a-col>
+      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
+        <chart-card :loading="loading" title="用户受理量" :total="cardCount.isll | NumberFormat">
+          <a-tooltip title="指标说明" slot="action">
+            <a-icon type="info-circle-o" />
+          </a-tooltip>
+          <div>
+            <mini-bar :datasource="chartData.isll" :height="50"/>
+          </div>
+          <template slot="footer">用户今日受理量：<span>{{ todayISll }}</span></template>
+        </chart-card>
+      </a-col>
+      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
+        <chart-card :loading="loading" title="用户办结量" :total="cardCount.ibjl | NumberFormat">
+          <a-tooltip title="指标说明" slot="action">
+            <a-icon type="info-circle-o" />
+          </a-tooltip>
+          <div>
+            <mini-bar :datasource="chartData.ibjl" :height="50"/>
+          </div>
+          <template slot="footer">用户今日办结量：<span>{{ todayIBjl }}</span></template>
+        </chart-card>
+      </a-col>
+    </a-row>
+
+    <a-card :loading="loading" :bordered="false" :body-style="{padding: '0'}">
+      <div class="salesCard">
+        <a-tabs default-active-key="1" size="large" :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}">
+          <div class="extra-wrapper" slot="tabBarExtraContent">
+            <div class="extra-item">
+              <a>今日</a>
+              <a>本周</a>
+              <a>本月</a>
+              <a>本年</a>
+            </div>
+            <a-range-picker :style="{width: '256px'}" />
+          </div>
+
+
+
+
+
+
+
+
+
+          <a-tab-pane loading="true" tab="用户数量" key="1">
+            <a-row>
+              <a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">
+                <index-bar title="用户数量统计" />
+              </a-col>
+            </a-row>
+          </a-tab-pane>
+
+
+
+
+
+
+
+
+
+
 
-  <div>
-<!--    <div class="background-card">-->
-
-<!--      <a-input v-model="sql" @blur="enter" :readonly="true" placeholder="考虑到统计过于耗费性能，您可以通过点击指定块实时刷新数据！"></a-input>-->
-
-<!--      <div class="grid-line">-->
-
-<!--        <a-card style="width: 560px; min-height: 400px; height: auto; margin: 20px;" title="兼职发布情况" :bordered="false" @click="clickCard3">-->
-
-<!--          <a-table :dataSource="clickDataSource3" :columns="clickDolumns3" :pagination="false" />-->
-
-<!--        </a-card>-->
-
-<!--        <div style="width: 1080px; display: flex; flex-wrap: wrap;">-->
-
-<!--          <a-card class="mini-div" title="兼职点击统计" :bordered="false" @click="clickCard1">-->
-
-<!--            <a-table :dataSource="clickDataSource" :columns="clickDolumns" :pagination="false" />-->
-
-<!--          </a-card>-->
-
-<!--          <a-card class="mini-div" title="联系方式点击统计" :bordered="false" @click="clickCard2">-->
-
-<!--            <a-table :dataSource="clickDataSource2" :columns="clickDolumns2" :pagination="false" />-->
-
-<!--          </a-card>-->
-
-<!--          <a-card class="mini-div" title="用户统计" :bordered="false" @click="clickCard0">-->
-
-<!--            <a-row>-->
-<!--              <a-col :span="8">-->
-<!--                <a-statistic title="总用户/实名" :value="cmap.zs" >-->
-<!--                  <template #suffix>-->
-<!--                    <span>/ {{cmap.ps}}</span>-->
-<!--                  </template>-->
-<!--                </a-statistic>-->
-<!--              </a-col>-->
-<!--              <a-col :span="8">-->
-<!--                <a-statistic title="今日" :value="cmap.za" >-->
-<!--                  <template #suffix>-->
-<!--                    <span>/ {{cmap.pa}}</span>-->
-<!--                  </template>-->
-<!--                </a-statistic>-->
-<!--              </a-col>-->
-<!--              <a-col :span="8">-->
-<!--                <a-statistic title="昨日" :value="cmap.zd" >-->
-<!--                  <template #suffix>-->
-<!--                    <span>/ {{cmap.pd}}</span>-->
-<!--                  </template>-->
-<!--                </a-statistic>-->
-<!--              </a-col>-->
-<!--            </a-row>-->
-
-<!--            <a-row style="margin-top: 40px;">-->
-<!--              <a-col :span="8">-->
-<!--                <a-statistic title="本周" :value="cmap.zb" >-->
-<!--                  <template #suffix>-->
-<!--                    <span>/ {{cmap.pb}}</span>-->
-<!--                  </template>-->
-<!--                </a-statistic>-->
-<!--              </a-col>-->
-<!--              <a-col :span="8">-->
-<!--                <a-statistic title="本月" :value="cmap.zc" >-->
-<!--                  <template #suffix>-->
-<!--                    <span>/ {{cmap.pc}}</span>-->
-<!--                  </template>-->
-<!--                </a-statistic>-->
-<!--              </a-col>-->
-<!--            </a-row>-->
-
-<!--          </a-card>-->
-
-<!--          <a-card class="mini-div" title="公众号概要" :bordered="false" @click="clickCard9">-->
-
-<!--            <a-row>-->
-<!--              <a-col :span="8">-->
-<!--                <a-statistic title="双端总用户" :value="cmbp.a" />-->
-<!--              </a-col>-->
-<!--              <a-col :span="8">-->
-<!--                <a-statistic title="平台用户" :value="cmbp.b" />-->
-<!--              </a-col>-->
-<!--              <a-col :span="8">-->
-<!--                <a-statistic title="关注公众号" :value="cmbp.c" />-->
-<!--              </a-col>-->
-<!--            </a-row>-->
-
-<!--            <a-row style="margin-top: 40px;">-->
-<!--              <a-col :span="8">-->
-<!--                <a-statistic title="未转公众号" :value="cmbp.d" />-->
-<!--              </a-col>-->
-<!--              <a-col :span="8">-->
-<!--                <a-statistic title="未转小程序" :value="cmbp.e" />-->
-<!--              </a-col>-->
-<!--            </a-row>-->
-
-<!--          </a-card>-->
-
-<!--        </div>-->
-
-<!--      </div>-->
-
-<!--    </div>-->
-  </div>
 
+
+
+          <a-tab-pane loading="true" tab="营业额量" key="2">
+            <a-row>
+              <a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">
+                <index-bar title="用户数量统计" />
+              </a-col>
+            </a-row>
+          </a-tab-pane>
+
+
+
+
+
+          <a-tab-pane loading="true" tab="主理人量" key="3">
+            <a-row>
+              <a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">
+                <index-bar title="用户数量统计" />
+              </a-col>
+            </a-row>
+          </a-tab-pane>
+
+          <a-tab-pane loading="true" tab="主理人量" key="4">
+            <a-row>
+              <a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">
+                <index-bar title="用户数量统计" />
+              </a-col>
+            </a-row>
+          </a-tab-pane>
+
+        </a-tabs>
+
+      </div>
+    </a-card>
+
+
+  </div>
 </template>
 
 <script>
-import { postAction, getAction } from '@/api/manage'
-import CryptoJS from 'crypto-js';
-  export default {
-    name: "Analysis",
-    data() {
-      return {
-        sql: '',
-        cmap: {
-          zs: 2500,
-          ps: 300,
-          za: 40,
-          pa: 6,
-          zb: 300,
-          pb: 20,
-          zc: 900,
-          pc: 90,
-          zd: 9999,
-          pd: 9999
+
+import ACol from "ant-design-vue/es/grid/Col"
+import ATooltip from "ant-design-vue/es/tooltip/Tooltip"
+import ChartCard from '@/components/ChartCard'
+import MiniBar from '@/components/chart/MiniBar'
+import MiniArea from '@/components/chart/MiniArea'
+import IndexBar from '@/components/chart/IndexBar'
+import BarMultid from '@/components/chart/BarMultid'
+import DashChartDemo from '@/components/chart/DashChartDemo'
+
+const jhjgData = [
+  { type: '房管', '1月': 900, '2月': 1120, '3月': 1380, '4月': 1480, '5月': 1450, '6月': 1100, '7月':1300, '8月':900,'9月':1000 ,'10月':1200 ,'11月':600 ,'12月':900 },
+  { type: '税务', '1月':1200, '2月': 1500, '3月': 1980, '4月': 2000, '5月': 1000, '6月': 600, '7月':900, '8月':1100,'9月':1300 ,'10月':2000 ,'11月':900 ,'12月':1100 },
+  { type: '不动产', '1月':2000, '2月': 1430, '3月': 1300, '4月': 1400, '5月': 900, '6月': 500, '7月':600, '8月':1000,'9月':600 ,'10月':1000 ,'11月':1500 ,'12月':1200 }
+]
+
+const jhjgFields=[
+  '1月','2月','3月','4月','5月','6月',
+  '7月','8月','9月','10月','11月','12月'
+]
+
+const xljgData = [
+  {type:'一月',"房管":1.12,"税务":1.55,"不动产":1.2},
+  {type:'二月',"房管":1.65,"税务":1.32,"不动产":1.42},
+  {type:'三月',"房管":1.85,"税务":1.1,"不动产":1.5},
+
+  {type:'四月',"房管":1.33,"税务":1.63,"不动产":1.4},
+  {type:'五月',"房管":1.63,"税务":1.8,"不动产":1.7},
+  {type:'六月',"房管":1.85,"税务":1.98,"不动产":1.8},
+
+  {type:'七月',"房管":1.98,"税务":1.5,"不动产":1.76},
+  {type:'八月',"房管":1.48,"税务":1.2,"不动产":1.3},
+  {type:'九月',"房管":1.41,"税务":1.9,"不动产":1.6},
+
+  {type:'十月',"房管":1.1,"税务":1.1,"不动产":1.4},
+  {type:'十一月',"房管":1.85,"税务":1.6,"不动产":1.5},
+  {type:'十二月',"房管":1.5,"税务":1.4,"不动产":1.3}
+]
+const xljgFields=["房管","税务","不动产"]
+
+const dataCol1 = [{
+  title: '业务号',
+  align:"center",
+  dataIndex: 'reBizCode'
+},{
+  title: '业务类型',
+  align:"center",
+  dataIndex: 'type'
+},{
+  title: '受理人',
+  align:"center",
+  dataIndex: 'acceptBy'
+},{
+  title: '受理时间',
+  align:"center",
+  dataIndex: 'acceptDate'
+},{
+  title: '当前节点',
+  align:"center",
+  dataIndex: 'curNode'
+},{
+  title: '办理时长',
+  align:"center",
+  dataIndex: 'flowRate',
+  scopedSlots: { customRender: 'flowRate' }
+}];
+const dataSource1=[
+  {reBizCode:"1",type:"转移登记",acceptBy:'张三',acceptDate:"2019-01-22",curNode:"任务分派",flowRate:60},
+  {reBizCode:"2",type:"抵押登记",acceptBy:'李四',acceptDate:"2019-01-23",curNode:"领导审核",flowRate:30},
+  {reBizCode:"3",type:"转移登记",acceptBy:'王武',acceptDate:"2019-01-25",curNode:"任务处理",flowRate:20},
+  {reBizCode:"4",type:"转移登记",acceptBy:'赵楼',acceptDate:"2019-11-22",curNode:"部门审核",flowRate:80},
+  {reBizCode:"5",type:"转移登记",acceptBy:'钱就',acceptDate:"2019-12-12",curNode:"任务分派",flowRate:90},
+  {reBizCode:"6",type:"转移登记",acceptBy:'孙吧',acceptDate:"2019-03-06",curNode:"任务处理",flowRate:10},
+  {reBizCode:"7",type:"抵押登记",acceptBy:'周大',acceptDate:"2019-04-13",curNode:"任务分派",flowRate:100},
+  {reBizCode:"8",type:"抵押登记",acceptBy:'吴二',acceptDate:"2019-05-09",curNode:"任务上报",flowRate:50},
+  {reBizCode:"9",type:"抵押登记",acceptBy:'郑爽',acceptDate:"2019-07-12",curNode:"任务处理",flowRate:63},
+  {reBizCode:"20",type:"抵押登记",acceptBy:'林有',acceptDate:"2019-12-12",curNode:"任务打回",flowRate:59},
+  {reBizCode:"11",type:"转移登记",acceptBy:'码云',acceptDate:"2019-09-10",curNode:"任务签收",flowRate:87},
+]
+
+const dataCol2 = [{
+  title: '业务号',
+  align:"center",
+  dataIndex: 'reBizCode'
+},{
+  title: '受理人',
+  align:"center",
+  dataIndex: 'acceptBy'
+},{
+  title: '发起时间',
+  align:"center",
+  dataIndex: 'acceptDate'
+},{
+  title: '当前节点',
+  align:"center",
+  dataIndex: 'curNode'
+},{
+  title: '超时时间',
+  align:"center",
+  dataIndex: 'flowRate',
+  scopedSlots: { customRender: 'flowRate' }
+}];
+const dataSource2=[
+  {reBizCode:"A001",type:"转移登记",acceptBy:'张四',acceptDate:"2019-01-22",curNode:"任务分派",flowRate:12},
+  {reBizCode:"A002",type:"抵押登记",acceptBy:'李吧',acceptDate:"2019-01-23",curNode:"任务签收",flowRate:3},
+  {reBizCode:"A003",type:"转移登记",acceptBy:'王三',acceptDate:"2019-01-25",curNode:"任务处理",flowRate:24},
+  {reBizCode:"A004",type:"转移登记",acceptBy:'赵二',acceptDate:"2019-11-22",curNode:"部门审核",flowRate:10},
+  {reBizCode:"A005",type:"转移登记",acceptBy:'钱大',acceptDate:"2019-12-12",curNode:"任务签收",flowRate:8},
+  {reBizCode:"A006",type:"转移登记",acceptBy:'孙就',acceptDate:"2019-03-06",curNode:"任务处理",flowRate:10},
+  {reBizCode:"A007",type:"抵押登记",acceptBy:'周晕',acceptDate:"2019-04-13",curNode:"部门审核",flowRate:24},
+  {reBizCode:"A008",type:"抵押登记",acceptBy:'吴有',acceptDate:"2019-05-09",curNode:"部门审核",flowRate:30},
+  {reBizCode:"A009",type:"抵押登记",acceptBy:'郑武',acceptDate:"2019-07-12",curNode:"任务分派",flowRate:1},
+  {reBizCode:"A0010",type:"抵押登记",acceptBy:'林爽',acceptDate:"2019-12-12",curNode:"部门审核",flowRate:16},
+  {reBizCode:"A0011",type:"转移登记",acceptBy:'码楼',acceptDate:"2019-09-10",curNode:"部门审核",flowRate:7},
+]
+
+export default {
+  name: "IndexBdc",
+  components: {
+    ATooltip,
+    ACol,
+    ChartCard,
+    MiniArea,
+    MiniBar,
+    DashChartDemo,
+    BarMultid,
+    IndexBar
+  },
+  data() {
+    return {
+      loading: true,
+      cardCount:{
+        sll:100,
+        bjl:87,
+        isll:15,
+        ibjl:9
+      },
+
+      todaySll:60,
+      todayBjl:54,
+      todayISll:13,
+      todayIBjl:7,
+
+      chartData:{
+        sll:[],
+        bjl:[],
+        isll:[],
+        ibjl:[]
+      },
+      jhjgFields,
+      jhjgData,
+
+      xljgData,
+      xljgFields,
+
+      diskInfo:[
+        {name:"C盘",restPPT:7},
+        {name:"D盘",restPPT:5}
+      ],
+
+      registerTypeList:[{
+        text:"业务受理"
+      },{
+        text:"业务管理"
+      },{
+        text:"文件管理"
+      },{
+        text:"信息查询"
+      }],
+
+      dataSource1:[],
+      dataSource2:[],
+      columns:dataCol1,
+      columns2:dataCol2,
+      ipagination1:{
+        current: 1,
+        pageSize: 5,
+        pageSizeOptions: ['10', '20', '30'],
+        showTotal: (total, range) => {
+          return range[0] + "-" + range[1] + " 共" + total + "条"
         },
-        cmbp: {
-          a: 9999,
-          b: 9999,
-          c: 9999,
-          d: 9999,
-          e: 9999,
+        showQuickJumper: true,
+        showSizeChanger: true,
+        total: 0,
+
+      },
+      ipagination2:{
+        current: 1,
+        pageSize: 5,
+        pageSizeOptions: ['10', '20', '30'],
+        showTotal: (total, range) => {
+          return range[0] + "-" + range[1] + " 共" + total + "条"
         },
+        showQuickJumper: true,
+        showSizeChanger: true,
+        total: 0,
+      },
+      indexRegisterType:"转移登记",
+      indexBottomTab:"1"
 
-        clickDataSource: [
-          {
-            key: '1',
-            name: '今日',
-            a: 0,
-            b: 0
-          },
-          {
-            key: '2',
-            name: '本周',
-            a: 0,
-            b: 0
-          },
-          {
-            key: '3',
-            name: '本月',
-            a: 0,
-            b: 0
-          },
-          {
-            key: '4',
-            name: '总计',
-            a: 0,
-            b: 0
-          },
-        ],
-        clickDolumns: [
-          {
-            title: '区域',
-            dataIndex: 'name',
-            key: 'name',
-          },
-          {
-            title: '点击次数',
-            dataIndex: 'a',
-            key: 'a',
-          },
-          {
-            title: '点击人数',
-            dataIndex: 'b',
-            key: 'b',
-          },
-        ],
-
-        clickDataSource2: [
-          {
-            key: '1',
-            name: '今日',
-            a: 0,
-            b: 0
-          },
-          {
-            key: '2',
-            name: '本周',
-            a: 0,
-            b: 0
-          },
-          {
-            key: '3',
-            name: '本月',
-            a: 0,
-            b: 0
-          },
-          {
-            key: '4',
-            name: '总计',
-            a: 0,
-            b: 0
-          },
-        ],
-        clickDolumns2: [
-          {
-            title: '区域',
-            dataIndex: 'name',
-            key: 'name',
-          },
-          {
-            title: '点击次数',
-            dataIndex: 'a',
-            key: 'a',
-          },
-          {
-            title: '点击人数',
-            dataIndex: 'b',
-            key: 'b',
-          },
-        ],
-
-        clickDataSource3: [
-          {
-            key: '4',
-            name: '统计',
-            a: 0,
-            b: 0,
-            c: 0
-          },
-        ],
-        clickDolumns3: [
-          {
-            title: '区域',
-            dataIndex: 'name',
-            key: 'name',
-          },
-          {
-            title: '今日',
-            dataIndex: 'a',
-            key: 'a',
-          },
-          {
-            title: '本周',
-            dataIndex: 'b',
-            key: 'b',
-          },
-          {
-            title: '本月',
-            dataIndex: 'c',
-            key: 'c',
-          },
-        ],
+    }
+  },
+  methods:{
+    goPage(){
+      this.$message.success("根据业务自行处理跳转页面!")
+    },
+    changeRegisterType(e){
+      this.indexRegisterType = e.target.value
+      if(this.indexBottomTab=="1"){
+        this.loadDataSource1()
+      }else{
+        this.loadDataSource2()
       }
     },
-    created() {
-      this.clickCard0()
-      this.clickCard1()
-      this.clickCard2()
-      this.clickCard3()
-      this.clickCard9()
+    tableChange1(pagination){
+      this.ipagination1.current = pagination.current
+      this.ipagination1.pageSize = pagination.pageSize
+      this.queryTimeoutInfo()
+    },
+    tableChange2(pagination){
+      this.ipagination2.current = pagination.current
+      this.ipagination2.pageSize = pagination.pageSize
+      this.queryNodeTimeoutInfo()
+    },
+    getFlowRateNumber(value){
+      return Number(value)
+    },
+    getPercentFormat(value){
+      if(value==100){
+        return "超时"
+      }else{
+        return value+"%"
+      }
+    },
+    getPercentColor(value){
+      let p = Number(value)
+      if(p>=90 && p<100){
+        return 'rgb(244, 240, 89)'
+      }else if(p>=100){
+        return 'red'
+      }else{
+        return 'rgb(16, 142, 233)'
+      }
     },
 
+    loadDataSource1(){
+      this.dataSource1 = dataSource1.filter(item=>{
+        if(!this.indexRegisterType){
+          return true
+        }
+        return item.type==this.indexRegisterType
+      })
+    },
+    loadDataSource2(){
+      this.dataSource2 = dataSource2.filter(item=>{
+        if(!this.indexRegisterType){
+          return true
+        }
+        return item.type==this.indexRegisterType
+      })
+    }
+  },
+  created() {
+    this.loadDataSource1()
+    this.loadDataSource2()
+    setTimeout(() => {
+      this.loading = !this.loading
+    }, 1000)
   }
+}
 </script>
 
-<style>
-.background-card{
-  width: 100%; min-height: 780px; height: auto; text-align: right; margin-top: 20px;background-color: #FFF
+<style lang="less" scoped>
+.extra-wrapper {
+  line-height: 55px;
+  padding-right: 24px;
+
+  .extra-item {
+    display: inline-block;
+    margin-right: 24px;
+
+    a {
+      margin-left: 24px;
+    }
+  }
+}
+
+.item-group {
+  padding: 20px 0 8px 24px;
+  font-size: 0;
+  a {
+    color: rgba(0, 0, 0, 0.65);
+    display: inline-block;
+    font-size: 14px;
+    margin-bottom: 13px;
+    width: 25%;
+  }
+}
+
+.item-group {
+  .more-btn {
+    margin-bottom: 13px;
+    text-align: center;
+  }
+}
+
+.list-content-item {
+  color: rgba(0, 0, 0, .45);
+  display: inline-block;
+  vertical-align: middle;
+  font-size: 14px;
+  margin-left: 40px;
+}
+
+@media only screen and (min-width: 1600px) {
+  .list-content-item{
+    margin-left:60px;
+  }
+}
+
+@media only screen and (max-width: 1300px) {
+  .list-content-item{
+    margin-left:20px;
+  }
+  .width-hidden4{
+    display:none
+  }
+}
+.list-content-item{
+  span{line-height: 20px;}
+}
+.list-content-item{
+  p{margin-top: 4px;margin-bottom:0;line-height:22px;}
 }
-.grid-line {
-  width: 100%;
-  min-height: 780px;
-  height: auto;
-  text-align: center;
-  color: blue;
-  box-sizing: border-box;
-  background: -webkit-linear-gradient(top, transparent 15px, #eee 0), -webkit-linear-gradient(left, transparent 15px, #eee 0);
-  background-size: 16px 16px;
-  position: relative;
-  display: flex;
-  flex-wrap: wrap;
+.anty-list-cust {
+  .ant-list-item-meta{flex: 0.3 !important;}
 }
-.mini-div {
-  width: 480px;
-  min-height: 400px;
-  height: auto;
-  margin: 20px;
+.anty-list-cust {
+  .ant-list-item-content{flex:1 !important; justify-content:flex-start !important;margin-left: 20px;}
 }
+
+
 </style>

admin-pc/src/views/popularizeActivity/modules/PopularizeActivityForm.vue

@@ -15,7 +15,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="活动类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
-              <j-dict-select-tag type="list" v-model="model.type" dictCode="no_type" placeholder="请选择活动类型" />
+              <j-dict-select-tag type="list" v-model="model.type" dictCode="no_type" placeholder="请选择活动类型"  disabled/>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">

admin-pc/src/views/popularizeOrder/PopularizeOrderList.vue

@@ -10,27 +10,42 @@
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="类型">
-              <j-dict-select-tag placeholder="请选择类型" v-model="queryParam.type" dictCode="order_type"/>
+            <a-form-item label="订单标题">
+              <a-input placeholder="请输入订单标题" v-model="queryParam.title"></a-input>
             </a-form-item>
           </a-col>
-          <template v-if="toggleSearchStatus">
+<!--          <template v-if="toggleSearchStatus">-->
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="类型">
+                <j-dict-select-tag placeholder="请选择类型" v-model="queryParam.type" dictCode="order_type"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="地点">
+                <a-input placeholder="请输入地点" v-model="queryParam.address"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="是否签到">
+                <j-dict-select-tag placeholder="请选择是否签到" v-model="queryParam.open" dictCode="is_qd_open"/>
+              </a-form-item>
+            </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="用户标识">
                 <j-search-select-tag placeholder="请选择用户标识" v-model="queryParam.userId" dict="han_hai_member,nick_name,id"/>
               </a-form-item>
             </a-col>
-          </template>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
-            </span>
-          </a-col>
+<!--          </template>-->
+<!--          <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
+<!--            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">-->
+<!--              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>-->
+<!--              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>-->
+<!--              <a @click="handleToggleSearch" style="margin-left: 8px">-->
+<!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
+<!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
+<!--              </a>-->
+<!--            </span>-->
+<!--          </a-col>-->
         </a-row>
       </a-form>
     </div>
@@ -95,22 +110,25 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
+          <a @click="handleDetail(record)" >详情</a>
+           <a-divider type="vertical" />
+          <a @click="handleEdit(record)" v-if="record.state == 3">退款</a>
+
+
 
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
+<!--          <a-dropdown>-->
+<!--            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>-->
+<!--            <a-menu slot="overlay">-->
+<!--              <a-menu-item>-->
+<!--                <a @click="handleDetail(record)">详情</a>-->
+<!--              </a-menu-item>-->
+<!--              <a-menu-item>-->
+<!--                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
+<!--                  <a>删除</a>-->
+<!--                </a-popconfirm>-->
+<!--              </a-menu-item>-->
+<!--            </a-menu>-->
+<!--          </a-dropdown>-->
         </span>
 
       </a-table>
@@ -194,8 +212,7 @@
           {
             title:'是否签到',
             align:"center",
-            dataIndex: 'open',
-            customRender: (text) => (text ? filterMultiDictText(this.dictOptions['open'], text) : ''),
+            dataIndex: 'open_dictText'
           },
           {
             title:'溯源活动',
@@ -281,7 +298,6 @@
       }
     },
     created() {
-      this.$set(this.dictOptions, 'open', [{text:'是',value:'Y'},{text:'否',value:'N'}])
       this.$set(this.dictOptions, 'isFp', [{text:'是',value:'Y'},{text:'否',value:'N'}])
       this.$set(this.dictOptions, 'isPj', [{text:'是',value:'Y'},{text:'否',value:'N'}])
     this.getSuperFieldList();
@@ -304,7 +320,7 @@
         fieldList.push({type:'datetime',value:'startTime',text:'时间'})
         fieldList.push({type:'Text',value:'address',text:'地点',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'price',text:'价格',dictCode:''})
-        fieldList.push({type:'switch',value:'open',text:'是否签到'})
+        fieldList.push({type:'string',value:'open',text:'是否签到',dictCode:'is_qd_open'})
         fieldList.push({type:'sel_search',value:'activityOrderId',text:'溯源活动',dictTable:"popularize_activity", dictText:'title', dictCode:'id'})
         fieldList.push({type:'sel_search',value:'travelOrderId',text:'溯源旅行',dictTable:"popularize_travel", dictText:'title', dictCode:'id'})
         fieldList.push({type:'sel_search',value:'userId',text:'用户标识',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})

admin-pc/src/views/popularizeOrder/modules/PopularizeOrderForm.vue

@@ -5,104 +5,116 @@
         <a-row>
           <a-col :span="24">
             <a-form-model-item label="订单状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
-              <j-dict-select-tag type="list" v-model="model.state" dictCode="order_state" placeholder="请选择订单状态" />
+              <j-dict-select-tag type="list" v-model="model.state" dictCode="order_state" placeholder="请选择订单状态" disabled />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="订单标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">
-              <a-input v-model="model.title" placeholder="请输入订单标题"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="订单图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
-              <j-image-upload isMultiple  v-model="model.image" ></j-image-upload>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
-              <j-dict-select-tag type="list" v-model="model.type" dictCode="order_type" placeholder="请选择类型" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="startTime">
-              <j-date placeholder="请选择时间"  v-model="model.startTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="地点" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
-              <a-input v-model="model.address" placeholder="请输入地点"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price">
-              <a-input-number v-model="model.price" placeholder="请输入价格" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="是否签到" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="open">
-              <j-switch v-model="model.open"  ></j-switch>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="溯源活动" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="activityOrderId">
-              <j-search-select-tag v-model="model.activityOrderId" dict="popularize_activity,title,id"  />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="溯源旅行" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="travelOrderId">
-              <j-search-select-tag v-model="model.travelOrderId" dict="popularize_travel,title,id"  />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="用户标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
-              <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id"  />
-            </a-form-model-item>
-          </a-col>
+              <a-input v-model="model.title" placeholder="请输入订单标题"  disabled></a-input>
+            </a-form-model-item>
+          </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="订单图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">-->
+<!--              <j-image-upload isMultiple  v-model="model.image" ></j-image-upload>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">-->
+<!--              <j-dict-select-tag type="list" v-model="model.type" dictCode="order_type" placeholder="请选择类型" />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="startTime">-->
+<!--              <j-date placeholder="请选择时间"  v-model="model.startTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="地点" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">-->
+<!--              <a-input v-model="model.address" placeholder="请输入地点"  ></a-input>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price">-->
+<!--              <a-input-number v-model="model.price" placeholder="请输入价格" style="width: 100%" />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="是否签到" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="open">-->
+<!--              <j-dict-select-tag type="list" v-model="model.open" dictCode="is_qd_open" placeholder="请选择是否签到" />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="溯源活动" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="activityOrderId">-->
+<!--              <j-search-select-tag v-model="model.activityOrderId" dict="popularize_activity,title,id"  />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="溯源旅行" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="travelOrderId">-->
+<!--              <j-search-select-tag v-model="model.travelOrderId" dict="popularize_travel,title,id"  />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="用户标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">-->
+<!--              <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id"  />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
           <a-col :span="24">
             <a-form-model-item label="支付金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="payPrice">
-              <a-input-number v-model="model.payPrice" placeholder="请输入支付金额" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="支付时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="payTime">
-              <j-date placeholder="请选择支付时间"  v-model="model.payTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="购票数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="num">
-              <a-input-number v-model="model.num" placeholder="请输入购票数量" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="是否已开票" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isFp">
-              <j-switch v-model="model.isFp"  ></j-switch>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="是否已评价" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isPj">
-              <j-switch v-model="model.isPj"  ></j-switch>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="typePrice">
-              <a-input-number v-model="model.typePrice" placeholder="请输入类型" style="width: 100%" />
+              <a-input-number v-model="model.payPrice" placeholder="请输入支付金额" style="width: 100%" disabled/>
             </a-form-model-item>
           </a-col>
+
           <a-col :span="24">
-            <a-form-model-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
-              <a-input v-model="model.name" placeholder="请输入姓名"  ></a-input>
+            <a-form-model-item label="已退款金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="payTuiPrice">
+              <a-input-number v-model="model.payTuiPrice" placeholder="请输入已退款金额" style="width: 100%" disabled/>
             </a-form-model-item>
           </a-col>
+
           <a-col :span="24">
-            <a-form-model-item label="电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
-              <a-input v-model="model.phone" placeholder="请输入电话"  ></a-input>
+            <a-form-model-item label="退款金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="payPrice">
+              <a-input-number v-model="model.tuiPrice" placeholder="请输入退款金额" style="width: 100%" />
             </a-form-model-item>
           </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="支付时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="payTime">-->
+<!--              <j-date placeholder="请选择支付时间"  v-model="model.payTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
           <a-col :span="24">
-            <a-form-model-item label="邀请码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="code">
-              <a-input v-model="model.code" placeholder="请输入邀请码"  ></a-input>
-            </a-form-model-item>
-          </a-col>
+            <a-form-model-item label="购票数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="num">
+              <a-input-number v-model="model.num" placeholder="请输入购票数量" style="width: 100%" disabled />
+            </a-form-model-item>
+          </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="是否已开票" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isFp">-->
+<!--              <j-switch v-model="model.isFp"  ></j-switch>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="是否已评价" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isPj">-->
+<!--              <j-switch v-model="model.isPj"  ></j-switch>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="typePrice">-->
+<!--              <a-input-number v-model="model.typePrice" placeholder="请输入类型" style="width: 100%" />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">-->
+<!--              <a-input v-model="model.name" placeholder="请输入姓名"  ></a-input>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">-->
+<!--              <a-input v-model="model.phone" placeholder="请输入电话"  ></a-input>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="邀请码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="code">-->
+<!--              <a-input v-model="model.code" placeholder="请输入邀请码"  ></a-input>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
         </a-row>
       </a-form-model>
     </j-form-container>

admin-pc/src/views/popularizeRecruit/PopularizeRecruitList.vue

@@ -0,0 +1,339 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="招募状态">
+              <j-dict-select-tag placeholder="请选择招募状态" v-model="queryParam.stateOn" dictCode="state_on"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="中文-招募标题">
+              <a-input placeholder="请输入中文-招募标题" v-model="queryParam.title"></a-input>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="英文-招募标题">
+                <a-input placeholder="请输入英文-招募标题" v-model="queryParam.enTitle"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="中文-地址">
+                <a-input placeholder="请输入中文-地址" v-model="queryParam.address"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="英文-地址">
+                <a-input placeholder="请输入英文-地址" v-model="queryParam.enAddress"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="中文-标签">
+                <a-input placeholder="请输入中文-标签" v-model="queryParam.iconText"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="英文标签">
+                <a-input placeholder="请输入英文标签" v-model="queryParam.enIconText"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="是否成行">
+                <j-dict-select-tag placeholder="请选择是否成行" v-model="queryParam.state" dictCode="is_xc"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="活动">
+                <j-search-select-tag placeholder="请选择活动" v-model="queryParam.activityId" dict="popularize_activity,title,id"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="旅行">
+                <j-search-select-tag placeholder="请选择旅行" v-model="queryParam.travelId" dict="popularize_travel,title,id"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="类型">
+                <j-dict-select-tag placeholder="请选择类型" v-model="queryParam.type" dictCode="vo_type"/>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('招募信息')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <popularize-recruit-modal ref="modalForm" @ok="modalFormOk"></popularize-recruit-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import PopularizeRecruitModal from './modules/PopularizeRecruitModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'PopularizeRecruitList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      PopularizeRecruitModal
+    },
+    data () {
+      return {
+        description: '招募信息管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'创建人',
+            align:"center",
+            dataIndex: 'createBy'
+          },
+          {
+            title:'创建日期',
+            align:"center",
+            sorter: true,
+            dataIndex: 'createTime'
+          },
+          {
+            title:'招募状态',
+            align:"center",
+            dataIndex: 'stateOn_dictText'
+          },
+          {
+            title:'中文-招募标题',
+            align:"center",
+            dataIndex: 'title'
+          },
+          {
+            title:'英文-招募标题',
+            align:"center",
+            dataIndex: 'enTitle'
+          },
+          {
+            title:'图片',
+            align:"center",
+            dataIndex: 'image',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'时间',
+            align:"center",
+            dataIndex: 'startTime'
+          },
+          {
+            title:'中文-地址',
+            align:"center",
+            dataIndex: 'address'
+          },
+          {
+            title:'英文-地址',
+            align:"center",
+            dataIndex: 'enAddress'
+          },
+          {
+            title:'中文-标签',
+            align:"center",
+            dataIndex: 'iconText'
+          },
+          {
+            title:'英文标签',
+            align:"center",
+            dataIndex: 'enIconText'
+          },
+          {
+            title:'是否上架 ',
+            align:"center",
+            dataIndex: 'isOpen',
+            customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isOpen'], text) : ''),
+          },
+          {
+            title:'是否成行',
+            align:"center",
+            dataIndex: 'state_dictText'
+          },
+          {
+            title:'参与人数',
+            align:"center",
+            dataIndex: 'num'
+          },
+          {
+            title:'活动',
+            align:"center",
+            dataIndex: 'activityId_dictText'
+          },
+          {
+            title:'旅行',
+            align:"center",
+            dataIndex: 'travelId_dictText'
+          },
+          {
+            title:'类型',
+            align:"center",
+            dataIndex: 'type_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/popularizeRecruit/popularizeRecruit/list",
+          delete: "/popularizeRecruit/popularizeRecruit/delete",
+          deleteBatch: "/popularizeRecruit/popularizeRecruit/deleteBatch",
+          exportXlsUrl: "/popularizeRecruit/popularizeRecruit/exportXls",
+          importExcelUrl: "popularizeRecruit/popularizeRecruit/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+      this.$set(this.dictOptions, 'isOpen', [{text:'是',value:'Y'},{text:'否',value:'N'}])
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'createBy',text:'创建人',dictCode:''})
+        fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
+        fieldList.push({type:'int',value:'stateOn',text:'招募状态',dictCode:'state_on'})
+        fieldList.push({type:'string',value:'title',text:'中文-招募标题',dictCode:''})
+        fieldList.push({type:'string',value:'enTitle',text:'英文-招募标题',dictCode:''})
+        fieldList.push({type:'Text',value:'image',text:'图片',dictCode:''})
+        fieldList.push({type:'datetime',value:'startTime',text:'时间'})
+        fieldList.push({type:'Text',value:'address',text:'中文-地址',dictCode:''})
+        fieldList.push({type:'Text',value:'enAddress',text:'英文-地址',dictCode:''})
+        fieldList.push({type:'Text',value:'iconText',text:'中文-标签',dictCode:''})
+        fieldList.push({type:'Text',value:'enIconText',text:'英文标签',dictCode:''})
+        fieldList.push({type:'switch',value:'isOpen',text:'是否上架 '})
+        fieldList.push({type:'int',value:'state',text:'是否成行',dictCode:'is_xc'})
+        fieldList.push({type:'int',value:'num',text:'参与人数',dictCode:''})
+        fieldList.push({type:'sel_search',value:'activityId',text:'活动',dictTable:"popularize_activity", dictText:'title', dictCode:'id'})
+        fieldList.push({type:'sel_search',value:'travelId',text:'旅行',dictTable:"popularize_travel", dictText:'title', dictCode:'id'})
+        fieldList.push({type:'string',value:'type',text:'类型',dictCode:'vo_type'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue/modules/PopularizeOrderForm.vue → admin-pc/src/views/popularizeRecruit/modules/PopularizeRecruitForm.vue

@@ -4,23 +4,23 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
           <a-col :span="24">
-            <a-form-model-item label="订单状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
-              <j-dict-select-tag type="list" v-model="model.state" dictCode="order_state" placeholder="请选择订单状态" />
+            <a-form-model-item label="招募状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="stateOn">
+              <j-dict-select-tag type="list" v-model="model.stateOn" dictCode="state_on" placeholder="请选择招募状态" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="订单标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">
-              <a-input v-model="model.title" placeholder="请输入订单标题"  ></a-input>
+            <a-form-model-item label="中文-招募标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">
+              <a-input v-model="model.title" placeholder="请输入中文-招募标题"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="订单图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
-              <j-image-upload isMultiple  v-model="model.image" ></j-image-upload>
+            <a-form-model-item label="英文-招募标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enTitle">
+              <a-input v-model="model.enTitle" placeholder="请输入英文-招募标题"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
-              <j-dict-select-tag type="list" v-model="model.type" dictCode="order_type" placeholder="请选择类型" />
+            <a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
+              <j-image-upload isMultiple  v-model="model.image" ></j-image-upload>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -29,78 +29,53 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="地点" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
-              <a-input v-model="model.address" placeholder="请输入地点"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price">
-              <a-input-number v-model="model.price" placeholder="请输入价格" style="width: 100%" />
+            <a-form-model-item label="中文-地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
+              <a-input v-model="model.address" placeholder="请输入中文-地址"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="是否签到" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="open">
-              <j-switch v-model="model.open"  ></j-switch>
+            <a-form-model-item label="英文-地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enAddress">
+              <a-input v-model="model.enAddress" placeholder="请输入英文-地址"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="溯源活动" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="activityOrderId">
-              <j-search-select-tag v-model="model.activityOrderId" dict="popularize_activity,title,id"  />
+            <a-form-model-item label="中文-标签" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="iconText">
+              <a-input v-model="model.iconText" placeholder="请输入中文-标签"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="溯源旅行" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="travelOrderId">
-              <j-search-select-tag v-model="model.travelOrderId" dict="popularize_travel,title,id"  />
+            <a-form-model-item label="英文标签" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enIconText">
+              <a-input v-model="model.enIconText" placeholder="请输入英文标签"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="用户标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
-              <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id"  />
+            <a-form-model-item label="是否上架 " :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isOpen">
+              <j-switch v-model="model.isOpen"  ></j-switch>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="支付金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="payPrice">
-              <a-input-number v-model="model.payPrice" placeholder="请输入支付金额" style="width: 100%" />
+            <a-form-model-item label="是否成行" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
+              <j-dict-select-tag type="list" v-model="model.state" dictCode="is_xc" placeholder="请选择是否成行" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="支付时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="payTime">
-              <j-date placeholder="请选择支付时间"  v-model="model.payTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
+            <a-form-model-item label="参与人数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="num">
+              <a-input-number v-model="model.num" placeholder="请输入参与人数" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="购票数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="num">
-              <a-input-number v-model="model.num" placeholder="请输入购票数量" style="width: 100%" />
+            <a-form-model-item label="活动" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="activityId">
+              <j-search-select-tag v-model="model.activityId" dict="popularize_activity,title,id"  />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="是否已开票" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isFp">
-              <j-switch v-model="model.isFp"  ></j-switch>
+            <a-form-model-item label="旅行" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="travelId">
+              <j-search-select-tag v-model="model.travelId" dict="popularize_travel,title,id"  />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="是否已评价" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isPj">
-              <j-switch v-model="model.isPj"  ></j-switch>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="typePrice">
-              <a-input-number v-model="model.typePrice" placeholder="请输入类型" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
-              <a-input v-model="model.name" placeholder="请输入姓名"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
-              <a-input v-model="model.phone" placeholder="请输入电话"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="邀请码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="code">
-              <a-input v-model="model.code" placeholder="请输入邀请码"  ></a-input>
+            <a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
+              <j-dict-select-tag type="list" v-model="model.type" dictCode="vo_type" placeholder="请选择类型" />
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -115,7 +90,7 @@
   import { validateDuplicateValue } from '@/utils/util'
 
   export default {
-    name: 'PopularizeOrderForm',
+    name: 'PopularizeRecruitForm',
     components: {
     },
     props: {
@@ -142,9 +117,9 @@
         validatorRules: {
         },
         url: {
-          add: "/popularizeOrder/popularizeOrder/add",
-          edit: "/popularizeOrder/popularizeOrder/edit",
-          queryById: "/popularizeOrder/popularizeOrder/queryById"
+          add: "/popularizeRecruit/popularizeRecruit/add",
+          edit: "/popularizeRecruit/popularizeRecruit/edit",
+          queryById: "/popularizeRecruit/popularizeRecruit/queryById"
         }
       }
     },

module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue/modules/PopularizeOrderModal.Style#Drawer.vue → admin-pc/src/views/popularizeRecruit/modules/PopularizeRecruitModal.Style#Drawer.vue

@@ -7,7 +7,7 @@
     @close="close"
     destroyOnClose
     :visible="visible">
-    <popularize-order-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></popularize-order-form>
+    <popularize-recruit-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></popularize-recruit-form>
     <div class="drawer-footer">
       <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
       <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
@@ -17,12 +17,12 @@
 
 <script>
 
-  import PopularizeOrderForm from './PopularizeOrderForm'
+  import PopularizeRecruitForm from './PopularizeRecruitForm'
 
   export default {
-    name: 'PopularizeOrderModal',
+    name: 'PopularizeRecruitModal',
     components: {
-      PopularizeOrderForm
+      PopularizeRecruitForm
     },
     data () {
       return {

module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue/modules/PopularizeOrderModal.vue → admin-pc/src/views/popularizeRecruit/modules/PopularizeRecruitModal.vue

@@ -8,17 +8,17 @@
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <popularize-order-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></popularize-order-form>
+    <popularize-recruit-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></popularize-recruit-form>
   </j-modal>
 </template>
 
 <script>
 
-  import PopularizeOrderForm from './PopularizeOrderForm'
+  import PopularizeRecruitForm from './PopularizeRecruitForm'
   export default {
-    name: 'PopularizeOrderModal',
+    name: 'PopularizeRecruitModal',
     components: {
-      PopularizeOrderForm
+      PopularizeRecruitForm
     },
     data () {
       return {

admin-pc/src/views/popularizeRecruitLog/PopularizeRecruitLogList.vue

@@ -0,0 +1,246 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="用户信息">
+              <j-search-select-tag placeholder="请选择用户信息" v-model="queryParam.userId" dict="han_hai_member,nick_name,id"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="姓名">
+              <a-input placeholder="请输入姓名" v-model="queryParam.name"></a-input>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="电话">
+                <a-input placeholder="请输入电话" v-model="queryParam.phone"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="招募项目">
+                <j-search-select-tag placeholder="请选择招募项目" v-model="queryParam.recruitId" dict="popularize_recruit,title,id"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="审核状态">
+                <j-dict-select-tag placeholder="请选择审核状态" v-model="queryParam.state" dictCode="recruit_state"/>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+<!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('招募报名日志')">导出</a-button>-->
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
+<!--      &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
+<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
+<!--      <a-dropdown v-if="selectedRowKeys.length > 0">-->
+<!--        <a-menu slot="overlay">-->
+<!--          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
+<!--        </a-menu>-->
+<!--        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>-->
+<!--      </a-dropdown>-->
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)" v-if="record.state==1">审核</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)" >详情</a>
+              </a-menu-item>
+<!--              <a-menu-item>-->
+<!--                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
+<!--                  <a>删除</a>-->
+<!--                </a-popconfirm>-->
+<!--              </a-menu-item>-->
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <popularize-recruit-log-modal ref="modalForm" @ok="modalFormOk"></popularize-recruit-log-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import PopularizeRecruitLogModal from './modules/PopularizeRecruitLogModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'PopularizeRecruitLogList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      PopularizeRecruitLogModal
+    },
+    data () {
+      return {
+        description: '招募报名日志管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'用户信息',
+            align:"center",
+            dataIndex: 'userId_dictText'
+          },
+          {
+            title:'姓名',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title:'电话',
+            align:"center",
+            dataIndex: 'phone'
+          },
+          {
+            title:'头像',
+            align:"center",
+            dataIndex: 'headImage',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'招募项目',
+            align:"center",
+            dataIndex: 'recruitId_dictText'
+          },
+          {
+            title:'项目时间',
+            align:"center",
+            dataIndex: 'recruitTime'
+          },
+          {
+            title:'审核状态',
+            align:"center",
+            dataIndex: 'state_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/popularizeRecruitLog/popularizeRecruitLog/list",
+          delete: "/popularizeRecruitLog/popularizeRecruitLog/delete",
+          deleteBatch: "/popularizeRecruitLog/popularizeRecruitLog/deleteBatch",
+          exportXlsUrl: "/popularizeRecruitLog/popularizeRecruitLog/exportXls",
+          importExcelUrl: "popularizeRecruitLog/popularizeRecruitLog/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'sel_search',value:'userId',text:'用户信息',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
+        fieldList.push({type:'string',value:'name',text:'姓名',dictCode:''})
+        fieldList.push({type:'string',value:'phone',text:'电话',dictCode:''})
+        fieldList.push({type:'Text',value:'headImage',text:'头像',dictCode:''})
+        fieldList.push({type:'sel_search',value:'recruitId',text:'招募项目',dictTable:"popularize_recruit", dictText:'title', dictCode:'id'})
+        fieldList.push({type:'datetime',value:'recruitTime',text:'项目时间'})
+        fieldList.push({type:'int',value:'state',text:'审核状态',dictCode:'recruit_state'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

admin-pc/src/views/popularizeRecruitLog/modules/PopularizeRecruitLogForm.vue

@@ -0,0 +1,134 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="用户信息" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id"  disabled/>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
+              <a-input v-model="model.name" placeholder="请输入姓名"  disabled></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
+              <a-input v-model="model.phone" placeholder="请输入电话" disabled ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="headImage">
+              <j-image-upload isMultiple  v-model="model.headImage" disabled></j-image-upload>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="招募项目" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="recruitId">
+              <j-search-select-tag v-model="model.recruitId" dict="popularize_recruit,title,id"  disabled/>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="项目时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="recruitTime">
+              <j-date placeholder="请选择项目时间"  v-model="model.recruitTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" disabled/>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="审核状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
+              <j-dict-select-tag type="list" v-model="model.state" dictCode="recruit_state" placeholder="请选择审核状态" />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'PopularizeRecruitLogForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/popularizeRecruitLog/popularizeRecruitLog/add",
+          edit: "/popularizeRecruitLog/popularizeRecruitLog/edit",
+          queryById: "/popularizeRecruitLog/popularizeRecruitLog/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

module-common/src/main/java/org/jeecg/api/service/impl/ApiIndexServiceImpl.java

@@ -49,6 +49,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.*;
 
 
@@ -129,77 +130,162 @@ public class ApiIndexServiceImpl implements ApiIndexService {
     //获取首页活动列表带分页
     @Override
     public Result<?> getActivityPageList(String title, String state,String timeStr,String cityId, PageBean pageBean){
-        Page<PopularizeActivity> page = new Page<PopularizeActivity>(pageBean.getPageNo(), pageBean.getPageSize());
-        Page<PopularizeActivity> page1 = popularizeActivityService
+
+        // 添加活动时间在当前时间之前的条件
+
+        List<PopularizeActivity> activityList = popularizeActivityService
                 .lambdaQuery()
-                .eq(PopularizeActivity::getState,state)
-                .orderByDesc(PopularizeActivity::getCreateTime)
-                .page(page);
-        //如果标题不为空
-        if(StringUtils.isNotBlank(title)){
-            page1 = popularizeActivityService
-                    .lambdaQuery()
-                    .like(PopularizeActivity::getTitle,title)
-                    .eq(PopularizeActivity::getState,state)
-                    .orderByDesc(PopularizeActivity::getCreateTime)
-                    .page(page);
+                .lt(PopularizeActivity::getStartTime, LocalDateTime.now())
+                .list(); // 这是一个假设的方法名，您需要根据实际情况调整
+
+        for (PopularizeActivity activity : activityList) {
+            activity.setType("1"); // 设置状态为往期活动
+            activity.setState(1); //设置活动已经结束
+            popularizeActivityService.updateById(activity);
         }
-        //如果时间不为空
-        if(StringUtils.isNotBlank(timeStr)){
-            page1 = popularizeActivityService
+
+        if(state.equals("0")){
+            Page<PopularizeActivity> page = new Page<PopularizeActivity>(pageBean.getPageNo(), pageBean.getPageSize());
+            Page<PopularizeActivity> page1 = popularizeActivityService
                     .lambdaQuery()
-                    .like(PopularizeActivity::getStartTime,timeStr)
                     .eq(PopularizeActivity::getState,state)
                     .orderByDesc(PopularizeActivity::getCreateTime)
                     .page(page);
-        }
-        //如果地址不为空
-        if(StringUtils.isNotBlank(cityId)){
-            page1 = popularizeActivityService
+            //如果标题不为空
+            if(StringUtils.isNotBlank(title)){
+                page1 = popularizeActivityService
+                        .lambdaQuery()
+                        .like(PopularizeActivity::getTitle,title)
+                        .eq(PopularizeActivity::getState,state)
+                        .orderByDesc(PopularizeActivity::getCreateTime)
+                        .page(page);
+            }
+            //如果时间不为空
+            if(StringUtils.isNotBlank(timeStr)){
+                page1 = popularizeActivityService
+                        .lambdaQuery()
+                        .like(PopularizeActivity::getStartTime,timeStr)
+                        .eq(PopularizeActivity::getState,state)
+                        .orderByDesc(PopularizeActivity::getCreateTime)
+                        .page(page);
+            }
+            //如果地址不为空
+            if(StringUtils.isNotBlank(cityId)){
+                page1 = popularizeActivityService
+                        .lambdaQuery()
+                        .eq(PopularizeActivity::getCityId,cityId)
+                        .eq(PopularizeActivity::getState,state)
+                        .orderByDesc(PopularizeActivity::getCreateTime)
+                        .page(page);
+                if(StringUtils.isNotBlank(title)){
+                    page1 = popularizeActivityService
+                            .lambdaQuery()
+                            .eq(PopularizeActivity::getCityId,cityId)
+                            .like(PopularizeActivity::getTitle,title)
+                            .eq(PopularizeActivity::getState,state)
+                            .orderByDesc(PopularizeActivity::getCreateTime)
+                            .page(page);
+                }
+            }
+
+            //得到集合
+            List<PopularizeActivity> records = page1.getRecords();
+            //创建一个新的集合
+            List<PopularizeActivity> recruitList = new ArrayList<>();
+            for (PopularizeActivity recruit : records) {
+                //创建一个对象
+                PopularizeActivity recruitObj = recruit;
+                recruitObj.setPopularizeOrderList(
+                        popularizeOrderService
+                                .lambdaQuery()
+                                .eq(PopularizeOrder::getActivityOrderId, recruit.getId())
+                                .ge(PopularizeOrder::getState, 1)
+                                .list()
+                );
+                //查询订单购票数量之和
+                Integer i = popularizeOrderService.sumNumByActivityOrderIdAndState(recruit.getId());
+                recruitObj.setNum(i);
+
+                recruitList.add(recruitObj);
+            }
+
+            page1.setRecords(recruitList);
+            return Result.OK(page1);
+        }else{
+            Page<PopularizeActivity> page = new Page<PopularizeActivity>(pageBean.getPageNo(), pageBean.getPageSize());
+            Page<PopularizeActivity> page1 = popularizeActivityService
                     .lambdaQuery()
-                    .eq(PopularizeActivity::getCityId,cityId)
                     .eq(PopularizeActivity::getState,state)
-                    .orderByDesc(PopularizeActivity::getCreateTime)
+                    .orderByAsc(PopularizeActivity::getCreateTime)
                     .page(page);
+            //如果标题不为空
             if(StringUtils.isNotBlank(title)){
                 page1 = popularizeActivityService
                         .lambdaQuery()
-                        .eq(PopularizeActivity::getCityId,cityId)
                         .like(PopularizeActivity::getTitle,title)
                         .eq(PopularizeActivity::getState,state)
-                        .orderByDesc(PopularizeActivity::getCreateTime)
+                        .orderByAsc(PopularizeActivity::getCreateTime)
                         .page(page);
             }
-        }
+            //如果时间不为空
+            if(StringUtils.isNotBlank(timeStr)){
+                page1 = popularizeActivityService
+                        .lambdaQuery()
+                        .like(PopularizeActivity::getStartTime,timeStr)
+                        .eq(PopularizeActivity::getState,state)
+                        .orderByAsc(PopularizeActivity::getCreateTime)
+                        .page(page);
+            }
+            //如果地址不为空
+            if(StringUtils.isNotBlank(cityId)){
+                page1 = popularizeActivityService
+                        .lambdaQuery()
+                        .eq(PopularizeActivity::getCityId,cityId)
+                        .eq(PopularizeActivity::getState,state)
+                        .orderByAsc(PopularizeActivity::getCreateTime)
+                        .page(page);
+                if(StringUtils.isNotBlank(title)){
+                    page1 = popularizeActivityService
+                            .lambdaQuery()
+                            .eq(PopularizeActivity::getCityId,cityId)
+                            .like(PopularizeActivity::getTitle,title)
+                            .eq(PopularizeActivity::getState,state)
+                            .orderByAsc(PopularizeActivity::getCreateTime)
+                            .page(page);
+                }
+            }
+
+            //得到集合
+            List<PopularizeActivity> records = page1.getRecords();
+            //创建一个新的集合
+            List<PopularizeActivity> recruitList = new ArrayList<>();
+            for (PopularizeActivity recruit : records) {
+                //创建一个对象
+                PopularizeActivity recruitObj = recruit;
+                recruitObj.setPopularizeOrderList(
+                        popularizeOrderService
+                                .lambdaQuery()
+                                .eq(PopularizeOrder::getActivityOrderId, recruit.getId())
+                                .ge(PopularizeOrder::getState, 1)
+                                .list()
+                );
+                //查询订单购票数量之和
+                Integer i = popularizeOrderService.sumNumByActivityOrderIdAndState(recruit.getId());
+                recruitObj.setNum(i);
 
+                recruitList.add(recruitObj);
+            }
+
+            page1.setRecords(recruitList);
+            return Result.OK(page1);
+        }
 
 
 
 
 
-        //得到集合
-        List<PopularizeActivity> records = page1.getRecords();
-        //创建一个新的集合
-        List<PopularizeActivity> recruitList = new ArrayList<>();
-        for (PopularizeActivity recruit : records) {
-            //创建一个对象
-            PopularizeActivity recruitObj = recruit;
-            recruitObj.setPopularizeOrderList(
-                    popularizeOrderService
-                            .lambdaQuery()
-                            .eq(PopularizeOrder::getActivityOrderId, recruit.getId())
-                            .ge(PopularizeOrder::getState, 1)
-                            .list()
-            );
-            //查询订单购票数量之和
-            Integer i = popularizeOrderService.sumNumByActivityOrderIdAndState(recruit.getId(), 1);
-            recruitObj.setNum(i);
 
-            recruitList.add(recruitObj);
-        }
 
-        page1.setRecords(recruitList);
-        return Result.OK(page1);
     }
 
 
@@ -314,7 +400,7 @@ public class ApiIndexServiceImpl implements ApiIndexService {
             );
 
             //查询订单购票数量之和
-            Integer i = popularizeOrderService.sumNumByTravelOrderIdAndState(recruit.getId(), 1);
+            Integer i = popularizeOrderService.sumNumByTravelOrderIdAndState(recruit.getId());
             if(i == null){
                 i = 0;
             }
@@ -706,13 +792,16 @@ public class ApiIndexServiceImpl implements ApiIndexService {
         Page<PopularizeRecruit> page = new Page<PopularizeRecruit>(pageBean.getPageNo(), pageBean.getPageSize());
         Page<PopularizeRecruit> page1 = popularizeRecruitService
                 .lambdaQuery()
+                .eq(PopularizeRecruit::getStateOn,0)
                 .orderByDesc(PopularizeRecruit::getCreateTime)
                 .page(page);
         //如果标题不为空
         if(StringUtils.isNotBlank(title)){
             page1 = popularizeRecruitService
                     .lambdaQuery()
+                    .eq(PopularizeRecruit::getStateOn,0)
                     .like(PopularizeRecruit::getTitle,title)
+
                     .orderByDesc(PopularizeRecruit::getCreateTime)
                     .page(page);
         }
@@ -729,6 +818,21 @@ public class ApiIndexServiceImpl implements ApiIndexService {
                             .list()
             );
             recruitObj.setNum(recruitObj.getPopularizeRecruitLogList().size());
+            //查询我是不是已经提交了
+            if(StringUtils.isNotBlank(token)){
+                //查询是否已经点击了招募
+                HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+                PopularizeRecruitLog one1 = popularizeRecruitLogService.lambdaQuery()
+                        .eq(PopularizeRecruitLog::getUserId, member.getId())
+                        .eq(PopularizeRecruitLog::getRecruitId, recruit.getId())
+                        .one();
+                if(one1!=null){
+                    recruitObj.setOpenState(one1.getState());
+                }else{
+                    recruitObj.setOpenState(0);
+                }
+            }
+
             recruitList.add(recruitObj);
         }
 
@@ -1024,7 +1128,7 @@ public class ApiIndexServiceImpl implements ApiIndexService {
                 .eq(PopularizeRecruitLog::getRecruitId, recruitId)
                 .one();
         if(one1!=null){
-            return Result.error("您已经参与过该招募活动");
+            return Result.error("参与招募成功，已提交后台审核");
         }
         //增加招募记录
         PopularizeRecruitLog popularizeRecruitLog = new PopularizeRecruitLog();
@@ -1035,6 +1139,7 @@ public class ApiIndexServiceImpl implements ApiIndexService {
         popularizeRecruitLog.setName(one.getName());
         popularizeRecruitLog.setPhone(one.getPhone());
         popularizeRecruitLog.setHeadImage(hanHaiMember.getHeadImage());
+        popularizeRecruitLog.setState(1);
         popularizeRecruitLogService.save(popularizeRecruitLog);
         return Result.OK();
     }

module-common/src/main/java/org/jeecg/modules/popularizeActivity/controller/PopularizeActivityController.java

@@ -1,18 +1,14 @@
 package org.jeecg.modules.popularizeActivity.controller;
 
+import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.popularizeActivity.entity.PopularizeActivity;
 import org.jeecg.modules.popularizeActivity.service.IPopularizeActivityService;
 
@@ -21,20 +17,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.popularizeOrder.entity.PopularizeOrder;
+import org.jeecg.modules.popularizeOrder.service.IPopularizeOrderService;
 import org.jeecg.modules.popularizeRecruit.entity.PopularizeRecruit;
 import org.jeecg.modules.popularizeRecruit.service.IPopularizeRecruitService;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -52,8 +42,11 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class PopularizeActivityController extends JeecgController<PopularizeActivity, IPopularizeActivityService> {
 	@Autowired
 	private IPopularizeActivityService popularizeActivityService;
-	 @Autowired
-	 private IPopularizeRecruitService popularizeRecruitService;
+	@Autowired
+	private IPopularizeRecruitService popularizeRecruitService;
+	@Autowired
+	private IPopularizeOrderService popularizeOrderService;
+
 	
 	/**
 	 * 分页列表查询
@@ -71,10 +64,45 @@ public class PopularizeActivityController extends JeecgController<PopularizeActi
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
+		//查询活动时在当前时间之前的数据
+		// 添加活动时间在当前时间之前的条件
+		QueryWrapper<PopularizeActivity> queryList = QueryGenerator.initQueryWrapper(popularizeActivity, req.getParameterMap());
+		LocalDateTime currentTime = LocalDateTime.now();
+		queryList.lt("start_time", currentTime); // 假设activityTime是数据库中的字段名，lt表示小于（less than）
+		List<PopularizeActivity> activityList = popularizeActivityService.list(queryList); // 这是一个假设的方法名，您需要根据实际情况调整
+
+		for (PopularizeActivity activity : activityList) {
+			activity.setState(1); //设置活动已经结束
+			activity.setType("1"); // 设置状态为往期活动
+			popularizeActivityService.updateById(activity);
+		}
+
 		QueryWrapper<PopularizeActivity> queryWrapper = QueryGenerator.initQueryWrapper(popularizeActivity, req.getParameterMap());
 		Page<PopularizeActivity> page = new Page<PopularizeActivity>(pageNo, pageSize);
 		IPage<PopularizeActivity> pageList = popularizeActivityService.page(page, queryWrapper);
+
+		//得到集合
+		List<PopularizeActivity> records = pageList.getRecords();
+		//创建一个新的集合
+		List<PopularizeActivity> recruitList = new ArrayList<>();
+		for (PopularizeActivity recruit : records) {
+			PopularizeActivity  recruitObj = recruit;
+			//查询订单购票数量之和
+			Integer i = popularizeOrderService.sumNumByActivityOrderIdAndState(recruit.getId());
+			if(i==null){
+				recruitObj.setNum(0);
+			}else{
+				recruitObj.setNum(i);
+			}
+			recruitList.add(recruitObj);
+		}
+
+		pageList.setRecords(recruitList);
 		return Result.OK(pageList);
+
+
+
+//		return Result.OK(pageList);
 	}
 	
 	/**
@@ -94,6 +122,11 @@ public class PopularizeActivityController extends JeecgController<PopularizeActi
 				.eq(PopularizeRecruit::getType,"0")
 				.eq(PopularizeRecruit::getActivityId,popularizeActivity.getId())
 				.one();
+
+
+
+
+
 		//如果不为空则增加
 		if(byId==null){
 			PopularizeRecruit recruit = new PopularizeRecruit();
@@ -108,6 +141,7 @@ public class PopularizeActivityController extends JeecgController<PopularizeActi
 			recruit.setIsOpen(popularizeActivity.getIsOpen());
 			recruit.setState(1);
 			recruit.setNum(0);
+			recruit.setStateOn(0);
 			recruit.setType("0");
 			recruit.setTravelId(popularizeActivity.getId());
 			popularizeRecruitService.save(recruit);
@@ -146,6 +180,7 @@ public class PopularizeActivityController extends JeecgController<PopularizeActi
 			recruit.setIsOpen(popularizeActivity.getIsOpen());
 			recruit.setState(1);
 			recruit.setNum(0);
+			recruit.setStateOn(0);
 			recruit.setType("0");
 			recruit.setActivityId(popularizeActivity.getId());
 			popularizeRecruitService.save(recruit);
@@ -160,6 +195,7 @@ public class PopularizeActivityController extends JeecgController<PopularizeActi
 			byId.setEnAddress(popularizeActivity.getEnAddress());
 			byId.setIsOpen(popularizeActivity.getIsOpen());
 			byId.setState(1);
+			byId.setStateOn(0);
 			byId.setNum(0);
 			byId.setType("0");
 			byId.setActivityId(popularizeActivity.getId());
@@ -210,6 +246,12 @@ public class PopularizeActivityController extends JeecgController<PopularizeActi
 		if(popularizeActivity==null) {
 			return Result.error("未找到对应数据");
 		}
+		Integer i = popularizeOrderService.sumNumByActivityOrderIdAndState(id);
+		if(i==null){
+			popularizeActivity.setNum(0);
+		}else{
+			popularizeActivity.setNum(i);
+		}
 		return Result.OK(popularizeActivity);
 	}
 

module-common/src/main/java/org/jeecg/modules/popularizeOrder/entity/PopularizeOrder.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.popularizeOrder.entity;
 import java.io.Serializable;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -132,4 +133,13 @@ public class PopularizeOrder implements Serializable {
 	@Excel(name = "邀请码", width = 15)
     @ApiModelProperty(value = "邀请码")
     private java.lang.String code;
+
+    @Excel(name = "退款金额", width = 15)
+    @ApiModelProperty(value = "退款金额")
+    private java.math.BigDecimal payTuiPrice;
+
+    @TableField(exist = false)
+    private java.math.BigDecimal tuiPrice;
+
+
 }

module-common/src/main/java/org/jeecg/modules/popularizeOrder/mapper/PopularizeOrderMapper.java

@@ -13,11 +13,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface PopularizeOrderMapper extends BaseMapper<PopularizeOrder> {
 
-    @Select("SELECT SUM(num) FROM popularize_order WHERE activity_order_id = #{activityOrderId} AND state >= #{state}")
-    Integer sumNumByActivityOrderIdAndState(@Param("activityOrderId") String activityOrderId, @Param("state") Integer state);
+    @Select("SELECT SUM(num) FROM popularize_order WHERE activity_order_id = #{activityOrderId} AND state in(1,2)")
+    Integer sumNumByActivityOrderIdAndState(@Param("activityOrderId") String activityOrderId);
+
+
+    @Select("SELECT SUM(num) FROM popularize_order WHERE travel_order_id = #{travelOrderId} AND state in(1,2)")
+    Integer sumNumByTravelOrderIdAndState(@Param("travelOrderId") String travelOrderId);
+
 
 
-    @Select("SELECT SUM(num) FROM popularize_order WHERE travel_order_id = #{travelOrderId} AND state >= #{state}")
-    Integer sumNumByTravelOrderIdAndState(@Param("travelOrderId") String travelOrderId, @Param("state") Integer state);
 
 }

module-common/src/main/java/org/jeecg/modules/popularizeOrder/service/IPopularizeOrderService.java

@@ -12,8 +12,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface IPopularizeOrderService extends IService<PopularizeOrder> {
 
 
-    Integer sumNumByActivityOrderIdAndState(String activityOrderId, Integer state);
+    Integer sumNumByActivityOrderIdAndState(String activityOrderId);
 
 
-    Integer sumNumByTravelOrderIdAndState(String travelOrderId, Integer state);
+    Integer sumNumByTravelOrderIdAndState(String travelOrderId);
 }

module-common/src/main/java/org/jeecg/modules/popularizeOrder/service/impl/PopularizeOrderServiceImpl.java

@@ -25,15 +25,15 @@ public class PopularizeOrderServiceImpl extends ServiceImpl<PopularizeOrderMappe
 
 
     @Override
-    public Integer sumNumByActivityOrderIdAndState(String activityOrderId, Integer state){
-        return popularizeOrderMapper.sumNumByActivityOrderIdAndState(activityOrderId,state);
+    public Integer sumNumByActivityOrderIdAndState(String activityOrderId){
+        return popularizeOrderMapper.sumNumByActivityOrderIdAndState(activityOrderId);
     }
 
 
 
     @Override
-    public Integer sumNumByTravelOrderIdAndState(String travelOrderId, Integer state){
-        return popularizeOrderMapper.sumNumByTravelOrderIdAndState(travelOrderId,state);
+    public Integer sumNumByTravelOrderIdAndState(String travelOrderId){
+        return popularizeOrderMapper.sumNumByTravelOrderIdAndState(travelOrderId);
     }
 
 }

module-common/src/main/java/org/jeecg/modules/popularizeRecruit/controller/PopularizeRecruitController.java

@@ -1,17 +1,12 @@
 package org.jeecg.modules.popularizeRecruit.controller;
 
+import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.popularizeRecruit.entity.PopularizeRecruit;
 import org.jeecg.modules.popularizeRecruit.service.IPopularizeRecruitService;
 
@@ -20,18 +15,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -66,6 +53,20 @@ public class PopularizeRecruitController extends JeecgController<PopularizeRecru
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
+
+		// 添加活动时间在当前时间之前的条件
+		QueryWrapper<PopularizeRecruit> queryList = QueryGenerator.initQueryWrapper(popularizeRecruit, req.getParameterMap());
+		LocalDateTime currentTime = LocalDateTime.now();
+		queryList.lt("start_time", currentTime); // 假设activityTime是数据库中的字段名，lt表示小于（less than）
+		List<PopularizeRecruit> activityList = popularizeRecruitService.list(queryList); // 这是一个假设的方法名，您需要根据实际情况调整
+
+		for (PopularizeRecruit activity : activityList) {
+			activity.setStateOn(1); // 设置状态为招募关闭
+			popularizeRecruitService.updateById(activity);
+		}
+
+
+
 		QueryWrapper<PopularizeRecruit> queryWrapper = QueryGenerator.initQueryWrapper(popularizeRecruit, req.getParameterMap());
 		Page<PopularizeRecruit> page = new Page<PopularizeRecruit>(pageNo, pageSize);
 		IPage<PopularizeRecruit> pageList = popularizeRecruitService.page(page, queryWrapper);

module-common/src/main/java/org/jeecg/modules/popularizeRecruit/entity/PopularizeRecruit.java

@@ -1,9 +1,6 @@
 package org.jeecg.modules.popularizeRecruit.entity;
 
 import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
 import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -11,9 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import org.jeecg.modules.popularizeRecruitLog.entity.PopularizeRecruitLog;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
@@ -112,8 +107,16 @@ public class PopularizeRecruit implements Serializable {
     @ApiModelProperty(value = "类型")
     private java.lang.String type;
 
+    /**招募状态*/
+    @Excel(name = "招募状态", width = 15, dicCode = "state_on")
+    @Dict(dicCode = "state_on")
+    @ApiModelProperty(value = "类型")
+    private java.lang.Integer stateOn;
+
 
     @TableField(exist = false)
     private List<PopularizeRecruitLog> popularizeRecruitLogList;
+    @TableField(exist = false)
+    private java.lang.Integer openState;
 
 }

module-common/src/main/java/org/jeecg/modules/popularizeRecruit/mapper/PopularizeRecruitMapper.java

@@ -1,8 +1,5 @@
 package org.jeecg.modules.popularizeRecruit.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.popularizeRecruit.entity.PopularizeRecruit;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 

module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/controller/PopularizeRecruitLogController.java

@@ -12,6 +12,8 @@ import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.popularizeActivity.entity.PopularizeActivity;
+import org.jeecg.modules.popularizeActivity.service.IPopularizeActivityService;
 import org.jeecg.modules.popularizeRecruitLog.entity.PopularizeRecruitLog;
 import org.jeecg.modules.popularizeRecruitLog.service.IPopularizeRecruitLogService;
 
@@ -39,7 +41,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 招募报名日志
  * @Author: jeecg-boot
- * @Date:   2025-01-06
+ * @Date:   2025-02-21
  * @Version: V1.0
  */
 @Api(tags="招募报名日志")
@@ -49,6 +51,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class PopularizeRecruitLogController extends JeecgController<PopularizeRecruitLog, IPopularizeRecruitLogService> {
 	@Autowired
 	private IPopularizeRecruitLogService popularizeRecruitLogService;
+	 private IPopularizeActivityService popularizeActivityService;
 	
 	/**
 	 * 分页列表查询
@@ -96,7 +99,20 @@ public class PopularizeRecruitLogController extends JeecgController<PopularizeRe
 	@ApiOperation(value="招募报名日志-编辑", notes="招募报名日志-编辑")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody PopularizeRecruitLog popularizeRecruitLog) {
-		popularizeRecruitLogService.updateById(popularizeRecruitLog);
+		if(popularizeRecruitLog.getState() ==2){
+			//查询该活动是不是有人已经审核通过
+			PopularizeRecruitLog one = popularizeRecruitLogService.lambdaQuery()
+					.eq(PopularizeRecruitLog::getRecruitId, popularizeRecruitLog.getRecruitId())
+					.eq(PopularizeRecruitLog::getState, 2)
+					.one();
+			if(one!=null){
+				return Result.error("该活动已经有人审核通过，不能重复审核");
+			}else{
+				popularizeRecruitLogService.updateById(popularizeRecruitLog);
+			}
+		}else{
+			popularizeRecruitLogService.updateById(popularizeRecruitLog);
+		}
 		return Result.OK("编辑成功!");
 	}
 	

module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/entity/PopularizeRecruitLog.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 招募报名日志
  * @Author: jeecg-boot
- * @Date:   2025-01-06
+ * @Date:   2025-02-21
  * @Version: V1.0
  */
 @Data
@@ -48,7 +48,8 @@ public class PopularizeRecruitLog implements Serializable {
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
 	/**用户信息*/
-	@Excel(name = "用户信息", width = 15)
+	@Excel(name = "用户信息", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
     @ApiModelProperty(value = "用户信息")
     private java.lang.String userId;
 	/**姓名*/
@@ -64,11 +65,17 @@ public class PopularizeRecruitLog implements Serializable {
     @ApiModelProperty(value = "头像")
     private java.lang.String headImage;
 	/**招募项目*/
-	@Excel(name = "招募项目", width = 15)
+	@Excel(name = "招募项目", width = 15, dictTable = "popularize_recruit", dicText = "title", dicCode = "id")
+	@Dict(dictTable = "popularize_recruit", dicText = "title", dicCode = "id")
     @ApiModelProperty(value = "招募项目")
     private java.lang.String recruitId;
 	/**项目时间*/
 	@Excel(name = "项目时间", width = 15)
     @ApiModelProperty(value = "项目时间")
     private java.util.Date recruitTime;
+	/**审核状态*/
+	@Excel(name = "审核状态", width = 15, dicCode = "recruit_state")
+	@Dict(dicCode = "recruit_state")
+    @ApiModelProperty(value = "审核状态")
+    private java.lang.Integer state;
 }

module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/mapper/PopularizeRecruitLogMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 招募报名日志
  * @Author: jeecg-boot
- * @Date:   2025-01-06
+ * @Date:   2025-02-21
  * @Version: V1.0
  */
 public interface PopularizeRecruitLogMapper extends BaseMapper<PopularizeRecruitLog> {

module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue/PopularizeRecruitLogList.vue → module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/popularizeRecruitLog/PopularizeRecruitLogList.vue

@@ -4,6 +4,43 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="用户信息">
+              <j-search-select-tag placeholder="请选择用户信息" v-model="queryParam.userId" dict="han_hai_member,nick_name,id"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="姓名">
+              <a-input placeholder="请输入姓名" v-model="queryParam.name"></a-input>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="电话">
+                <a-input placeholder="请输入电话" v-model="queryParam.phone"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="招募项目">
+                <j-search-select-tag placeholder="请选择招募项目" v-model="queryParam.recruitId" dict="popularize_recruit,title,id"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="审核状态">
+                <j-dict-select-tag placeholder="请选择审核状态" v-model="queryParam.state" dictCode="recruit_state"/>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
         </a-row>
       </a-form>
     </div>
@@ -99,6 +136,7 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import PopularizeRecruitLogModal from './modules/PopularizeRecruitLogModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
     name: 'PopularizeRecruitLogList',
@@ -124,7 +162,7 @@
           {
             title:'用户信息',
             align:"center",
-            dataIndex: 'userId'
+            dataIndex: 'userId_dictText'
           },
           {
             title:'姓名',
@@ -139,18 +177,24 @@
           {
             title:'头像',
             align:"center",
-            dataIndex: 'headImage'
+            dataIndex: 'headImage',
+            scopedSlots: {customRender: 'imgSlot'}
           },
           {
             title:'招募项目',
             align:"center",
-            dataIndex: 'recruitId'
+            dataIndex: 'recruitId_dictText'
           },
           {
             title:'项目时间',
             align:"center",
             dataIndex: 'recruitTime'
           },
+          {
+            title:'审核状态',
+            align:"center",
+            dataIndex: 'state_dictText'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -185,12 +229,13 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'string',value:'userId',text:'用户信息',dictCode:''})
+        fieldList.push({type:'sel_search',value:'userId',text:'用户信息',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
         fieldList.push({type:'string',value:'name',text:'姓名',dictCode:''})
         fieldList.push({type:'string',value:'phone',text:'电话',dictCode:''})
         fieldList.push({type:'Text',value:'headImage',text:'头像',dictCode:''})
-        fieldList.push({type:'string',value:'recruitId',text:'招募项目',dictCode:''})
+        fieldList.push({type:'sel_search',value:'recruitId',text:'招募项目',dictTable:"popularize_recruit", dictText:'title', dictCode:'id'})
         fieldList.push({type:'datetime',value:'recruitTime',text:'项目时间'})
+        fieldList.push({type:'int',value:'state',text:'审核状态',dictCode:'recruit_state'})
         this.superFieldList = fieldList
       }
     }

module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue/modules/PopularizeRecruitLogForm.vue → module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/popularizeRecruitLog/modules/PopularizeRecruitLogForm.vue

@@ -5,7 +5,7 @@
         <a-row>
           <a-col :span="24">
             <a-form-model-item label="用户信息" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
-              <a-input v-model="model.userId" placeholder="请输入用户信息"  ></a-input>
+              <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id"  />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -20,12 +20,12 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="headImage">
-              <a-input v-model="model.headImage" placeholder="请输入头像"  ></a-input>
+              <j-image-upload isMultiple  v-model="model.headImage" ></j-image-upload>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="招募项目" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="recruitId">
-              <a-input v-model="model.recruitId" placeholder="请输入招募项目"  ></a-input>
+              <j-search-select-tag v-model="model.recruitId" dict="popularize_recruit,title,id"  />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -33,6 +33,11 @@
               <j-date placeholder="请选择项目时间"  v-model="model.recruitTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="审核状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
+              <j-dict-select-tag type="list" v-model="model.state" dictCode="recruit_state" placeholder="请选择审核状态" />
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/popularizeRecruitLog/modules/PopularizeRecruitLogModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <popularize-recruit-log-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></popularize-recruit-log-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import PopularizeRecruitLogForm from './PopularizeRecruitLogForm'
+
+  export default {
+    name: 'PopularizeRecruitLogModal',
+    components: {
+      PopularizeRecruitLogForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/popularizeRecruitLog/modules/PopularizeRecruitLogModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <popularize-recruit-log-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></popularize-recruit-log-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import PopularizeRecruitLogForm from './PopularizeRecruitLogForm'
+  export default {
+    name: 'PopularizeRecruitLogModal',
+    components: {
+      PopularizeRecruitLogForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/service/IPopularizeRecruitLogService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 招募报名日志
  * @Author: jeecg-boot
- * @Date:   2025-01-06
+ * @Date:   2025-02-21
  * @Version: V1.0
  */
 public interface IPopularizeRecruitLogService extends IService<PopularizeRecruitLog> {

module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/service/impl/PopularizeRecruitLogServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 招募报名日志
  * @Author: jeecg-boot
- * @Date:   2025-01-06
+ * @Date:   2025-02-21
  * @Version: V1.0
  */
 @Service

module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue3/PopularizeRecruitLog.data.ts

@@ -7,7 +7,7 @@ export const columns: BasicColumn[] = [
     {
     title: '用户信息',
     align:"center",
-    dataIndex: 'userId'
+    dataIndex: 'userId_dictText'
    },
    {
     title: '姓名',
@@ -22,28 +22,76 @@ export const columns: BasicColumn[] = [
    {
     title: '头像',
     align:"center",
-    dataIndex: 'headImage'
+    dataIndex: 'headImage',
+    customRender:render.renderAvatar,
    },
    {
     title: '招募项目',
     align:"center",
-    dataIndex: 'recruitId'
+    dataIndex: 'recruitId_dictText'
    },
    {
     title: '项目时间',
     align:"center",
     dataIndex: 'recruitTime'
    },
+   {
+    title: '审核状态',
+    align:"center",
+    dataIndex: 'state_dictText'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
+	{
+      label: "用户信息",
+      field: "userId",
+      component: 'JSearchSelect',
+      componentProps:{
+         dict:"han_hai_member,nick_name,id"
+      },
+      colProps: {span: 6},
+ 	},
+	{
+      label: "姓名",
+      field: "name",
+      component: 'Input',
+      colProps: {span: 6},
+ 	},
+	{
+      label: "电话",
+      field: "phone",
+      component: 'Input',
+      colProps: {span: 6},
+ 	},
+	{
+      label: "招募项目",
+      field: "recruitId",
+      component: 'JSearchSelect',
+      componentProps:{
+         dict:"popularize_recruit,title,id"
+      },
+      colProps: {span: 6},
+ 	},
+	{
+      label: "审核状态",
+      field: "state",
+      component: 'JDictSelectTag',
+      componentProps:{
+          dictCode:"recruit_state"
+      },
+      colProps: {span: 6},
+ 	},
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
   {
     label: '用户信息',
     field: 'userId',
-    component: 'Input',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"han_hai_member,nick_name,id"
+    },
   },
   {
     label: '姓名',
@@ -58,16 +106,29 @@ export const formSchema: FormSchema[] = [
   {
     label: '头像',
     field: 'headImage',
-    component: 'Input',
+     component: 'JImageUpload',
+     componentProps:{
+      },
   },
   {
     label: '招募项目',
     field: 'recruitId',
-    component: 'Input',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"popularize_recruit,title,id"
+    },
   },
   {
     label: '项目时间',
     field: 'recruitTime',
     component: 'Input',
   },
+  {
+    label: '审核状态',
+    field: 'state',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"recruit_state"
+     },
+  },
 ];

module-common/src/main/java/org/jeecg/modules/popularizeTravel/controller/PopularizeTravelController.java

@@ -1,18 +1,15 @@
 package org.jeecg.modules.popularizeTravel.controller;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.popularizeActivity.entity.PopularizeActivity;
+import org.jeecg.modules.popularizeOrder.service.IPopularizeOrderService;
 import org.jeecg.modules.popularizeRecruit.entity.PopularizeRecruit;
 import org.jeecg.modules.popularizeRecruit.service.IPopularizeRecruitService;
 import org.jeecg.modules.popularizeTravel.entity.PopularizeTravel;
@@ -23,18 +20,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -54,6 +43,9 @@ public class PopularizeTravelController extends JeecgController<PopularizeTravel
 	private IPopularizeTravelService popularizeTravelService;
 	@Autowired
 	private IPopularizeRecruitService popularizeRecruitService;
+	 @Autowired
+	 private IPopularizeOrderService popularizeOrderService;
+
 
 	/**
 	 * 分页列表查询
@@ -74,7 +66,26 @@ public class PopularizeTravelController extends JeecgController<PopularizeTravel
 		QueryWrapper<PopularizeTravel> queryWrapper = QueryGenerator.initQueryWrapper(popularizeTravel, req.getParameterMap());
 		Page<PopularizeTravel> page = new Page<PopularizeTravel>(pageNo, pageSize);
 		IPage<PopularizeTravel> pageList = popularizeTravelService.page(page, queryWrapper);
+
+		//得到集合
+		List<PopularizeTravel> records = pageList.getRecords();
+		//创建一个新的集合
+		List<PopularizeTravel> recruitList = new ArrayList<>();
+		for (PopularizeTravel recruit : records) {
+			PopularizeTravel  recruitObj = recruit;
+			//查询订单购票数量之和
+			Integer i = popularizeOrderService.sumNumByTravelOrderIdAndState(recruit.getId());
+			if(i==null){
+				recruitObj.setNum(0);
+			}else{
+				recruitObj.setNum(i);
+			}
+			recruitList.add(recruitObj);
+		}
+
+		pageList.setRecords(recruitList);
 		return Result.OK(pageList);
+//		return Result.OK(pageList);
 	}
 	
 	/**