0205

src/main/java/cn/ezhizao/project/business/product/controller/BizDayworkController.java

@@ -806,7 +806,7 @@ public class BizDayworkController extends BaseController {
                     .in("daywork_id", dayworkIdList)
                     .list();
             //查询计划单下所有的报工记录
-            List<BizDayworkItem> totalDayworkItemList = bizDayworkItemService.query().eq("dept_id", deptId).list();
+            List<BizDayworkItem> totalDayworkItemList = bizDayworkItemService.query().eq("dept_id", deptId).or().eq("from_dept_id",deptId).list();
 
             // 循环最终要展示的 daywork 集合，根据每个daywork，精确赋予相关数据
             List<Long> allLotIds = dayworkList.stream().map(BizDaywork::getLotId).collect(Collectors.toList());

src/main/resources/mybatis/business/product/BizDayworkMapper.xml

@@ -115,7 +115,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT DISTINCT t1.*
         FROM biz_daywork t1
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
-            t1.status = 1 AND t1.deleted = 0 AND t1.dept_id = #{deptId}
+            t1.status = 1 AND t1.deleted = 0 AND (
+            t1.dept_id = #{deptId}
+            OR t1.dept_id = (
+            SELECT t.dept_id
+            FROM biz_daywork_item t
+            WHERE t.daywork_id = 1886976660903870466
+            AND t.deleted = 0
+            ORDER BY t.create_time DESC
+            LIMIT 1
+            )
+            )
             AND (
             SELECT t2.status
             FROM biz_daywork_item t2