diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceRepairTaskController.java b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceRepairTaskController.java index d7e4daa3..e265342a 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceRepairTaskController.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceRepairTaskController.java @@ -172,7 +172,7 @@ public class ResourceRepairTaskController { try{ resourceRepairTaskService.saveRepairTask(resourceRepairTask); }catch (Exception e){ - return R.failed("提报失败,"+e.getMessage()); + return R.failed("提报失败:"+e.getMessage()); } return R.ok(); } diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java index 4fcda511..3687afe2 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java @@ -15,7 +15,6 @@ import com.foreverwin.mesnac.equip.model.ResourceRepairTask; import com.foreverwin.mesnac.equip.service.ResourceInspectPlanService; import com.foreverwin.mesnac.equip.service.ResourceInspectTaskSpareService; import com.foreverwin.mesnac.equip.service.ResourceRepairTaskService; -import com.foreverwin.mesnac.meapi.dto.NcCodeDto; import com.foreverwin.mesnac.meapi.mapper.NcCodeMapper; import com.foreverwin.mesnac.meapi.mapper.NwaUserMapper; import com.foreverwin.mesnac.meapi.model.DataField; @@ -27,8 +26,8 @@ import com.foreverwin.mesnac.meapi.service.ResrceService; import com.foreverwin.modular.core.exception.BusinessException; import com.foreverwin.modular.core.util.CommonMethods; import com.foreverwin.modular.core.util.FrontPage; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -149,7 +148,7 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl