fix: 修复导出/编辑利润率/审核列表

谢茂盛
1 parent 42bbd60c
Showing 6 changed files with 88 additions and 9 deletions
src/main/java/com/order/erp/config/DataScope.java
src/main/java/com/order/erp/domain/vo/admin/AdminResultVO.java
src/main/java/com/order/erp/service/admin/AdminUserService.java
src/main/java/com/order/erp/service/admin/impl/AdminUserServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java
@@ -2,6 +2,7 @@ package com.order.erp.config;
 import com.order.erp.common.utils.SecurityUtils;
 import com.order.erp.domain.vo.UserVO;
+import com.order.erp.domain.vo.admin.AdminResultVO;
 import com.order.erp.service.admin.AdminUserService;
 import org.springframework.stereotype.Component;
@@ -27,10 +28,16 @@ public class DataScope {
     }
     /**
-     *
      * @return
      */
-    public String getLoginUserName(){
+    public AdminResultVO isAdmin() {
+        return userService.isAdmin(SecurityUtils.getUsername()).getData();
+    }
+
+    /**
+     * @return
+     */
+    public String getLoginUserName() {
         return SecurityUtils.getUsername();
     }
+package com.order.erp.domain.vo.admin;
+
+import com.order.erp.domain.vo.BasePageVO;
+import com.order.erp.domain.vo.UserVO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 用户表(AdminUser)实体类
+ *
+ * @author makejava
+ * @since 2023-08-30 17:51:48
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class AdminResultVO extends BasePageVO implements Serializable {
+
+    private Boolean isAdmin;
+
+    private UserVO userVO;
+}
+
@@ -61,6 +61,13 @@ public interface AdminUserService extends IService&lt;AdminUserDO&gt; {
     ServerResult deleteById(AdminUserQueryVO adminUserQueryVO);
     /**
+     *
+     * @param userName
+     * @return
+     */
+    ServerResult<AdminResultVO> isAdmin(String userName);
+
+    /**
      * 修改密码
      *
      * @param pwdVO
@@ -14,6 +14,7 @@ import com.order.erp.common.constant.ServerResult;
 import com.order.erp.common.constant.ServerResultCode;
 import com.order.erp.common.exception.BusinessException;
 import com.order.erp.common.utils.ImgCaptchaUtils;
+import com.order.erp.common.utils.SecurityUtils;
 import com.order.erp.common.utils.SmsUtils;
 import com.order.erp.common.utils.TransactionHelper;
 import com.order.erp.config.DataScope;
@@ -40,6 +41,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -180,8 +182,8 @@ 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)
-                .eq(AdminUserDO::getPhone,adminUserVO.getPhone()));
+        List<AdminUserDO> userDOS = list(new LambdaQueryWrapper<AdminUserDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(AdminUserDO::getPhone, adminUserVO.getPhone()));
         if (CollectionUtils.isNotEmpty(userDOS)) {
             throw new BusinessException("手机号已被注册");
         }
@@ -251,6 +253,26 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
         return ServerResult.success();
     }
+    @Override
+    public ServerResult<AdminResultVO> isAdmin(String userName) {
+        UserVO user = findByUserName(SecurityUtils.getUsername());
+        if (Objects.isNull(user)) {
+            throw new BusinessException("用户不存在");
+        }
+        List<AdminUserRoleDO> userRoleDOList = userRoleService.list(new LambdaQueryWrapper<AdminUserRoleDO>()
+                .eq(AdminUserRoleDO::getUserId, user.getId()));
+        if (CollectionUtils.isEmpty(userRoleDOList)) {
+            return ServerResult.success(AdminResultVO.builder().isAdmin(false).userVO(user).build());
+        }
+        AtomicReference<Boolean> result = new AtomicReference<>(false);
+        userRoleDOList.forEach(x -> {
+            if (RoleEnum.ADMIN.getId().equals(x.getRoleId())) {
+                result.set(true);
+            }
+        });
+        return ServerResult.success(AdminResultVO.builder().isAdmin(result.get()).userVO(user).build());
+    }
+
     /**
      * 通过主键删除数据
      *
@@ -302,8 +302,9 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     }
                 }
             }
-            OrderProfitAnalysisVO profitAnalysisVO = orderInfoResultVO.getProfitAnalysisInfo();
-            if (Objects.nonNull(profitAnalysisFields) && Objects.nonNull(profitAnalysisVO)) {
+            OrderProfitAnalysisVO profitAnalysisVO = Objects.nonNull(orderInfoResultVO.getProfitAnalysisInfo()) ?
+                    orderInfoResultVO.getProfitAnalysisInfo() : new OrderProfitAnalysisVO();
+            if (Objects.nonNull(profitAnalysisFields)) {
                 if (StringUtils.isNotBlank(profitAnalysisFields.getCustomerPrice())) {
                     map.put("客户单价$", profitAnalysisVO.getCustomerPrice());
                 }
@@ -329,7 +330,8 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     map.put("利润率", profitAnalysisVO.getProfitRate());
                 }
             }
-            OrderCompletionReportVO reportInfo = orderInfoResultVO.getReportInfo();
+            OrderCompletionReportVO reportInfo = Objects.nonNull(orderInfoResultVO.getReportInfo()) ?
+                    orderInfoResultVO.getReportInfo() : new OrderCompletionReportVO();
             if (Objects.nonNull(reportFields) && Objects.nonNull(reportInfo)) {
                 if (StringUtils.isNotBlank(reportFields.getIdeaSource())) {
                     map.put("想法来源", reportInfo.getIdeaSource());
@@ -341,7 +343,8 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     map.put("想法和手工比例分配", reportInfo.getIdeaManualRate());
                 }
             }
-            OrderTrackStageVO trackStageInfo = orderInfoResultVO.getTrackStageInfo();
+            OrderTrackStageVO trackStageInfo = Objects.nonNull(orderInfoResultVO.getTrackStageInfo()) ?
+                    orderInfoResultVO.getTrackStageInfo() : new OrderTrackStageVO();
             if (Objects.nonNull(trackStageFields) && Objects.nonNull(trackStageInfo)) {
                 if (StringUtils.isNotBlank(trackStageFields.getPpTime())) {
                     map.put("pp date", trackStageInfo.getPpTime());
@@ -380,7 +383,8 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     map.put("最晚订舱+报关资料时间", trackStageInfo.getLatestBkTime());
                 }
             }
-            OrderInspectionStageVO inspectionStageInfo = orderInfoResultVO.getInspectionStageInfo();
+            OrderInspectionStageVO inspectionStageInfo = Objects.nonNull(orderInfoResultVO.getInspectionStageInfo()) ?
+                    orderInfoResultVO.getInspectionStageInfo() : new OrderInspectionStageVO();
             if (Objects.nonNull(inspectionStageFields) && Objects.nonNull(inspectionStageInfo)) {
                 if (StringUtils.isNotBlank(inspectionStageFields.getMidCheckApplyTime())) {
                     map.put("中期验货申请时间", inspectionStageInfo.getMidCheckApplyTime());
@@ -20,6 +20,7 @@ import com.order.erp.domain.ApplyTypeEnum;
 import com.order.erp.domain.OrderStatusEnum;
 import com.order.erp.domain.dto.BaseDO;
 import com.order.erp.domain.dto.order.*;
+import com.order.erp.domain.vo.admin.AdminResultVO;
 import com.order.erp.domain.vo.order.*;
 import com.order.erp.mapper.order.OrderFieldLockApplyMapper;
 import com.order.erp.service.order.*;
@@ -299,6 +300,10 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
      * @return
      */
     private LambdaQueryWrapper<OrderFieldLockApplyDO> buildQueryByParam(OrderFieldLockApplyQueryVO queryVO) {
+        AdminResultVO resultVO = dataScope.isAdmin();
+        if (!resultVO.getIsAdmin()) {
+            queryVO.setApplyUserId(Objects.nonNull(resultVO.getUserVO()) ? resultVO.getUserVO().getId() : -1);
+        }
         return new LambdaQueryWrapper<OrderFieldLockApplyDO>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                 .eq(Objects.nonNull(queryVO.getApplyUserId()), OrderFieldLockApplyDO::getApplyUserId, queryVO.getApplyUserId())
@@ -442,11 +447,14 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                 profitAnalysisDO.setOrderStatus(OrderStatusEnum.PROFIT_AUDIT_PASS.getStatus());
                 profitAnalysisDO.setCustomerPrice(Objects.nonNull(profitAnalysisFieldVO.getCustomerPrice()) ? Double.valueOf(profitAnalysisFieldVO.getCustomerPrice()) : null);
                 profitAnalysisDO.setCustomerTotalPrice(Objects.nonNull(profitAnalysisFieldVO.getCustomerTotalPrice()) ? Double.valueOf(profitAnalysisFieldVO.getCustomerTotalPrice()) : null);
+                profitAnalysisDO.setCustomerCurrency(StringUtils.isNotBlank(profitAnalysisFieldVO.getCustomerCurrency()) ? profitAnalysisFieldVO.getCustomerCurrency() : null);
                 profitAnalysisDO.setExchangeRate(Objects.nonNull(profitAnalysisFieldVO.getExchangeRate()) ? Double.valueOf(profitAnalysisFieldVO.getExchangeRate()) : null);
                 profitAnalysisDO.setPacketPrice(Objects.nonNull(profitAnalysisFieldVO.getPacketPrice()) ? Double.valueOf(profitAnalysisFieldVO.getPacketPrice()) : null);
+                profitAnalysisDO.setPacketCurrency(StringUtils.isNotBlank(profitAnalysisFieldVO.getPacketCurrency()) ? profitAnalysisFieldVO.getPacketCurrency() : null);
                 profitAnalysisDO.setPacketTotalPrice(Objects.nonNull(profitAnalysisFieldVO.getPacketTotalPrice()) ? Double.valueOf(profitAnalysisFieldVO.getPacketTotalPrice()) : null);
                 profitAnalysisDO.setProductionDepartmentPrice(Objects.nonNull(profitAnalysisFieldVO.getProductionDepartmentPrice()) ? Double.valueOf(profitAnalysisFieldVO.getProductionDepartmentPrice()) : null);
                 profitAnalysisDO.setProductionDepartmentTotalPrice(Objects.nonNull(profitAnalysisFieldVO.getProductionDepartmentTotalPrice()) ? Double.valueOf(profitAnalysisFieldVO.getProductionDepartmentTotalPrice()) : null);
+                profitAnalysisDO.setProductionDepartmentCurrency(StringUtils.isNotBlank(profitAnalysisFieldVO.getProductionDepartmentCurrency()) ? profitAnalysisFieldVO.getProductionDepartmentCurrency() : null);
                 profitAnalysisDO.setProfitRate(Objects.nonNull(profitAnalysisFieldVO.getProfitRate()) ? Double.valueOf(profitAnalysisFieldVO.getProfitRate()) : null);
                 profitAnalysisDO.setProfitType(profitAnalysisFieldVO.getProfitType());
                 profitAnalysisService.updateById(profitAnalysisDO);
@@ -485,11 +493,14 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                 .profitType(profitAnalysisFieldVO.getProfitType())
                 .customerPrice(Objects.nonNull(profitAnalysisFieldVO.getCustomerPrice()) ? Double.valueOf(profitAnalysisFieldVO.getCustomerPrice()) : null)
                 .customerTotalPrice(Objects.nonNull(profitAnalysisFieldVO.getCustomerTotalPrice()) ? Double.valueOf(profitAnalysisFieldVO.getCustomerTotalPrice()) : null)
+                .customerCurrency(StringUtils.isNotBlank(profitAnalysisFieldVO.getCustomerCurrency()) ? profitAnalysisFieldVO.getCustomerCurrency() : null)
                 .exchangeRate(Objects.nonNull(profitAnalysisFieldVO.getExchangeRate()) ? Double.valueOf(profitAnalysisFieldVO.getExchangeRate()) : null)
                 .packetPrice(Objects.nonNull(profitAnalysisFieldVO.getPacketPrice()) ? Double.valueOf(profitAnalysisFieldVO.getPacketPrice()) : null)
                 .packetTotalPrice(Objects.nonNull(profitAnalysisFieldVO.getPacketTotalPrice()) ? Double.valueOf(profitAnalysisFieldVO.getPacketTotalPrice()) : null)
+                .packetCurrency(StringUtils.isNotBlank(profitAnalysisFieldVO.getPacketCurrency()) ? profitAnalysisFieldVO.getPacketCurrency() : null)
                 .productionDepartmentPrice(Objects.nonNull(profitAnalysisFieldVO.getProductionDepartmentPrice()) ? Double.valueOf(profitAnalysisFieldVO.getProductionDepartmentPrice()) : null)
                 .productionDepartmentTotalPrice(Objects.nonNull(profitAnalysisFieldVO.getProductionDepartmentTotalPrice()) ? Double.valueOf(profitAnalysisFieldVO.getProductionDepartmentTotalPrice()) : null)
+                .productionDepartmentCurrency(StringUtils.isNotBlank(profitAnalysisFieldVO.getProductionDepartmentCurrency()) ? profitAnalysisFieldVO.getProductionDepartmentCurrency() : null)
                 .profitRate(Objects.nonNull(profitAnalysisFieldVO.getProfitRate()) ? Double.valueOf(profitAnalysisFieldVO.getProfitRate()) : null)
                 .build();
     }