From 3668d4433f8db668ff506fcfb0488e7f40ff8382 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 11 六月 2024 15:47:10 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
admin/src/components/common/Menu.vue | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java | 12 +
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/StagingCloudController.java | 11 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java | 2
server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 2
admin/package-lock.json | 8 +
admin/package.json | 1
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformInterfaceLogServiceImpl.java | 15 -
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 44 ++++++
admin/src/views/business/relativeMember.vue | 8
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ApproveService.java | 5
admin/src/views/business/platformInterfaceLog.vue | 145 ++++++++++++++++++++
admin/src/components/business/OperaInterfaceLogWindow.vue | 113 +++++++++++----
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformInterfaceLog.java | 10 +
admin/src/api/business/platformInterfaceLog.js | 18 ++
admin/src/views/business/internalMember.vue | 6
17 files changed, 344 insertions(+), 60 deletions(-)
diff --git a/admin/package-lock.json b/admin/package-lock.json
index f3820ef..38ced85 100644
--- a/admin/package-lock.json
+++ b/admin/package-lock.json
@@ -13952,6 +13952,14 @@
"integrity": "sha1-UylVzB6yCKPZkLOp+acFdGV+CPI=",
"dev": true
},
+ "vue-json-viewer": {
+ "version": "2.2.22",
+ "resolved": "https://registry.npmmirror.com/vue-json-viewer/-/vue-json-viewer-2.2.22.tgz",
+ "integrity": "sha512-3oPH5BxoUWva/qp7wNJj+15FBXyi9Yu5VDW4mCWivjHR1pUpMv34fjqqxML7jh2uOqm1S/3Xks5nQ5JjC5+OWw==",
+ "requires": {
+ "clipboard": "^2.0.4"
+ }
+ },
"vue-loader": {
"version": "15.9.7",
"resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-15.9.7.tgz",
diff --git a/admin/package.json b/admin/package.json
index 64369f9..b47b3e7 100644
--- a/admin/package.json
+++ b/admin/package.json
@@ -26,6 +26,7 @@
"qrcodejs2": "0.0.2",
"vue": "^2.6.11",
"vue-clipboard2": "^0.3.1",
+ "vue-json-viewer": "^2.2.22",
"vue-router": "^3.5.1",
"vuescroll": "^4.17.3",
"vuex": "^3.4.0"
diff --git a/admin/src/api/business/platformInterfaceLog.js b/admin/src/api/business/platformInterfaceLog.js
new file mode 100644
index 0000000..2ecb2e2
--- /dev/null
+++ b/admin/src/api/business/platformInterfaceLog.js
@@ -0,0 +1,18 @@
+import request from '../../utils/request'
+
+// 鏌ヨ
+export function fetchList (data) {
+ return request.post('/visitsAdmin/cloudService/business/platformInterfaceLog/page', data, {
+ trim: true
+ })
+}
+
+// 鍒涘缓
+export function create (data) {
+ return request.post('/visitsAdmin/cloudService/business/platformInterfaceLog/create', data)
+}
+
+// 淇敼
+export function updateById (data) {
+ return request.post('/visitsAdmin/cloudService/business/platformInterfaceLog/updateById', data)
+}
diff --git a/admin/src/components/business/OperaInterfaceLogWindow.vue b/admin/src/components/business/OperaInterfaceLogWindow.vue
index 986f828..1533647 100644
--- a/admin/src/components/business/OperaInterfaceLogWindow.vue
+++ b/admin/src/components/business/OperaInterfaceLogWindow.vue
@@ -1,49 +1,102 @@
<template>
- <GlobalWindow
+ <el-dialog
:title="title"
+ width="60%"
:withFooter="false"
:visible.sync="visible"
:confirm-working="isWorking"
+ append-to-body
@confirm="confirm"
>
- <div class="box">
- {{form.content}}
- </div>
- </GlobalWindow>
+ <div class="codeEditBox">
+ <json-viewer
+ :value="form.formatContent"
+ :expand-depth="5"
+ copyable
+ boxed
+ :expanded="false"
+ @copied="copyText"
+ sort
+ :show-array-index="false"
+ class="w-100%">
+ <template slot="copy">
+ <i class="el-icon-document-copy" title="澶嶅埗">澶嶅埗浠ｇ爜</i>
+ </template>
+ </json-viewer>
+ </div>
+ </el-dialog>
</template>
<script>
- import BaseOpera from '@/components/base/BaseOpera'
- import GlobalWindow from '@/components/common/GlobalWindow'
- export default {
- name: 'OperaInterfaceLogWindow',
- extends: BaseOpera,
- components: { GlobalWindow },
- data () {
- return {
- // 琛ㄥ崟鏁版嵁
- form: {
- content: ''
- },
- // 楠岃瘉瑙勫垯
- rules: {
- }
- }
+import BaseOpera from '@/components/base/BaseOpera'
+import JsonViewer from 'vue-json-viewer'
+
+export default {
+ name: 'OperaInterfaceLogWindow',
+ extends: BaseOpera,
+ components: { JsonViewer },
+ data () {
+ return {
+ // 琛ㄥ崟鏁版嵁
+ form: {
+ content: '',
+ formatContent: {}
+ },
+ // 楠岃瘉瑙勫垯
+ rules: {
+ },
+ copyable: { copyText: 'copy', copiedText: 'copied' }
+ }
+ },
+ created () {
+ this.config({
+ api: '/business/interfaceLog',
+ 'field.id': 'id'
+ })
+ },
+ methods: {
+ copyText (val) {
+ this.$message.success('鍐呭宸叉垚鍔熷鍒跺埌鍓垏鏉匡紒')
},
- created () {
- this.config({
- api: '/business/interfaceLog',
- 'field.id': 'id'
+ open (title, target) {
+ this.title = title
+ this.visible = true
+ // 鏂板缓
+ if (target == null) {
+ this.$nextTick(() => {
+ this.$refs.form.resetFields()
+ this.form[this.configData['field.id']] = null
+ })
+ return
+ }
+ // 缂栬緫
+ this.$nextTick(() => {
+ for (const key in this.form) {
+ this.form[key] = target[key]
+ }
+ try {
+ this.form.formatContent = JSON.parse(this.form.content)
+ } catch (e) {
+ this.form.formatContent = this.form.content
+ }
})
}
}
+}
</script>
<style lang="scss" scoped>
- .box {
- width: 100%;
- font-size: 15px;
- color: #222222;
- word-wrap: break-word;
+ .codeEditBox {
+ width: 100%;
+ height: 90%;
+ overflow:auto;
+ display: block;
+ border: 1px solid #dcdee2;
+ overflow-y: auto;
+ }
+ ::v-deep .el-dialog__body{height:70vh;overflow-y: auto}
+ ::v-deep .el-dialog{height:78vh;overflow: hidden}
+ .jv-container {
+ //height: 60vh;
}
</style>
diff --git a/admin/src/components/common/Menu.vue b/admin/src/components/common/Menu.vue
index 0a5b41e..15f7c56 100644
--- a/admin/src/components/common/Menu.vue
+++ b/admin/src/components/common/Menu.vue
@@ -61,7 +61,7 @@
return
}
// 鐐瑰嚮褰撳墠鑿滃崟涓嶅仛澶勭悊
- if (menuConfig.url === this.$route.path && menuConfig.params === this.$route.query.param) {
+ if (menuConfig.url === this.$route.path && (menuConfig.params ==null || menuConfig.params==undefined || menuConfig.params=='' || menuConfig.params === this.$route.query.param)) {
return
}
if (menuConfig.url == null || menuConfig.url.trim().length === 0) {
diff --git a/admin/src/views/business/internalMember.vue b/admin/src/views/business/internalMember.vue
index 9629aed..747d2d7 100644
--- a/admin/src/views/business/internalMember.vue
+++ b/admin/src/views/business/internalMember.vue
@@ -167,9 +167,9 @@
>
<template slot-scope="{row}">
<el-button type="text" icon="el-icon-edit" @click="$refs.OperaMemberWindow.open('缂栬緫鍛樺伐淇℃伅',row,department)" v-permissions="['business:empower:update']">缂栬緫</el-button>
- <el-button type="text" :loading="heading" icon="el-icon-delete" @click="updateHead(row,0)" v-if="row.headStatus ==1 " v-permissions="['business:member:head']">鍙栨秷涓荤</el-button>
- <el-button type="text" :loading="heading" icon="el-icon-edit" @click="updateHead(row,1)" v-if="row.headStatus == 0" v-permissions="['business:member:head']">璁句负涓荤</el-button>
- <el-button type="text" icon="el-icon-plus" @click="empower(row.id)" v-permissions="['business:empower:create']">閲嶆柊鎺堟潈</el-button>
+ <el-button type="text" icon="el-icon-plus" @click="empower(row.id)" v-permissions="['business:empower:create']">閲嶆柊鎺堟潈</el-button>
+ <el-button type="text" :loading="heading" style="color: red" icon="el-icon-delete" @click="updateHead(row,0)" v-if="row.headStatus ==1 " v-permissions="['business:member:head']">鍙栨秷涓荤</el-button>
+ <el-button type="text" :loading="heading" icon="el-icon-edit" @click="updateHead(row,1)" v-if="row.headStatus == 0" v-permissions="['business:member:head']">璁句负涓荤</el-button>
<el-button type="text" icon="el-icon-delete" @click="deleteById(row)" style="color: red" v-permissions="['business:member:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
diff --git a/admin/src/views/business/platformInterfaceLog.vue b/admin/src/views/business/platformInterfaceLog.vue
new file mode 100644
index 0000000..c554833
--- /dev/null
+++ b/admin/src/views/business/platformInterfaceLog.vue
@@ -0,0 +1,145 @@
+<template>
+ <TableLayout :permissions="['business:interfacelog:query']">
+ <!-- 鎼滅储琛ㄥ崟 -->
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form-item label="鎺ュ彛鍚嶇О" prop="name">
+ <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ユ帴鍙ｅ悕绉�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="绫诲瀷" prop="type">
+ <el-select v-model="searchForm.type" @change="search" placeholder="璇烽�夋嫨">
+ <el-option label="璋冪敤" value="0"></el-option>
+ <el-option label="鎺ㄩ�佹帴鍙�" value="1"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="璧锋鏃堕棿" prop="startDate">
+ <el-date-picker
+ @change="seleTime"
+ v-model="time"
+ type="datetimerange"
+ format="yyyy-MM-dd HH:mm:ss"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫椂闂�"
+ end-placeholder="缁撴潫鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
+ <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
+ <el-radio-button label="0">褰撳ぉ</el-radio-button>
+ <el-radio-button label="1">杩�7澶�</el-radio-button>
+ <el-radio-button label="2">杩�30澶�</el-radio-button>
+ </el-radio-group>
+ <section>
+ <el-button type="primary" @click="search">鎼滅储</el-button>
+ <el-button @click="reset">閲嶇疆</el-button>
+ </section>
+ </el-form>
+ <!-- 琛ㄦ牸鍜屽垎椤� -->
+ <template v-slot:table-wrap>
+ <el-table
+ v-loading="isWorking.search"
+ :data="tableData.list"
+ stripe
+ >
+ <el-table-column prop="name" label="鎺ュ彛鍚嶇О" min-width="180px"></el-table-column>
+ <el-table-column prop="url" label="鍦板潃淇℃伅" min-width="180px"></el-table-column>
+ <el-table-column label="绫诲瀷" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.type == 0">璋冪敤</span>
+ <span v-if="row.type == 1">鎺ㄩ�佹帴鏀�</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="骞冲彴" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.plat == 0">娴峰悍瀹夐槻骞冲彴</span>
+ <span v-if="row.plat == 1">ERP绯荤粺</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="request" label="璇锋眰鍙傛暟" min-width="100px">
+ <template slot-scope="{row}">
+ <el-button type="text" @click="$refs.operaInterfaceLogWindow.open('璇锋眰鍙傛暟', {content: row.request})">鏌ョ湅</el-button>
+ </template>
+ </el-table-column>
+ <el-table-column prop="repose" label="鍝嶅簲鍙傛暟" min-width="100px">
+ <template slot-scope="{row}">
+ <el-button type="text" @click="$refs.operaInterfaceLogWindow.open('鍝嶅簲鍙傛暟', {content: row.repose})">鏌ョ湅</el-button>
+ </template>
+ </el-table-column>
+ <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
+ </el-table>
+ <pagination
+ @size-change="handleSizeChange"
+ @current-change="handlePageChange"
+ :pagination="tableData.pagination"
+ >
+ </pagination>
+ </template>
+ <!-- 鏂板缓/淇敼 -->
+ <OperaInterfaceLogWindow ref="operaInterfaceLogWindow" @success="handlePageChange"/>
+ </TableLayout>
+</template>
+
+<script>
+import BaseTable from '@/components/base/BaseTable'
+import TableLayout from '@/layouts/TableLayout'
+import Pagination from '@/components/common/Pagination'
+import OperaInterfaceLogWindow from '@/components/business/OperaInterfaceLogWindow'
+import { timeForMat } from '@/utils/util'
+export default {
+ name: 'InterfaceLog',
+ extends: BaseTable,
+ components: { TableLayout, Pagination, OperaInterfaceLogWindow },
+ data () {
+ return {
+ // 鎼滅储
+ searchForm: {
+ name: '',
+ type: '',
+ endDate: '',
+ startDate: '',
+ radio: '0'
+ },
+ time: []
+ }
+ },
+ created () {
+ this.config({
+ module: '涓夋柟骞冲彴鎺ュ彛浜や簰璁板綍',
+ api: '/business/platformInterfaceLog',
+ 'field.id': 'id',
+ 'field.main': 'id'
+ })
+ this.changeRadio('0')
+ },
+ methods: {
+ changeRadio (e) {
+ if (e === '0') {
+ this.searchForm.startTime = timeForMat(0)[0]
+ this.searchForm.endTime = timeForMat(0)[1]
+ this.time = timeForMat(0)
+ } else if (e === '1') {
+ this.searchForm.startTime = timeForMat(6)[0]
+ this.searchForm.endTime = timeForMat(6)[1]
+ this.time = timeForMat(6)
+ } else if (e === '2') {
+ this.searchForm.startTime = timeForMat(29)[0]
+ this.searchForm.endTime = timeForMat(29)[1]
+ this.time = timeForMat(29)
+ }
+ this.search()
+ },
+ seleTime (e) {
+ this.searchForm.startDate = e[0]
+ this.searchForm.endDate = e[1]
+ this.searchForm.radio = null
+ this.search()
+ },
+ reset () {
+ this.$refs.searchForm.resetFields()
+ this.searchForm.startDate = ''
+ this.searchForm.endDate = ''
+ this.time = []
+ this.search()
+ }
+ }
+}
+</script>
diff --git a/admin/src/views/business/relativeMember.vue b/admin/src/views/business/relativeMember.vue
index 258bd1c..73e45ef 100644
--- a/admin/src/views/business/relativeMember.vue
+++ b/admin/src/views/business/relativeMember.vue
@@ -168,10 +168,10 @@
>
<template slot-scope="{row}">
<el-button type="text" icon="el-icon-edit" @click="$refs.OperaMemberWindow.open('缂栬緫鍛樺伐淇℃伅',row,department)" v-permissions="['business:empower:update']">缂栬緫</el-button>
- <el-button type="text" :loading="heading" icon="el-icon-delete" @click="updateHead(row,0)" v-if="row.headStatus ==1 " v-permissions="['business:member:head']">鍙栨秷涓荤</el-button>
- <el-button type="text" :loading="heading" icon="el-icon-edit" @click="updateHead(row,1)" v-if="row.headStatus == 0" v-permissions="['business:member:head']">璁句负涓荤</el-button>
- <el-button type="text" icon="el-icon-plus" @click="empower(row.id)" v-permissions="['business:empower:create']">閲嶆柊鎺堟潈</el-button>
- <el-button type="text" icon="el-icon-delete" @click="empower(row.id)" v-permissions="['business:empower:delete']">鍒犻櫎</el-button>
+ <el-button type="text" icon="el-icon-plus" @click="empower(row.id)" v-permissions="['business:empower:create']">閲嶆柊鎺堟潈</el-button>
+ <el-button type="text" :loading="heading" style="color: red" icon="el-icon-delete" @click="updateHead(row,0)" v-if="row.headStatus ==1 " v-permissions="['business:member:head']">鍙栨秷涓荤</el-button>
+ <el-button type="text" :loading="heading" icon="el-icon-edit" @click="updateHead(row,1)" v-if="row.headStatus == 0" v-permissions="['business:member:head']">璁句负涓荤</el-button>
+ <el-button type="text" icon="el-icon-delete" style="color: red" @click="empower(row.id)" v-permissions="['business:empower:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java
index 68ab7e8..f83bec9 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java
@@ -174,8 +174,6 @@
queryWrapper.eq("1","2");
}
queryWrapper.ge(noticesDTO.getStartDate() != null, Notices::getCreateDate, Utils.Date.getStart(noticesDTO.getStartDate() ));
- queryWrapper.le(noticesDTO.getStartDate() != null, Notices::getCreateDate, Utils.Date.getEnd(noticesDTO.getStartDate() ));
- queryWrapper.ge(noticesDTO.getEndDate() != null, Notices::getCreateDate, Utils.Date.getStart(noticesDTO.getEndDate() ));
queryWrapper.le(noticesDTO.getEndDate() != null, Notices::getCreateDate, Utils.Date.getEnd(noticesDTO.getEndDate() ));
queryWrapper.eq(Objects.nonNull(noticesDTO.getType()),Notices::getType,noticesDTO.getType());
queryWrapper.eq(StringUtils.isNotBlank(noticesDTO.getTitle()),Notices::getTitle,noticesDTO.getTitle());
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/StagingCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/StagingCloudController.java
index 4dddf78..91b2143 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/StagingCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/StagingCloudController.java
@@ -83,16 +83,23 @@
- @ApiOperation(value = "浠诲姟涓績澶撮儴", notes = "H5")
+ @ApiOperation(value = "浠诲姟涓績澶撮儴 - H5", notes = "H5")
@GetMapping("/taskCenterHead")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "isDetail", value = " 鏄惁鏌ヨ璇︾粏 1鏄紱0鍚�", required = true),
})
public ApiResponse<InternalHomeVO> taskCenterHead(@RequestParam Integer isDetail,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
- return ApiResponse.success("鏌ヨ鎴愬姛",approveService.getHomeData(getLoginUser(token).getMemberId(),isDetail));
+ return ApiResponse.success("鏌ヨ鎴愬姛",approveService.getHomeDataH5(getLoginUser(token).getMemberId(),isDetail));
}
+ @ApiOperation(value = "浠诲姟涓績澶撮儴 - PC", notes = "PC")
+ @PostMapping("/taskCenterHeadPC")
+ public ApiResponse<InternalHomeVO> taskCenterHeadPC(@RequestBody NoticesDTO noticesDTO,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ noticesDTO.setMemberId(getLoginUser(token).getMemberId());
+ return ApiResponse.success("鏌ヨ鎴愬姛",approveService.getHomeDataPC(noticesDTO));
+ }
+
@ApiOperation("浠诲姟涓績鍒嗛〉")
@PostMapping("/taskPage")
public ApiResponse<PageData<Notices>> taskPage (@RequestBody PageWrap<NoticesDTO> pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformInterfaceLog.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformInterfaceLog.java
index 52e20b5..0d8df6c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformInterfaceLog.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformInterfaceLog.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
@@ -60,7 +61,7 @@
@ApiModelProperty(value = "鍦板潃淇℃伅")
@ExcelColumn(name="鍦板潃淇℃伅")
- private Date url;
+ private String url;
@ApiModelProperty(value = "璇锋眰鍙傛暟")
@ExcelColumn(name="璇锋眰鍙傛暟")
@@ -86,4 +87,11 @@
@ExcelColumn(name="鍏宠仈瀵硅薄缂栫爜锛堝涓敤鑻辨枃閫楀彿闅斿紑锛�")
private String objId;
+ @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ @TableField(exist = false)
+ private Date startDate;
+
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ @TableField(exist = false)
+ private Date endDate;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ApproveService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ApproveService.java
index 8254608..6b2fb66 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ApproveService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ApproveService.java
@@ -5,6 +5,7 @@
import com.doumee.dao.business.dto.ApproveDTO;
import com.doumee.dao.business.model.Approve;
import com.doumee.dao.business.vo.ApproveDataVO;
+import com.doumee.dao.system.dto.NoticesDTO;
import com.doumee.dao.web.response.InternalHomeVO;
import java.util.List;
@@ -105,7 +106,9 @@
* @param memberId
* @return
*/
- InternalHomeVO getHomeData(Integer memberId,Integer isDetail);
+ InternalHomeVO getHomeDataH5(Integer memberId,Integer isDetail);
+
+ InternalHomeVO getHomeDataPC(NoticesDTO noticesDTO);
void createApproveFlow(Integer tempType,Integer businessId,Integer createMemberId);
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
index 41dc926..619f502 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
@@ -18,6 +18,7 @@
import com.doumee.dao.business.join.VisitsJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.ApproveDataVO;
+import com.doumee.dao.system.dto.NoticesDTO;
import com.doumee.dao.system.join.NoticesJoinMapper;
import com.doumee.dao.system.model.Notices;
import com.doumee.dao.system.model.SystemUser;
@@ -240,7 +241,7 @@
* @return
*/
@Override
- public InternalHomeVO getHomeData(Integer memberId,Integer isDetail){
+ public InternalHomeVO getHomeDataH5(Integer memberId,Integer isDetail){
InternalHomeVO internalHomeVO = new InternalHomeVO();
internalHomeVO.setHomeImg(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.HOME_IMAGE).getCode());
//浠诲姟鏁版嵁
@@ -280,6 +281,47 @@
}
+ @Override
+ public InternalHomeVO getHomeDataPC(NoticesDTO noticesDTO){
+ InternalHomeVO internalHomeVO = new InternalHomeVO();
+ internalHomeVO.setHomeImg(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.HOME_IMAGE).getCode());
+ //浠诲姟鏁版嵁
+ List<Notices> noticesList = noticesJoinMapper.
+ selectList(new QueryWrapper<Notices>().lambda()
+ .ge(noticesDTO.getStartDate() != null, Notices::getCreateDate, Utils.Date.getStart(noticesDTO.getStartDate() ))
+ .le(noticesDTO.getEndDate() != null, Notices::getCreateDate, Utils.Date.getEnd(noticesDTO.getEndDate() ))
+ .eq(Notices::getUserId,noticesDTO.getMemberId()).orderByDesc(Notices::getCreateDate)
+ );
+ internalHomeVO.setTaskNum(noticesList.size());
+ if(CollectionUtils.isNotEmpty(noticesList)){
+ //寰呮垜澶勭悊鐨勬暟鎹�
+ internalHomeVO.setNoticeWaitNum(
+ noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),noticesDTO.getMemberId())
+ &&Constants.equalsInteger(i.getStatus(),Constants.ZERO)
+ &&Constants.equalsInteger(i.getSendacopy(),Constants.ZERO)
+ ).count()
+ );
+ internalHomeVO.setNoticeDealNum(
+ noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),noticesDTO.getMemberId())
+ &&Constants.equalsInteger(i.getStatus(),Constants.ONE)
+ &&Constants.equalsInteger(i.getSendacopy(),Constants.ZERO)
+ ).count()
+ );
+
+ internalHomeVO.setNoticeCreateNum(
+ noticesJoinMapper.selectCount(new QueryWrapper<Notices>().lambda().eq(Notices::getParam3,noticesDTO.getMemberId()))
+ );
+
+ internalHomeVO.setNoticeCopyNum(
+ noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),noticesDTO.getMemberId())
+ &&Constants.equalsInteger(i.getSendacopy(),Constants.ONE)
+ ).count()
+ );
+ }
+
+ return internalHomeVO;
+ }
+
/**
* 鍒涘缓瀹℃壒娴佺▼
* @param tempType 妯℃澘绫诲瀷 0闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 1鏂藉伐浜哄憳璁垮鐢宠 2璁垮鎶ュ 3鍏溅甯傚唴鐢ㄨ溅 4鍏溅瀹ゅ鐢ㄨ溅 5甯傚叕鍙哥墿娴佽溅棰勭害
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java
index 3f3d105..7b9bfbb 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java
@@ -10,6 +10,7 @@
import com.doumee.dao.business.ApproveParamMapper;
import com.doumee.dao.business.ApproveTemplMapper;
import com.doumee.dao.business.MemberMapper;
+import com.doumee.dao.business.join.MemberJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.ApproveParamDataVO;
import com.doumee.service.business.ApproveTemplService;
@@ -17,6 +18,7 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -42,7 +44,7 @@
@Autowired
private ApproveParamMapper approveParamMapper;
@Autowired
- private MemberMapper memberMapper;
+ private MemberJoinMapper memberJoinMapper;
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
@@ -161,8 +163,12 @@
);
for (ApproveParam approveParam :approveParamList) {
if(StringUtils.isNotBlank(approveParam.getObjIds())){
- approveParam.setMemberList(memberMapper.selectList(new QueryWrapper<Member>()
- .lambda().eq(Member::getIsdeleted,Constants.ZERO).in(Member::getId,approveParam.getObjIds().split(","))));
+ approveParam.setMemberList(memberJoinMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>()
+ .selectAll(Member.class)
+ .selectAs(Company::getName,Member::getCompanyName)
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId)
+ .eq(Member::getIsdeleted,Constants.ZERO)
+ .in(Member::getId,approveParam.getObjIds().split(","))));
}
}
model.setParamList(approveParamList);
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
index 10ea27c..f0024a9 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
@@ -123,7 +123,7 @@
multifileMapper.insert(multifile);
}
}
- String title = "[闅愭偅闅忔墜鎷峕鎻愭姤浜�-"+hiddenDanger.getLoginUserInfo().getRealname();
+ String title = "銆愰殣鎮ｉ殢鎵嬫媿銆戞彁鎶ヤ汉 - "+hiddenDanger.getLoginUserInfo().getRealname();
//json鏁版嵁
Map<String,Object> jsonMap = new HashMap<>();
jsonMap.put("area", "鍙戠幇鍖哄煙:" + hiddenDangerParam.getName());
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformInterfaceLogServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformInterfaceLogServiceImpl.java
index b5038a0..b6d98ec 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformInterfaceLogServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformInterfaceLogServiceImpl.java
@@ -106,23 +106,18 @@
.eq(pageWrap.getModel().getIsdeleted() != null, PlatformInterfaceLog::getIsdeleted, pageWrap.getModel().getIsdeleted())
.eq(pageWrap.getModel().getRemark() != null, PlatformInterfaceLog::getRemark, pageWrap.getModel().getRemark())
.eq(pageWrap.getModel().getType() != null, PlatformInterfaceLog::getType, pageWrap.getModel().getType())
- .eq(pageWrap.getModel().getName() != null, PlatformInterfaceLog::getName, pageWrap.getModel().getName())
- .ge(pageWrap.getModel().getUrl() != null, PlatformInterfaceLog::getUrl, Utils.Date.getStart(pageWrap.getModel().getUrl()))
- .le(pageWrap.getModel().getUrl() != null, PlatformInterfaceLog::getUrl, Utils.Date.getEnd(pageWrap.getModel().getUrl()))
+ .like(pageWrap.getModel().getName() != null, PlatformInterfaceLog::getName, pageWrap.getModel().getName())
+ .like(pageWrap.getModel().getUrl() != null, PlatformInterfaceLog::getUrl, pageWrap.getModel().getUrl())
.eq(pageWrap.getModel().getRequest() != null, PlatformInterfaceLog::getRequest, pageWrap.getModel().getRequest())
.eq(pageWrap.getModel().getRepose() != null, PlatformInterfaceLog::getRepose, pageWrap.getModel().getRepose())
.eq(pageWrap.getModel().getSuccess() != null, PlatformInterfaceLog::getSuccess, pageWrap.getModel().getSuccess())
.eq(pageWrap.getModel().getPlat() != null, PlatformInterfaceLog::getPlat, pageWrap.getModel().getPlat())
.eq(pageWrap.getModel().getObjType() != null, PlatformInterfaceLog::getObjType, pageWrap.getModel().getObjType())
.eq(pageWrap.getModel().getObjId() != null, PlatformInterfaceLog::getObjId, pageWrap.getModel().getObjId())
+ .ge(pageWrap.getModel().getStartDate() != null,PlatformInterfaceLog::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getStartDate()))
+ .le(pageWrap.getModel().getEndDate() != null,PlatformInterfaceLog::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getEndDate()))
+ .orderByDesc(PlatformInterfaceLog::getCreateDate);
;
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
return PageData.from(platformInterfaceLogMapper.selectPage(page, queryWrapper));
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
index c44988f..aa6d84b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
@@ -193,7 +193,7 @@
//鏌ヨ鍏ㄩ儴鐩稿叧鏂逛汉鍛樹俊鎭�
List<Member> list = memberJoinMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>()
.selectAll(Member.class)
- .leftJoin(Company.class,Company::getId,Member::getId)
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId)
.eq(Company::getType,Constants.ZERO)
// .in(Company::getId,loginUserInfo.getCompanyIdList() )
.eq(Member::getIsdeleted, com.doumee.core.utils.Constants.ZERO));
--
Gitblit v1.9.3