From 5284a4b7535cbad8e4f74a29c57c276979cdd137 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 15 Mar 2024 11:18:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8F=90=E7=A4=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/master/MaterialMainMapper.java | 2 ++ .../product/bomnew/pojo/vo/UserInfoVO.java | 19 +++++++++++++++++ .../bomnew/service/UserInfoService.java | 21 +++++++++++++++++++ .../OriginalBom/PlmBomToOriginalConvert.java | 9 ++++---- .../mapper/master/MaterialMainMapper.xml | 9 ++++++++ 5 files changed, 55 insertions(+), 5 deletions(-) create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/UserInfoVO.java create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/UserInfoService.java diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/MaterialMainMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/MaterialMainMapper.java index e9c96799..400951c2 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/MaterialMainMapper.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/MaterialMainMapper.java @@ -6,6 +6,7 @@ import com.nflg.product.bomnew.pojo.entity.MaterialMainEntity; import com.nflg.product.bomnew.pojo.vo.BaseMaterialVO; import com.nflg.product.bomnew.pojo.vo.MaterialMateVO; import com.nflg.product.bomnew.pojo.vo.RolePostVo; +import com.nflg.product.bomnew.pojo.vo.UserInfoVO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -58,4 +59,5 @@ public interface MaterialMainMapper extends BaseMapper { */ List getRolePostByUserId(@Param("userRowId") Long userRowId); + UserInfoVO getUserInfoByUserCode(@Param("userCode")String userCode); } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/UserInfoVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/UserInfoVO.java new file mode 100644 index 00000000..48e8b042 --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/UserInfoVO.java @@ -0,0 +1,19 @@ +package com.nflg.product.bomnew.pojo.vo; + +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * @author 曹鹏飞 + * @date 2024-03-15 10:48:27 + */ +@Data +@Accessors(chain = true) +@ApiModel(value = "com-nflg-product-material-pojo-vo-UserInfoVO") +public class UserInfoVO { + + private String userCode; + private String realName; + +} diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/UserInfoService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/UserInfoService.java new file mode 100644 index 00000000..ca34b5ce --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/UserInfoService.java @@ -0,0 +1,21 @@ +package com.nflg.product.bomnew.service; + +import com.nflg.product.bomnew.pojo.vo.UserInfoVO; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +/** + * @author 曹鹏飞 + * @date 2024-03-15 10:55:09 + */ +@Service +public class UserInfoService { + + @Resource + MaterialMainService materialMainService; + + public UserInfoVO getUserInfo(String userCode){ + return materialMainService.getBaseMapper().getUserInfoByUserCode(userCode); + } +} diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvert.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvert.java index fa783287..5b5b9e21 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvert.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvert.java @@ -11,12 +11,10 @@ import com.nflg.product.bomnew.constant.OriginalSourceEnum; import com.nflg.product.bomnew.constant.OriginalStatusEnum; import com.nflg.product.bomnew.mapper.master.MaterialMainMapper; import com.nflg.product.bomnew.pojo.entity.*; -import com.nflg.product.bomnew.pojo.vo.BaseMaterialVO; -import com.nflg.product.bomnew.pojo.vo.BomOriginalPlmBomVO; -import com.nflg.product.bomnew.pojo.vo.ImportOriginalBomVO; -import com.nflg.product.bomnew.pojo.vo.MaterialMateVO; +import com.nflg.product.bomnew.pojo.vo.*; import com.nflg.product.bomnew.service.BomOriginalCadChildService; import com.nflg.product.bomnew.service.MaterialMainService; +import com.nflg.product.bomnew.service.UserInfoService; import com.nflg.product.bomnew.util.VUtils; import lombok.Getter; @@ -136,7 +134,8 @@ public class PlmBomToOriginalConvert extends BaseConvert { // VUtils.isTure(true).throwMessage("图号:"+parent.getChartNo()+"此数据已创建BOM，请删除BOM重新导入"); } else { - importErrorResult.add(new ImportOriginalBomVO( parent.getChartNo(),"此数据已被其他用户创建，请联系其他人处理")); + UserInfoVO userInfo =SpringUtil.getBean(UserInfoService.class).getUserInfo(ebom.getCreatedBy()); + importErrorResult.add(new ImportOriginalBomVO( parent.getChartNo(),"此数据已被"+userInfo.getRealName()+"("+userInfo.getUserCode()+")创建，请联系TA处理")); // VUtils.isTure(true).throwMessage("图号:"+parent.getChartNo()+"此数据已被其他用户创建，请联系其他人处理"); } } else { //ebom为正式状态 diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/MaterialMainMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/MaterialMainMapper.xml index 77b4ec11..0ea18db0 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/MaterialMainMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/MaterialMainMapper.xml @@ -188,4 +188,13 @@ AND rp.role_row_id=ru.role_row_id AND ru.user_row_id= #{userRowId} + +