From c420375d61a5703c829d9feac8e99c7d67b870ac Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 21 八月 2023 15:57:13 +0800
Subject: [PATCH] 解除大屏登陆拦截
---
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 ++++++-
server/src/main/java/doumeemes/dao/business/dto/statistics/ProcedurePlansPageModel.java | 19 ++++++++++---------
6 files changed, 29 insertions(+), 24 deletions(-)
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