| | |
|---|
| | | if (!CollectionUtils.isEmpty(baseFactoryUserList)) { |
|---|
| | | List<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toList()); |
|---|
| | | List<String> factoryCode = baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getFactoryCode).collect(Collectors.toList()); |
|---|
| | | queryWrapper.in("e.factory_code", factoryCode); |
|---|
| | | queryWrapper.in("e.factory_org_code", factoryCode); |
|---|
| | | } else { |
|---|
| | | return page; |
|---|
| | | } |
|---|
| | |
|---|
| | | entity.setHasOtherCheck(request.getHasOtherCheck()); |
|---|
| | | entity.setHasPrecisionCheck(request.getHasPrecisionCheck()); |
|---|
| | | entity.setHasSafetyEquipmentCheck(request.getHasSafetyEquipmentCheck()); |
|---|
| | | entity.setRemark(request.getRemark()); |
|---|
| | | this.getBaseMapper().updateById(entity); |
|---|
| | | //处理详情 |
|---|
| | | if(CollectionUtil.isNotEmpty(request.getTableDetailList())) { |
|---|
| | |
|---|
| | | newEntity.setHasSafetyEquipmentCheck(request.getHasSafetyEquipmentCheck()); |
|---|
| | | //删除标记 |
|---|
| | | newEntity.setDelFlag(CommonConstant.DEL_FLAG_0); |
|---|
| | | newEntity.setRemark(request.getRemark()); |
|---|
| | | //重复性校验 |
|---|
| | | EamTechnicalStatusEvaluationStandard exist = checkDuplicate(newEntity.getEquipmentId(), entity.getId()); |
|---|
| | | if(exist != null){ |
|---|
