|
@@ -47,8 +47,8 @@ public class BizProductionPlanDetailSubDetailEquipmentUserController extends Bas
|
|
@GetMapping("/list")
|
|
@GetMapping("/list")
|
|
public TableDataInfo list(BizProductionPlanDetailSubDetailEquipmentUser bizProductionPlanDetailSubDetailEquipmentUser) throws NoSuchFieldException, IllegalAccessException
|
|
public TableDataInfo list(BizProductionPlanDetailSubDetailEquipmentUser bizProductionPlanDetailSubDetailEquipmentUser) throws NoSuchFieldException, IllegalAccessException
|
|
{
|
|
{
|
|
- String tenantId = request.getHeader("tenantId");
|
|
|
|
- bizProductionPlanDetailSubDetailEquipmentUser.setTenantId(Long.valueOf(tenantId));
|
|
|
|
|
|
+// String tenantId = request.getHeader("tenantId");
|
|
|
|
+// bizProductionPlanDetailSubDetailEquipmentUser.setTenantId(Long.valueOf(tenantId));
|
|
startPage();
|
|
startPage();
|
|
List<BizProductionPlanDetailSubDetailEquipmentUser> list = bizProductionPlanDetailSubDetailEquipmentUserService.getList(bizProductionPlanDetailSubDetailEquipmentUser);
|
|
List<BizProductionPlanDetailSubDetailEquipmentUser> list = bizProductionPlanDetailSubDetailEquipmentUserService.getList(bizProductionPlanDetailSubDetailEquipmentUser);
|
|
return getDataTable(list);
|
|
return getDataTable(list);
|
|
@@ -86,7 +86,7 @@ public class BizProductionPlanDetailSubDetailEquipmentUserController extends Bas
|
|
@PostMapping
|
|
@PostMapping
|
|
public AjaxResult save(@RequestBody List<BizProductionPlanDetailSubDetailEquipmentUser> bizProductionPlanDetailSubDetailEquipmentUser) throws NoSuchFieldException, IllegalAccessException
|
|
public AjaxResult save(@RequestBody List<BizProductionPlanDetailSubDetailEquipmentUser> bizProductionPlanDetailSubDetailEquipmentUser) throws NoSuchFieldException, IllegalAccessException
|
|
{
|
|
{
|
|
- String tenantId = request.getHeader("tenantId");
|
|
|
|
|
|
+// String tenantId = request.getHeader("tenantId");
|
|
|
|
|
|
// if(bizProductionPlanDetailSubDetailEquipmentUser.size()>0){
|
|
// if(bizProductionPlanDetailSubDetailEquipmentUser.size()>0){
|
|
// BizProductionPlanDetailSubDetailEquipmentUser equipmentUser = new BizProductionPlanDetailSubDetailEquipmentUser();
|
|
// BizProductionPlanDetailSubDetailEquipmentUser equipmentUser = new BizProductionPlanDetailSubDetailEquipmentUser();
|
|
@@ -101,12 +101,12 @@ public class BizProductionPlanDetailSubDetailEquipmentUserController extends Bas
|
|
for (BizProductionPlanDetailSubDetailEquipmentUser item: bizProductionPlanDetailSubDetailEquipmentUser
|
|
for (BizProductionPlanDetailSubDetailEquipmentUser item: bizProductionPlanDetailSubDetailEquipmentUser
|
|
) {
|
|
) {
|
|
ids.add(item.getProductionPlanDetailSubDetailEquipmentId());
|
|
ids.add(item.getProductionPlanDetailSubDetailEquipmentId());
|
|
- item.setTenantId(Long.valueOf(tenantId));
|
|
|
|
|
|
+// item.setTenantId(Long.valueOf(tenantId));
|
|
}
|
|
}
|
|
ids = ids.stream().distinct().collect(Collectors.toList());
|
|
ids = ids.stream().distinct().collect(Collectors.toList());
|
|
QueryWrapper<BizProductionPlanDetailSubDetailEquipmentUser> queryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<BizProductionPlanDetailSubDetailEquipmentUser> queryWrapper = new QueryWrapper<>();
|
|
queryWrapper.in("production_plan_detail_sub_detail_equipment_id", ids);
|
|
queryWrapper.in("production_plan_detail_sub_detail_equipment_id", ids);
|
|
- queryWrapper.eq("tenant_id", Long.valueOf(tenantId));
|
|
|
|
|
|
+// queryWrapper.eq("tenant_id", Long.valueOf(tenantId));
|
|
List<BizProductionPlanDetailSubDetailEquipmentUser> oldList = bizProductionPlanDetailSubDetailEquipmentUserService.list(queryWrapper);
|
|
List<BizProductionPlanDetailSubDetailEquipmentUser> oldList = bizProductionPlanDetailSubDetailEquipmentUserService.list(queryWrapper);
|
|
|
|
|
|
|
|
|
|
@@ -121,8 +121,8 @@ public class BizProductionPlanDetailSubDetailEquipmentUserController extends Bas
|
|
@PutMapping
|
|
@PutMapping
|
|
public AjaxResult edit(@RequestBody BizProductionPlanDetailSubDetailEquipmentUser bizProductionPlanDetailSubDetailEquipmentUser) throws NoSuchFieldException, IllegalAccessException
|
|
public AjaxResult edit(@RequestBody BizProductionPlanDetailSubDetailEquipmentUser bizProductionPlanDetailSubDetailEquipmentUser) throws NoSuchFieldException, IllegalAccessException
|
|
{
|
|
{
|
|
- String tenantId = request.getHeader("tenantId");
|
|
|
|
- bizProductionPlanDetailSubDetailEquipmentUser.setTenantId(Long.valueOf(tenantId));
|
|
|
|
|
|
+// String tenantId = request.getHeader("tenantId");
|
|
|
|
+// bizProductionPlanDetailSubDetailEquipmentUser.setTenantId(Long.valueOf(tenantId));
|
|
return toAjax(bizProductionPlanDetailSubDetailEquipmentUserService.updateById(bizProductionPlanDetailSubDetailEquipmentUser));
|
|
return toAjax(bizProductionPlanDetailSubDetailEquipmentUserService.updateById(bizProductionPlanDetailSubDetailEquipmentUser));
|
|
}
|
|
}
|
|
|
|
|