报工添加过滤条件

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionReportingDetailServiceImpl.java

@@ -5,20 +5,17 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.mes.entity.production.dto.ProductionReportingDetailDto;
 import com.fjhx.mes.entity.production.dto.ProductionReportingDetailSelectDto;
 import com.fjhx.mes.entity.production.po.ProductionReportingDetail;
 import com.fjhx.mes.entity.production.vo.ProductionReportingDetailVo;
 import com.fjhx.mes.mapper.production.ProductionReportingDetailMapper;
-import com.fjhx.mes.service.production.ProduceOrderDetailService;
-import com.fjhx.mes.service.production.ProduceOrderService;
 import com.fjhx.mes.service.production.ProductionReportingDetailService;
-import com.fjhx.mes.service.production.ProductionTaskProgressService;
-import com.fjhx.mes.service.technology.TechnologyProcessLineService;
 import com.fjhx.tenant.utils.DeptUstil;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.system.utils.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -40,16 +37,12 @@ import java.util.stream.Collectors;
 @Service
 public class ProductionReportingDetailServiceImpl extends ServiceImpl<ProductionReportingDetailMapper, ProductionReportingDetail> implements ProductionReportingDetailService {
 
+    private final ISysUserService sysUserService;
+
     @Autowired
-    private ProductionTaskProgressService productionTaskProgressService;
-    @Autowired
-    private ProduceOrderDetailService produceOrderDetailService;
-    @Autowired
-    private ProductInfoService productInfoService;
-    @Autowired
-    private TechnologyProcessLineService technologyProcessLineService;
-    @Autowired
-    private ProduceOrderService produceOrderService;
+    public ProductionReportingDetailServiceImpl(ISysUserService sysUserService) {
+        this.sysUserService = sysUserService;
+    }
 
     @Override
     public Page<ProductionReportingDetailVo> getPage(ProductionReportingDetailSelectDto dto) {
@@ -67,6 +60,16 @@ public class ProductionReportingDetailServiceImpl extends ServiceImpl<Production
         //工序过滤
         wrapper.eq("prd", ProductionReportingDetail::getProductionProcessesId, dto.getProductionProcessesId());
 
+        //关键字检索
+        if (ObjectUtil.isNotEmpty(dto.getKeyword())) {
+            List<SysUser> list = sysUserService.list(IWrapper.<SysUser>getWrapper().like(SysUser::getNickName, dto.getKeyword()));
+            List<Long> uIds = list.stream().map(SysUser::getUserId).collect(Collectors.toList());
+            wrapper.and(q -> q
+                    .like("po.code", dto.getKeyword())
+                    .or().in("prd.user_id", uIds)
+            );
+        }
+
         Page<ProductionReportingDetailVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<ProductionReportingDetailVo> records = page.getRecords();
         if (ObjectUtil.isEmpty(records)) {