tenantId

src/main/java/cn/ezhizao/project/business/controller/BizProductionPlanDetailController.java

@@ -11,6 +11,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -24,6 +25,8 @@ import java.util.List;
 public class BizProductionPlanDetailController extends BaseController {
     @Resource
     private IBizProductionPlanDetailService bizProductionPlanDetailService;
+    @Resource
+    HttpServletRequest request;
 
     /**
      * 查询生产计划明细列表
@@ -31,6 +34,8 @@ public class BizProductionPlanDetailController extends BaseController {
     @PreAuthorize("@ss.hasPermi('business:productionPlanDetail:list')")
     @GetMapping("/list")
     public TableDataInfo list( BizProductionPlanDetail data) throws NoSuchFieldException, IllegalAccessException {
+        final String tenantId = request.getHeader("tenantId");
+        data.setTenantId(Long.valueOf(tenantId));
         startPage();
         List<BizProductionPlanDetail> list = bizProductionPlanDetailService.getList(data);
         return getDataTable(list);
@@ -52,7 +57,8 @@ public class BizProductionPlanDetailController extends BaseController {
     @Log(title = "生产计划明细", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BizProductionPlanDetail bizProductionPlanDetail) throws NoSuchFieldException, IllegalAccessException {
-        setTenantId(bizProductionPlanDetail);
+        final String tenantId = request.getHeader("tenantId");
+        bizProductionPlanDetail.setTenantId(Long.valueOf(tenantId));
         return toAjax(bizProductionPlanDetailService.save(bizProductionPlanDetail));
     }
 
@@ -63,7 +69,8 @@ public class BizProductionPlanDetailController extends BaseController {
     @Log(title = "生产计划明细", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BizProductionPlanDetail bizProductionPlanDetail) throws NoSuchFieldException, IllegalAccessException {
-        setTenantId(bizProductionPlanDetail);
+        final String tenantId = request.getHeader("tenantId");
+        bizProductionPlanDetail.setTenantId(Long.valueOf(tenantId));
         return toAjax(bizProductionPlanDetailService.updateById(bizProductionPlanDetail));
     }
 

src/main/java/cn/ezhizao/project/business/controller/BizProductionPlanDetailSubDetailController.java

@@ -21,6 +21,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.List;
@@ -45,6 +46,8 @@ public class BizProductionPlanDetailSubDetailController extends BaseController {
     private ISysDeptUserService deptUserService;
     @Resource
     private ISysDeptService deptService;
+    @Resource
+    HttpServletRequest request;
 
     /**
      * 查询生产子计划明细列表
@@ -52,7 +55,8 @@ public class BizProductionPlanDetailSubDetailController extends BaseController {
     @PreAuthorize("@ss.hasPermi('business:planDetailSubDetail:list')")
     @GetMapping("/list")
     public TableDataInfo list(BizProductionPlanDetailSubDetail bizProductionPlanDetailSubDetail) throws NoSuchFieldException, IllegalAccessException {
-        setTenantId(bizProductionPlanDetailSubDetail);
+        final String tenantId = request.getHeader("tenantId");
+        bizProductionPlanDetailSubDetail.setTenantId(Long.valueOf(tenantId));
         startPage();
         List<BizProductionPlanDetailSubDetail> list = bizProductionPlanDetailSubDetailService.getList(bizProductionPlanDetailSubDetail);
         return getDataTable(list);
@@ -117,7 +121,8 @@ public class BizProductionPlanDetailSubDetailController extends BaseController {
     @Log(title = "生产子计划明细", businessType = BusinessType.INSERT)
     @PostMapping("/save")
     public AjaxResult add(@RequestBody BizProductionPlanDetailSubDetail bizProductionPlanDetailSubDetail) throws NoSuchFieldException, IllegalAccessException {
-        setTenantId(bizProductionPlanDetailSubDetail);
+        final String tenantId = request.getHeader("tenantId");
+        bizProductionPlanDetailSubDetail.setTenantId(Long.valueOf(tenantId));
 
         /*
          * 德迈仕生产批号生成规则
@@ -206,7 +211,8 @@ public class BizProductionPlanDetailSubDetailController extends BaseController {
     @Log(title = "生产子计划明细", businessType = BusinessType.UPDATE)
     @PutMapping("/save")
     public AjaxResult edit(@RequestBody BizProductionPlanDetailSubDetail bizProductionPlanDetailSubDetail) throws NoSuchFieldException, IllegalAccessException {
-        setTenantId(bizProductionPlanDetailSubDetail);
+        final String tenantId = request.getHeader("tenantId");
+        bizProductionPlanDetailSubDetail.setTenantId(Long.valueOf(tenantId));
         return toAjax(bizProductionPlanDetailSubDetailService.updateById(bizProductionPlanDetailSubDetail));
     }
 

src/main/java/cn/ezhizao/project/business/controller/BizProductionPlanDetailSubDetailEquipmentController.java

@@ -4,6 +4,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import cn.ezhizao.framework.web.controller.BaseController;
@@ -35,6 +36,8 @@ import cn.ezhizao.framework.web.page.TableDataInfo;
 public class BizProductionPlanDetailSubDetailEquipmentController extends BaseController {
     @Resource
     private IBizProductionPlanDetailSubDetailEquipmentService bizProductionPlanDetailSubDetailEquipmentService;
+    @Resource
+    HttpServletRequest request;
 
     /**
      * 子计划对应的工序指定的使用设备 列表
@@ -43,7 +46,8 @@ public class BizProductionPlanDetailSubDetailEquipmentController extends BaseCon
     @GetMapping("/list")
     public TableDataInfo list(BizProductionPlanDetailSubDetailEquipment bizProductionPlanDetailSubDetailEquipment) throws NoSuchFieldException, IllegalAccessException
     {
-        setTenantId(bizProductionPlanDetailSubDetailEquipment);
+        final String tenantId = request.getHeader("tenantId");
+        bizProductionPlanDetailSubDetailEquipment.setTenantId(Long.valueOf(tenantId));
         //startPage();
         List<BizProductionPlanDetailSubDetailEquipment> list = bizProductionPlanDetailSubDetailEquipmentService.getList(bizProductionPlanDetailSubDetailEquipment);
         return getDataTable(list);
@@ -83,7 +87,8 @@ public class BizProductionPlanDetailSubDetailEquipmentController extends BaseCon
     @PostMapping
     public AjaxResult add(@RequestBody BizProductionPlanDetailSubDetailEquipment bizProductionPlanDetailSubDetailEquipment) throws NoSuchFieldException, IllegalAccessException
     {
-        setTenantId(bizProductionPlanDetailSubDetailEquipment);
+        final String tenantId = request.getHeader("tenantId");
+        bizProductionPlanDetailSubDetailEquipment.setTenantId(Long.valueOf(tenantId));
         return toAjax(bizProductionPlanDetailSubDetailEquipmentService.save(bizProductionPlanDetailSubDetailEquipment));
     }
     /**
@@ -106,7 +111,8 @@ public class BizProductionPlanDetailSubDetailEquipmentController extends BaseCon
     @PutMapping
     public AjaxResult edit(@RequestBody BizProductionPlanDetailSubDetailEquipment bizProductionPlanDetailSubDetailEquipment) throws NoSuchFieldException, IllegalAccessException
     {
-        setTenantId(bizProductionPlanDetailSubDetailEquipment);
+        final String tenantId = request.getHeader("tenantId");
+        bizProductionPlanDetailSubDetailEquipment.setTenantId(Long.valueOf(tenantId));
         return toAjax(bizProductionPlanDetailSubDetailEquipmentService.updateById(bizProductionPlanDetailSubDetailEquipment));
     }
 

src/main/java/cn/ezhizao/project/business/controller/BizProductionPlanDetailSubDetailEquipmentUserController.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import cn.ezhizao.common.utils.poi.ExcelUtil;
@@ -36,6 +37,8 @@ public class BizProductionPlanDetailSubDetailEquipmentUserController extends Bas
 {
     @Resource
     private IBizProductionPlanDetailSubDetailEquipmentUserService bizProductionPlanDetailSubDetailEquipmentUserService;
+    @Resource
+    HttpServletRequest request;
 
     /**
      * 查询子计划对应的工序指定的使用设备列表
@@ -44,7 +47,8 @@ public class BizProductionPlanDetailSubDetailEquipmentUserController extends Bas
     @GetMapping("/list")
     public TableDataInfo list(BizProductionPlanDetailSubDetailEquipmentUser bizProductionPlanDetailSubDetailEquipmentUser) throws NoSuchFieldException, IllegalAccessException
     {
-        setTenantId(bizProductionPlanDetailSubDetailEquipmentUser);
+        final String tenantId = request.getHeader("tenantId");
+        bizProductionPlanDetailSubDetailEquipmentUser.setTenantId(Long.valueOf(tenantId));
         startPage();
         List<BizProductionPlanDetailSubDetailEquipmentUser> list = bizProductionPlanDetailSubDetailEquipmentUserService.getList(bizProductionPlanDetailSubDetailEquipmentUser);
         return getDataTable(list);
@@ -82,7 +86,8 @@ public class BizProductionPlanDetailSubDetailEquipmentUserController extends Bas
     @PostMapping
     public AjaxResult save(@RequestBody List<BizProductionPlanDetailSubDetailEquipmentUser> bizProductionPlanDetailSubDetailEquipmentUser) throws NoSuchFieldException, IllegalAccessException
     {
-        setTenantId(bizProductionPlanDetailSubDetailEquipmentUser);
+        final String tenantId = request.getHeader("tenantId");
+
 //        if(bizProductionPlanDetailSubDetailEquipmentUser.size()>0){
 //            BizProductionPlanDetailSubDetailEquipmentUser equipmentUser = new BizProductionPlanDetailSubDetailEquipmentUser();
 //            equipmentUser.setProductionPlanDetailSubDetailEquipmentId(bizProductionPlanDetailSubDetailEquipmentUser.get(0).getProductionPlanDetailSubDetailEquipmentId());
@@ -96,11 +101,12 @@ public class BizProductionPlanDetailSubDetailEquipmentUserController extends Bas
         for (BizProductionPlanDetailSubDetailEquipmentUser item: bizProductionPlanDetailSubDetailEquipmentUser
              ) {
             ids.add(item.getProductionPlanDetailSubDetailEquipmentId());
+           item.setTenantId(Long.valueOf(tenantId));
         }
         ids = ids.stream().distinct().collect(Collectors.toList());
         QueryWrapper<BizProductionPlanDetailSubDetailEquipmentUser> queryWrapper = new QueryWrapper<>();
         queryWrapper.in("production_plan_detail_sub_detail_equipment_id", ids);
-
+        queryWrapper.eq("tenant_id", tenantId);
         List<BizProductionPlanDetailSubDetailEquipmentUser> oldList = bizProductionPlanDetailSubDetailEquipmentUserService.list(queryWrapper);
 
 
@@ -115,7 +121,8 @@ public class BizProductionPlanDetailSubDetailEquipmentUserController extends Bas
     @PutMapping
     public AjaxResult edit(@RequestBody BizProductionPlanDetailSubDetailEquipmentUser bizProductionPlanDetailSubDetailEquipmentUser) throws NoSuchFieldException, IllegalAccessException
     {
-        setTenantId(bizProductionPlanDetailSubDetailEquipmentUser);
+        final String tenantId = request.getHeader("tenantId");
+        bizProductionPlanDetailSubDetailEquipmentUser.setTenantId(Long.valueOf(tenantId));
         return toAjax(bizProductionPlanDetailSubDetailEquipmentUserService.updateById(bizProductionPlanDetailSubDetailEquipmentUser));
     }
 

src/main/java/cn/ezhizao/project/business/controller/BizResourceAllocationController.java

@@ -2,6 +2,7 @@ package cn.ezhizao.project.business.controller;
 
 import java.util.List;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import cn.ezhizao.common.utils.poi.ExcelUtil;
@@ -10,6 +11,7 @@ import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
 import cn.ezhizao.framework.web.controller.BaseController;
 import cn.ezhizao.framework.web.domain.AjaxResult;
 import cn.ezhizao.framework.web.page.TableDataInfo;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -34,6 +36,8 @@ public class BizResourceAllocationController extends BaseController
 {
     @Resource
     private IBizResourceAllocationService bizResourceAllocationService;
+    @Resource
+    HttpServletRequest request;
 
     /**
      * 查询资源分配列表
@@ -42,7 +46,8 @@ public class BizResourceAllocationController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(BizResourceAllocation bizResourceAllocation) throws NoSuchFieldException, IllegalAccessException
     {
-        setTenantId(bizResourceAllocation);
+        final String tenantId = request.getHeader("tenantId");
+        bizResourceAllocation.setTenantId(Long.valueOf(tenantId));
         startPage();
         List<BizResourceAllocation> list = bizResourceAllocationService.getList(bizResourceAllocation);
         return getDataTable(list);
@@ -80,8 +85,15 @@ public class BizResourceAllocationController extends BaseController
     @PostMapping
     public AjaxResult save(@RequestBody List<BizResourceAllocation> bizResourceAllocation) throws NoSuchFieldException, IllegalAccessException
     {
-        setTenantId(bizResourceAllocation);
-        List<BizResourceAllocation> oldList = bizResourceAllocationService.query().eq("dept_user_id", bizResourceAllocation.get(0).getDeptUserId()).list();
+        final String tenantId = request.getHeader("tenantId");
+        QueryWrapper queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("tenant_id" , tenantId);
+        queryWrapper.eq("dept_user_id", bizResourceAllocation.get(0).getDeptUserId());
+        List<BizResourceAllocation> oldList = bizResourceAllocationService.list(queryWrapper);
+        for (BizResourceAllocation item: bizResourceAllocation
+             ) {
+            item.setTenantId(Long.valueOf(tenantId));
+        }
 
         return toAjax(saveOrUpdateBatch(bizResourceAllocationService,bizResourceAllocation,oldList));
     }

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

@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             deleted = 0
             <if test="keywords != null and keywords !=''"> AND `product_description` LIKE CONCAT('%', #{keywords}, '%')</if>
+            <if test="tenantId != null  and tenantId != 0"> AND tenant_id = #{tenantId}</if>
         </trim>
     </select>
 

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

@@ -36,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="processId!= null and processId!=''">
             AND t1.process_id = #{processId}
             </if>
+        <if test="tenantId != null  and tenantId != 0"> AND t1.tenant_id = #{tenantId}</if>
         GROUP BY
             t1.id
     </select>

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

@@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="equipmentDetailCode != null  and equipmentDetailCode != ''"> AND equipment_detail_code = #{equipmentDetailCode}</if>
             <if test="userName != null  and userName != ''"> AND user_name like concat('%', #{userName}, '%')</if>
             <if test="nickName != null  and nickName != ''"> AND nick_name like concat('%', #{nickName}, '%')</if>
+            <if test="tenantId != null  and tenantId != 0"> AND tenant_id = #{tenantId}</if>
         </trim>
     </select>
 

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

@@ -22,6 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId !=null and deptId !=''"> AND dept_id = #{deptId}</if>
             <if test="lotNumber != null "> AND lot_number = #{lotNumber}</if>
             <if test="deptId != null"> AND dept_id = #{deptId}</if>
+            <if test="tenantId != null  and tenantId != 0"> AND tenant_id = #{tenantId}</if>
         </trim>
         ORDER BY create_time DESC
     </select>