From ea704e018a27c26ef6deeaea4adc8a28b4d0b27e Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 17 一月 2025 17:15:29 +0800
Subject: [PATCH] 修改指派设备
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java | 33 ++++++++-------------------------
1 files changed, 8 insertions(+), 25 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java
index 4a4c131..20618d5 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java
@@ -351,11 +351,10 @@
if(file == null || file.isEmpty() || !ValidateUtil.validateString(id))
ExceptionCast.cast(CommonCode.INVALID_PARAM);
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- String userId = user.getId();
- if(!ValidateUtil.validateString(userId))
+ if(!ValidateUtil.validateString(user.getUsername()))
ExceptionCast.cast(UcenterCode.UCENTER_ACCOUNT_NOT_EXIST);
FileOperate operate = fileOperateService.getByDocId(id);
- if(operate == null || !userId.equals(operate.getCreateUser()))
+ if(operate == null || !user.getUsername().equals(operate.getCreateBy()))
ExceptionCast.cast(DocumentCode.DOC_OPERATE_PUSH_FAIL);
DocInfo en = super.getById(id);
if(en == null)
@@ -527,11 +526,10 @@
if(!ValidateUtil.validateString(id))
ExceptionCast.cast(CommonCode.INVALID_PARAM);
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- String userId = user.getId();
- if(!ValidateUtil.validateString(userId))
+ if(!ValidateUtil.validateString(user.getUsername()))
ExceptionCast.cast(UcenterCode.UCENTER_ACCOUNT_NOT_EXIST);
FileOperate operate = fileOperateService.getByDocId(id);
- if(operate == null || !userId.equals(operate.getCreateUser()))
+ if(operate == null || !user.getUsername().equals(operate.getCreateBy()))
ExceptionCast.cast(DocumentCode.DOC_CANCEL_PULL_ERROR);
DocInfo en = super.getById(id);
if(en == null)
@@ -582,14 +580,7 @@
}
queryWrapper.ge(StrUtil.isNotEmpty(docQuery.getStartTime()),"date_format(u.create_time,'%Y-%m-%d %H:%i:%s')",docQuery.getStartTime());
queryWrapper.le(StrUtil.isNotEmpty(docQuery.getEndTime()),"date_format(u.create_time,'%Y-%m-%d %H:%i:%s')",docQuery.getEndTime());
- if(ValidateUtil.validateString(docQuery.getAscStr())) {
- String[] ascArr = docQuery.getAscStr().split(",");
-// ((Page<DocInfo>) pageData).setAsc(ascArr);
- }
- if(ValidateUtil.validateString(docQuery.getDescStr())) {
- String[] descStr = docQuery.getDescStr().split(",");
-// ((Page<DocInfo>) pageData).setDesc(descStr);
- }
+ queryWrapper.orderByDesc("u.create_time");
IPage<DocInfo> docInfoIPage = super.getBaseMapper().findDocExtList(pageData, queryWrapper);
return Result.ok(docInfoIPage);
}
@@ -758,7 +749,7 @@
}
@Override
- public QueryPageResponseResult<DocInfo> findPageListByDevice(int page, int size, DocInfoQueryRequest docQuery) {
+ public IPage<DocInfo> findPageListByDevice(int page, int size, DocInfoQueryRequest docQuery) {
if(page < 1 || size < 1) {
ExceptionCast.cast(CommonCode.INVALID_PAGE);
}
@@ -788,22 +779,14 @@
}
queryWrapper.ge(StrUtil.isNotEmpty(docQuery.getStartTime()),"date_format(u.create_time,'%Y-%m-%d %H:%i:%s')",docQuery.getStartTime());
queryWrapper.le(StrUtil.isNotEmpty(docQuery.getEndTime()),"date_format(u.create_time,'%Y-%m-%d %H:%i:%s')",docQuery.getEndTime());
-
- if(ValidateUtil.validateString(docQuery.getAscStr())) {
- String[] ascArr = docQuery.getAscStr().split(",");
-// ((Page<DocInfo>) pageData).setAsc(ascArr);
- }
- if(ValidateUtil.validateString(docQuery.getDescStr())) {
- String[] descStr = docQuery.getDescStr().split(",");
-// ((Page<DocInfo>) pageData).setDesc(descStr);
- }
+ queryWrapper.orderByDesc("u.create_time");
IPage<DocInfo> docInfoIPage = super.getBaseMapper().findDeviceDocExtList(pageData, queryWrapper);
if (docInfoIPage != null && docInfoIPage.getRecords() != null && !docInfoIPage.getRecords().isEmpty()) {
for (DocInfo d : docInfoIPage.getRecords()) {
d.setSyncStatus(2);
}
}
- return new QueryPageResponseResult<>(CommonCode.SUCCESS, docInfoIPage);
+ return docInfoIPage;
}
@Override
--
Gitblit v1.9.3