From 7ba18a5ff7453daa361541edf94e98f0ab865f24 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Tue, 14 May 2024 11:44:34 +0800 Subject: [PATCH] =?UTF-8?q?2024-05-314=20=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../change/mapper/ChangeManagementMapper.java | 2 +- .../impl/ChangeManagementServiceImpl.java | 38 ++++------- .../impl/CustomerAddressServiceImpl.java | 63 ++++++++++++------- .../impl/RoutingManagementServiceImpl.java | 3 + .../mapper/change/ChangeManagementMapper.xml | 11 ++-- 5 files changed, 64 insertions(+), 53 deletions(-) diff --git a/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java b/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java index 8828b333..0d2e5ed0 100644 --- a/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java +++ b/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java @@ -104,7 +104,7 @@ public interface ChangeManagementMapper extends BaseMapper{ List queryRequestHeader(ChangeRequestVo data); - List queryNodeDetailFirst(String site, String workflowId); + List queryNodeDetailFirst(@Param("site") String site, @Param("workflowId") String workflowId, @Param("menuId") String menuId); int getSeqNo(ProcessFormEntity processFormEntity); diff --git a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java index 2d854c4d..41d9558c 100644 --- a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java +++ b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java @@ -745,24 +745,6 @@ public class ChangeManagementServiceImpl extends ServiceImpl> res = JSON.parseObject(String.valueOf(getRequestOperatorInfoResponses.getObj()), new TypeReference>>(){}); -// logger.info(res.toString()); -// throw new RuntimeException("抛个异常"); -// } - // 1、获取当前登陆人的域控账号 SysUserEntity user = sysUserDao.selectOne(new QueryWrapper().eq("username", data.getUserName())); @@ -796,10 +778,11 @@ public class ChangeManagementServiceImpl extends ServiceImpl mainData = new ArrayList<>(); - List nodeDetails = changeManagementMapper.queryNodeDetailFirst(data.getSite(), workflowId); - if (nodeDetails.isEmpty()) { - throw new RuntimeException("出口配置获取有误!"); - } + List nodeDetails = changeManagementMapper.queryNodeDetailFirst(data.getSite(), workflowId, data.getMenuId()); + logger.info(nodeDetails.toString()); +// if (nodeDetails.isEmpty()) { +// throw new RuntimeException("出口配置获取有误!"); +// } // 查出变更单相关表的数据 // 主信息 @@ -822,6 +805,9 @@ public class ChangeManagementServiceImpl extends ServiceImpl map2 = result2.get(0); String userId2 = (String) map2.get("id"); md.setFieldValue(userId2); @@ -1202,9 +1190,9 @@ public class ChangeManagementServiceImpl extends ServiceImpl mainData = new ArrayList<>(); List nodeDetails = changeManagementMapper.queryNodeDetails(processFormList.get(0)); - if (nodeDetails.isEmpty()) { - throw new RuntimeException("出口配置获取有误!"); - } +// if (nodeDetails.isEmpty()) { +// throw new RuntimeException("出口配置获取有误!"); +// } // 查出变更单相关表的数据 // 库存成本影响 ChangeCostImpactVo costImpact = changeManagementMapper.costImpactSearch(changeRequest); diff --git a/src/main/java/com/spring/modules/customer/service/impl/CustomerAddressServiceImpl.java b/src/main/java/com/spring/modules/customer/service/impl/CustomerAddressServiceImpl.java index 6c9004b8..69cd6062 100644 --- a/src/main/java/com/spring/modules/customer/service/impl/CustomerAddressServiceImpl.java +++ b/src/main/java/com/spring/modules/customer/service/impl/CustomerAddressServiceImpl.java @@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; @Service @@ -47,17 +48,26 @@ public class CustomerAddressServiceImpl extends ServiceImpl() - .eq("site", data.getSite()) - .eq("customer_no", data.getCustomerNo()) - .eq("address_type", data.getAddressType()) - .eq("address_name", data.getAddressName()) - .eq("default_address", data.getDefaultAddress())) - .stream() - .findAny() - .ifPresent(a -> { - throw new RuntimeException("该地址已存在这个默认地址！"); - }); +// customerAddressMapper.selectList(new QueryWrapper() +// .eq("site", data.getSite()) +// .eq("customer_no", data.getCustomerNo()) +// .eq("address_type", data.getAddressType()) +// .eq("address_name", data.getAddressName()) +// .eq("default_address", data.getDefaultAddress())) +// .stream() +// .findAny() +// .ifPresent(a -> { +// throw new RuntimeException("该地址已存在这个默认地址！"); +// }); + if ("Y".equals(data.getDefaultAddress())) { + List addressList = customerAddressMapper.selectList(new QueryWrapper().eq("site", data.getSite()).eq("customer_no", data.getCustomerNo())); + if (!addressList.isEmpty()) { + boolean b = addressList.stream().anyMatch(a -> "Y".equals(a.getDefaultAddress())); + if (b) { + throw new RuntimeException("该客户已存在默认地址！"); + } + } + } customerAddressMapper.insert(data); } @@ -71,17 +81,26 @@ public class CustomerAddressServiceImpl extends ServiceImpl() - .eq("site", data.getSite()) - .eq("customer_no", data.getCustomerNo()) - .eq("address_type", data.getAddressType()) - .eq("address_name", data.getAddressName()) - .eq("default_address", data.getDefaultAddress())) - .stream() - .findAny() - .ifPresent(a -> { - throw new RuntimeException("该地址已存在这个默认地址！"); - }); +// customerAddressMapper.selectList(new QueryWrapper() +// .eq("site", data.getSite()) +// .eq("customer_no", data.getCustomerNo()) +// .eq("address_type", data.getAddressType()) +// .eq("address_name", data.getAddressName()) +// .eq("default_address", data.getDefaultAddress())) +// .stream() +// .findAny() +// .ifPresent(a -> { +// throw new RuntimeException("该地址已存在这个默认地址！"); +// }); + if ("Y".equals(data.getDefaultAddress())) { + List addressList = customerAddressMapper.selectList(new QueryWrapper().eq("site", data.getSite()).eq("customer_no", data.getCustomerNo())); + if (!addressList.isEmpty()) { + List collect = addressList.stream().filter(a -> "Y".equals(a.getDefaultAddress()) && !Objects.equals(a.getAddressId(), data.getAddressId())).collect(Collectors.toList()); + if (!collect.isEmpty()) { + throw new RuntimeException("该客户已存在默认地址！"); + } + } + } customerAddressMapper.updateById(data); } diff --git a/src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java index 7b4833b9..7b1a3b26 100644 --- a/src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java +++ b/src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java @@ -1221,6 +1221,9 @@ public class RoutingManagementServiceImpl extends ServiceImpl