质检报告分页查询

src/main/java/com/sfa/operation/controller/zzhao/core/ZzProQualityCoreController.java

@@ -3,6 +3,7 @@ package com.sfa.operation.controller.zzhao.core;
 import com.sfa.common.security.utils.SecurityUtils;
 import com.sfa.operation.pojo.zzhao.request.ZzProductQualityVo;
 import com.sfa.operation.service.zzhao.IZzProQualityCoreService;
+import com.sfa.system.api.domain.SysDept;
 import com.sfa.system.api.model.LoginUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -27,10 +28,10 @@ public class ZzProQualityCoreController {
     @PostMapping("/add")
     public void add(@RequestBody ZzProductQualityVo vo) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        String deptName = loginUser.getSysUser().getDept().getDeptName();
-
-        vo.setManufacturersName(deptName);
+        SysDept dept = loginUser.getSysUser().getDept();
+        vo.setManufacturersName(dept.getDeptName());
         vo.setCreateBy(loginUser.getNickName());
+        vo.setDeptId(dept.getDeptId());
         zzProQualityCoreService.add(vo);
     }
 }

src/main/java/com/sfa/operation/controller/zzhao/query/ZzProQualityQueryController.java

+package com.sfa.operation.controller.zzhao.query;
+
+/**
+ * @author : liqiulin
+ * @date : 2025-10-30 18
+ * @describe :
+ */
+
+import com.sfa.common.core.enums.ECode;
+import com.sfa.common.core.exception.CheckedException;
+import com.sfa.common.core.web.domain.PageInfo;
+import com.sfa.common.security.utils.SecurityUtils;
+import com.sfa.operation.pojo.zzhao.request.ZzProductQualityVo;
+import com.sfa.operation.service.zzhao.IZzProQualityQueryService;
+import com.sfa.system.api.domain.SysRole;
+import com.sfa.system.api.domain.SysUser;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * @author : liqiulin
+ * @date : 2025-10-30 15
+ * @describe :
+ */
+@RestController
+@RequestMapping("/zzhao/query/proQuality")
+public class ZzProQualityQueryController {
+    @Autowired
+    private IZzProQualityQueryService zzProQualityQueryService;
+
+    @GetMapping("/page")
+    public PageInfo page(ZzProductQualityVo vo){
+        // 判断当前角色数据权限，当前部门或全部部门
+        SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
+        List<SysRole> roles = sysUser.getRoles();
+        if (CollectionUtils.isEmpty(roles)) {
+            throw new CheckedException(ECode.ROLE_ERROR);
+        }
+        Optional<SysRole> first = roles.stream().filter(role -> "cpzjgc".equals(role.getRoleKey())).findFirst();
+        if (first.isPresent()){
+            SysRole sysRole = first.get();
+            String dataScope = sysRole.getDataScope();
+            // 判断数据范围
+            if ("3".equals(dataScope)){
+                Long deptId = sysUser.getDeptId();
+                vo.setDeptId(deptId);
+            }
+        }
+
+        return zzProQualityQueryService.page(vo);
+    }
+}

src/main/java/com/sfa/operation/domain/zzhao/dao/IZzProductQualityDao.java

 package com.sfa.operation.domain.zzhao.dao;
 
+import com.sfa.common.core.web.domain.PageInfo;
+import com.sfa.operation.domain.zzhao.wq.ZzProductQualityWq;
 import com.sfa.operation.pojo.zzhao.response.ZzProductQualityDto;
 
 /**
@@ -9,4 +11,6 @@ import com.sfa.operation.pojo.zzhao.response.ZzProductQualityDto;
  */
 public interface IZzProductQualityDao {
     void insert(ZzProductQualityDto dto);
+
+    PageInfo page(ZzProductQualityWq wq);
 }

src/main/java/com/sfa/operation/domain/zzhao/dao/impl/ZzProductQualityDaoImpl.java

 package com.sfa.operation.domain.zzhao.dao.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.sfa.common.core.enums.ECode;
 import com.sfa.common.core.exception.WXLSQLException;
+import com.sfa.common.core.web.domain.PageInfo;
+import com.sfa.common.core.web.page.TableSupport;
 import com.sfa.operation.domain.zzhao.dao.IZzProductQualityDao;
 import com.sfa.operation.domain.zzhao.entity.ZzProductQuality;
 import com.sfa.operation.domain.zzhao.mapper.ZzProductQualityMapper;
+import com.sfa.operation.domain.zzhao.wq.ZzProductQualityWq;
 import com.sfa.operation.pojo.zzhao.response.ZzProductQualityDto;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Objects;
+
 /**
  * @author : liqiulin
  * @date : 2025-10-30 15
@@ -36,4 +44,34 @@ public class ZzProductQualityDaoImpl implements IZzProductQualityDao {
             throw new WXLSQLException(ECode.DB_TABLE_UPDATE_ERROR);
         }
     }
+
+    @Override
+    public PageInfo page(ZzProductQualityWq wq) {
+        LambdaQueryWrapper<ZzProductQuality> qw = buildQw(wq);
+        Page<ZzProductQuality> page = zzProductQualityMapper.selectPage(TableSupport.pageI(), qw);
+        PageInfo<ZzProductQuality> pageInfo = new PageInfo<>(page);
+        return pageInfo;
+    }
+
+    private LambdaQueryWrapper<ZzProductQuality> buildQw(ZzProductQualityWq wq){
+        LambdaQueryWrapper<ZzProductQuality> qw = new LambdaQueryWrapper<>();
+        if (Objects.nonNull(wq.getDeptId())){
+            qw.eq(ZzProductQuality::getDeptId, wq.getDeptId());
+        }
+        if (StringUtils.isNotBlank(wq.getPrdCN())) {
+            qw.and(
+                    wrapper -> wrapper.like(ZzProductQuality::getPrdName, wq.getPrdCN())
+                            .or()
+                            .like(ZzProductQuality::getPrdCode, wq.getPrdCN())
+            );
+        }
+        if (wq.getShipDate() != null){
+            qw.eq(ZzProductQuality::getShipDate, wq.getShipDate());
+        }
+        if (StringUtils.isNotBlank(wq.getManufacturersNameLike())){
+            qw.like(ZzProductQuality::getManufacturersName, wq.getManufacturersNameLike());
+        }
+        qw.orderByDesc(ZzProductQuality::getShipDate);
+        return qw;
+    }
 }

src/main/java/com/sfa/operation/domain/zzhao/entity/ZzProductQuality.java

@@ -50,7 +50,10 @@ public class ZzProductQuality implements Serializable {
      * 生产厂家名称
      */
     private String manufacturersName;
-
+    /**
+     * 归属部门(工厂)编码
+     */
+    private Long deptId;
     /**
      * 创建者
      */

src/main/java/com/sfa/operation/domain/zzhao/wq/ZzProductQualityWq.java

+package com.sfa.operation.domain.zzhao.wq;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author : liqiulin
+ * @date : 2025-10-30 19
+ * @describe :
+ */
+@Data
+public class ZzProductQualityWq {
+    private String prdCN;
+    /**
+     * 发货日期
+     */
+    private Date shipDate;
+    private Long deptId;
+    /**
+     * 工厂
+     */
+    private String manufacturersNameLike;
+}

src/main/java/com/sfa/operation/pojo/zzhao/request/ZzProductQualityVo.java

@@ -41,8 +41,20 @@ public class ZzProductQualityVo {
      */
     private String manufacturersName;
 
+    /**
+     * 归属部门(工厂)编码
+     */
+    private Long deptId;
+
     /**
      * 创建者
      */
     private String createBy;
+
+    private String manufacturersNameLike;
+
+    /**
+     * 料号/品名 模糊查询
+     */
+    private String prdCN;
 }

src/main/java/com/sfa/operation/pojo/zzhao/response/ZzProductQualityDto.java

@@ -36,7 +36,10 @@ public class ZzProductQualityDto {
      * 发货日期
      */
     private Date shipDate;
-
+    /**
+     * 归属部门(工厂)编码
+     */
+    private Long deptId;
     /**
      * 生产厂家名称
      */

src/main/java/com/sfa/operation/service/zzhao/IZzProQualityQueryService.java

+package com.sfa.operation.service.zzhao;
+
+import com.sfa.common.core.web.domain.PageInfo;
+import com.sfa.operation.pojo.zzhao.request.ZzProductQualityVo;
+
+/**
+ * @author : liqiulin
+ * @date : 2025-10-30 18
+ * @describe :
+ */
+public interface IZzProQualityQueryService {
+    PageInfo page(ZzProductQualityVo vo);
+}

src/main/java/com/sfa/operation/service/zzhao/impl/ZzProQualityQueryServiceImpl.java

+package com.sfa.operation.service.zzhao.impl;
+
+import com.sfa.common.core.web.domain.PageInfo;
+import com.sfa.operation.domain.zzhao.dao.IZzProductQualityDao;
+import com.sfa.operation.domain.zzhao.wq.ZzProductQualityWq;
+import com.sfa.operation.pojo.zzhao.request.ZzProductQualityVo;
+import com.sfa.operation.service.zzhao.IZzProQualityQueryService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author : liqiulin
+ * @date : 2025-10-30 18
+ * @describe :
+ */
+@Service
+public class ZzProQualityQueryServiceImpl implements IZzProQualityQueryService {
+    @Autowired
+    private IZzProductQualityDao zzProductQualityDao;
+    @Override
+    public PageInfo page(ZzProductQualityVo vo) {
+        ZzProductQualityWq wq = new ZzProductQualityWq();
+        BeanUtils.copyProperties(vo, wq);
+        return zzProductQualityDao.page(wq);
+    }
+}