0615

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

@@ -339,10 +339,11 @@ public class BizDayworkItemController extends BaseController {
     @GetMapping("/getDayWorkItemHistory")
     @Log(title = "查询报工历史", businessType = BusinessType.SELECT)
     public TableDataInfo getDayWorkItemHistory(String startTime, String endTime) {
+
         startTime = startTime + " 00:00:00";
         endTime = endTime + " 23:59:59";
-
-        List<BizDayworkItem> list = bizDayworkItemService.getDayWorkItemHistory(startTime, endTime, SecurityUtils.getLoginUser().getUser().getUserName());
+        Long tenantId = Long.parseLong(request.getHeader("tenantId"));
+        List<BizDayworkItem> list = bizDayworkItemService.getDayWorkItemHistory(startTime, endTime, SecurityUtils.getLoginUser().getUser().getUserName(),tenantId);
         return getDataTable(list);
     }
     @GetMapping("/getDayWorkItemFinishHistory")
@@ -350,7 +351,8 @@ public class BizDayworkItemController extends BaseController {
     public AjaxResult getDayWorkItemFinishHistory(String startTime, String endTime) {
         startTime = startTime + " 00:00:00";
         endTime = endTime + " 23:59:59";
-        List<BizDayworkItem> list = bizDayworkItemService.getDayWorkItemHistory(startTime, endTime, SecurityUtils.getLoginUser().getUser().getUserName());
+        Long tenantId = Long.parseLong(request.getHeader("tenantId"));
+        List<BizDayworkItem> list = bizDayworkItemService.getDayWorkItemHistory(startTime, endTime, SecurityUtils.getLoginUser().getUser().getUserName(),tenantId);
         if(!list.isEmpty()){
             List<BizDayworkItem> finishedList = list.stream().filter(item -> item.getStatus().equals("3")).collect(Collectors.toList());
             if(!finishedList.isEmpty()){

src/main/java/cn/ezhizao/project/business/product/domain/BizInspectionChamber.java

@@ -31,5 +31,6 @@ public class BizInspectionChamber extends BaseEntity
     /** 所在车间 */
     @ApiModelProperty(value = "检查室编码")
     private Long workShopId;
+    private Long tenantId;
 
 }

src/main/java/cn/ezhizao/project/business/product/mapper/BizDayworkItemMapper.java

@@ -64,7 +64,7 @@ public interface BizDayworkItemMapper extends BaseMapper<BizDayworkItem>
     public BizDayworkItem getDayworkItemByCarrier(String carrierId);
 
 
-    List<BizDayworkItem> getDayWorkItemHistory(String startTime,String endTime,String userName);
+    List<BizDayworkItem> getDayWorkItemHistory(String startTime,String endTime,String userName,Long tenantId);
 
     List<BizDayworkItem> getItemScreen(Long dayWorkId);
 

src/main/java/cn/ezhizao/project/business/product/service/IBizDayworkItemService.java

@@ -51,7 +51,7 @@ public interface IBizDayworkItemService extends IService<BizDayworkItem>
      */
     public List<BizDayworkItem> getUndoneItem(BizDayworkItem bizDayworkItem);
 
-    List<BizDayworkItem> getDayWorkItemHistory(String startTime,String endTime,String userName);
+    List<BizDayworkItem> getDayWorkItemHistory(String startTime,String endTime,String userName,Long tenantId);
 
     List<BizDayworkItem> getItemScreen(Long dayWorkId);
     List<BizDayworkItem> getUnfinishedDayworkItemByUser(Long userId);

src/main/java/cn/ezhizao/project/business/product/service/impl/BizDayworkItemServiceImpl.java

@@ -96,8 +96,8 @@ public class BizDayworkItemServiceImpl  extends ServiceImpl<BizDayworkItemMapper
     }
 
     @Override
-    public List<BizDayworkItem> getDayWorkItemHistory(String startTime,String endTime,String userName) {
-        return bizDayworkItemMapper.getDayWorkItemHistory(startTime,endTime,userName);
+    public List<BizDayworkItem> getDayWorkItemHistory(String startTime,String endTime,String userName,Long tenantId) {
+        return bizDayworkItemMapper.getDayWorkItemHistory(startTime,endTime,userName,tenantId);
     }
 
     @Override

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

@@ -547,6 +547,7 @@
         WHERE di.deleted = 0
         AND di.`status` in (2, 3)
         AND di.user_name = #{userName}
+        and di.tenant_id = #{tenantId}
         AND di.start_time BETWEEN #{startTime} AND #{endTime}
         ORDER BY di.start_time DESC
     </select>