guarantee-lsq il y a 1 an
Parent
commit
751682fd5d

+ 7 - 24
platform-service/src/main/java/com/platform/service/longyanpurchaseorder/impl/LongYanPurchaseOrderServiceImpl.java

@@ -1,48 +1,33 @@
 package com.platform.service.longyanpurchaseorder.impl;
+
+import com.github.pagehelper.PageHelper;
 import com.platform.common.bean.AbstractPageResultBean;
-import com.platform.common.exception.BusinessException;
 import com.platform.common.model.UserInfo;
 import com.platform.common.util.*;
 import com.platform.dao.bean.MyPage;
-import com.github.pagehelper.PageHelper;
-import com.platform.dao.bean.MyVOPage;
 import com.platform.dao.dto.longyanpurchaseorder.LongYanPurchaseDetailDTO;
-import com.platform.dao.dto.preparation.PreparationDTO;
+import com.platform.dao.dto.longyanpurchaseorder.LongYanPurchaseOrderDTO;
 import com.platform.dao.dto.sb.SbInfoDTO;
-import com.platform.dao.dto.sb.SbModelSpareBomDTO;
-import com.platform.dao.dto.store.OutStoreDetailDTO;
-import com.platform.dao.dto.store.OutStoreFormDTO;
 import com.platform.dao.entity.longyanpurchaseorder.LongYanPurchaseDetail;
-import com.platform.dao.entity.repair.RepairApplicationForm;
-import com.platform.dao.entity.sb.SbInfo;
-import com.platform.dao.entity.sb.SbModelSpareBom;
+import com.platform.dao.entity.longyanpurchaseorder.LongYanPurchaseOrder;
 import com.platform.dao.enums.LongYanPurchaseOrderStatusEnum;
 import com.platform.dao.mapper.longyanpurchaseorder.LongYanPurchaseDetailMapper;
+import com.platform.dao.mapper.longyanpurchaseorder.LongYanPurchaseOrderMapper;
 import com.platform.dao.mapper.project.ProjectMapper;
 import com.platform.dao.mapper.sb.SbInfoMapper;
-import com.platform.dao.mapper.sb.SbModelSpareBomMapper;
 import com.platform.dao.vo.query.longyanpurchaseorder.LongYanPurchaseDetailVO;
 import com.platform.dao.vo.query.longyanpurchaseorder.LongYanPurchaseOrderVO;
-import com.platform.dao.dto.longyanpurchaseorder.LongYanPurchaseOrderDTO;
-import com.platform.dao.entity.longyanpurchaseorder.LongYanPurchaseOrder;
-import com.platform.dao.mapper.longyanpurchaseorder.LongYanPurchaseOrderMapper;
-import com.platform.dao.vo.query.preparation.PreparationVO;
 import com.platform.dao.vo.query.project.ProjectVO;
-import com.platform.dao.vo.report.AllPreparationReportVO;
 import com.platform.dao.vo.report.LongYanPurchaseOrderByConditionReportVO;
 import com.platform.dao.vo.report.LongYanPurchaseOrderByTimeExport;
 import com.platform.dao.vo.report.LongYanPurchaseOrderReportVO;
 import com.platform.dao.vo.sb.SbInfoVO;
-import com.platform.dao.vo.sb.SbModelSpareBomVO;
+import com.platform.service.base.impl.BaseServiceImpl;
 import com.platform.service.longyanpurchaseorder.LongYanPurchaseOrderService;
-import com.platform.service.util.PageUtils;
-import org.apache.poi.ss.formula.functions.T;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
-import com.platform.service.base.impl.BaseServiceImpl;
-import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.weekend.Weekend;
 import tk.mybatis.mapper.weekend.WeekendCriteria;
-import lombok.AllArgsConstructor;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -51,7 +36,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * @Description 龙岩采购单表 service 实现类
@@ -63,7 +47,6 @@ import java.util.stream.Collectors;
 @Service("longYanPurchaseOrderService")
 public class LongYanPurchaseOrderServiceImpl extends BaseServiceImpl<LongYanPurchaseOrderMapper, LongYanPurchaseOrder, LongYanPurchaseOrderDTO> implements LongYanPurchaseOrderService {
     private LongYanPurchaseDetailMapper longYanPurchaseDetailMapper;
-    private SbModelSpareBomMapper sbModelSpareBomMapper;
     private SbInfoMapper sbInfoMapper;
     private ProjectMapper projectMapper;
 

+ 1 - 1
platform-service/src/main/java/com/platform/service/upms/impl/SysUserServiceImpl.java

@@ -500,7 +500,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser,
             for(SysUserVO vo : pageInfos.getRows()){
                 // 获取部门和角色
                 vo.setRoleName(sysUserRoleService.selectRoleName(vo.getUserId()));
-                vo.setDeptName(sysDeptService.getModelById(vo.getDept()).getName());
+                //vo.setDeptName(sysDeptService.getModelById(vo.getDept()).getName());
             }
         }
         return pageInfos;