fix:添加账套id查询

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

@@ -124,11 +124,13 @@ public class WorkOrderServiceController extends BaseController {
         BizWorkOrderRecord bizWorkOrderRecord = new BizWorkOrderRecord();
         bizWorkOrderRecord.setWorkOrderIds(list.stream().map(BizWorkOrder::getId).collect(Collectors.toList()));
         bizWorkOrderRecord.setYear(bizWorkOrder.getYear());
+        bizWorkOrderRecord.setTenantId(bizWorkOrder.getTenantId());
 //        bizWorkOrderRecord.setMonth(bizWorkOrder.getMonth());
         List<BizWorkOrderRecord> records = bizWorkOrderRecordService.getList(bizWorkOrderRecord);
         BizEntrust entrustConditions = new BizEntrust();
         entrustConditions.setWorkOrderIds(list.stream().map(BizWorkOrder::getId).collect(Collectors.toList()));
         entrustConditions.setCurrentYear(bizWorkOrder.getYear());
+        entrustConditions.setTenantId(bizWorkOrder.getTenantId());
         List<BizEntrust> entrusts = entrustService.getList(entrustConditions);
         list.forEach(v -> {
             v.setRecords(records.stream().filter(e -> e.getWorkOrderId().equals(v.getId())).collect(Collectors.toList()));
@@ -152,10 +154,12 @@ public class WorkOrderServiceController extends BaseController {
         BizWorkOrderRecord bizWorkOrderRecord = new BizWorkOrderRecord();
         bizWorkOrderRecord.setWorkOrderIds(list.stream().map(BizWorkOrder::getId).collect(Collectors.toList()));
         bizWorkOrderRecord.setYear(bizWorkOrder.getYear());
+        bizWorkOrderRecord.setTenantId(bizWorkOrder.getTenantId());
         List<BizWorkOrderRecord> records = bizWorkOrderRecordService.getList(bizWorkOrderRecord);
         BizEntrust entrustConditions = new BizEntrust();
         entrustConditions.setWorkOrderIds(list.stream().map(BizWorkOrder::getId).collect(Collectors.toList()));
         entrustConditions.setCurrentYear(bizWorkOrder.getYear());
+        entrustConditions.setTenantId(bizWorkOrder.getTenantId());
         Map<Long, List<BizEntrust>> collect = entrustService.getList(entrustConditions).stream().collect(Collectors.groupingBy(BizEntrust::getCompanyId));
         list.forEach(v -> {
             v.setRecord(records.stream().filter(e -> e.getWorkOrderId().equals(v.getId())
@@ -208,11 +212,14 @@ public class WorkOrderServiceController extends BaseController {
         List<BizWorkOrder> list = bizWorkOrderService.getList(bizWorkOrder);
         List<BizWorkOrderOnce> listOnce = new ArrayList<>();
         BizWorkOrderRecord bizWorkOrderRecord = new BizWorkOrderRecord();
+        bizWorkOrderRecord.setYear(bizWorkOrder.getYear());
         bizWorkOrderRecord.setWorkOrderIds(list.stream().map(BizWorkOrder::getId).collect(Collectors.toList()));
+        bizWorkOrderRecord.setTenantId(bizWorkOrder.getTenantId());
         List<BizWorkOrderRecord> records = bizWorkOrderRecordService.getList(bizWorkOrderRecord);
         BizEntrust entrustConditions = new BizEntrust();
         entrustConditions.setWorkOrderIds(list.stream().map(BizWorkOrder::getId).collect(Collectors.toList()));
         entrustConditions.setCurrentYear(bizWorkOrder.getYear());
+        entrustConditions.setTenantId(bizWorkOrder.getTenantId());
         List<BizEntrust> entrusts = entrustService.getList(entrustConditions);
         list.forEach(v -> {
             v.setRecord(records.stream().filter(e -> e.getWorkOrderId().equals(v.getId()) && e.getFromId().equals(0L)).findFirst().orElse(null));
@@ -265,10 +272,12 @@ public class WorkOrderServiceController extends BaseController {
         });
         BizWorkOrderRecord bizWorkOrderRecord = new BizWorkOrderRecord();
         bizWorkOrderRecord.setWorkOrderIds(list.stream().map(BizWorkOrder::getId).collect(Collectors.toList()));
+        bizWorkOrderRecord.setTenantId(bizWorkOrder.getTenantId());
         List<BizWorkOrderRecord> records = bizWorkOrderRecordService.getList(bizWorkOrderRecord);
 
         BizEntrust entrustConditions = new BizEntrust();
         entrustConditions.setWorkOrderIds(list.stream().map(BizWorkOrder::getId).collect(Collectors.toList()));
+        entrustConditions.setTenantId(bizWorkOrder.getTenantId());
         List<BizEntrust> entrusts = entrustService.getList(entrustConditions);
         list.forEach(v -> {
             v.setRecords(records.stream().filter(e -> e.getWorkOrderId().equals(v.getId())).collect(Collectors.toList()));

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

@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             t1.deleted = 0
             <if test="isStop != null "> AND t1.is_stop = #{isStop}</if>
+            <if test="tenantId != null "> AND t1.tenant_id = #{tenantId}</if>
             <if test="currentYear != null and currentYear != ''"> AND date_format(t1.current_month,'%Y') = #{currentYear}</if>
             <if test="workOrderIds != null and workOrderIds.size() > 0">
                 AND t1.work_order_id IN