This commit is contained in:
parent
b1fb3f1773
commit
e2fd903141
|
|
@ -148,7 +148,6 @@ public class TypeRepairController extends BaseController
|
|||
*/
|
||||
@ApiOperation(value = "新增人员配置")
|
||||
@PreventRepeatSubmit
|
||||
@RequiresPermissions("ma:manage:add")
|
||||
@SysLog(title = "新增人员配置", businessType = OperaType.INSERT, module = "仓储管理->新增人员配置")
|
||||
@PostMapping("/addTypeManage")
|
||||
public AjaxResult addTypeManage(@RequestBody List<TypeRepair> typeRepairs)
|
||||
|
|
@ -160,7 +159,6 @@ public class TypeRepairController extends BaseController
|
|||
* 查询人员配置列表
|
||||
*/
|
||||
@ApiOperation(value = "查询人员配置列表")
|
||||
@RequiresPermissions("ma:manage:list")
|
||||
@GetMapping("/getTypeManageList")
|
||||
public TableDataInfo getTypeManageList(MaTypeVo maTypeVo)
|
||||
{
|
||||
|
|
@ -174,7 +172,6 @@ public class TypeRepairController extends BaseController
|
|||
*/
|
||||
@ApiOperation(value = "删除单个维修班机具配置")
|
||||
@PreventRepeatSubmit
|
||||
@RequiresPermissions("ma:manage:remove")
|
||||
@SysLog(title = "维修班机具配置", businessType = OperaType.DELETE, module = "仓储管理->删除单个维修班机具配置")
|
||||
@PostMapping("/unbindTypeManage")
|
||||
public AjaxResult unbindTypeManage(@RequestBody List<TypeRepair> typeRepairs)
|
||||
|
|
|
|||
|
|
@ -167,7 +167,9 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
|
|||
List<KeyValueVO> keyValueList = repairAuditDetailsMapper.selectTypeNamesByTaskIds(taskIds);
|
||||
// 设置 itemType
|
||||
if (CollectionUtil.isNotEmpty(keyValueList)) {
|
||||
Map<String, String> keyValueMap = keyValueList.stream().collect(Collectors.toMap(KeyValueVO::getMapKey, KeyValueVO::getMapValue));
|
||||
Map<String, String> keyValueMap = keyValueList.stream()
|
||||
.filter(vo -> vo.getMapKey() != null && vo.getMapValue() != null) // 过滤键或值为 null 的元素
|
||||
.collect(Collectors.toMap(KeyValueVO::getMapKey, KeyValueVO::getMapValue));
|
||||
for (ScrapApplyDetailsVO scrapApplyDetailsVO : repairQuestList) {
|
||||
Long taskId = scrapApplyDetailsVO.getTaskId();
|
||||
if (taskId != null) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue