canrd-outside / order-erp · Commits

Commit 30ec44cdcf7edca831d5024f4a732c9051302901

Authored by chenhang4442024
1 parent a8d06449
build: skipped

feat:创建生产科角色的同时顺便把生产科添加到dictionary中

Inline Side-by-side
Showing 2 changed files with 32 additions and 10 deletions
src/main/java/com/order/erp/service/admin/impl/AdminUserServiceImpl.java
  View file @30ec44c
... ... @@ -97,6 +97,8 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
97 97 @Resource
98 98 private DataScope dataScope;
99 99  
  100 + @Resource
  101 + private DictionaryService dictionaryService;
100 102 /**
101 103 * 通过ID查询单条数据
102 104 * <p>
... ... @@ -181,18 +183,20 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
181 183 if (Objects.nonNull(adminUserVO.getId())) {
182 184 adminUserVO.setId(null);
183 185 }
184   - List<AdminUserDO> userDOS = list(new LambdaQueryWrapper<AdminUserDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
  186 + List<AdminUserDO> byPhoneUserDOS = list(new LambdaQueryWrapper<AdminUserDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
185 187 .eq(AdminUserDO::getPhone, adminUserVO.getPhone()));
186   - if (CollectionUtils.isNotEmpty(userDOS)) {
  188 + if (CollectionUtils.isNotEmpty(byPhoneUserDOS)) {
187 189 throw new BusinessException("手机号已被注册");
188 190 }
  191 + List<AdminUserDO> byUserNameUserDOS = list(new LambdaQueryWrapper<AdminUserDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
  192 + .eq(AdminUserDO::getUserName, adminUserVO.getUserName()));
  193 + if (CollectionUtils.isNotEmpty(byUserNameUserDOS)) {
  194 + throw new BusinessException("用户名已存在");
  195 + }
189 196 AdminUserDO adminUserDo = BeanUtil.copyProperties(adminUserVO, AdminUserDO.class);
190 197 if(StringUtils.isNotBlank(adminUserVO.getEmail())){
191 198 adminUserDo.setEmail(adminUserVO.getEmail());
192 199 }
193   - if (StringUtils.isNotBlank(adminUserVO.getUserName())) {
194   - adminUserDo.setNickName(adminUserVO.getUserName());
195   - }
196 200 if (StringUtils.isNotBlank(adminUserVO.getNickName())) {
197 201 adminUserDo.setUserName(adminUserVO.getNickName());
198 202 }
... ... @@ -209,6 +213,17 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
209 213 roleIds.add(adminUserVO.getRoleId());
210 214 authRole(AdminAuthUserVO.builder().userId(adminUserDo.getId()).roleIds(roleIds).build());
211 215 }
  216 + //创建生产科角色顺便添加到dictionary的生产科中。
  217 + if(Constant.SIX==adminUserVO.getRoleId().intValue()){
  218 + DictionaryVO dictionaryVO = new DictionaryVO();
  219 + dictionaryVO.setRemark("生产科");
  220 + dictionaryVO.setDictCode("productionDepartment");
  221 + dictionaryVO.setDictName("生产科");
  222 + dictionaryVO.setDictValue(adminUserVO.getNickName());
  223 + int count = dictionaryService.count();
  224 + dictionaryVO.setSort(count+1);
  225 + dictionaryService.add(dictionaryVO);
  226 + }
212 227 return ServerResult.success();
213 228 }
214 229  
... ...
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
  View file @30ec44c
... ... @@ -1457,6 +1457,14 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
1457 1457 BeanUtils.copyProperties(baseInfoVO, baseInfoDO);
1458 1458 baseInfoDO.setOrderStatus(OrderStatusEnum.CREATE_FINISH.getStatus());
1459 1459 save(baseInfoDO);
  1460 + OrderTrackStageDO orderTrackStageDO = new OrderTrackStageDO();
  1461 + orderTrackStageDO.setOrderId(baseInfoDO.getId());
  1462 + orderTrackStageDO.setOrderStatus(OrderStatusEnum.CREATE_FINISH.getStatus());
  1463 + trackStageService.save(orderTrackStageDO);
  1464 + OrderInspectionStageDO orderInspectionStageDO = new OrderInspectionStageDO();
  1465 + orderInspectionStageDO.setOrderId(baseInfoDO.getId());
  1466 + orderInspectionStageDO.setOrderStatus(OrderStatusEnum.CREATE_FINISH.getStatus());
  1467 + inspectionStageService.save(orderInspectionStageDO);
1460 1468  
1461 1469 OrderProfitAnalysisVO profitAnalysisVO = orderAddVO.getProfitAnalysisInfo();
1462 1470 if (Objects.nonNull(profitAnalysisVO)) {
... ... @@ -1606,7 +1614,6 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
1606 1614 @Override
1607 1615 @Transactional
1608 1616 public ServerResult edit(OrderUpdateVO updateVO) {
1609   -
1610 1617 //todo 校验
1611 1618 if (Objects.isNull(updateVO.getOrderId())) {
1612 1619 return ServerResult.fail("id 不能为空");
... ... @@ -1661,7 +1668,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
1661 1668 if (StringUtils.isNotBlank(trackStageInfo.getPpConfirmResult())) {
1662 1669 //由于跟单信息在创建时也是采用edit接口,所以要限制第一次创建时ppconfirmResult为空的情况,这种情况不计算到跟单记录中去。
1663 1670 if(!(trackStageInfo.getPpConfirmResult().equals(trackStageDO.getPpConfirmResult())) &&
1664   - StringUtils.isNotBlank(trackStageDO.getPpConfirmResult()) ){
  1671 + StringUtils.isNotBlank(trackStageInfo.getPpConfirmResult()) ){
1665 1672 //用于在跟单记录中展示。
1666 1673 OrderOpinionLogDO orderOpinionLogDO =buildOrderOpinionLogDo(updateVO.getOrderId(),OrderOpinionLogEnum.ORDER_PP_CONFIRRM_RESULT.getDesc(),trackStageInfo.getPpConfirmResult());
1667 1674 orderOpinionLogDOList.add(orderOpinionLogDO);
... ... @@ -1676,7 +1683,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
1676 1683 }
1677 1684 if (StringUtils.isNotBlank(trackStageInfo.getShippmentSampleConfirmResult())) {
1678 1685 if(!(trackStageInfo.getShippmentSampleConfirmResult().equals(trackStageDO.getShippmentSampleConfirmResult())) &&
1679   - StringUtils.isNotBlank(trackStageDO.getShippmentSampleConfirmResult())) {
  1686 + StringUtils.isNotBlank(trackStageInfo.getShippmentSampleConfirmResult())) {
1680 1687 OrderOpinionLogDO orderOpinionLogDO = buildOrderOpinionLogDo(updateVO.getOrderId(), OrderOpinionLogEnum.ORDER_SHIPMENT_SAMPLE_CONFIRM_RESULT.getDesc(), trackStageInfo.getShippmentSampleConfirmResult());
1681 1688 orderOpinionLogDOList.add(orderOpinionLogDO);
1682 1689 }trackStageDO.setShippmentSampleConfirmResult(trackStageInfo.getShippmentSampleConfirmResult());
... ... @@ -1689,7 +1696,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
1689 1696 }
1690 1697 if (StringUtils.isNotBlank(trackStageInfo.getAitexTestFinishResult())) {
1691 1698 if(!(trackStageInfo.getAitexTestFinishResult().equals(trackStageDO.getAitexTestFinishResult())) &&
1692   - StringUtils.isNotBlank(trackStageDO.getAitexTestFinishResult())){
  1699 + StringUtils.isNotBlank(trackStageInfo.getAitexTestFinishResult())){
1693 1700 OrderOpinionLogDO orderOpinionLogDO =buildOrderOpinionLogDo(updateVO.getOrderId(),OrderOpinionLogEnum.ORDER_AITEX_TEST_FINISH_RESULT.getDesc(),trackStageInfo.getAitexTestFinishResult());
1694 1701 orderOpinionLogDOList.add(orderOpinionLogDO);
1695 1702 }
... ... @@ -1700,7 +1707,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
1700 1707 }
1701 1708 if (StringUtils.isNotBlank(trackStageInfo.getSgsTestFinishResult())) {
1702 1709 if(!(trackStageInfo.getSgsTestFinishResult().equals(trackStageDO.getSgsTestFinishResult())) &&
1703   - StringUtils.isNotBlank(trackStageDO.getSgsTestFinishResult())){
  1710 + StringUtils.isNotBlank(trackStageInfo.getSgsTestFinishResult())){
1704 1711 OrderOpinionLogDO orderOpinionLogDO =buildOrderOpinionLogDo(updateVO.getOrderId(),OrderOpinionLogEnum.ORDER_SGS_TEST_FINISH_RESULT.getDesc(),trackStageInfo.getSgsTestFinishResult());
1705 1712 orderOpinionLogDOList.add(orderOpinionLogDO);
1706 1713 }
... ...