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

chenhang4442024
1 parent a8d06449
Showing 2 changed files with 32 additions and 10 deletions
src/main/java/com/order/erp/service/admin/impl/AdminUserServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
@@ -97,6 +97,8 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
     @Resource
     private DataScope dataScope;
+    @Resource
+    private DictionaryService dictionaryService;
     /**
      * 通过ID查询单条数据
      * <p>
@@ -181,18 +183,20 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
         if (Objects.nonNull(adminUserVO.getId())) {
             adminUserVO.setId(null);
         }
-        List<AdminUserDO> userDOS = list(new LambdaQueryWrapper<AdminUserDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+        List<AdminUserDO> byPhoneUserDOS = list(new LambdaQueryWrapper<AdminUserDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                 .eq(AdminUserDO::getPhone, adminUserVO.getPhone()));
-        if (CollectionUtils.isNotEmpty(userDOS)) {
+        if (CollectionUtils.isNotEmpty(byPhoneUserDOS)) {
             throw new BusinessException("手机号已被注册");
         }
+        List<AdminUserDO> byUserNameUserDOS = list(new LambdaQueryWrapper<AdminUserDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(AdminUserDO::getUserName, adminUserVO.getUserName()));
+        if (CollectionUtils.isNotEmpty(byUserNameUserDOS)) {
+            throw new BusinessException("用户名已存在");
+        }
         AdminUserDO adminUserDo = BeanUtil.copyProperties(adminUserVO, AdminUserDO.class);
         if(StringUtils.isNotBlank(adminUserVO.getEmail())){
             adminUserDo.setEmail(adminUserVO.getEmail());
         }
-        if (StringUtils.isNotBlank(adminUserVO.getUserName())) {
-            adminUserDo.setNickName(adminUserVO.getUserName());
-        }
         if (StringUtils.isNotBlank(adminUserVO.getNickName())) {
             adminUserDo.setUserName(adminUserVO.getNickName());
         }
@@ -209,6 +213,17 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
             roleIds.add(adminUserVO.getRoleId());
             authRole(AdminAuthUserVO.builder().userId(adminUserDo.getId()).roleIds(roleIds).build());
         }
+        //创建生产科角色顺便添加到dictionary的生产科中。
+        if(Constant.SIX==adminUserVO.getRoleId().intValue()){
+            DictionaryVO dictionaryVO = new DictionaryVO();
+            dictionaryVO.setRemark("生产科");
+            dictionaryVO.setDictCode("productionDepartment");
+            dictionaryVO.setDictName("生产科");
+            dictionaryVO.setDictValue(adminUserVO.getNickName());
+            int count = dictionaryService.count();
+            dictionaryVO.setSort(count+1);
+            dictionaryService.add(dictionaryVO);
+        }
         return ServerResult.success();
     }
@@ -1457,6 +1457,14 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         BeanUtils.copyProperties(baseInfoVO, baseInfoDO);
         baseInfoDO.setOrderStatus(OrderStatusEnum.CREATE_FINISH.getStatus());
         save(baseInfoDO);
+        OrderTrackStageDO orderTrackStageDO = new OrderTrackStageDO();
+        orderTrackStageDO.setOrderId(baseInfoDO.getId());
+        orderTrackStageDO.setOrderStatus(OrderStatusEnum.CREATE_FINISH.getStatus());
+        trackStageService.save(orderTrackStageDO);
+        OrderInspectionStageDO orderInspectionStageDO = new OrderInspectionStageDO();
+        orderInspectionStageDO.setOrderId(baseInfoDO.getId());
+        orderInspectionStageDO.setOrderStatus(OrderStatusEnum.CREATE_FINISH.getStatus());
+        inspectionStageService.save(orderInspectionStageDO);
         OrderProfitAnalysisVO profitAnalysisVO = orderAddVO.getProfitAnalysisInfo();
         if (Objects.nonNull(profitAnalysisVO)) {
@@ -1606,7 +1614,6 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
     @Override
     @Transactional
     public ServerResult edit(OrderUpdateVO updateVO) {
-
         //todo 校验
         if (Objects.isNull(updateVO.getOrderId())) {
             return ServerResult.fail("id 不能为空");
@@ -1661,7 +1668,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 if (StringUtils.isNotBlank(trackStageInfo.getPpConfirmResult())) {
                     //由于跟单信息在创建时也是采用edit接口,所以要限制第一次创建时ppconfirmResult为空的情况,这种情况不计算到跟单记录中去。
                     if(!(trackStageInfo.getPpConfirmResult().equals(trackStageDO.getPpConfirmResult())) &&
-                            StringUtils.isNotBlank(trackStageDO.getPpConfirmResult()) ){
+                            StringUtils.isNotBlank(trackStageInfo.getPpConfirmResult()) ){
                         //用于在跟单记录中展示。
                         OrderOpinionLogDO orderOpinionLogDO =buildOrderOpinionLogDo(updateVO.getOrderId(),OrderOpinionLogEnum.ORDER_PP_CONFIRRM_RESULT.getDesc(),trackStageInfo.getPpConfirmResult());
                         orderOpinionLogDOList.add(orderOpinionLogDO);
@@ -1676,7 +1683,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getShippmentSampleConfirmResult())) {
                     if(!(trackStageInfo.getShippmentSampleConfirmResult().equals(trackStageDO.getShippmentSampleConfirmResult())) &&
-                            StringUtils.isNotBlank(trackStageDO.getShippmentSampleConfirmResult())) {
+                            StringUtils.isNotBlank(trackStageInfo.getShippmentSampleConfirmResult())) {
                         OrderOpinionLogDO orderOpinionLogDO = buildOrderOpinionLogDo(updateVO.getOrderId(), OrderOpinionLogEnum.ORDER_SHIPMENT_SAMPLE_CONFIRM_RESULT.getDesc(), trackStageInfo.getShippmentSampleConfirmResult());
                         orderOpinionLogDOList.add(orderOpinionLogDO);
                     }trackStageDO.setShippmentSampleConfirmResult(trackStageInfo.getShippmentSampleConfirmResult());
@@ -1689,7 +1696,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getAitexTestFinishResult())) {
                     if(!(trackStageInfo.getAitexTestFinishResult().equals(trackStageDO.getAitexTestFinishResult())) &&
-                            StringUtils.isNotBlank(trackStageDO.getAitexTestFinishResult())){
+                            StringUtils.isNotBlank(trackStageInfo.getAitexTestFinishResult())){
                         OrderOpinionLogDO orderOpinionLogDO =buildOrderOpinionLogDo(updateVO.getOrderId(),OrderOpinionLogEnum.ORDER_AITEX_TEST_FINISH_RESULT.getDesc(),trackStageInfo.getAitexTestFinishResult());
                         orderOpinionLogDOList.add(orderOpinionLogDO);
                     }
@@ -1700,7 +1707,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getSgsTestFinishResult())) {
                     if(!(trackStageInfo.getSgsTestFinishResult().equals(trackStageDO.getSgsTestFinishResult())) &&
-                            StringUtils.isNotBlank(trackStageDO.getSgsTestFinishResult())){
+                            StringUtils.isNotBlank(trackStageInfo.getSgsTestFinishResult())){
                         OrderOpinionLogDO orderOpinionLogDO =buildOrderOpinionLogDo(updateVO.getOrderId(),OrderOpinionLogEnum.ORDER_SGS_TEST_FINISH_RESULT.getDesc(),trackStageInfo.getSgsTestFinishResult());
                         orderOpinionLogDOList.add(orderOpinionLogDO);
                     }