From 0c4507ad5ebdbf8ac1c2bbcdcf38203908e61378 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 21 八月 2023 16:04:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
screen_standard/src/components/AppLayout.vue | 214 +++++++++++++++++++++++++-
server/src/main/resources/mappers/DeviceCheckExtMapper.xml | 2
server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java | 3
server/src/main/java/doumeemes/dao/business/dto/statistics/ProcedureProcessModel.java | 19 +-
server/src/main/java/doumeemes/service/ext/DeviceCheckExtService.java | 3
server/src/main/java/doumeemes/service/ext/impl/DeviceCheckExtServiceImpl.java | 7
screen_standard/src/views/index.vue | 173 +++++++++++++++++---
server/src/main/java/doumeemes/dao/business/dto/statistics/ProcedurePlansPageModel.java | 19 +-
8 files changed, 375 insertions(+), 65 deletions(-)
diff --git a/screen_standard/src/components/AppLayout.vue b/screen_standard/src/components/AppLayout.vue
index 7d27cac..4fca14a 100644
--- a/screen_standard/src/components/AppLayout.vue
+++ b/screen_standard/src/components/AppLayout.vue
@@ -1,13 +1,50 @@
<template>
<div class="content">
<div class="header">
- <div class="header-item" style="font-size: 20px;">璞嗙背绉戞妧</div>
+ <div class="header-item" style="font-size: 20px;">
+ <el-dropdown trigger="click">
+ <div class="eare-title">
+ {{ tempCom.name}}
+ <div class="right-icon">
+ <img src="@/assets/img/ar_drop@2x.png" alt="">
+ </div>
+ </div>
+ <template #dropdown>
+ <el-dropdown-menu>
+ <el-dropdown-item v-for="(item, index) in comList" :key="index" @click="selectCom(item, index)">{{item.name}}</el-dropdown-item>
+ </el-dropdown-menu>
+ </template>
+ </el-dropdown>
+
+ </div>
<div class="title">DM浜戝伐鍘傝溅闂村ぇ灞�</div>
- <div class="header-item">澶╂皵</div>
+ <div class="header-item right">
+
+ <img v-if="!isFull" src="@/assets/img/ic_fullscreen@2x.png" class="full-ic" @click="fullChange">
+ <img v-else src="@/assets/img/ic_exitfullscreen@2x.png" class="full-ic" @click="fullChange">
+ <img src="@/assets/img/title_line@2x.png" class="right-line" alt="">
+ <div class="date">
+ <div class="time">{{ tempDate.time }}</div>
+ <div class="day">{{ `${tempDate.date} ${tempDate.day}` }}</div>
+ </div>
+ <img src="@/assets/img/title_line@2x.png" class="right-line" alt="">
+ </div>
</div>
-
+ <!-- 'background': `url(${getAssets(item.bgImg)})`, -->
<div class="num-list">
-
+ <div
+ v-for="(item, index) in layoutList"
+ :key="index"
+ class="num-item"
+ :style="{ 'background-image': `url(${getAssets(item.bgImg)})`}"
+ >
+ <img :src="getAssets(item.logo)" alt="">
+ <div class="item-right">
+ <div class="item-title">{{ item.name }}</div>
+ <div class="num-value">1</div>
+ </div>
+
+ </div>
</div>
<RouterView />
</div>
@@ -15,14 +52,83 @@
<script setup>
-
-import { reactive } from 'vue';
+import { getAssets } from '@/utils'
+import { reactive, toRefs, onMounted } from 'vue';
import { RouterView } from 'vue-router'
-// const layoutList = [
-// { bgImg: requir('@/assets/img/bg_zhixingzhong@2x.png'), name: '鎵ц涓鍒掓暟(涓�)', logo: requir('@/assets/img') }
-// ]
+const layoutList = [
+ { bgImg: 'bg_zhixingzhong@2x.png', name: '鎵ц涓鍒掓暟(涓�)', logo: 'ic_zhixingzhong@2x.png' },
+ { bgImg: 'bg_yanqijihua@2x.png', name: '寤舵湡璁″垝鏁�(涓�)', logo: 'ic_yanqijihua@2x.png' },
+ { bgImg: 'bg_jinrirenshu@2x.png', name: '浠婃棩鐢熶骇浜烘暟(浜�)', logo: 'ic_jinrirenshu@2x.png' },
+ { bgImg: 'bg_jinrishebei@2x.png', name: '浠婃棩鐢熶骇璁惧(鍙�)', logo: 'ic_jinrishebei@2x.png' },
+ { bgImg: 'bg_jinribuliang@2x.png', name: '浠婃棩涓嶈壇鍝佺巼(%)', logo: 'ic_jinribuliang@2x.png' },
+]
+const data = reactive({
+ tempCom: { name: '璞嗙背绉戞妧' },
+ isFull: false,
+ tempDate: {
+ time: '',
+ date: '',
+ day: ''
+ }
+})
+let { tempCom, isFull, tempDate } = toRefs(data)
+
+const comList = [
+ {name: '璞嗙背'},
+ {name: '澶х背'},
+ {name: '灏忕背'},
+ {name: '榛勭背'},
+]
+
+
+const selectCom = (item, index) => {
+ data.tempCom = item
+}
+
+const fullChange = () => {
+ data.isFull = !data.isFull
+ let element = document.documentElement;
+ if (data.isFull) { // 鍏ㄥ睆
+ if (element.requestFullscreen) {
+ element.requestFullscreen();
+ } else if (element.webkitRequestFullScreen) {
+ element.webkitRequestFullScreen();
+ } else if (element.mozRequestFullScreen) {
+ element.mozRequestFullScreen();
+ } else if (element.msRequestFullscreen) {
+ // IE11
+ element.msRequestFullscreen();
+ }
+ } else { // 杩樺師
+ if (document.exitFullscreen) {
+ document.exitFullscreen();
+ } else if (document.webkitCancelFullScreen) {
+ document.webkitCancelFullScreen();
+ } else if (document.mozCancelFullScreen) {
+ document.mozCancelFullScreen();
+ } else if (document.msExitFullscreen) {
+ document.msExitFullscreen();
+ }
+ }
+ // data.isFull = !data.isFull
+}
+
+onMounted(() => {
+
+ const week = ['鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�', '鏄熸湡鏃�',]
+ setInterval(() => {
+ let date = new Date()
+ data.tempDate = {
+ time: `${date.getHours()}:${date.getMinutes()}:${date.getSeconds()}`,
+ date: `${date.getFullYear()}/${date.getMonth()+1}/${date.getDate()}`,
+ day: week[date.getDay()-1]
+ }
+ }, 1000)
+ // console.log(date.getDay());
+
+})
</script>
<style lang="scss" scoped>
@@ -42,10 +148,26 @@
height: 74px;
display: flex;
padding-top: 1px;
+ padding-left: 20px;
justify-content: space-between;
color: #fff;
.header-item {
- width: 200px;
+ width: 300px;
+ }
+ .eare-title {
+ margin-top: 27px;
+ color: #fff;
+ height: 20px;
+ font-size: 20px;
+ font-family: SourceHanSansSC-Medium, SourceHanSansSC;
+ font-weight: 500;
+ // line-height: 74px;
+ display: flex;
+ .right-icon {
+ width: 20px;
+ height: 20px;
+ margin-left: 8px;
+ }
}
.title {
margin-top: 15px;
@@ -55,10 +177,82 @@
line-height: 25px;
text-align: center;
}
+ .right {
+ margin-top: 20px;
+ height: 30px;
+ display: flex;
+ padding-right: 22px;
+ flex-direction: row-reverse;
+ .full-ic {
+ margin-top: 2px;
+ width: 30px;
+ height: 30px;
+ }
+ .right-line {
+ width: 2px;
+ height: 34px;
+ margin-left: 15px;
+ margin-right: 15px;
+ }
+ .date {
+ .time {
+ height: 20px;
+ font-size: 18px;
+ font-weight: 500;
+ color: #FFFFFF;
+ line-height: 20px;
+ }
+ .day {
+ height: 12px;
+ font-size: 12px;
+ font-weight: 400;
+ color: #D2E0FF;
+ line-height: 12px;
+ }
+ }
+ }
}
.num-list {
+ margin-top: 24px;
display: flex;
justify-content: space-between;
+ height: 88px;
+ color: white;
+ .num-item {
+ width: calc(25% - 50px);
+ background-size: 100% 100%;
+ margin-right: 25px;
+ padding-left: 30px;
+ padding-top: 12px;
+ display: flex;
+ &:last-child {
+ margin-right: 0px;
+ }
+ img {
+ width: 52px;
+ height: 52px;
+ }
+ .item-right {
+ margin-left: 12px;
+ .item-title {
+ height: 19px;
+ font-size: 13px;
+ font-weight: 400;
+ color: rgba(255,255,255,0.9);
+ line-height: 19px;
+ }
+ .num-value {
+ height: 35px;
+ font-size: 30px;
+ font-weight: bold;
+ color: #FFFFFF;
+ line-height: 35px;
+ background: linear-gradient(180deg, #EEEEEE 0%, #15CFFF 100%);
+ -webkit-background-clip: text;
+ -webkit-text-fill-color: transparent;
+ }
+ }
+ }
}
}
</style>
diff --git a/screen_standard/src/views/index.vue b/screen_standard/src/views/index.vue
index 5b0d6f3..b8c1ff6 100644
--- a/screen_standard/src/views/index.vue
+++ b/screen_standard/src/views/index.vue
@@ -1,5 +1,5 @@
<template>
- <div class="content">
+ <div class="content1">
<div class="content_left">
<div class="content_left_item1">
<div class="content_left_item1_head">
@@ -26,34 +26,20 @@
<span>浠撳簱瀹炴椂浣欓噺缁熻</span>
</div>
<div class="content_left_item2_content">
- <div class="productProcess">
-
- <!-- 濡傛灉椤甸潰鍒锋柊鏁版嵁姣旇緝棰戠箒锛屽彲浠ュ皢loading銆乻howFlag鐨勭浉鍏充唬鐮佸垹闄わ紝闃叉杩囦簬棰戠箒鐨勫嚭鐜板姞杞藉姩鐢� -->
- <div class="loading_div" v-show="!showFlag">
- <div>Loading...</div> <!-- 杩欎釜loading鑷繁鍐欙紝浠ｇ爜娌¤创鍑烘潵 -->
- </div>
-
- <div class="success_info_body" v-show="showFlag">
- <!-- 鍙傛暟鍚嶇О銆佸垪鏁版牴鎹疄闄呮儏鍐佃皟鏁� -->
- <div class="table_body">
- <div class="table_th">
- <div class="tr1 th_style">鎺掍骇缂栧彿</div>
- <div class="tr2 th_style">绫诲瀷</div>
- <div class="tr3 th_style">鏃ユ湡</div>
- <div class="tr4 th_style">杩涘害</div>
- </div>
- <div class="table_main_body">
- <div class="table_inner_body" :style="{top: tableTop + 'px'}">
- <div class="table_tr" v-for="(item,index) in tableList" :key="index">
- <div class="tr1 tr">{{item.planNo}}</div>
- <div class="tr2 tr">{{item.type}}</div>
- <div class="tr3 tr" v-if="item.startDate!='-'">{{item.startDate}} ~ {{item.endDate}}</div>
- <div class="tr3 tr" v-else>-</div>
- <div class="tr4 tr" v-if="item.process!='-'">{{Number(item.process).toFixed(2)}} %</div>
- <div class="tr4 tr" v-else>-</div>
- </div>
- </div>
- </div>
+ <div class="item2_content_head">
+ <div class="item2_content_head_item">鐗╂枡鍚嶇О / 宸ュ簭</div>
+ <div class="item2_content_head_item">浠撳簱</div>
+ <div class="item2_content_head_item">璐ф灦</div>
+ <div class="item2_content_head_item">鏁伴噺</div>
+ </div>
+ <div @mouseenter="handleMouseEnter" @mouseleave="handleMouseLeave" class="main_container">
+ <div ref="scrollContainer" class="scroll_container">
+ <div v-for="(item, index) in listData" :key="item.id" :class="index % 2 == 0 ? 'scroll_item scroll_item_bg1' : 'scroll_item scroll_item_bg2'">
+ <span>{{ item.name }}</span>
+ <div class="scroll_item_row"></div>
+ <div class="scroll_item_row"></div>
+ <div class="scroll_item_row"></div>
+ <div class="scroll_item_row"></div>
</div>
</div>
</div>
@@ -66,11 +52,92 @@
</template>
<script setup>
+ import {reactive, ref, onMounted, onBeforeUnmount, onUnmounted, nextTick} from 'vue'
+ let timer = ref(null)
+ let scrollContainer = ref(null)
+ let listData = reactive([
+ {name: 'dom绗竴涓�'},
+ {name: 'dom绗簩涓�'},
+ {name: 'dom绗笁涓�'},
+ {name: 'dom绗洓涓�'},
+ {name: 'dom绗簲涓�'},
+ {name: 'dom绗叚涓�'},
+ {name: 'dom绗竷涓�'},
+ {name: 'dom绗叓涓�'},
+ {name: 'dom绗節涓�'},
+ {name: 'dom绗崄涓�'},
+ ])
+ start()
+ // 娉細绀轰緥涓殑 listData 鍐欑殑鏄潤鎬佹暟鎹紝鍙互鐩存帴璋冪敤 start()
+ // 濡傛灉鏄帴鍙ｈ幏鍙� listData 鍒楄〃鏃讹紝闇�瑕佸湪 nextTick 涓皟鐢� start()
+ // 鍚﹀垯锛岃繘鍏ラ〉闈笉浼氭粴鍔ㄣ�傚繀椤婚紶鏍囩Щ鍏ョЩ鍑烘墠浼氭粴鍔�
+ // 鐢� nextTick 鐨勫師鍥犳槸闇�瑕佺瓑 dom 鍏冪礌鍔犺浇瀹屾瘯鍚庡啀鎵ц鏂规硶
+
+ // let chartData = reactive({
+ // data: []
+ // })
+ // function getSensorData() {
+ // GetSensorData().then(res=> {
+ // chartData.data = res.data.data
+ // nextTick(()=>{
+ // start()
+ // })
+ // })
+ // }
+
+ // onMounted(()=> {
+ // getSensorData()
+ // })
+
+ onBeforeUnmount(()=>{
+ clearTimeout(timer.value)
+ })
+ onUnmounted(()=>{
+ clearTimeout(timer.value)
+ })
+
+ function handleMouseEnter() {
+ clearTimeout(timer.value)
+ }
+ function handleMouseLeave() {
+ start()
+ }
+ // 寮�鍚畾鏃跺櫒
+ function start() {
+ clearTimeout(timer.value)
+ // 瀹氭椂鍣ㄨЕ鍙戝懆鏈�
+ let speed = ref(25)
+ timer.value = setInterval(ListScroll, speed.value)
+ }
+ function ListScroll() {
+ let scrollDom = scrollContainer.value
+ // 鍒よ缁勪欢鏄惁娓叉煋瀹屾垚
+ if(scrollDom.offsetHeight == 0) {
+ scrollDom = scrollContainer.value
+ }else {
+ // 濡傛灉鍒楄〃鏁伴噺杩囧皯涓嶈繘琛屾粴鍔�
+ if(scrollDom.children.length < 4) {
+ clearTimeout(timer.value)
+ return
+ }
+ // 缁勪欢杩涜婊氬姩
+ scrollDom.scrollTop += 1
+ // 鍒ゆ柇鏄惁婊氬姩鍒板簳閮�
+ if(scrollDom.scrollTop == (scrollDom.scrollHeight - scrollDom.clientHeight)) {
+ // 鑾峰彇缁勪欢绗竴涓妭鐐�
+ let first = scrollDom.children[0]
+ // 鍒犻櫎鑺傜偣
+ scrollDom.removeChild(first)
+ // 灏嗚鑺傜偣鎷兼帴鍒扮粍浠舵渶鍚�
+ scrollDom.append(first)
+ }
+ }
+ }
</script>
<style lang="scss" scoped>
- .content {
+ .content1 {
width: 100%;
height: auto;
display: flex;
@@ -190,8 +257,52 @@
.content_left_item2_content {
width: 100%;
height: 361px;
+ padding: 20px;
+ box-sizing: border-box;
background: linear-gradient(180deg, rgba(52,88,159,0) 0%, rgba(0,86,255,0.4) 100%);
-
+ .item2_content_head {
+ width: 100%;
+ height: 36px;
+ display: flex;
+ align-items: center;
+ background: rgba(52,88,159,0.5);
+ .item2_content_head_item {
+ flex: 1;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 13px;
+ font-family: PingFangSC-Medium, PingFang SC;
+ font-weight: 500;
+ color: #01D9FE;
+ &:first-child {
+ flex: 1.5;
+ }
+ }
+ }
+ .main_container {
+ width: 100%;
+ height: calc(100% - 36px);
+ .scroll_container {
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+ .scroll_item_bg1 {
+ background: rgba(52,88,159,0.2);
+ }
+ .scroll_item_bg2 {
+ background: rgba(52,88,159,0.5);
+ }
+ .scroll_item {
+ width: 100%;
+ height: 36px;
+ display: flex;
+ align-items: center;
+
+ }
+ }
+ }
}
}
}
diff --git a/server/src/main/java/doumeemes/dao/business/dto/statistics/ProcedurePlansPageModel.java b/server/src/main/java/doumeemes/dao/business/dto/statistics/ProcedurePlansPageModel.java
index d20ad64..fb1903d 100644
--- a/server/src/main/java/doumeemes/dao/business/dto/statistics/ProcedurePlansPageModel.java
+++ b/server/src/main/java/doumeemes/dao/business/dto/statistics/ProcedurePlansPageModel.java
@@ -18,21 +18,22 @@
*/
public class ProcedurePlansPageModel {
- @ApiModelProperty(value = "宸ュ簭鍚嶇О", example = "1")
- private String procedureName;
- @ApiModelProperty(value = "宸ュ簭缂栫爜", example = "1")
- private Integer procedureId;
- @ApiModelProperty(value = "涓嶈壇鍝佺巼", example = "1")
- private BigDecimal unqualifiedRate;
@ApiModelProperty(value = "涓嶈壇鍝佹暟", example = "1")
private BigDecimal unqualifiedNum;
@ApiModelProperty(value = "鑹搧鏁�", example = "1")
private BigDecimal qualifiedNum;
@ApiModelProperty(value = "鏈畬宸ユ暟閲�", example = "1")
private BigDecimal undoneNum;
- @ApiModelProperty(value = "璁″垝鐢熶骇鏁伴噺", example = "1")
+ @ApiModelProperty(value = "璁″垝鏁伴噺", example = "1")
private BigDecimal num;
- @ApiModelProperty(value = "璁″垝涓暟", example = "1")
- private Integer planCount;
+ @ApiModelProperty(value = "涓嶈壇鍝佺巼%", example = "1")
+ private BigDecimal unqualifiedRate;
+ @ApiModelProperty(value = "鐗╂枡缂栫爜")
+ private String materialCode;
+ @ApiModelProperty(value = "宸ュ簭鍚嶇О")
+ private String procedureName;
+
+ @ApiModelProperty(value = "鐘舵�� 0宸茬敓鎴愩��1宸插彂甯冦��2宸叉挙鍥炪��3宸插彇娑堛��4宸插垎閰嶃��5宸叉殏鍋溿��6宸插畬宸ャ��7宸插叆搴撱��8宸插叧闂�", example = "1")
+ private Integer status;
}
diff --git a/server/src/main/java/doumeemes/dao/business/dto/statistics/ProcedureProcessModel.java b/server/src/main/java/doumeemes/dao/business/dto/statistics/ProcedureProcessModel.java
index e1caf3a..00dcaf7 100644
--- a/server/src/main/java/doumeemes/dao/business/dto/statistics/ProcedureProcessModel.java
+++ b/server/src/main/java/doumeemes/dao/business/dto/statistics/ProcedureProcessModel.java
@@ -15,22 +15,21 @@
* 鏈�鍚庝竴鍒楃殑鑹搧鏁�/瀹屽伐鏁帮細涓哄綋鍓嶄骇鍝佹渶鍚庝竴閬撳伐搴忕殑鑹搧鏁�/瀹屽伐鏁帮紱
*/
public class ProcedureProcessModel {
+ @ApiModelProperty(value = "宸ュ簭鍚嶇О", example = "1")
+ private String procedureName;
+ @ApiModelProperty(value = "宸ュ簭缂栫爜", example = "1")
+ private Integer procedureId;
+ @ApiModelProperty(value = "涓嶈壇鍝佺巼", example = "1")
+ private BigDecimal unqualifiedRate;
@ApiModelProperty(value = "涓嶈壇鍝佹暟", example = "1")
private BigDecimal unqualifiedNum;
@ApiModelProperty(value = "鑹搧鏁�", example = "1")
private BigDecimal qualifiedNum;
@ApiModelProperty(value = "鏈畬宸ユ暟閲�", example = "1")
private BigDecimal undoneNum;
- @ApiModelProperty(value = "璁″垝鏁伴噺", example = "1")
+ @ApiModelProperty(value = "璁″垝鐢熶骇鏁伴噺", example = "1")
private BigDecimal num;
- @ApiModelProperty(value = "涓嶈壇鍝佺巼%", example = "1") private BigDecimal unqualifiedRate;
- @ApiModelProperty(value = "鐗╂枡缂栫爜")
- private String materialCode;
- @ApiModelProperty(value = "宸ュ簭鍚嶇О")
- private String procedureName;
-
- @ApiModelProperty(value = "鐘舵�� 0宸茬敓鎴愩��1宸插彂甯冦��2宸叉挙鍥炪��3宸插彇娑堛��4宸插垎閰嶃��5宸叉殏鍋溿��6宸插畬宸ャ��7宸插叆搴撱��8宸插叧闂�", example = "1")
- private Integer status;
-
+ @ApiModelProperty(value = "璁″垝涓暟", example = "1")
+ private Integer planCount;
}
diff --git a/server/src/main/java/doumeemes/service/ext/DeviceCheckExtService.java b/server/src/main/java/doumeemes/service/ext/DeviceCheckExtService.java
index ab7d320..07cad0e 100644
--- a/server/src/main/java/doumeemes/service/ext/DeviceCheckExtService.java
+++ b/server/src/main/java/doumeemes/service/ext/DeviceCheckExtService.java
@@ -5,7 +5,6 @@
import doumeemes.dao.business.model.DeviceCheck;
import doumeemes.dao.ext.vo.DeviceCheckExtListVO;
import doumeemes.dao.ext.dto.QueryDeviceCheckExtDTO;
-import io.lettuce.core.dynamic.annotation.Param;
/**
* 璁惧宸℃淇℃伅琛� EXTService瀹氫箟
@@ -22,4 +21,6 @@
PageData<DeviceCheckExtListVO> findPage(PageWrap<QueryDeviceCheckExtDTO> pageWrap);
DeviceCheck selectOneById(Integer id);
+
+ PageData<DeviceCheckExtListVO> getDeviceCheckPage( PageWrap<QueryDeviceCheckExtDTO> pageWrap);
}
diff --git a/server/src/main/java/doumeemes/service/ext/impl/DeviceCheckExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/DeviceCheckExtServiceImpl.java
index 463b2c0..1091ade 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/DeviceCheckExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/DeviceCheckExtServiceImpl.java
@@ -17,7 +17,6 @@
import doumeemes.dao.ext.DeviceCheckExtMapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
-import io.lettuce.core.dynamic.annotation.Param;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -63,6 +62,12 @@
List<DeviceCheckExtListVO> result = deviceCheckExtMapper.selectList(pageWrap.getModel());
return PageData.from(new PageInfo<>(result));
}
+ @Override
+ public PageData<DeviceCheckExtListVO> getDeviceCheckPage (PageWrap<QueryDeviceCheckExtDTO> pageWrap) {
+ PageHelper.startPage(pageWrap.getPage(), pageWrap.getCapacity());
+ List<DeviceCheckExtListVO> result = deviceCheckExtMapper.selectList(pageWrap.getModel());
+ return PageData.from(new PageInfo<>(result));
+ }
@Override
public DeviceCheck selectOneById(Integer id){
diff --git a/server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java
index c67ff46..d43172b 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java
@@ -223,8 +223,7 @@
//鍙兘鏌ョ湅褰撳墠鏍圭粍缁囩殑鏁版嵁
pageWrap.getModel().setRootDepartId(department.getRootId());
pageWrap.getModel().setComDepartId(departId);
- PageHelper.startPage(pageWrap.getPage(), pageWrap.getCapacity());
- return deviceCheckExtService.findPage(pageWrap);
+ return deviceCheckExtService.getDeviceCheckPage(pageWrap);
}
@Override
public List<ProcedurePlansPageModel> getProcedurePlansPage(Integer companyId, Integer departId,Integer procedureId){
diff --git a/server/src/main/resources/mappers/DeviceCheckExtMapper.xml b/server/src/main/resources/mappers/DeviceCheckExtMapper.xml
index fbd4d89..294959b 100644
--- a/server/src/main/resources/mappers/DeviceCheckExtMapper.xml
+++ b/server/src/main/resources/mappers/DeviceCheckExtMapper.xml
@@ -33,7 +33,7 @@
left join device d on `deviceCheck`.DEVICE_ID = d.id
left join procedures p on p.id = d.PROCEDURE_ID
left join `system_user` s on s.id = `deviceCheck`.CREATE_USER
- <where>
+ <where> deviceCheck.deleted=0
<if test="deviceName != null and deviceName != ''">
AND d.NAME like concat('%',#{deviceName},'%')
</if>
--
Gitblit v1.9.3