fix:查询通过ids查出所有工单工作记录过滤

src/main/java/cn/ezhizao/project/business/workOrder/controller/BizWorkOrderController.java

@@ -28,7 +28,9 @@ import cn.ezhizao.project.business.order.service.IBizArchiveInputDetailService;
 import cn.ezhizao.project.business.order.service.impl.BizArchiveInputServiceImpl;
 import cn.ezhizao.project.business.workOrder.domain.BizWorkOrderDetail;
 import cn.ezhizao.project.business.workOrder.domain.BizWorkOrderNoContract;
+import cn.ezhizao.project.business.workOrder.domain.BizWorkOrderRecord;
 import cn.ezhizao.project.business.workOrder.service.IBizWorkOrderDetailService;
+import cn.ezhizao.project.business.workOrder.service.IBizWorkOrderRecordService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.conditions.query.QueryChainWrapper;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -62,7 +64,8 @@ import cn.ezhizao.framework.web.page.TableDataInfo;
 public class BizWorkOrderController extends BaseController {
     @Resource
     private IBizWorkOrderService bizWorkOrderService;
-
+    @Resource
+    private IBizWorkOrderRecordService bizWorkOrderRecordService;
     @Resource
     private IBizEntrustService entrustService;
 
@@ -106,9 +109,14 @@ public class BizWorkOrderController extends BaseController {
         //有合并工单情况 不可以用合同明细联查
         List<BizWorkOrder> list = bizWorkOrderService.getList2(bizWorkOrder);
         BizEntrust entrustConditions = new BizEntrust();
+        BizWorkOrderRecord bizWorkOrderRecord = new BizWorkOrderRecord();
+        bizWorkOrderRecord.setWorkOrderIds(list.stream().map(BizWorkOrder::getId).collect(Collectors.toList()));
+        bizWorkOrderRecord.setYear(bizWorkOrder.getYear());
+        List<BizWorkOrderRecord> records = bizWorkOrderRecordService.getList(bizWorkOrderRecord);
         entrustConditions.setWorkOrderIds(list.stream().map(BizWorkOrder::getId).collect(Collectors.toList()));
         List<BizEntrust> entrusts = entrustService.getList(entrustConditions);
         list.forEach(v -> {
+            v.setRecords(records.stream().filter(e -> e.getWorkOrderId().equals(v.getId())).collect(Collectors.toList()));
             v.setEntrusts(entrusts.stream().filter(e -> e.getWorkOrderId().equals(v.getId())).collect(Collectors.toList()));
         });
 
@@ -307,7 +315,7 @@ public class BizWorkOrderController extends BaseController {
         setTenantId(bizWorkOrder);
 //        startPage();
         startOrderBy();
-        List<BizWorkOrder> list = bizWorkOrderService.getList(bizWorkOrder);
+        List<BizWorkOrder> list = bizWorkOrderService.getList2(bizWorkOrder);
         ExcelUtil<BizWorkOrder> util = new ExcelUtil<BizWorkOrder>(BizWorkOrder.class);
         util.exportExcel(response, list, "工单信息数据");
     }
@@ -322,7 +330,7 @@ public class BizWorkOrderController extends BaseController {
         setTenantId(bizWorkOrder);
 //        startPage();
         startOrderBy();
-        List<BizWorkOrder> list = bizWorkOrderService.getList(bizWorkOrder);
+        List<BizWorkOrder> list = bizWorkOrderService.getList2(bizWorkOrder);
         List<BizWorkOrderNoContract> listNoContract = new ArrayList<>();
         BizEntrust bizEntrust = new BizEntrust();
         bizEntrust.setWorkOrderIds(list.stream().map(BizWorkOrder::getId).collect(Collectors.toList()));

src/main/resources/mybatis/business/BizWorkOrderMapper.xml

@@ -7,7 +7,6 @@
     <resultMap type="cn.ezhizao.project.business.workOrder.domain.BizWorkOrder" id="BizWorkOrderResult">
         <id column="id" property="id"/>
         <result column="company_id" jdbcType="BIGINT" property="companyId"/>
-        <collection property="records"   select="getRecords" column="id"/>
     </resultMap>
 
     <resultMap type="cn.ezhizao.project.business.workOrder.domain.BizWorkOrderRecord"