From 03965438c47dc6620bf5bf9ebb7ae97e805b4aae Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 15 十月 2026 15:44:44 +0800
Subject: [PATCH] fix(crm,mes): 客户转化统计漏行、归档台账分页与排序
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/documentaudit/MesPdDocumentAuditServiceImpl.java | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/documentaudit/MesPdDocumentAuditServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/documentaudit/MesPdDocumentAuditServiceImpl.java
index 1119fc3..dd7506f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/documentaudit/MesPdDocumentAuditServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/documentaudit/MesPdDocumentAuditServiceImpl.java
@@ -4,25 +4,31 @@
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
import cn.iocoder.yudao.module.mes.controller.admin.pd.documentaudit.vo.MesPdDocumentAuditPageReqVO;
+import cn.hutool.core.collection.CollUtil;
import cn.iocoder.yudao.module.mes.controller.admin.pd.documentaudit.vo.MesPdDocumentAuditSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pd.document.MesPdDocumentDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pd.documentaudit.MesPdDocumentAuditDO;
import cn.iocoder.yudao.module.mes.dal.mysql.pd.documentaudit.MesPdDocumentAuditMapper;
+import cn.iocoder.yudao.module.mes.enums.MesPdStatusConstants;
import cn.iocoder.yudao.module.mes.service.pd.document.MesPdDocumentService;
-import com.mysql.cj.protocol.Security;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import java.time.LocalDateTime;
import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.PD_DOCUMENT_AUDIT_NOT_EXISTS;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.PD_DOCUMENT_AUDIT_STATUS_INVALID;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.PD_DOCUMENT_AUDIT_STATUS_REQUIRED;
/**
* MES 璧勬枡瀹℃牳 Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -48,10 +54,18 @@
public void updateDocumentAudit(MesPdDocumentAuditSaveReqVO updateReqVO) {
// 鏍￠獙瀛樺湪
validateDocumentAuditExists(updateReqVO.getId());
- if (updateReqVO.getAuditStatus() ==1 ) {
- updateReqVO.setReviewer(SecurityFrameworkUtils.getLoginUserId());
- updateReqVO.setAuditTime(LocalDateTime.now());
+ // 鏍￠獙瀹℃牳缁撴灉锛氳嚜鍔ㄥ鎵规ā寮忎笅鍓嶇浼氶殣钘忋�屽鏍哥粨鏋溿�嶅瓧娈靛鑷存紡浼狅紝蹇呴』鍦ㄦ鏄惧紡鎷︽埅锛岄伩鍏嶆媶绠� NPE
+ Integer auditStatus = updateReqVO.getAuditStatus();
+ if (auditStatus == null) {
+ throw exception(PD_DOCUMENT_AUDIT_STATUS_REQUIRED);
}
+ if (!Objects.equals(auditStatus, MesPdStatusConstants.DOCUMENT_AUDIT_PASS)
+ && !Objects.equals(auditStatus, MesPdStatusConstants.DOCUMENT_AUDIT_REJECT)) {
+ throw exception(PD_DOCUMENT_AUDIT_STATUS_INVALID);
+ }
+ // 瀹℃牳浜轰笌瀹℃牳鏃堕棿缁熶竴鐢卞悗绔褰曪紝涓嶉噰鐢ㄥ墠绔紶鍊�
+ updateReqVO.setReviewer(SecurityFrameworkUtils.getLoginUserId());
+ updateReqVO.setAuditTime(LocalDateTime.now());
// 鏇存柊
MesPdDocumentAuditDO updateObj = BeanUtils.toBean(updateReqVO, MesPdDocumentAuditDO.class);
documentAuditMapper.updateById(updateObj);
@@ -72,6 +86,17 @@
@Override
public PageResult<MesPdDocumentAuditDO> getDocumentAuditPage(MesPdDocumentAuditPageReqVO pageReqVO) {
+ // 鎸夐」鐩瓫閫夛細鍏堟煡鍑洪」鐩笅鎵�鏈夎祫鏂欙紝鍐嶆寜璧勬枡 ID 杩囨护瀹℃牳璁板綍
+ if (pageReqVO.getProjectId() != null) {
+ List<MesPdDocumentDO> documents = documentService.getDocumentListByProjectId(
+ pageReqVO.getProjectId());
+ if (CollUtil.isEmpty(documents)) {
+ return PageResult.empty();
+ }
+ List<Long> documentIds = documents.stream()
+ .map(MesPdDocumentDO::getId).collect(Collectors.toList());
+ return documentAuditMapper.selectPage(pageReqVO, documentIds);
+ }
return documentAuditMapper.selectPage(pageReqVO);
}
--
Gitblit v1.9.3