Commit bcf9ac9a authored by JiangSN's avatar JiangSN

缴存总览查询crud改为公共方法

parent 604ba8f5
...@@ -3,41 +3,39 @@ ...@@ -3,41 +3,39 @@
<el-col :xs="12" :sm="12" :lg="6" class="card-panel-col"> <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
<div class="card-panel" @click="handleSetLineChartData('newVisitis')"> <div class="card-panel" @click="handleSetLineChartData('newVisitis')">
<div class="card-panel-icon-wrapper icon-people"> <div class="card-panel-icon-wrapper icon-people">
<!-- <svg-icon icon-class="peoples" class-name="card-panel-icon" />-->
<svg-icon icon-class="visits" class-name="card-panel-icon" /> <svg-icon icon-class="visits" class-name="card-panel-icon" />
</div> </div>
<div class="card-panel-description"> <div class="card-panel-description">
<div class="card-panel-text"> <div class="card-panel-text">
接口访问总 每日访问
</div> </div>
<count-to :start-val="0" :end-val="102400" :duration="2600" class="card-panel-num" /> <count-to :start-val="0" :end-val="this.visits" :duration="2600" class="card-panel-num" />
</div> </div>
</div> </div>
</el-col> </el-col>
<el-col :xs="12" :sm="12" :lg="6" class="card-panel-col"> <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
<div class="card-panel" @click="handleSetLineChartData('messages')"> <div class="card-panel" @click="handleSetLineChartData('messages')">
<div class="card-panel-icon-wrapper icon-message"> <div class="card-panel-icon-wrapper icon-people">
<!-- <svg-icon icon-class="message" class-name="card-panel-icon" />--> <svg-icon icon-class="visits" class-name="card-panel-icon" />
<svg-icon icon-class="tree" class-name="card-panel-icon"/>
</div> </div>
<div class="card-panel-description"> <div class="card-panel-description">
<div class="card-panel-text"> <div class="card-panel-text">
任务调度 每月访问量
</div> </div>
<count-to :start-val="0" :end-val="81212" :duration="3000" class="card-panel-num" /> <count-to :start-val="0" :end-val="this.totalview" :duration="3000" class="card-panel-num" />
</div> </div>
</div> </div>
</el-col> </el-col>
<el-col :xs="12" :sm="12" :lg="6" class="card-panel-col"> <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
<div class="card-panel" @click="handleSetLineChartData('purchases')"> <div class="card-panel" @click="handleSetLineChartData('purchases')">
<div class="card-panel-icon-wrapper icon-money"> <div class="card-panel-icon-wrapper icon-message">
<svg-icon icon-class="money" class-name="card-panel-icon" /> <svg-icon icon-class="tree" class-name="card-panel-icon"/>
</div> </div>
<div class="card-panel-description"> <div class="card-panel-description">
<div class="card-panel-text"> <div class="card-panel-text">
Purchases 任务调度
</div> </div>
<count-to :start-val="0" :end-val="9280" :duration="3200" class="card-panel-num" /> <count-to :start-val="0" :end-val="'----'" :duration="3200" class="card-panel-num" />
</div> </div>
</div> </div>
</el-col> </el-col>
...@@ -48,9 +46,9 @@ ...@@ -48,9 +46,9 @@
</div> </div>
<div class="card-panel-description"> <div class="card-panel-description">
<div class="card-panel-text"> <div class="card-panel-text">
Shoppings
</div> </div>
<count-to :start-val="0" :end-val="13600" :duration="3600" class="card-panel-num" /> <count-to :start-val="0" :end-val="'----'" :duration="3600" class="card-panel-num" />
</div> </div>
</div> </div>
</el-col> </el-col>
...@@ -61,6 +59,16 @@ ...@@ -61,6 +59,16 @@
import CountTo from 'vue-count-to' import CountTo from 'vue-count-to'
export default { export default {
props: {
visits: {
type: String,
default: 0
},
totalview: {
type: String,
default: 0
},
},
components: { components: {
CountTo CountTo
}, },
......
<template>
<div class="crud-opts">
<el-button-group class="crud-opts-right">
<el-button
size="mini"
plain
type="info"
icon="el-icon-search"
@click="toggleSearch()"
/>
<el-button
size="mini"
icon="el-icon-refresh"
@click="crud.refresh()"
/>
<el-popover
placement="bottom-end"
width="150"
trigger="click"
>
<el-button
slot="reference"
size="mini"
icon="el-icon-s-grid"
>
<i
class="fa fa-caret-down"
aria-hidden="true"
/>
</el-button>
<el-checkbox
v-model="allColumnsSelected"
:indeterminate="allColumnsSelectedIndeterminate"
@change="handleCheckAllChange"
>
全选
</el-checkbox>
<el-checkbox
v-for="item in tableColumns"
:key="item.property"
v-model="item.visible"
@change="handleCheckedTableColumnsChange(item)"
>
{{ item.label }}
</el-checkbox>
</el-popover>
</el-button-group>
</div>
</template>
<script>
import CRUD, { crud } from '@crud/crud'
function sortWithRef(src, ref) {
const result = Object.assign([], ref)
let cursor = -1
src.forEach(e => {
const idx = result.indexOf(e)
if (idx === -1) {
cursor += 1
result.splice(cursor, 0, e)
} else {
cursor = idx
}
})
return result
}
export default {
mixins: [crud()],
props: {
permission: {
type: Object,
default: () => { return {} }
},
hiddenColumns: {
type: Array,
default: () => { return [] }
},
ignoreColumns: {
type: Array,
default: () => { return [] }
}
},
data() {
return {
tableColumns: [],
allColumnsSelected: true,
allColumnsSelectedIndeterminate: false,
tableUnwatcher: null,
// 忽略下次表格列变动
ignoreNextTableColumnsChange: false
}
},
watch: {
'crud.props.table'() {
this.updateTableColumns()
this.tableColumns.forEach(column => {
if (this.hiddenColumns.indexOf(column.property) !== -1) {
column.visible = false
this.updateColumnVisible(column)
}
})
},
'crud.props.table.store.states.columns'() {
this.updateTableColumns()
}
},
created() {
this.crud.updateProp('searchToggle', true)
},
methods: {
updateTableColumns() {
const table = this.crud.getTable()
if (!table) {
this.tableColumns = []
return
}
let cols = null
const columnFilter = e => e && e.type === 'default' && e.property && this.ignoreColumns.indexOf(e.property) === -1
const refCols = table.columns.filter(columnFilter)
if (this.ignoreNextTableColumnsChange) {
this.ignoreNextTableColumnsChange = false
return
}
this.ignoreNextTableColumnsChange = false
const columns = []
const fullTableColumns = table.$children.map(e => e.columnConfig).filter(columnFilter)
cols = sortWithRef(fullTableColumns, refCols)
cols.forEach(config => {
const column = {
property: config.property,
label: config.label,
visible: refCols.indexOf(config) !== -1
}
columns.push(column)
})
this.tableColumns = columns
},
handleCheckAllChange(val) {
if (val === false) {
this.allColumnsSelected = true
return
}
this.tableColumns.forEach(column => {
if (!column.visible) {
column.visible = true
this.updateColumnVisible(column)
}
})
this.allColumnsSelected = val
this.allColumnsSelectedIndeterminate = false
},
handleCheckedTableColumnsChange(item) {
let totalCount = 0
let selectedCount = 0
this.tableColumns.forEach(column => {
++totalCount
selectedCount += column.visible ? 1 : 0
})
if (selectedCount === 0) {
this.crud.notify('请至少选择一列', CRUD.NOTIFICATION_TYPE.WARNING)
this.$nextTick(function() {
item.visible = true
})
return
}
this.allColumnsSelected = selectedCount === totalCount
this.allColumnsSelectedIndeterminate = selectedCount !== totalCount && selectedCount !== 0
this.updateColumnVisible(item)
},
updateColumnVisible(item) {
const table = this.crud.props.table
const vm = table.$children.find(e => e.prop === item.property)
const columnConfig = vm.columnConfig
if (item.visible) {
// 找出合适的插入点
const columnIndex = this.tableColumns.indexOf(item)
vm.owner.store.commit('insertColumn', columnConfig, columnIndex + 1, null)
} else {
vm.owner.store.commit('removeColumn', columnConfig, null)
}
this.ignoreNextTableColumnsChange = true
},
toggleSearch() {
this.crud.props.searchToggle = !this.crud.props.searchToggle
}
}
}
</script>
<style>
.crud-opts {
padding: 4px 0;
display: -webkit-flex;
display: flex;
align-items: center;
}
.crud-opts .crud-opts-right {
margin-left: auto;
}
.crud-opts .crud-opts-right span {
float: left;
}
</style>
<!--分页-->
<template>
<el-pagination
:page-size.sync="page.size"
:total="page.total"
:current-page.sync="page.page"
style="margin-top: 8px;"
layout="total, prev, pager, next, sizes"
@size-change="crud.sizeChangeHandler($event)"
@current-change="crud.pageChangeHandler"
/>
</template>
<script>
import { pagination } from '@crud/crud'
export default {
mixins: [pagination()]
}
</script>
<!--搜索与重置-->
<template>
<span>
<el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="crud.toQuery">搜索</el-button>
<el-button v-if="crud.optShow.reset" class="filter-item" size="mini" type="warning" icon="el-icon-refresh-left" @click="crud.resetQuery()">重置</el-button>
</span>
</template>
<script>
import { crud } from '@crud/crud'
export default {
mixins: [crud()],
props: {
itemClass: {
type: String,
required: false,
default: ''
}
}
}
</script>
<template>
<div>
<el-button v-permission="permission.edit" :loading="crud.status.cu === 2" :disabled="disabledEdit" size="mini" type="primary" icon="el-icon-chat-line-square" @click="crud.toEdit(data)">
查看详情
</el-button>
<el-popover v-model="pop" v-permission="permission.del" placement="top" width="180" trigger="manual" @show="onPopoverShow" @hide="onPopoverHide">
<p>{{ msg }}</p>
<div style="text-align: right; margin: 0">
<el-button size="mini" type="text" @click="doCancel">取消</el-button>
<el-button :loading="crud.dataStatus[crud.getDataId(data)].delete === 2" type="primary" size="mini" @click="crud.doDelete(data)">确定</el-button>
</div>
<!-- 删除按钮,此页面只需要查询,所以注释-->
<!-- <el-button slot="reference" :disabled="disabledDle" type="danger" icon="el-icon-delete" size="mini" @click="toDelete" />-->
</el-popover>
</div>
</template>
<script>
import CRUD, { crud } from '@crud/crud'
export default {
mixins: [crud()],
props: {
data: {
type: Object,
required: true
},
permission: {
type: Object,
required: true
},
disabledEdit: {
type: Boolean,
default: false
},
disabledDle: {
type: Boolean,
default: false
},
msg: {
type: String,
default: '确定删除本条数据吗?'
}
},
data() {
return {
pop: false
}
},
methods: {
doCancel() {
this.pop = false
this.crud.cancelDelete(this.data)
},
toDelete() {
this.pop = true
},
[CRUD.HOOK.afterDelete](crud, data) {
if (data === this.data) {
this.pop = false
}
},
onPopoverShow() {
setTimeout(() => {
document.addEventListener('click', this.handleDocumentClick)
}, 0)
},
onPopoverHide() {
document.removeEventListener('click', this.handleDocumentClick)
},
handleDocumentClick(event) {
this.pop = false
}
}
}
</script>
This diff is collapsed.
...@@ -12,26 +12,26 @@ ...@@ -12,26 +12,26 @@
</div> </div>
<!--表单组件--> <!--表单组件-->
<el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="100%" hight="100%"> <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="100%" hight="100%">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="130px"> <el-form ref="form" :disabled="crud.status.CHECK" :model="form" :rules="rules" size="small" label-width="130px">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="8"> <el-col :span="8">
<div class="grid-content bg-purple"> <div class="grid-content bg-purple">
<el-form-item label="证件类型" prop="zjlx"> <el-form-item label="证件类型" prop="zjlx">
<el-input v-model="form.zjlx" style="width: 370px" :disabled="true" /> <el-input v-model="form.zjlx" style="width: 370px" />
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="grid-content bg-purple-light"> <div class="grid-content bg-purple-light">
<el-form-item label="证件号码" prop="zjhm"> <el-form-item label="证件号码" prop="zjhm">
<el-input v-model="form.zjhm" style="width: 370px" :disabled="true" /> <el-input v-model="form.zjhm" style="width: 370px" />
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="grid-content bg-purple"> <div class="grid-content bg-purple">
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-input v-model="form.status" type="textarea" style="width: 370px" :disabled="true" /> <el-input v-model="form.status" type="textarea" style="width: 370px" />
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
...@@ -40,13 +40,13 @@ ...@@ -40,13 +40,13 @@
<el-col :span="8"> <el-col :span="8">
<div class="grid-content bg-purple"> <div class="grid-content bg-purple">
<el-form-item label="姓名" prop="xingming"> <el-form-item label="姓名" prop="xingming">
<el-input v-model.number="form.xingming" style="width: 370px;" :disabled="true" /> <el-input v-model.number="form.xingming" style="width: 370px;" />
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="插入日期" prop="crrq"> <el-form-item label="插入日期" prop="crrq">
<el-input v-model.number="form.crrq" style="width: 370px;" :disabled="true" /> <el-input v-model.number="form.crrq" style="width: 370px;" />
</el-form-item> </el-form-item>
<div class="grid-content bg-purple-light" /> <div class="grid-content bg-purple-light" />
</el-col> </el-col>
...@@ -55,22 +55,22 @@ ...@@ -55,22 +55,22 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="8"> <el-col :span="8">
<div class="grid-content bg-purple"> <div class="grid-content bg-purple">
<el-form-item label="证件类型" prop="zjlx"> <el-form-item label="开户中心编号" prop="KHZXBH">
<el-input v-model="form.zjlx" style="width: 370px" :disabled="true" /> <el-input v-model="form.KHZXBH" style="width: 370px" />
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="grid-content bg-purple-light"> <div class="grid-content bg-purple-light">
<el-form-item label="单位地址" prop="xynr"> <el-form-item label="开户中心名称" prop="KHZXMC">
<el-input v-model="form.dom" style="width: 370px" :disabled="true" /> <el-input v-model="form.KHZXMC" style="width: 370px" />
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="grid-content bg-purple"> <div class="grid-content bg-purple">
<el-form-item label="法人代表姓名" prop="name"> <el-form-item label="单位账号" prop="DWZH">
<el-input v-model="form.name" style="width: 370px" :disabled="true" /> <el-input v-model="form.DWZH" style="width: 370px" />
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
...@@ -78,22 +78,22 @@ ...@@ -78,22 +78,22 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="8"> <el-col :span="8">
<div class="grid-content bg-purple"> <div class="grid-content bg-purple">
<el-form-item label="统一社会信用代码" prop="uniscid"> <el-form-item label="个人账号" prop="GRZH">
<el-input v-model="form.uniscid" style="width: 370px" :disabled="true" /> <el-input v-model="form.GRZH" style="width: 370px" />
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="grid-content bg-purple-light"> <div class="grid-content bg-purple-light">
<el-form-item label="成立日期" prop="estDate"> <el-form-item label="个人账户状态" prop="GRZHZT">
<el-input v-model="form.estDate" style="width: 370px" :disabled="true" /> <el-input v-model="form.GRZHZT" style="width: 370px" />
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="grid-content bg-purple"> <div class="grid-content bg-purple">
<el-form-item label="注册资本" prop="name"> <el-form-item label="数据插入日期" prop="CRRQ">
<el-input v-model="form.regCap" style="width: 370px" :disabled="true" /> <el-input v-model="form.CRRQ" style="width: 370px" />
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
...@@ -101,38 +101,20 @@ ...@@ -101,38 +101,20 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="8"> <el-col :span="8">
<div class="grid-content bg-purple"> <div class="grid-content bg-purple">
<el-form-item label="经营(驻在)期限自" prop="opFrom"> <el-form-item label="报文返回日期" prop="ZXZWRQ">
<el-input v-model="form.opFrom" style="width: 370px" :disabled="true" /> <el-input v-model="form.ZXZWRQ" style="width: 370px" />
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="grid-content bg-purple-light"> <div class="grid-content bg-purple-light">
<el-form-item label="经营(驻在)期限至" prop="opto">
<el-input v-model="form.opto" style="width: 370px" :disabled="true" />
</el-form-item>
</div> </div>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="grid-content bg-purple"> <div class="grid-content bg-purple">
<el-form-item label="登记机关" prop="regOrgCn">
<el-input v-model="form.regOrgCn" style="width: 370px" :disabled="true" />
</el-form-item>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="登记登记状态" prop="regStateCn">
<el-input v-model="form.regStateCn" style="width: 370px" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="企业经营范围" prop="opScope">
<el-input v-model="form.opScope" type="textarea" style="width: 370px" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer" style="text-align: center"> <div slot="footer" class="dialog-footer" style="text-align: center">
<el-button type="primary" size="medium" @click="crud.cancelCU">确认</el-button> <el-button type="primary" size="medium" @click="crud.cancelCU">确认</el-button>
...@@ -140,10 +122,11 @@ ...@@ -140,10 +122,11 @@
</el-dialog> </el-dialog>
<!--表格渲染--> <!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%" @selection-change="crud.selectionChangeHandler"> <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%" @selection-change="crud.selectionChangeHandler">
<el-table-column v-if="checkPer(['admin','serverDeploy:edit'])" label="操作" width="150px" align="center"> <el-table-column v-if="checkPer(['admin','serverDeploy:check'])" label="操作" width="150px" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<udOperation <Retrieve
:data="scope.row" :data="scope.row"
:queryList="queryList"
:permission="permission" :permission="permission"
/> />
</template> </template>
...@@ -163,23 +146,39 @@ ...@@ -163,23 +146,39 @@
<script> <script>
import { testServerConnect } from '@/api/mnt/connect' import { testServerConnect } from '@/api/mnt/connect'
import CRUD, { presenter, header, form, crud } from './Crud/crud' import CRUD, { presenter, header, form, crud } from '@crud/crud'
import rrOperation from './Crud/RR.operation' import rrOperation from '@crud/RR.operation'
import udOperation from './Crud/UD.operation' import udOperation from '@crud/UD.operation'
import pagination from './Crud/Pagination' import pagination from '@crud/Pagination'
import DateRangePicker from '@/components/DateRangePicker' import DateRangePicker from '@/components/DateRangePicker'
import crudOperation from './Crud/CRUD.operation' import crudOperation from '@crud/CRUD.operation'
import Retrieve from "@crud/Retrieve";
const defaultForm = { id: null, name: null, ip: null, port: 22, account: 'root', password: null } const defaultForm = { id: null, name: null, ip: null, port: 22, account: 'root', password: null }
export default { export default {
name: 'Jczlcx', name: 'Jczlcx',
components: { pagination, rrOperation, udOperation, DateRangePicker, crudOperation }, components: {Retrieve, pagination, rrOperation, udOperation, DateRangePicker, crudOperation },
cruds() { cruds() {
return CRUD({ title: '缴存总览详情', url: 'api/JczlcxController', crudMethod: {}}) return CRUD({
title: '缴存总览详情',
url: 'api/JczlcxController',
optShow: {
add: false,
edit: false,
del: false,
download: false,
reset: true
},
})
}, },
mixins: [presenter(), header(), form(defaultForm), crud()], mixins: [presenter(), header(), form(defaultForm), crud()],
data() { data() {
return { return {
//明细请求参数
queryList: {
status:true,
url:"api/JczlcxController/QueryJczlcxFhmx",
id:""
},
// currView: 'index', // currView: 'index',
accountList: [], accountList: [],
accountMap: {}, accountMap: {},
...@@ -194,6 +193,14 @@ export default { ...@@ -194,6 +193,14 @@ export default {
} }
}, },
methods: { methods: {
testDigSeven(val){
console.log("val:"+val)
// this.queryList.push(val)
this.$http.get("http://localhost:8013/api/JczlcxController/QueryJczlcxFhmx?id=" + val.id).then(function (res) {
// console.log("this.queryList:"+ this.queryList)
// this.queryList.push(res.body.data[0])
});
},
testConnectServer() { testConnectServer() {
this.$refs['form'].validate((valid) => { this.$refs['form'].validate((valid) => {
if (valid) { if (valid) {
......
...@@ -15,19 +15,12 @@ ...@@ -15,19 +15,12 @@
*/ */
package me.zhengjie.controller; package me.zhengjie.controller;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import me.zhengjie.annotation.AnonymousAccess;
import me.zhengjie.service.JczlcxService; import me.zhengjie.service.JczlcxService;
import me.zhengjie.service.QyxxcxService;
import me.zhengjie.service.dto.JczlcxDeployQueryCriteria; import me.zhengjie.service.dto.JczlcxDeployQueryCriteria;
import me.zhengjie.service.dto.QyxxcxDeployQueryCriteria; import me.zhengjie.util.R;
import me.zhengjie.util.shengneiUtil;
import org.apache.http.impl.client.CloseableHttpClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
...@@ -35,11 +28,10 @@ import org.springframework.http.ResponseEntity; ...@@ -35,11 +28,10 @@ import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.text.SimpleDateFormat; import java.util.List;
import java.util.Date;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
//import static me.zhengjie.util.shengneiUtil.createSSLClientDefault; //import static me.zhengjie.util.shengneiUtil.createSSLClientDefault;
...@@ -64,4 +56,11 @@ public class JczlcxController { ...@@ -64,4 +56,11 @@ public class JczlcxController {
public ResponseEntity<Object> query(JczlcxDeployQueryCriteria criteria, Pageable pageable){ public ResponseEntity<Object> query(JczlcxDeployQueryCriteria criteria, Pageable pageable){
return new ResponseEntity<>(jczlcxService.queryAll(criteria,pageable),HttpStatus.OK); return new ResponseEntity<>(jczlcxService.queryAll(criteria,pageable),HttpStatus.OK);
} }
@ApiOperation("缴存总览查询返回明细")
@RequestMapping("/QueryJczlcxFhmx")
public R QueryJczlcxFhmx(@RequestParam("id") String id) {
List<Map> visits = jczlcxService.QueryJczlcxFhmx(id);
return new R<>(visits);
}
} }
package me.zhengjie.service; package me.zhengjie.service;
import me.zhengjie.service.dto.JczlcxDeployQueryCriteria; import me.zhengjie.service.dto.JczlcxDeployQueryCriteria;
import me.zhengjie.service.dto.QyxxcxDeployQueryCriteria;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import java.util.List;
import java.util.Map;
public interface JczlcxService { public interface JczlcxService {
/** /**
* 分页查询 * 分页查询
...@@ -13,4 +15,5 @@ public interface JczlcxService { ...@@ -13,4 +15,5 @@ public interface JczlcxService {
*/ */
Object queryAll(JczlcxDeployQueryCriteria criteria, Pageable pageable); Object queryAll(JczlcxDeployQueryCriteria criteria, Pageable pageable);
List<Map> QueryJczlcxFhmx(String id);
} }
package me.zhengjie.serviceimpl; package me.zhengjie.serviceimpl;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import me.zhengjie.MybatisMapper.JczlcxMybatisMapper;
import me.zhengjie.domain.JczlcxDeploy; import me.zhengjie.domain.JczlcxDeploy;
import me.zhengjie.domain.QyxxcxDeploy;
import me.zhengjie.mapper.JczlcxMapper; import me.zhengjie.mapper.JczlcxMapper;
import me.zhengjie.mapper.QyxxcxMapper;
import me.zhengjie.repository.JczlcxDeployRepository; import me.zhengjie.repository.JczlcxDeployRepository;
import me.zhengjie.repository.QyxxcxDeployRepository;
import me.zhengjie.service.JczlcxService; import me.zhengjie.service.JczlcxService;
import me.zhengjie.service.QyxxcxService;
import me.zhengjie.service.dto.JczlcxDeployQueryCriteria; import me.zhengjie.service.dto.JczlcxDeployQueryCriteria;
import me.zhengjie.service.dto.QyxxcxDeployQueryCriteria;
import me.zhengjie.utils.PageUtil; import me.zhengjie.utils.PageUtil;
import me.zhengjie.utils.QueryHelp; import me.zhengjie.utils.QueryHelp;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/** /**
* @author Jing Xiduo * @author Jing Xiduo
* @date 2021-10-18 * @date 2021-10-18
...@@ -27,9 +26,15 @@ public class JczlcxServiceImpl implements JczlcxService { ...@@ -27,9 +26,15 @@ public class JczlcxServiceImpl implements JczlcxService {
private final JczlcxDeployRepository jczlcxDeployRepository; private final JczlcxDeployRepository jczlcxDeployRepository;
private final JczlcxMapper jczlcxMapper; private final JczlcxMapper jczlcxMapper;
private final JczlcxMybatisMapper jczlcxMybatisMapper;
@Override @Override
public Object queryAll(JczlcxDeployQueryCriteria criteria, Pageable pageable){ public Object queryAll(JczlcxDeployQueryCriteria criteria, Pageable pageable){
Page<JczlcxDeploy> page = jczlcxDeployRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable); Page<JczlcxDeploy> page = jczlcxDeployRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
return PageUtil.toPage(page.map(jczlcxMapper::toDto)); return PageUtil.toPage(page.map(jczlcxMapper::toDto));
} }
@Override
public List<Map> QueryJczlcxFhmx(String id) {
return jczlcxMybatisMapper.QueryJczlcxFhmx(id);
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment