Przeglądaj źródła

feat(risk): 3.2.1 品控巡检列表 - 移动端接口 queryQualityMobileList 独立过滤 biz_type='quality'

- IRiskInspectionTaskService 新增 queryQualityMobileList 方法
- RiskInspectionTaskServiceImpl 实现,过滤 biz_type='quality'
- RiskQualityInspectionTaskController /mobileList 端点改用 queryQualityMobileList(原误用风控 queryMobileList)

Created: 2026-06-21
yangjingjing 2 dni temu
rodzic
commit
3ff2fa52c8

+ 2 - 2
ruoyi-modules/ruoyi-risk/src/main/java/org/dromara/risk/controller/RiskQualityInspectionTaskController.java

@@ -139,14 +139,14 @@ public class RiskQualityInspectionTaskController extends BaseController {
 
     /**
      * 移动端-品控巡检任务列表(已登录)
-     * <p>此处先复用风控 mobileList,后续品控单独表或表内 biz_type='quality' 隔离时再扩</p>
+     * <p>调用 queryQualityMobileList 过滤 biz_type='quality'</p>
      */
     @GetMapping("/mobileList")
     public TableDataInfo<org.dromara.risk.domain.vo.MobileInspectionTaskVo> mobileList(
         @RequestParam(required = false) String status,
         PageQuery pageQuery) {
         Long inspectorId = StpUtil.getLoginIdAsLong();
-        return inspectionTaskService.queryMobileList(inspectorId, status, pageQuery);
+        return inspectionTaskService.queryQualityMobileList(inspectorId, status, pageQuery);
     }
 
     /**

+ 9 - 0
ruoyi-modules/ruoyi-risk/src/main/java/org/dromara/risk/service/IRiskInspectionTaskService.java

@@ -87,6 +87,15 @@ public interface IRiskInspectionTaskService {
      */
     TableDataInfo<MobileInspectionTaskVo> queryMobileList(Long inspectorId, String status, PageQuery pageQuery);
 
+    /**
+     * 移动端-查询品控(biz_type=quality)巡检任务列表(分页,带打卡状态)
+     *
+     * @param inspectorId 巡检人ID(可空,空则取当前登录用户)
+     * @param status      任务状态(待打卡/已打卡/已逾期/已完成,可选)
+     * @param pageQuery   分页
+     */
+    TableDataInfo<MobileInspectionTaskVo> queryQualityMobileList(Long inspectorId, String status, PageQuery pageQuery);
+
     /**
      * 移动端-查询任务详情(含巡检项目列表)
      */

+ 27 - 0
ruoyi-modules/ruoyi-risk/src/main/java/org/dromara/risk/service/impl/RiskInspectionTaskServiceImpl.java

@@ -267,6 +267,33 @@ public class RiskInspectionTaskServiceImpl implements IRiskInspectionTaskService
             .setCurrent(page.getCurrent()));
     }
 
+    /**
+     * 移动端-品控巡检任务列表(独立于 queryMobileList,过滤 biz_type='quality')
+     */
+    @Override
+    public TableDataInfo<MobileInspectionTaskVo> queryQualityMobileList(Long inspectorId, String status, PageQuery pageQuery) {
+        LambdaQueryWrapper<RiskInspectionTask> lqw = Wrappers.<RiskInspectionTask>lambdaQuery();
+        // 独立功能:只查品控(biz_type='quality')
+        lqw.eq(RiskInspectionTask::getBizType, "quality");
+        if (ObjectUtil.isNotNull(inspectorId)) {
+            lqw.eq(RiskInspectionTask::getInspectorId, inspectorId);
+        }
+        lqw.eq(RiskInspectionTask::getDelFlag, "0");
+        if (StringUtils.isBlank(status)) {
+            lqw.ne(RiskInspectionTask::getTaskStatus, "已完成");
+        }
+        lqw.orderByDesc(RiskInspectionTask::getPlanStartTime);
+        Page<RiskInspectionTask> page = baseMapper.selectPage(pageQuery.build(), lqw);
+        List<MobileInspectionTaskVo> rows = page.getRecords().stream()
+            .map(this::convertToMobileVo)
+            .toList();
+        return TableDataInfo.build(new Page<MobileInspectionTaskVo>()
+            .setRecords(rows)
+            .setTotal(page.getTotal())
+            .setSize(page.getSize())
+            .setCurrent(page.getCurrent()));
+    }
+
     /**
      * 移动端-查询任务详情
      */