From 958a0faa328020fc7ebce1e7782e8aeb2150153c Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 14 Jun 2022 21:57:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/project/mapper/xml/NcrTrackMapper.xml | 5 +++++
.../project/service/impl/NcrTrackServiceImpl.java | 11 ++++++++---
.../java/com/jero/modules/project/vo/NcrTrackVO.java | 2 ++
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml
index e193d375a..6fb360f6a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml
@@ -36,12 +36,17 @@
left join project_laws_inventory pli on pti.project_laws_inventory_id = pli.id
left join project_library_base plb on plb.id = pli.project_library_id
left join project_name_info pni on pni.id = plb.project_name_id
+ left join project_task_inventory_detail ptid on ptid.project_task_inventory_id = pti.project_laws_inventory_id
where
plb.id =#{ncrTrackVO.projectLibraryId}
and
+
+ ptid.user_id =#{ncrTrackVO.userId}
+ and
+
pli.serial_number like concat(concat('%',#{ncrTrackVO.serialNumber}),'%')
and
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
index d21304787..af23daa76 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.constant.enums.CutEnum;
import com.jero.common.exception.JeroBootException;
+import com.jero.common.system.vo.LoginUser;
import com.jero.modules.project.entity.ProjectTaskInventoryDetailEO;
import com.jero.modules.project.enums.ReviewResultEnum;
import com.jero.modules.project.mapper.NcrTrackMapper;
@@ -21,6 +22,7 @@ import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.apache.shiro.SecurityUtils;
import org.jeecgframework.poi.excel.ExcelExportUtil;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.enmus.ExcelType;
@@ -57,6 +59,8 @@ public class NcrTrackServiceImpl extends ServiceImpl
@Override
public List getPageInfo(NcrTrackVO ncrTrackVO) {
+ LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ ncrTrackVO.setUserId(loginUser.getId());
if(StringUtils.isNotBlank(ncrTrackVO.getSerialNumber())){
if(ncrTrackVO.getSerialNumber().contains("%")){
ncrTrackVO.setSerialNumber(ncrTrackVO.getSerialNumber().replaceAll("%", "/%"));
@@ -73,6 +77,7 @@ public class NcrTrackServiceImpl extends ServiceImpl
ncrTrackVO.setInconformity(ReviewResultEnum.INCONFORMITY.getValue());
ncrTrackVO.setTrack(ReviewResultEnum.TO_TRACK.getValue());
List infoList = ncrTrackMapper.getInfoList(ncrTrackVO);
+ infoList = infoList.stream().distinct().collect(Collectors.toList());
List trackVOList = new ArrayList<>();
String designName = "";
String prehomoName = "";
@@ -122,7 +127,7 @@ public class NcrTrackServiceImpl extends ServiceImpl
}
//设计符合性确认
- if(StringUtils.isNotBlank(designPId)){
+ if(StringUtils.isNotBlank(designPId) && StringUtils.isNotBlank(designFlowTaskStatusName)){
NcrTrackVO ncrTrackVOTemp = entityInfo(trackVO.getSerialNumber(),
trackVO.getTitle(),
trackVO.getDesignPId(),
@@ -141,7 +146,7 @@ public class NcrTrackServiceImpl extends ServiceImpl
trackVOList.add(ncrTrackVOTemp);
}
//PreHomo确认
- if(StringUtils.isNotBlank(prehomoPId)){
+ if(StringUtils.isNotBlank(prehomoPId) && StringUtils.isNotBlank(prehomoFlowTaskStatusName)){
NcrTrackVO ncrTrackVOTemp = entityInfo(trackVO.getSerialNumber(),
trackVO.getTitle(),
trackVO.getPrehomoPId(),
@@ -160,7 +165,7 @@ public class NcrTrackServiceImpl extends ServiceImpl
trackVOList.add(ncrTrackVOTemp);
}
//验证符合性确认
- if(StringUtils.isNotBlank(verifyPId)){
+ if(StringUtils.isNotBlank(verifyPId) && StringUtils.isNotBlank(verifyFlowTaskStatusName)){
NcrTrackVO ncrTrackVOTemp = entityInfo(trackVO.getSerialNumber(),
trackVO.getTitle(),
trackVO.getVerifyPId(),
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java
index 7ccfe9809..69193946c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java
@@ -31,6 +31,8 @@ public class NcrTrackVO implements Serializable {
//用于导出时勾选数据
private String uuid;
+ private String userId;
+
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")