|
@@ -1,14 +1,16 @@
|
|
|
package com.fjhx.bom.service.impl;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
-import com.fjhx.utils.WrapperUtil;
|
|
|
-import com.fjhx.bom.entity.Bom;
|
|
|
-import com.fjhx.bom.vo.BomVo;
|
|
|
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
+import com.fjhx.entity.bom.Bom;
|
|
|
+import com.fjhx.enums.bom.BomTypeEnum;
|
|
|
import com.fjhx.bom.mapper.BomMapper;
|
|
|
import com.fjhx.bom.service.BomService;
|
|
|
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
+import com.fjhx.params.bom.BomVo;
|
|
|
+import com.fjhx.constants.CommonConstant;
|
|
|
+import com.fjhx.utils.WrapperUtil;
|
|
|
+import com.fjhx.utils.feign.UserClientUtil;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.util.Map;
|
|
@@ -25,20 +27,29 @@ import java.util.Map;
|
|
|
public class BomServiceImpl extends ServiceImpl<BomMapper, Bom> implements BomService {
|
|
|
|
|
|
@Override
|
|
|
- public Page<Bom> getPage(Map<String, Object> condition) {
|
|
|
+ public Page<BomVo> getPage(Map<String, Object> condition) {
|
|
|
|
|
|
- QueryWrapper<Bom> wrapper = Wrappers.query();
|
|
|
+ QueryWrapper<?> wrapper = WrapperUtil.init(condition)
|
|
|
+ .eq("p.classif_id", "classifId")
|
|
|
+ .keyword("p.name", "p.code")
|
|
|
+ .eqTenantId("b")
|
|
|
+ .getWrapper();
|
|
|
|
|
|
- WrapperUtil.init(condition, wrapper)
|
|
|
- .eqTenantId()
|
|
|
- .createTimeDesc();
|
|
|
+ wrapper.eq("b.type", BomTypeEnum.PRODUCT_TYPE.getCode());
|
|
|
+ wrapper.eq("b.current_edition", CommonConstant.YES);
|
|
|
+ wrapper.orderByAsc("p.code");
|
|
|
|
|
|
- Page<Bom> page = page(condition, wrapper);
|
|
|
- return page;
|
|
|
+ Page<BomVo> result = baseMapper.getPage(createPage(condition), wrapper);
|
|
|
+
|
|
|
+
|
|
|
+ Map<Long, String> userNameMap = UserClientUtil.getUserNameMap(result.getRecords(), Bom::getUpdateUser);
|
|
|
+ result.getRecords().forEach(item -> item.setUpdateUserName(userNameMap.get(item.getUpdateUser())));
|
|
|
+ return result;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public void add(BomVo bomVo) {
|
|
|
+
|
|
|
save(bomVo);
|
|
|
}
|
|
|
|