提交

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

@@ -171,7 +171,7 @@ public class BizDayworkAuxiliaryItemController extends BaseController {
      */
     @GetMapping("/listDaywork")
     @Log(title = "获取报工列表", businessType = BusinessType.EXPORT)
-    public TableDataInfo list(BizDaywork bizDaywork) {
+    public TableDataInfo list(BizDaywork bizDaywork) throws NoSuchFieldException, IllegalAccessException {
         if (!getLoginUser().getUser().isAdmin()) {
             SysDept conditionDept = new SysDept();
             conditionDept.setUserId(getUserId());
@@ -180,6 +180,7 @@ public class BizDayworkAuxiliaryItemController extends BaseController {
         }
 
         startPage();
+        setTenantId(bizDaywork);
 
         //查询当前生产子计划的批次报工列表
         List<BizDaywork> dayworkList = bizDayworkService.getListForAuxiliary(bizDaywork);

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

@@ -40,8 +40,7 @@ import cn.ezhizao.project.business.service.IBizPackageResourceGroupService;
  */
 @RestController
 @RequestMapping("/business/packageResourceGroup")
-public class BizPackageResourceGroupController extends BaseController
-{
+public class BizPackageResourceGroupController extends BaseController {
     @Resource
     private IBizPackageResourceGroupService bizPackageResourceGroupService;
     @Resource
@@ -57,8 +56,7 @@ public class BizPackageResourceGroupController extends BaseController
 //    @PreAuthorize("@ss.hasPermi('business:packageResourceGroup:list')")
     @GetMapping("/list")
     @Log(title = "查询包装线列表", businessType = BusinessType.SELECT)
-    public TableDataInfo list(BizPackageResourceGroup bizPackageResourceGroup) throws NoSuchFieldException, IllegalAccessException
-    {
+    public TableDataInfo list(BizPackageResourceGroup bizPackageResourceGroup) throws NoSuchFieldException, IllegalAccessException {
 //        setTenantId(bizPackageResourceGroup);
 //        startPage();
         List<BizPackageResourceGroup> list = bizPackageResourceGroupService.getList(bizPackageResourceGroup);
@@ -71,8 +69,7 @@ public class BizPackageResourceGroupController extends BaseController
     @PreAuthorize("@ss.hasPermi('business:packageResourceGroup:export')")
     @Log(title = "导出包装线", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, BizPackageResourceGroup bizPackageResourceGroup) throws NoSuchFieldException, IllegalAccessException
-    {
+    public void export(HttpServletResponse response, BizPackageResourceGroup bizPackageResourceGroup) throws NoSuchFieldException, IllegalAccessException {
         setTenantId(bizPackageResourceGroup);
         List<BizPackageResourceGroup> list = bizPackageResourceGroupService.getList(bizPackageResourceGroup);
         ExcelUtil<BizPackageResourceGroup> util = new ExcelUtil<BizPackageResourceGroup>(BizPackageResourceGroup.class);
@@ -84,8 +81,7 @@ public class BizPackageResourceGroupController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('business:packageResourceGroup:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(bizPackageResourceGroupService.getById(id));
     }
 
@@ -94,12 +90,12 @@ public class BizPackageResourceGroupController extends BaseController
      */
     @Log(title = "新增包装线", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody BizPackageResourceGroup bizPackageResourceGroup) throws NoSuchFieldException, IllegalAccessException
-    {
+    public AjaxResult add(@RequestBody BizPackageResourceGroup bizPackageResourceGroup) throws NoSuchFieldException, IllegalAccessException {
+        setTenantId(bizPackageResourceGroup);
         //根据工段号和包装线号查询是否存在相同的数据
-        List<BizPackageResourceGroup> packageResourceGroups=bizPackageResourceGroupService.query().eq("dept_no",bizPackageResourceGroup.getDeptNo()).eq("package_line_no",bizPackageResourceGroup.getPackageLineNo()).list();
+        List<BizPackageResourceGroup> packageResourceGroups = bizPackageResourceGroupService.query().eq("dept_no", bizPackageResourceGroup.getDeptNo()).eq("package_line_no", bizPackageResourceGroup.getPackageLineNo()).list();
         //如果有数据代表有相同的包装线号和工段号返回异常
-        if(!packageResourceGroups.isEmpty()){
+        if (!packageResourceGroups.isEmpty()) {
             return error("已有相同的工段号和包装线号请重新输入。");
         }
         setTenantId(bizPackageResourceGroup);
@@ -111,11 +107,10 @@ public class BizPackageResourceGroupController extends BaseController
      */
     @Log(title = "修改包装线", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody BizPackageResourceGroup bizPackageResourceGroup) throws NoSuchFieldException, IllegalAccessException
-    {
+    public AjaxResult edit(@RequestBody BizPackageResourceGroup bizPackageResourceGroup) throws NoSuchFieldException, IllegalAccessException {
         //根据工段号和包装线号查询是否存在相同的数据，根据id排除自身数据
-        List<BizPackageResourceGroup> packageResourceGroups=bizPackageResourceGroupService.query().eq("dept_no",bizPackageResourceGroup.getDeptNo()).eq("package_line_no",bizPackageResourceGroup.getPackageLineNo()).ne("id",bizPackageResourceGroup.getId()).list();
-        if(!packageResourceGroups.isEmpty()){
+        List<BizPackageResourceGroup> packageResourceGroups = bizPackageResourceGroupService.query().eq("dept_no", bizPackageResourceGroup.getDeptNo()).eq("package_line_no", bizPackageResourceGroup.getPackageLineNo()).ne("id", bizPackageResourceGroup.getId()).list();
+        if (!packageResourceGroups.isEmpty()) {
             return error("已有相同的工段号和包装线号请重新输入。");
         }
         //如果有数据代表有相同的包装线号和工段号返回异常
@@ -127,12 +122,11 @@ public class BizPackageResourceGroupController extends BaseController
      * 删除包装线
      */
     @Log(title = "删除包装线", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable List<Long> ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable List<Long> ids) {
         //判断如果该包装线下有员工，则不能删除
         List<BizPackageResourceGroupDetail> list = bizPackageResourceGroupDetailService.query().in("package_resource_group_id", ids).list();
-        if(list.size()>0) {
+        if (list.size() > 0) {
             return error("该包装线下有员工，不能删除！");
 
         }
@@ -144,7 +138,7 @@ public class BizPackageResourceGroupController extends BaseController
      */
     @PostMapping("/addDetails")
     @Log(title = "包装线明细新增", businessType = BusinessType.INSERT)
-    public AjaxResult addDetails(@RequestBody BizPackageResourceGroup bizPackageResourceGroup) {
+    public AjaxResult addDetails(@RequestBody BizPackageResourceGroup bizPackageResourceGroup) throws NoSuchFieldException, IllegalAccessException {
         // 判断是否存在其他包装线有该人员
         long count = bizPackageResourceGroupDetailService.query().in("user_id", bizPackageResourceGroup.getEmployees().stream().map(SysUser::getUserId).collect(Collectors.toList())).ne("package_resource_group_id", bizPackageResourceGroup.getId()).count();
         if (count > 0) {
@@ -180,6 +174,9 @@ public class BizPackageResourceGroupController extends BaseController
             detail.setTenantId(getLoginUser().getTenantId());
             newDetails.add(detail);
         });
+        for (BizPackageResourceGroupDetail detail : newDetails) {
+            setTenantId(detail);
+        }
         return newDetails.isEmpty() || bizPackageResourceGroupDetailService.saveBatch(newDetails) ? success() : error("保存失败");
     }
 
@@ -189,8 +186,7 @@ public class BizPackageResourceGroupController extends BaseController
      */
     @GetMapping("/listDetails")
     @Log(title = "查询包装线明细列表", businessType = BusinessType.SELECT)
-    public TableDataInfo listDetails(BizPackageResourceGroupDetail bizPackageResourceGroupDetail) throws NoSuchFieldException, IllegalAccessException
-    {
+    public TableDataInfo listDetails(BizPackageResourceGroupDetail bizPackageResourceGroupDetail) throws NoSuchFieldException, IllegalAccessException {
         setTenantId(bizPackageResourceGroupDetail);
         startPage();
         List<BizPackageResourceGroupDetail> list = bizPackageResourceGroupDetailService.getList(bizPackageResourceGroupDetail);

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

@@ -52,6 +52,7 @@ public class BizProductionPlanDetailController extends BaseController {
     public TableDataInfo list( BizProductionPlanDetail data) throws NoSuchFieldException, IllegalAccessException {
 //        String tenantId = request.getHeader("tenantId");
 //        data.setTenantId(Long.valueOf(tenantId));
+        setTenantId(data);
         startPage();
         List<BizProductionPlanDetail> list = bizProductionPlanDetailService.getList(data);
         return getDataTable(list);

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

@@ -41,7 +41,7 @@ public class BizProductionResourceGroupController extends BaseController
     @Log(title = "查询工段资源组列表", businessType = BusinessType.SELECT)
     public TableDataInfo list(BizProductionResourceGroup bizProductionResourceGroup) throws NoSuchFieldException, IllegalAccessException
     {
-
+        setTenantId(bizProductionResourceGroup);
         List<BizProductionResourceGroup> list = bizProductionResourceGroupService.getList(bizProductionResourceGroup);
         return getDataTable(list);
     }
@@ -77,12 +77,16 @@ public class BizProductionResourceGroupController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody BizProductionResourceGroup bizProductionResourceGroup) throws NoSuchFieldException, IllegalAccessException
     {
+        setTenantId(bizProductionResourceGroup);
         bizProductionResourceGroupService.saveOrUpdate(bizProductionResourceGroup);
         for (BizProductionResourceGroupDetail item: bizProductionResourceGroup.getGroupDetailList()
              ) {
             item.setProductionResourceGroupId(bizProductionResourceGroup.getId());
         }
         List<BizProductionResourceGroupDetail> oldList = bizProductionResourceGroupDetailService.query().eq("production_resource_group_id", bizProductionResourceGroup.getId()).list();
+        for(BizProductionResourceGroupDetail item : bizProductionResourceGroup.getGroupDetailList()) {
+            setTenantId(item);
+        }
         boolean batch = saveOrUpdateBatch(bizProductionResourceGroupDetailService, bizProductionResourceGroup.getGroupDetailList(), oldList);
         return toAjax(batch);
     }

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

@@ -85,7 +85,9 @@ public class BizProductionResourceGroupSubPlanController extends BaseController
     @PostMapping("/saveBatch")
     public AjaxResult saveBatch(@RequestBody List<BizProductionResourceGroupSubPlan> bizProductionResourceGroupSubPlans) throws NoSuchFieldException, IllegalAccessException
     {
-
+        for(BizProductionResourceGroupSubPlan item:bizProductionResourceGroupSubPlans) {
+            setTenantId(item);
+        }
         return toAjax(bizProductionResourceGroupSubPlanService.saveBatch(bizProductionResourceGroupSubPlans));
     }
     /**

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

@@ -21,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="code != null  and code != ''"> AND code like concat('%',#{code},'%') AND</if>
             <if test="deptId != null  and deptId != ''"> AND dept_id = #{deptId}</if>
             <if test="isDeactivate != null "> AND is_deactivate = #{isDeactivate}</if>
+            <if test="tenantId != null"> AND tenant_id = #{tenantId}</if>
         </trim>
     </select>