From 626630050b7a66288872ccba387f56dbaa6b5f09 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期日, 07 四月 2024 09:24:54 +0800
Subject: [PATCH] 提交一把
---
server/shop/src/main/java/com/doumee/api/business/NoticesController.java | 2
company/src/components/business/OperaWtbApplyShopWindow.vue | 2
company/src/views/business/unionApply.vue | 6
company/src/components/business/detailsEntrustedInsurance.vue | 14 -
company/src/views/indexShop.vue | 514 +++++++++++++++++++++++++++++++++++++++++++++++++++
server/service/src/main/java/com/doumee/service/business/impl/NoticesServiceImpl.java | 6
company/src/components/business/operaverifyPhoneNumberWindew.vue | 2
company/src/components/business/OperaUnionChangeDetailWindow.vue | 4
company/src/components/business/OperaApplyChangeDetailWindow.vue | 2
company/src/components/business/OperaUnionChangeUnitDetailWindow.vue | 4
server/service/src/main/java/com/doumee/dao/business/model/Notices.java | 4
server/platform/src/main/java/com/doumee/api/business/InsuranceApplyController.java | 7
server/platform/src/main/java/com/doumee/api/business/ApplyChangeController.java | 7
company/src/components/business/OperaApplyChangeUnitDetailWindow.vue | 2
company/.env.development | 4
15 files changed, 553 insertions(+), 27 deletions(-)
diff --git a/company/.env.development b/company/.env.development
index 0dc6c15..a5a333a 100644
--- a/company/.env.development
+++ b/company/.env.development
@@ -5,7 +5,7 @@
# VUE_APP_API_PREFIX = '/yyb_web_api'
# 浼佷笟绔�-浠佸悍
-VUE_APP_API = 'http://192.168.0.153:10031/'
+#VUE_APP_API = 'http://192.168.0.153:10031/'
# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_web_api/'
# 骞冲彴绔�-浠佸悍
@@ -15,4 +15,4 @@
# 骞冲彴绔�-钀嶅
# VUE_APP_API = 'http://192.168.0.105:10023/'
-# VUE_APP_API = 'http://localhost:10030/'
+VUE_APP_API = 'http://localhost:10030/'
diff --git a/company/src/components/business/OperaApplyChangeDetailWindow.vue b/company/src/components/business/OperaApplyChangeDetailWindow.vue
index 5492629..a4c4046 100644
--- a/company/src/components/business/OperaApplyChangeDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeDetailWindow.vue
@@ -285,7 +285,7 @@
visiblePhone: false,
form: {
businessId: null,
- phone: this.$store.state.userInfo.company.phone,
+ phone: this.$store.state.userInfo.company? this.$store.state.userInfo.company.phone:null,
id: null,
editDate: '',
code:null
diff --git a/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue b/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
index 3231746..079d084 100644
--- a/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
@@ -277,7 +277,7 @@
visiblePhone: false,
form: {
businessId: null,
- phone: this.$store.state.userInfo.company.phone,
+ phone: this.$store.state.userInfo.company ? this.$store.state.userInfo.company.phone:null,
id: null,
editDate: '',
code: null
diff --git a/company/src/components/business/OperaUnionChangeDetailWindow.vue b/company/src/components/business/OperaUnionChangeDetailWindow.vue
index d2420ea..abc1dd9 100644
--- a/company/src/components/business/OperaUnionChangeDetailWindow.vue
+++ b/company/src/components/business/OperaUnionChangeDetailWindow.vue
@@ -42,7 +42,7 @@
border
style="width: 100%">
<el-table-column
- prop="validCode"
+ prop="code"
align="center"
label="鎵瑰崟鍙�">
</el-table-column>
@@ -291,7 +291,7 @@
visibleFile:false,
form: {
businessId: null,
- phone: this.$store.state.userInfo.company.phone,
+ phone: this.$store.state.userInfo.company? this.$store.state.userInfo.company.phone:null,
id: null,
editDate: '',
code:null
diff --git a/company/src/components/business/OperaUnionChangeUnitDetailWindow.vue b/company/src/components/business/OperaUnionChangeUnitDetailWindow.vue
index ff3da3d..2b3afe1 100644
--- a/company/src/components/business/OperaUnionChangeUnitDetailWindow.vue
+++ b/company/src/components/business/OperaUnionChangeUnitDetailWindow.vue
@@ -40,7 +40,7 @@
border
style="width: 100%">
<el-table-column
- prop="validCode"
+ prop="code"
align="center"
label="鎵瑰崟鍙�">
</el-table-column>
@@ -270,7 +270,7 @@
visibleFile:false,
form: {
businessId: null,
- phone: this.$store.state.userInfo.company.phone,
+ phone: this.$store.state.userInfo.company? this.$store.state.userInfo.company.phone:null,
id: null,
editDate: '',
code:null
diff --git a/company/src/components/business/OperaWtbApplyShopWindow.vue b/company/src/components/business/OperaWtbApplyShopWindow.vue
index 52fc424..1d6743c 100644
--- a/company/src/components/business/OperaWtbApplyShopWindow.vue
+++ b/company/src/components/business/OperaWtbApplyShopWindow.vue
@@ -514,7 +514,7 @@
model: {},
form: {
businessId: null,
- phone: this.$store.state.userInfo.company.phone,
+ phone: this.$store.state.userInfo.company? this.$store.state.userInfo.company.phone:null,
code: '',
type:0
},
diff --git a/company/src/components/business/detailsEntrustedInsurance.vue b/company/src/components/business/detailsEntrustedInsurance.vue
index 23fe825..a668ef5 100644
--- a/company/src/components/business/detailsEntrustedInsurance.vue
+++ b/company/src/components/business/detailsEntrustedInsurance.vue
@@ -451,13 +451,13 @@
dataId: null,
signTitle: '鎵嬫満鍙烽獙璇�',
fileTitle: '鏌ョ湅鎶曚繚鍗�',
- fileFlag:0,
+ fileFlag: 0,
visibleFile: false,
fileData: [],
model: {},
form: {
businessId: null,
- phone: this.$store.state.userInfo.company.phone,
+ phone: this.$store.state.userInfo.company ? this.$store.state.userInfo.company.phone:null,
code: '',
type: 0
},
@@ -508,7 +508,6 @@
this.fileData = []
this.taobaodanFileData = []
this.baoxiandanFileData = []
- this.dataId = null
this.dataId = target.id
this.form.businessId = target.id
this.formInline.applyStatus = ''
@@ -772,15 +771,6 @@
this.visibleFile=true
this.fileTitle='鏌ョ湅鎶曚繚鍗�'
this.fileFlag = 0
- /* if (this.model.toubaodanSignedFile && this.model.toubaodanSignedFile.fileurlFull) {
- setTimeout(() => {
- window.open(this.model.toubaodanSignedFile.fileurlFull)
- }, 500)
- } else if (this.model.toubaodanFile && this.model.toubaodanFile.fileurlFull) {
- setTimeout(() => {
- window.open(this.model.toubaodanFile.fileurlFull)
- }, 500)
- }*/
},
viewBaoxiandan () {
this.fileFlag = 1
diff --git a/company/src/components/business/operaverifyPhoneNumberWindew.vue b/company/src/components/business/operaverifyPhoneNumberWindew.vue
index f218701..4e815c7 100644
--- a/company/src/components/business/operaverifyPhoneNumberWindew.vue
+++ b/company/src/components/business/operaverifyPhoneNumberWindew.vue
@@ -33,7 +33,7 @@
data () {
return {
form: {
- phone: this.$store.state.userInfo.company.phone,
+ phone: this.$store.state.userInfo.company? this.$store.state.userInfo.company.phone:null,
code: ''
},
rules: {
diff --git a/company/src/views/business/unionApply.vue b/company/src/views/business/unionApply.vue
index e7e4e9e..5c7d707 100644
--- a/company/src/views/business/unionApply.vue
+++ b/company/src/views/business/unionApply.vue
@@ -39,7 +39,7 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:insurance:create']">
+ <ul class="toolbar" v-if="userInfo.type==2" v-permissions="['business:insurance:create']">
<li><el-button type="primary" @click="$refs.OpearaUnionApply.open('濮旀墭鎶曚繚鐢宠')" v-permissions="['business:insurance:create']">鎻愪氦鐢宠</el-button></li>
</ul>
<el-table
@@ -93,6 +93,7 @@
import { all as solutionAll } from '@/api/business/solutions'
import OpearaUnionApply from '@/components/business/OpearaUnionApply'
import detailsEntrustedInsurance from '@/components/business/detailsEntrustedInsurance'
+ import {mapState} from "vuex";
export default {
name: 'unionApply',
extends: BaseTable,
@@ -120,6 +121,9 @@
this.search()
this.loadSelectList()
},
+ computed: {
+ ...mapState(['userInfo'])
+ },
methods:{
// 鎼滅储妗嗛噸缃�
reset () {
diff --git a/company/src/views/indexShop.vue b/company/src/views/indexShop.vue
new file mode 100644
index 0000000..8c02270
--- /dev/null
+++ b/company/src/views/indexShop.vue
@@ -0,0 +1,514 @@
+<template>
+ <div class="home">
+ <div class="home_inlet">
+ <div class="home_inlet_label">蹇嵎鍏ュ彛</div>
+ <div class="home_inlet_list" v-if="userInfo.type==2" >
+ <div class="home_inlet_item" v-for="(item, index) in cate" :key="index" @click="jump(item.url)">
+ <img :src="item.icon" />
+ <span>{{item.name}}</span>
+ </div>
+ </div>
+ </div>
+ <div class="home_content">
+ <div class="home_content_left">
+ <div class="home_content_left_item" ref="picture1"></div>
+ <div class="home_content_left_item" ref="picture2"></div>
+ <div class="home_content_left_item" ref="picture3"></div>
+ </div>
+ <div class="home_content_right">
+ <div class="home_content_right_label" v-if="tabs && tabs.length>0" >浠ｅ姙浜嬮」</div>
+ <el-tabs v-model="activeName" @tab-click="handleClick" >
+ <el-tab-pane v-for="a in tabs" :key="a.path" :name="a.name" >
+ <span slot="label" title="鐐瑰嚮鍒锋柊"> {{a.label }}
+ <el-badge v-if="(a.name==0?totalPage0:(a.name==1?totalPage1:totalPage2)) >0" :value="(a.name==0?totalPage0:(a.name==1?totalPage1:totalPage2)) " class="item"></el-badge>
+ </span>
+ </el-tab-pane>
+ </el-tabs>
+ <div v-if="activeName === '0'" >
+ <div class="home_content_right_list">
+ <div class="list_item" v-for="(item, index) in tableData0" :key="index">
+ <div class="list_item_left">
+ <span>{{item.title}}锛坽{ item.typeDetail }}锛�</span>
+ <span>{{item.info}}锛坽{item.content}}锛�</span>
+ </div>
+ <div class="list_item_center">
+ <span>{{item.companyName}}</span>
+ <span>鎻愪氦鏃堕棿 {{item.createDate}}</span>
+ </div>
+ <div class="list_item_right">
+ <span @click="detail(item)">鏌ョ湅</span>
+ </div>
+ </div>
+ </div>
+ <div class="home_content_right_page">
+ <el-pagination
+ @current-change="handleCurrentChange0"
+ :current-page="page0"
+ :page-size="5"
+ layout="total, prev, pager, next, jumper"
+ :total="totalPage0">
+ </el-pagination>
+ </div>
+ </div>
+ <div v-if="activeName === '1'" >
+ <div class="home_content_right_list">
+ <div class="list_item" v-for="(item, index) in tableData1" :key="index">
+ <div class="list_item_left">
+ <span>{{item.title}}锛坽{ item.typeDetail }}锛�</span>
+ <span>{{item.info}}锛坽{item.content}}锛�</span>
+ </div>
+ <div class="list_item_center">
+ <span>{{item.companyName}}</span>
+ <span>鎻愪氦鏃堕棿 {{item.createDate}}</span>
+ </div>
+ <div class="list_item_right">
+ <span @click="detail(item)">鏌ョ湅</span>
+ </div>
+ </div>
+ </div>
+ <div class="home_content_right_page">
+ <el-pagination
+ @current-change="handleCurrentChange1"
+ :current-page="page1"
+ :page-size="5"
+ layout="total, prev, pager, next, jumper"
+ :total="totalPage1">
+ </el-pagination>
+ </div>
+ </div>
+ </div>
+ </div>
+ <OperaInsuranceApplyWindow ref="operaInsuranceApplyWindow" @success="handleCurrentChange0()"/>
+ <dispatchUnitDetailsPlat ref="dispatchUnitDetailsPlat" @success="handleCurrentChange0()"/>
+ <OperaSettleClaimsWindow ref="operaSettleClaimsWindow" @success="handleCurrentChange2()"/>
+ <OperaApplyChangeUnitDetailWindow ref="operaApplyChangeUnitDetailWindow" @success="handleCurrentChange0()"/>
+ <OperaApplyChangeDetailWindow ref="operaApplyChangeDetailWindow" @success="handleCurrentChange0()"/>
+ <OperaTaxesWindow ref="OperaTaxesWindow" @success="handleCurrentChange1()"/>
+ </div>
+</template>
+
+<script>
+import * as echarts from 'echarts'
+import { mapState } from 'vuex'
+import OperaInsuranceApplyWindow from '@/components/business/OperaInsuranceApplyWindow'
+import dispatchUnitDetailsPlat from '@/components/business/dispatchUnitDetailsPlat'
+import OperaApplyChangeUnitDetailWindow from '@/components/business/OperaApplyChangeUnitDetailWindow'
+import OperaSettleClaimsWindow from '@/components/business/OperaSettleClaimsWindow'
+import OperaApplyChangeDetailWindow from '@/components/business/OperaApplyChangeDetailWindow'
+import OperaTaxesWindow from '@/components/business/OperaTaxesWindow'
+import { fetchList as noticeList, deleById } from '@/api/business/notices'
+export default {
+ components: {
+ OperaInsuranceApplyWindow,
+ dispatchUnitDetailsPlat,
+ OperaTaxesWindow,
+ OperaSettleClaimsWindow,
+ OperaApplyChangeDetailWindow,
+ OperaApplyChangeUnitDetailWindow
+ },
+ name: 'Index',
+ data () {
+ return {
+ activeName: '0',
+ tabs: [],
+ page0: 1,
+ page1: 1,
+ page2: 1,
+ totalPage2: 0,
+ totalPage1: 0,
+ totalPage0: 0,
+ tableData0: [],
+ tableData1: [],
+ tableData2: [],
+ cate: [
+ {
+ name: '鎶曚繚鐢宠瀹℃牳',
+ url: '/business/insuranceApplyShop',
+ icon: require('../assets/icons/plat/apply_check.png')
+ },
+ {
+ name: '鍔�/鍑忎繚鐢宠瀹℃牳',
+ url: '/business/applyChangeShop',
+ icon: require('../assets/icons/plat/change_apply_check.png')
+ },
+ {
+ name: '鏇存崲娲鹃仯鍗曚綅鐢宠瀹℃牳',
+ url: '/business/switchCourtShop',
+ icon: require('../assets/icons/plat/apply_check.png')
+ } ,
+ {
+ name: '鎶曚繚瀹℃牳',
+ url: '/business/insuranceApply',
+ icon: require('../assets/icons/plat/apply_check.png')
+ },
+ {
+ name: '鍔�/鍑忎繚瀹℃牳',
+ url: '/business/applyChange',
+ icon: require('../assets/icons/plat/change_apply_check.png')
+ },
+ {
+ name: '鏇存崲娲鹃仯鍗曚綅瀹℃牳',
+ url: '/business/switchCourt',
+ icon: require('../assets/icons/plat/apply_check.png')
+ }
+ ]
+ }
+ },
+ computed: {
+ ...mapState(['userInfo'])
+ },
+ mounted () {
+ this.setPicture1()
+ this.setPicture2()
+ this.setPicture3()
+ this.initPanel()
+ this.setLoadTimer()
+ },
+ methods: {
+ detail (obj) {
+ if(obj && obj.type === 7){
+ if (obj.objType === 0) {
+ this.$refs.operaInsuranceApplyWindow.open('鎶曚繚鐢宠璇︽儏', { id: obj.objId })
+ } else if (obj.objType === 1) {
+ this.$refs.operaApplyChangeDetailWindow.open('鍔犲噺淇濊鎯�', { id: obj.objId, applyId: obj.param1 })
+ } else if (obj.objType === 2) {
+ this.$refs.operaApplyChangeUnitDetailWindow.open('鏇存崲娲鹃仯鍗曚綅鐢宠璇︽儏', { id: obj.objId, applyId: obj.param1 })
+ }
+ }else {
+ if (obj.objType === 0) {
+ this.$refs.operaInsuranceApplyWindow.open('鎶曚繚鐢宠璇︽儏', { id: obj.objId })
+ } else if (obj.objType === 1) {
+ this.$refs.operaApplyChangeDetailWindow.open('鍔犲噺淇濊鎯�', { id: obj.objId, applyId: obj.param1 })
+ } else if (obj.objType === 2) {
+ this.$refs.operaApplyChangeUnitDetailWindow.open('鏇存崲娲鹃仯鍗曚綅鐢宠璇︽儏', { id: obj.objId, applyId: obj.param1 })
+ }
+ }
+ },
+ setLoadTimer () {
+ var that = this
+ this.initLoadData()
+ if (window.timer) {
+ clearInterval(window.timer)
+ }
+ window.timer = setInterval(() => {
+ that.initLoadData()
+ }, 60000)
+ },
+ initLoadData () {
+ this.handleCurrentChange0(0)
+ this.handleCurrentChange1(0)
+ },
+ getNoticeList (type, page) {
+ noticeList({
+ page: page,
+ capacity: 5,
+ model: { queryType: type },
+ sorts: []
+ })
+ .then(response => {
+ if (type === 0) {
+ this.tableData0 = response.records
+ this.totalPage0 = response.total
+ }
+ if (type === 1) {
+ this.tableData1 = response.records
+ this.totalPage1 = response.total
+ } if (type === 2) {
+ this.tableData2 = response.records
+ this.totalPage2 = response.total
+ }
+ })
+ .catch(e => {
+ this.$tip.apiFailed(e)
+ })
+ },
+ initPanel () {
+ this.tabs.push({ name: '0', label: '鐩存帴鎶曚繚浠ｅ姙' })
+ this.tabs.push({ name: '1', label: '濮旀墭鎶曚繚浠ｅ姙' })
+ },
+ handleClick (e) {
+ this.activeName = e.name
+ if (this.activeName === '0') {
+ this.handleCurrentChange0(0)
+ } else if (this.activeName === '1') {
+ this.handleCurrentChange1(0)
+ }
+ },
+ handleCurrentChange0 (page) {
+ this.page0 = page
+ this.getNoticeList(3, this.page0)
+ },
+ handleCurrentChange1 (page) {
+ this.page1 = page
+ this.getNoticeList(4, this.page1)
+ },
+ jump (url) {
+ if (!url) return
+ this.$router.push({ path: url })
+ },
+ setPicture1 () {
+ const chartDom = this.$refs.picture1
+ const myChart = echarts.init(chartDom)
+ let option
+ option = {
+ title: {
+ text: '褰撴湀淇濋櫓閲戦',
+ left: '5%',
+ top: '5%'
+ },
+ tooltip: {
+ trigger: 'item'
+ },
+ series: [
+ {
+ type: 'pie',
+ radius: '50%',
+ data: [
+ { value: 1048, name: '淇濋殰涓�' },
+ { value: 735, name: '涓嶅湪淇�' }
+ ],
+ emphasis: {
+ itemStyle: {
+ shadowBlur: 10,
+ shadowOffsetX: 0,
+ shadowColor: 'rgba(0, 0, 0, 0.5)'
+ }
+ }
+ }
+ ]
+ }
+
+ option && myChart.setOption(option)
+ },
+ setPicture2 () {
+ const chartDom = this.$refs.picture2
+ const myChart = echarts.init(chartDom)
+ let option
+ option = {
+ title: {
+ text: '褰撴湀鍦ㄤ繚浜烘暟',
+ left: '5%',
+ top: '5%'
+ },
+ grid: {
+ left: '3%',
+ right: '4%',
+ bottom: '13%',
+ containLabel: true
+ },
+ tooltip: {
+ trigger: 'axis'
+ },
+ xAxis: {
+ type: 'category',
+ data: ['涓�鏈�', '浜屾湀', '涓夋湀', '鍥涙湀', '浜旀湀', '鍏湀', '涓冩湀', '鍏湀', '涔濇湀', '鍗佹湀', '鍗佷竴鏈�', '鍗佷簩鏈�']
+ },
+ yAxis: {
+ type: 'value'
+ },
+ series: [
+ {
+ data: [10, 30, 25, 16, 21, 18, 5, 30, 30, 30, 30, 30],
+ type: 'line'
+ }
+ ]
+ }
+
+ option && myChart.setOption(option)
+ },
+ setPicture3 () {
+ const chartDom = this.$refs.picture3
+ const myChart = echarts.init(chartDom)
+ let option
+ option = {
+ title: {
+ text: '鎬昏禂浠樼巼 78%',
+ left: '5%',
+ top: '5%'
+ },
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'shadow'
+ }
+ },
+ grid: {
+ left: '3%',
+ right: '4%',
+ bottom: '25%',
+ containLabel: true
+ },
+ xAxis: {
+ type: 'value'
+ // boundaryGap: [0, 0.01]
+ },
+ yAxis: {
+ type: 'category',
+ data: ['淇濋櫓A璧斾粯鐜�', '淇濋櫓B璧斾粯鐜�', '鎬昏禂浠樼巼']
+ },
+ series: [
+ {
+ type: 'bar',
+ stack: 'total',
+ barWidth: '60%',
+ data: [10, 20, 30]
+ },
+ {
+ type: 'bar',
+ stack: 'total',
+ barWidth: '60%',
+ data: [15, 16, 24]
+ }
+ ]
+ }
+
+ option && myChart.setOption(option)
+ }
+ }
+}
+</script>
+
+<style scoped lang="scss">
+@import "@/assets/style/variables.scss";
+.home {
+ width: 100%;
+ height: 100%;
+ .home_inlet {
+ width: 100%;
+ height: 160px;
+ display: flex;
+ flex-direction: column;
+ padding: 20px;
+ box-sizing: border-box;
+ background: #ffffff;
+ .home_inlet_label {
+ width: 100%;
+ font-size: 18px;
+ font-weight: bold;
+ color: black;
+ margin-bottom: 20px;
+ }
+ .home_inlet_list {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ .home_inlet_item {
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ cursor: pointer;
+ img {
+ width: 40px;
+ height: 40px;
+ }
+ span {
+ font-size: 14px;
+ color: black;
+ margin-top: 5px;
+ }
+ }
+ }
+ }
+ .home_content {
+ width: 100%;
+ height: calc(100% - 170px);
+ margin-top: 10px;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ .home_content_left {
+ width: 350px;
+ height: 100%;
+ flex-shrink: 0;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ .home_content_left_item {
+ width: 100%;
+ height: 32%;
+ background: #ffffff;
+ }
+ }
+ .home_content_right {
+ flex: 1;
+ height: 100%;
+ background: #ffffff;
+ margin-left: 10px;
+ padding: 20px;
+ box-sizing: border-box;
+ position: relative;
+ .home_content_right_label {
+ font-size: 18px;
+ color: black;
+ font-weight: bold;
+ }
+ .home_content_right_list {
+ width: 100%;
+ display: flex;
+ flex-direction: column;
+ .list_item {
+ padding: 10px;
+ box-sizing: border-box;
+ width: 100%;
+ display: flex;
+ justify-content: space-between;
+ border: 1px solid #ececec;
+ margin-bottom: 15px;
+ &:last-child {
+ margin-bottom: 0 !important;
+ }
+ .list_item_left {
+ display: flex;
+ width: 60%;
+ flex-direction: column;
+ span {
+ &:nth-child(1) {
+ font-size: 14px;
+ color: black;
+ font-weight: bold;
+ }
+ &:nth-child(2) {
+ font-size: 14px;
+ color: black;
+ margin-top: 5px;
+ }
+ }
+ }
+ .list_item_center {
+ display: flex;
+ flex-direction: column;
+ span {
+ font-size: 14px;
+ color: black;
+ &:nth-child(2) {
+ margin-top: 5px;
+ }
+ }
+ }
+ .list_item_right {
+ height: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ span {
+ font-size: 14px;
+ color: #1890FF;
+ margin-top: 10px;
+ cursor: pointer;
+ }
+ }
+ }
+ }
+ .home_content_right_page {
+ margin-top: 20px;
+ position: relative;
+ bottom: 20px;
+ left: 20px;
+ box-sizing: border-box;
+ }
+ }
+ }
+}
+</style>
diff --git a/server/platform/src/main/java/com/doumee/api/business/ApplyChangeController.java b/server/platform/src/main/java/com/doumee/api/business/ApplyChangeController.java
index d8a1d53..237d7d8 100644
--- a/server/platform/src/main/java/com/doumee/api/business/ApplyChangeController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/ApplyChangeController.java
@@ -78,6 +78,13 @@
public ApiResponse<String> getChangeUnitSignLink (@RequestBody ApplyChange model, HttpServletResponse response) {
return ApiResponse.success( applyChangeService.getSignLinkChangeUnit(model));
}
+ @ApiOperation("鍒楄〃鏌ヨ")
+ @PostMapping("/list")
+ @RequiresPermissions("business:applychange:query")
+ public ApiResponse<List<ApplyChange>> list (@RequestBody ApplyChange applyChange) {
+ return ApiResponse.success(applyChangeService.findListForCompany(applyChange));
+ }
+
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
@RequiresPermissions("business:applychange:delete")
diff --git a/server/platform/src/main/java/com/doumee/api/business/InsuranceApplyController.java b/server/platform/src/main/java/com/doumee/api/business/InsuranceApplyController.java
index 7e726d2..17bff02 100644
--- a/server/platform/src/main/java/com/doumee/api/business/InsuranceApplyController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/InsuranceApplyController.java
@@ -133,7 +133,12 @@
public void exportDetailExcel (@RequestBody InsuranceApply model, HttpServletResponse response) {
ExcelExporter.build(InsuranceApply.class).exportApplyDetail(insuranceApplyService.findDetailForExport(model), response);
}
-
+ @ApiOperation("鍒楄〃")
+ @PostMapping("/findListByDTO")
+ @RequiresPermissions("business:insuranceapply:query")
+ public ApiResponse<List<InsuranceApply>> findListByDTO (@RequestBody InsuranceApplyQueryDTO insuranceApplyQueryDTO) {
+ return ApiResponse.success(insuranceApplyService.findListByDTO(insuranceApplyQueryDTO));
+ }
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
@RequiresPermissions("business:insuranceapply:query")
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Notices.java b/server/service/src/main/java/com/doumee/dao/business/model/Notices.java
index 857bc68..c89243d 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Notices.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Notices.java
@@ -119,8 +119,8 @@
@TableField(exist = false)
private String companyName;
- @ApiModelProperty(value = "骞冲彴 0骞冲彴娑堟伅 1浼佷笟娑堟伅", example = "1")
- @ExcelColumn(name="骞冲彴 0骞冲彴娑堟伅 1浼佷笟娑堟伅")
+ @ApiModelProperty(value = "骞冲彴 0骞冲彴娑堟伅 1浼佷笟娑堟伅 2鍟嗘埛娑堟伅", example = "1")
+ @ExcelColumn(name="骞冲彴 0骞冲彴娑堟伅 1浼佷笟娑堟伅 2鍟嗘埛娑堟伅 ")
private Integer palt;
@ApiModelProperty(value = "鐘舵�� 0姝ｅ父 1宸插叧闂� ", example = "1")
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/NoticesServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/NoticesServiceImpl.java
index d6651fd..a9ac725 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/NoticesServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/NoticesServiceImpl.java
@@ -145,6 +145,12 @@
queryWrapper.in(Notices::getObjType,new Integer[]{Constants.NoticeObjectType.TAXES.getKey() });
} else if(pageWrap.getModel().getQueryType().equals(Constants.TWO)){
queryWrapper.in(Notices::getObjType,new Integer[]{Constants.NoticeObjectType.SETTLE_CLAIMS.getKey() });
+ }else if(pageWrap.getModel().getQueryType().equals(Constants.THREE)){
+ //濮旀墭淇濅唬鍔�
+ queryWrapper.notIn(Notices::getType,new Integer[]{Constants.NoticeType.SEVEN.getStatus() });
+ }else if(pageWrap.getModel().getQueryType().equals(Constants.FOUR)){
+ //濮旀墭淇濅唬鍔�
+ queryWrapper.in(Notices::getType,new Integer[]{Constants.NoticeType.SEVEN.getStatus() });
}
}
if(CollectionUtils.isNotEmpty(pageWrap.getSorts())){
diff --git a/server/shop/src/main/java/com/doumee/api/business/NoticesController.java b/server/shop/src/main/java/com/doumee/api/business/NoticesController.java
index 97d7836..f0f74ed 100644
--- a/server/shop/src/main/java/com/doumee/api/business/NoticesController.java
+++ b/server/shop/src/main/java/com/doumee/api/business/NoticesController.java
@@ -72,7 +72,7 @@
@PostMapping("/page")
@RequiresPermissions("business:notices:query")
public ApiResponse<PageData<Notices>> findPage (@RequestBody PageWrap<Notices> pageWrap) {
- pageWrap.getModel().setPalt(Constants.ZERO);
+ pageWrap.getModel().setPalt(Constants.TWO);
return ApiResponse.success(noticesService.findPage(pageWrap));
}
--
Gitblit v1.9.3