更新

admin-ui/src/assets/styles/extend.scss

@@ -2,7 +2,7 @@
 .vl-notify-mask {
   background-color: black !important;
   opacity: 0.4 !important;
-  z-index: 1503!important;
+  z-index: 1503 !important;
 }
 .vl-notify.vl-notify-msg.vl-notify-loading {
   z-index: 1505 !important;
@@ -399,3 +399,11 @@
     padding-top: 20px;
   }
 }
+.jlu {
+  margin-bottom: 15px;
+  color: #323232;
+  font-weight: bold;
+  .sp {
+    padding-right: 15px;
+  }
+}

admin-ui/src/views/work/statement/audit/index.vue

@@ -25,9 +25,9 @@
     <el-table :data="response.rows" border height="calc(100vh - 235px)">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column type="index" label="序号" align="center" width="80" />
-      <el-table-column label="结算单号" align="center" prop="num" width="160" />
+      <el-table-column label="结算单号" align="center" prop="num"/>
       <el-table-column label="结算批次" align="center" prop="batchName" />
-      <el-table-column label="服务公司" align="center" width="150">
+      <el-table-column label="服务公司" align="center">
         <template slot-scope="scope">
           <div class="omit" :title="scope.row.serviceCompany">{{ scope.row.serviceCompany }}</div>
         </template>
@@ -63,7 +63,7 @@
 </template>
 
 <script>
-import record from './record';
+import record from '@/views/work/statement/manage/record';
 export default {
   data() {
     return {
@@ -101,7 +101,7 @@ export default {
     op(tag, row) {
       const id = row.id;
       if (tag == 'detail') {
-        this.iframe({ obj: record, param: { id: id, detail: true }, title: '查看详情', width: '75%', height: '65%' });
+        this.iframe({ obj: record, param: { form: row, detail: true }, title: '查看结算单详情', width: '75%', height: '65%' });
       }
       if (tag == 'success') {
         this.$confirm('是否确认审核通过?', '警告', { type: 'warning' }).then(() => {

admin-ui/src/views/work/statement/audit/record.vue

@@ -1,96 +0,0 @@
-<template>
-  <div class="cmain">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" @submit.native.prevent v-show="showSearch">
-      <el-form-item label="姓名" prop="name">
-        <el-input v-model="queryParams.name" placeholder="请输入姓名" @keyup.enter.native="handleQuery" class="inp" clearable />
-      </el-form-item>
-      <el-form-item label="手机号" prop="phone">
-        <el-input v-model="queryParams.phone" placeholder="请输入手机号" @keyup.enter.native="handleQuery" class="inp" clearable />
-      </el-form-item>
-      <el-form-item label="身份证号" prop="idCard">
-        <el-input v-model="queryParams.idCard" placeholder="请输入身份证号" @keyup.enter.native="handleQuery" clearable />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-    <el-table :data="response.rows" border>
-      <el-table-column type="index" label="序号" align="center" width="80" />
-      <el-table-column label="姓名" align="center" prop="name" width="100" />
-      <el-table-column label="身份证号" align="center" prop="idCard" width="170" />
-      <el-table-column label="手机号" align="center" prop="phone" width="150" />
-      <el-table-column label="支付宝账户" align="center" prop="alipay" width="130" />
-      <el-table-column label="流水号" align="center" prop="num" width="170" />
-      <el-table-column label="结算金额(元)" align="center" prop="money" width="120" />
-      <el-table-column label="发放业务费(元)" align="center" prop="realMoney" width="120" />
-      <el-table-column label="综合服务费(元)" align="center" prop="serviceMoney" width="120" />
-      <el-table-column label="结算单状态" align="center">
-        <template slot-scope="scope">
-          <span v-if="scope.row.state == 0">待发放</span>
-          <span v-if="scope.row.state == 1">已发放</span>
-        </template>
-      </el-table-column>
-      <template slot="empty">
-        <el-empty></el-empty>
-      </template>
-    </el-table>
-    <pagination v-if="response.total > 0" :total="response.total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
-  </div>
-</template>
-<script>
-export default {
-  data() {
-    return {
-      ids: [],
-      showSearch: true,
-      response: {},
-      dateRange: [],
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        name: null,
-        phone: null,
-        idCard: null,
-        orderByColumn: 'id',
-        isAsc: 'desc'
-      }
-    };
-  },
-  props: {
-    param: {
-      type: Object,
-      default: () => {
-        return {};
-      }
-    },
-    layerid: {
-      type: String
-    }
-  },
-  created() {
-    this.queryParams.statementId = this.param.id;
-    this.getList();
-  },
-  methods: {
-    getList() {
-      this.ajax({ url: '/work/statement/detailList', data: this.queryParams }).then((response) => {
-        this.response = response;
-      });
-    },
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    resetQuery() {
-      this.resetForm('queryForm');
-      this.dateRange = [];
-      this.handleQuery();
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('/work/recharge/export', { ...this.queryParams }, '充值明细.xlsx');
-    }
-  }
-};
-</script>

admin-ui/src/views/work/statement/bill/index.vue

@@ -0,0 +1,96 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" @submit.native.prevent v-show="showSearch">
+      <el-form-item label="结算单号" prop="num">
+        <el-input v-model="queryParams.num" placeholder="请输入结算单号" @keyup.enter.native="handleQuery" clearable />
+      </el-form-item>
+      <el-form-item label="创建日期">
+        <el-date-picker v-model="dateRange" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table :data="response.rows" border height="calc(100vh - 235px)">
+      <el-table-column type="index" label="序号" align="center" width="70" />
+      <el-table-column label="结算单号" align="center" prop="num" width="160" />
+      <el-table-column label="结算批次" align="center" prop="batchName" width="160" />
+      <el-table-column label="服务公司" align="center" width="200">
+        <template slot-scope="scope">
+          <div class="omit" :title="scope.row.serviceCompany">{{ scope.row.serviceCompany }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column label="关联项目" align="center" prop="projectName" width="150" />
+      <el-table-column label="结算人数" align="center" prop="peoples" width="110" />
+      <el-table-column label="结算金额(元)" align="center" prop="money" width="125" />
+      <el-table-column label="发放业务费(元)" align="center" prop="realMoney" width="125" />
+      <el-table-column label="综合服务费(元)" align="center" prop="serviceMoney" width="125" />
+      <el-table-column label="发放状态" align="center" width="110">
+        <template slot-scope="scope">
+          <el-tag type="info" v-if="scope.row.give == 1">待发放</el-tag>
+          <el-tag type="success" v-if="scope.row.give == 2">已发放</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建日期" align="center" prop="giveTime" width="160" />
+      <el-table-column label="操作" align="center" width="160">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-view" @click="op('detail', scope.row)">详情</el-button>
+        </template>
+      </el-table-column>
+      <template slot="empty">
+        <el-empty></el-empty>
+      </template>
+    </el-table>
+    <pagination v-if="response.total > 0" :total="response.total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+  </div>
+</template>
+
+<script>
+import record from '@/views/work/statement/manage/record';
+export default {
+  data() {
+    return {
+      showSearch: true,
+      response: {},
+      dateRange: [],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        num: null,
+        give: null,
+        orderByColumn: 's.id',
+        isAsc: 'desc'
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    getList() {
+      if (this.dateRange) {
+        this.queryParams.dateBegin = this.dateRange[0];
+        this.queryParams.dateEnd = this.dateRange[1];
+      }
+      this.ajax({ url: '/work/statement/bill', data: this.queryParams }).then((response) => {
+        this.response = response;
+      });
+    },
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    resetQuery() {
+      this.resetForm('queryForm');
+      this.dateRange = [];
+      this.handleQuery();
+    },
+    op(tag, row) {
+      if (tag == 'detail') {
+        this.iframe({ obj: record, param: { form: row, detail: true }, title: '查看结算单详情', width: '75%', height: '65%' });
+      }
+    }
+  }
+};
+</script>

admin-ui/src/views/work/statement/give/index.vue

@@ -7,14 +7,11 @@
       <el-form-item label="结算批次" prop="batchName">
         <el-input v-model="queryParams.batchName" placeholder="请输入结算批次" @keyup.enter.native="handleQuery" clearable />
       </el-form-item>
-      <el-form-item label="关联项目" prop="projectId">
-        <projectSelect v-model="queryParams.projectId"></projectSelect>
-      </el-form-item>
-      <el-form-item label="审核状态" prop="audit">
-        <el-select v-model="queryParams.audit" placeholder="充值状态" class="se" clearable>
-          <el-option value="1" label="待审核"></el-option>
-          <el-option value="2" label="审核通过"></el-option>
-          <el-option value="3" label="审核驳回"></el-option>
+      <el-form-item label="发放状态" prop="give">
+        <el-select v-model="queryParams.give" placeholder="充值状态" class="se" clearable>
+          <el-option value="0" label="待发放"></el-option>
+          <el-option value="1" label="待核实"></el-option>
+          <el-option value="2" label="发放成功"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -33,8 +30,10 @@
         </template>
       </el-table-column>
       <el-table-column label="关联项目" align="center" prop="projectName" />
-      <el-table-column label="发放金额(元)" align="center" prop="money" width="110" />
-      <el-table-column label="发放人数" align="center" prop="peoples" width="110" />
+      <el-table-column label="应发人数" align="center" prop="peoples" width="110" />
+      <el-table-column label="应发金额(元)" align="center" prop="money" width="125" />
+      <el-table-column label="发放业务费(元)" align="center" prop="realMoney" width="125" />
+      <el-table-column label="综合服务费(元)" align="center" prop="serviceMoney" width="125" />
       <el-table-column label="发放状态" align="center" width="110">
         <template slot-scope="scope">
           <el-tag type="info" v-if="scope.row.give == 0">待发放</el-tag>
@@ -58,7 +57,7 @@
 </template>
 
 <script>
-import record from './record';
+import record from '@/views/work/statement/manage/record';
 import send from './send';
 export default {
   data() {
@@ -96,7 +95,7 @@ export default {
     op(tag, row) {
       const id = row.id || this.ids[0];
       if (tag == 'detail') {
-        this.iframe({ obj: record, param: { id: id, detail: true }, title: '查看详情', width: '75%', height: '65%' });
+        this.iframe({ obj: record, param: { form: row, detail: true }, title: '查看结算单详情', width: '75%', height: '65%' });
       }
       if (tag == 'send') {
         this.iframe({ obj: send, param: { id: id, row: row }, title: '薪资发放', width: '50%', height: '70%' });

admin-ui/src/views/work/statement/give/record.vue

@@ -1,96 +0,0 @@
-<template>
-  <div class="cmain">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" @submit.native.prevent v-show="showSearch">
-      <el-form-item label="姓名" prop="name">
-        <el-input v-model="queryParams.name" placeholder="请输入姓名" @keyup.enter.native="handleQuery" class="inp" clearable />
-      </el-form-item>
-      <el-form-item label="手机号" prop="phone">
-        <el-input v-model="queryParams.phone" placeholder="请输入手机号" @keyup.enter.native="handleQuery" class="inp" clearable />
-      </el-form-item>
-      <el-form-item label="身份证号" prop="idCard">
-        <el-input v-model="queryParams.idCard" placeholder="请输入身份证号" @keyup.enter.native="handleQuery" clearable />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-    <el-table :data="response.rows" border>
-      <el-table-column type="index" label="序号" align="center" width="80" />
-      <el-table-column label="姓名" align="center" prop="name" width="100" />
-      <el-table-column label="身份证号" align="center" prop="idCard" width="170" />
-      <el-table-column label="手机号" align="center" prop="phone" width="150" />
-      <el-table-column label="支付宝账户" align="center" prop="alipay" width="130" />
-      <el-table-column label="流水号" align="center" prop="num" width="170" />
-      <el-table-column label="结算金额(元)" align="center" prop="money" width="120" />
-      <el-table-column label="发放业务费(元)" align="center" prop="realMoney" width="120" />
-      <el-table-column label="综合服务费(元)" align="center" prop="serviceMoney" width="120" />
-      <el-table-column label="结算单状态" align="center">
-        <template slot-scope="scope">
-          <span v-if="scope.row.state == 0">待发放</span>
-          <span v-if="scope.row.state == 1">已发放</span>
-        </template>
-      </el-table-column>
-      <template slot="empty">
-        <el-empty></el-empty>
-      </template>
-    </el-table>
-    <pagination v-if="response.total > 0" :total="response.total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
-  </div>
-</template>
-<script>
-export default {
-  data() {
-    return {
-      ids: [],
-      showSearch: true,
-      response: {},
-      dateRange: [],
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        name: null,
-        phone: null,
-        idCard: null,
-        orderByColumn: 'id',
-        isAsc: 'desc'
-      }
-    };
-  },
-  props: {
-    param: {
-      type: Object,
-      default: () => {
-        return {};
-      }
-    },
-    layerid: {
-      type: String
-    }
-  },
-  created() {
-    this.queryParams.statementId = this.param.id;
-    this.getList();
-  },
-  methods: {
-    getList() {
-      this.ajax({ url: '/work/statement/detailList', data: this.queryParams }).then((response) => {
-        this.response = response;
-      });
-    },
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    resetQuery() {
-      this.resetForm('queryForm');
-      this.dateRange = [];
-      this.handleQuery();
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('/work/recharge/export', { ...this.queryParams }, '充值明细.xlsx');
-    }
-  }
-};
-</script>

admin-ui/src/views/work/statement/make/index.vue

@@ -92,7 +92,7 @@ export default {
       }
       const id = row.id;
       if (tag == 'detail') {
-        this.iframe({ obj: record, param: { id: id, detail: true }, title: '查看结算单明细', width: '65%', height: '65%' });
+        this.iframe({ obj: record, param: { id: id, detail: true }, title: '查看结算单明细', width: '65%', height: '70%' });
       }
       if (tag == 'edit') {
         this.iframe({ obj: record, param: { id: id }, title: '编辑结算单', width: '65%', height: '65%' });

admin-ui/src/views/work/statement/manage/index.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" @submit.native.prevent v-show="showSearch">
+      <el-form-item label="结算单号" prop="num">
+        <el-input v-model="queryParams.num" placeholder="请输入结算单号" @keyup.enter.native="handleQuery" clearable />
+      </el-form-item>
       <el-form-item label="结算批次" prop="batchName">
         <el-input v-model="queryParams.batchName" placeholder="请输入结算批次" @keyup.enter.native="handleQuery" clearable />
       </el-form-item>
@@ -15,9 +18,9 @@
     <el-table :data="response.rows" border height="calc(100vh - 235px)">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column type="index" label="序号" align="center" width="80" />
-      <el-table-column label="结算单号" align="center" prop="num" width="160" />
+      <el-table-column label="结算单号" align="center" prop="num"/>
       <el-table-column label="结算批次" align="center" prop="batchName" />
-      <el-table-column label="服务公司" align="center" width="150">
+      <el-table-column label="服务公司" align="center">
         <template slot-scope="scope">
           <div class="omit" :title="scope.row.serviceCompany">{{ scope.row.serviceCompany }}</div>
         </template>
@@ -62,6 +65,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        num: null,
         batchName: null,
         projectId: null,
         orderByColumn: 's.id',
@@ -89,7 +93,7 @@ export default {
     op(tag, row) {
       const id = row.id;
       if (tag == 'detail') {
-        this.iframe({ obj: record, param: { id: id, detail: true }, title: '查看详情', width: '75%', height: '65%' });
+        this.iframe({ obj: record, param: { form: row, detail: true }, title: '查看结算单详情', width: '75%', height: '65%' });
       }
       if (tag == 'submit') {
         this.$confirm('是否提交审核?', '警告', { type: 'warning' }).then(() => {

admin-ui/src/views/work/statement/manage/record.vue

@@ -15,17 +15,23 @@
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-    <el-table :data="response.rows" border>
+    <div class="jlu">
+      <span class="sp">共计应付款：{{ param.form.money }}元</span>
+      <span class="sp">发放业务费：{{ param.form.realMoney }}元</span>
+      <span class="sp">综合服务费：{{ param.form.serviceMoney }}元</span>
+      <span class="sp">应结算人数：{{ param.form.peoples }}人</span>
+    </div>
+    <el-table :data="response.rows" border height="400">
       <el-table-column type="index" label="序号" align="center" width="80" />
       <el-table-column label="姓名" align="center" prop="name" width="100" />
-      <el-table-column label="身份证号" align="center" prop="idCard" width="170" />
-      <el-table-column label="手机号" align="center" prop="phone" width="150" />
+      <el-table-column label="身份证号" align="center" prop="idCard"/>
+      <el-table-column label="手机号" align="center" prop="phone" width="130" />
       <el-table-column label="支付宝账户" align="center" prop="alipay" width="130" />
       <el-table-column label="流水号" align="center" prop="num" width="170" />
       <el-table-column label="结算金额(元)" align="center" prop="money" width="120" />
       <el-table-column label="发放业务费(元)" align="center" prop="realMoney" width="120" />
       <el-table-column label="综合服务费(元)" align="center" prop="serviceMoney" width="120" />
-      <el-table-column label="结算单状态" align="center">
+      <el-table-column label="结算单状态" align="center" width="120">
         <template slot-scope="scope">
           <span v-if="scope.row.state == 0">待发放</span>
           <span v-if="scope.row.state == 1">已发放</span>
@@ -69,7 +75,7 @@ export default {
     }
   },
   created() {
-    this.queryParams.statementId = this.param.id;
+    this.queryParams.statementId = this.param.form.id;
     this.getList();
   },
   methods: {

admin-ui/src/views/work/statement/pay/index.vue

@@ -1,8 +1,17 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" @submit.native.prevent v-show="showSearch">
-      <el-form-item label="结算单号" prop="batchName">
-        <el-input v-model="queryParams.batchName" placeholder="请输入结算批次" @keyup.enter.native="handleQuery" clearable />
+      <el-form-item label="结算单号" prop="num">
+        <el-input v-model="queryParams.num" placeholder="请输入结算单号" @keyup.enter.native="handleQuery" clearable />
+      </el-form-item>
+      <el-form-item label="发放状态" prop="give">
+        <el-select v-model="queryParams.give" placeholder="发放状态" clearable style="width: 117px">
+          <el-option value="1" label="待发放"></el-option>
+          <el-option value="2" label="已发放"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建日期">
+        <el-date-picker v-model="dateRange" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -49,11 +58,12 @@ export default {
     return {
       showSearch: true,
       response: {},
+      dateRange: [],
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        batchName: null,
-        projectId: null,
+        num: null,
+        give:null,
         orderByColumn: 's.id',
         isAsc: 'desc'
       }
@@ -64,6 +74,10 @@ export default {
   },
   methods: {
     getList() {
+      if (this.dateRange) {
+        this.queryParams.dateBegin = this.dateRange[0];
+        this.queryParams.dateEnd = this.dateRange[1];
+      }
       this.ajax({ url: '/work/statement/pay', data: this.queryParams }).then((response) => {
         this.response = response;
       });
@@ -74,6 +88,7 @@ export default {
     },
     resetQuery() {
       this.resetForm('queryForm');
+      this.dateRange = [];
       this.handleQuery();
     },
     op(tag, row) {

ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/StatementController.java

@@ -110,6 +110,20 @@ public class StatementController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 财务对账
+     */
+    @PreAuthorize("@ss.hasPermi('work:statement:bill')")
+    @GetMapping("/bill")
+    public TableDataInfo bill(Statement statement) {
+        statement.setGive(2);
+        statement.setAuditors(false);
+        statement.setCompanyId(getLoginUser().getUser().getCompanyId());
+        startPage();
+        List<Statement> list = statementService.selectList(statement);
+        return getDataTable(list);
+    }
+
     @PreAuthorize("@ss.hasPermi('work:statement:ok')")
     @Log(title = "平台确认发放业务费", businessType = BusinessType.UPDATE)
     @GetMapping("/pay/ok/{id}")

ruoyi-admin/src/main/resources/mapper/work/StatementDetailMapper.xml

@@ -10,7 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="statementId != null "> and statement_id = #{statementId}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="phone != null  and phone != ''"> and phone like concat('%', #{phone}, '%')</if>
-            <if test="idCard != null  and idCard != ''"> and idCard like concat('%', #{idCard}, '%')</if>
+            <if test="idCard != null  and idCard != ''"> and id_card like concat('%', #{idCard}, '%')</if>
             <if test="state != null "> and state = #{state}</if>
         </where>
     </select>

ruoyi-admin/src/main/resources/mapper/work/StatementMapper.xml

@@ -41,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectId != null "> and s.project_id = #{projectId}</if>
             <if test="state != null "> and s.state = #{state}</if>
             <if test="give != null "> and s.give = #{give}</if>
+            <if test="dateBegin != null  and dateBegin != ''"> AND s.give_time BETWEEN #{dateBegin} AND #{dateEnd} + INTERVAL 1 DAY</if>
             <choose>
                 <when test="auditors">
                     <if test="audit == null "> and s.audit <![CDATA[ >= ]]> 1</if>
@@ -58,8 +59,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="num != null  and num != ''"> and s.num like concat('%', #{num}, '%')</if>
             <choose>
                 <when test="give != null">and s.give=#{give} and s.give <![CDATA[ >= ]]> 1</when>
-                <otherwise>s.give <![CDATA[ >= ]]> 1</otherwise>
+                <otherwise>and s.give <![CDATA[ >= ]]> 1</otherwise>
             </choose>
+            <if test="dateBegin != null  and dateBegin != ''"> AND s.give_time BETWEEN #{dateBegin} AND #{dateEnd} + INTERVAL 1 DAY</if>
         </where>
     </select>