feat：查询设计师任务接口

ruoyi-modules/ruoyi-developmentManagement/src/main/java/org/dromara/management/controller/DevelopmentOrderController.java

@@ -46,4 +46,9 @@ public class DevelopmentOrderController extends BaseController {
     public R<Void> delete(@PathVariable Long[] ids) {
         return toAjax(developmentOrderService.delete(ids));
     }
-}
+
+    @GetMapping("/getDesignerTaskList")
+    public DevelopmentOrderTableDataInfo<DevelopmentOrderVo> getDesignerTaskList(PageQuery pageQuery, DevelopmentOrderBo developmentOrderBo) {
+        return developmentOrderService.getDesignerTaskList(developmentOrderBo, pageQuery);
+    }
+}

ruoyi-modules/ruoyi-developmentManagement/src/main/java/org/dromara/management/domain/DevelopmentOrder.java

@@ -103,6 +103,16 @@ public class DevelopmentOrder extends TenantEntity {
      */
     private Long layoutUserid;
 
+    /**
+     * 排版文件
+     */
+    private String layoutFile;
+
+    /**
+     * 打版师id
+     */
+    private Long patternUserid;
+
     /**
      * 打版文件
      */
@@ -221,4 +231,4 @@ public class DevelopmentOrder extends TenantEntity {
     private String remark;
 
     private Integer flag;
-}
+}

ruoyi-modules/ruoyi-developmentManagement/src/main/java/org/dromara/management/service/DevelopmentOrderService.java

@@ -40,4 +40,6 @@ public interface DevelopmentOrderService extends IService<DevelopmentOrder> {
     int addRemark(DevelopmentOrderRemarkBo developmentOrderBo);
 
     void insertDevelopmentOrderLogs(int devOrderId, String content);
-}
+
+    DevelopmentOrderTableDataInfo<DevelopmentOrderVo> getDesignerTaskList(DevelopmentOrderBo developmentOrderBo, PageQuery pageQuery);
+}

ruoyi-modules/ruoyi-developmentManagement/src/main/java/org/dromara/management/service/impl/DevelopmentOrderServiceImpl.java

@@ -156,15 +156,66 @@ public class DevelopmentOrderServiceImpl extends ServiceImpl<DevelopmentOrderMap
         if (StringUtils.isNotBlank(bo.getKuanhao())) {
             queryWrapper.like(DevelopmentOrder::getKuanhao, bo.getKuanhao());
         }
-        if (bo.getStatus() != null) {
-            queryWrapper.eq(DevelopmentOrder::getStatus, bo.getStatus());
+        if (StringUtils.isNotBlank(bo.getOrderNum())) {
+            queryWrapper.eq(DevelopmentOrder::getOrderNum,bo.getOrderNum());
         }
+        Integer status = bo.getStatus();
+        Long designUserid = bo.getDesignUserid();
+        if (status != null) {
+            queryWrapper.eq(DevelopmentOrder::getStatus, bo.getStatus());
+            //传了状态参数，表示时间是摸个子任务的时间
+            LocalDate startDate = parseDate((String) params.get("beginTime"));
+            LocalDate endDate = parseDate((String) params.get("endTime"));
+            //任务节点的条件处理
+            switch (status){
+                //画图
+                case 1:
+                    if (Objects.nonNull(startDate) && Objects.nonNull(endDate)) {
+                        queryWrapper.between(DevelopmentOrder::getStatus_1StartTime,startDate,endDate);
+                    }
+                    //不同状态对应不同设计师，对应的字段不一样
+                    queryWrapper.eq(Objects.nonNull(designUserid),DevelopmentOrder::getDesignUserid,designUserid);
+                    break;
+                //确认
+                case 2:
+                    if (Objects.nonNull(startDate) && Objects.nonNull(endDate)) {
+                        queryWrapper.between(DevelopmentOrder::getStatus_2StartTime,startDate,endDate);
+                    }
+                    queryWrapper.eq(Objects.nonNull(designUserid),DevelopmentOrder::getConfirmUserid,designUserid);
+                    break;
+                //调色
+                case 3:
+                    if (Objects.nonNull(startDate) && Objects.nonNull(endDate)) {
+                        queryWrapper.between(DevelopmentOrder::getStatus_3StartTime,startDate,endDate);
+                    }
+                    queryWrapper.eq(Objects.nonNull(designUserid),DevelopmentOrder::getColorUserid,designUserid);
+
+                    break;
+                //排版
+                case 4:
+                    if (Objects.nonNull(startDate) && Objects.nonNull(endDate)) {
+                        queryWrapper.between(DevelopmentOrder::getStatus_4StartTime,startDate,endDate);
+                    }
+                    queryWrapper.eq(Objects.nonNull(designUserid),DevelopmentOrder::getLayoutUserid,designUserid);
 
-        // 时间范围处理
-        LocalDate startDate = parseDate((String) params.get("beginTime"));
-        LocalDate endDate = parseDate((String) params.get("endTime"));
-        if (startDate != null && endDate != null) {
-            queryWrapper.between(DevelopmentOrder::getCreateTime, startDate, endDate);
+                    break;
+                //打版
+                case 5:
+                    if (Objects.nonNull(startDate) && Objects.nonNull(endDate)) {
+                        queryWrapper.between(DevelopmentOrder::getStatus_5StartTime,startDate,endDate);
+                    }
+                    queryWrapper.eq(Objects.nonNull(designUserid),DevelopmentOrder::getPatternUserid,designUserid);
+                    break;
+            }
+
+        }else{
+            //没有传状态参数，表示时间是整个开发订单的时间
+            // 时间范围处理
+            LocalDate startDate = parseDate((String) params.get("beginTime"));
+            LocalDate endDate = parseDate((String) params.get("endTime"));
+            if (startDate != null && endDate != null) {
+                queryWrapper.between(DevelopmentOrder::getCreateTime, startDate, endDate);
+            }
         }
     }
 
@@ -250,6 +301,15 @@ public class DevelopmentOrderServiceImpl extends ServiceImpl<DevelopmentOrderMap
         }
     }
 
+    @Override
+    public DevelopmentOrderTableDataInfo<DevelopmentOrderVo> getDesignerTaskList(DevelopmentOrderBo developmentOrderBo, PageQuery pageQuery) {
+        // 构建动态查询条件
+        LambdaQueryWrapper<DevelopmentOrder> queryWrapper = new LambdaQueryWrapper<>();
+        addDynamicConditions(queryWrapper, developmentOrderBo);
+        Page<DevelopmentOrderVo> page = developmentOrderMapper.getList(pageQuery.build(), queryWrapper);
+        return DevelopmentOrderTableDataInfo.build(page);
+    }
+
     /**
      * 新增开发日志
      *
@@ -277,4 +337,4 @@ public class DevelopmentOrderServiceImpl extends ServiceImpl<DevelopmentOrderMap
         }
     }
 
-}
+}