diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/plansub/PlanSubServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/plansub/PlanSubServiceImpl.java index bed9c584..fe75b5e7 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/plansub/PlanSubServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/plansub/PlanSubServiceImpl.java @@ -17,6 +17,8 @@ import com.chanko.yunxi.mes.module.heli.dal.mysql.processbom.ProcessBomMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.projectorder.ProjectOrderMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.projectorder.ProjectOrderSubMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.shopCalendar.ShopCalendarMapper; +import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO; +import com.chanko.yunxi.mes.module.system.dal.mysql.user.AdminUserMapper; import jodd.util.StringUtil; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -56,6 +58,8 @@ public class PlanSubServiceImpl implements PlanSubService { private PlanSubDetailMapper planSubDetailMapper; @Resource private ProjectOrderMapper projectOrderMapper; + @Resource + private AdminUserMapper adminUserMapper; @Override public Long createPlanSub(PlanSubSaveReqVO createReqVO) { // 插入 @@ -207,7 +211,8 @@ public class PlanSubServiceImpl implements PlanSubService { // 只检查同一个责任人负责的任务 if (item1.owner.equals(item2.owner)) { if (hasOverlap(item1.start, item1.end, item2.start, item2.end)) { - throw exception(new ErrorCode(1_007_006,"当前插入:"+item1.type+item1.start.toString().substring(0,10)+" -"+item1.end.toString().substring(0,10)+"跟"+item2.type+item2.start.toString().substring(0,10)+item2.end.toString().substring(0,10)+"存在交集,请确认!")); + AdminUserDO adminUserDO = adminUserMapper.selectById(item1.owner); + throw exception(new ErrorCode(1_007_006,adminUserDO.getNickname()+":"+item1.start.toString().substring(0,10)+" -"+item1.end.toString().substring(0,10)+"跟"+item2.start.toString().substring(0,10)+item2.end.toString().substring(0,10)+"存在交集,请确认!")); } } } @@ -258,7 +263,8 @@ public class PlanSubServiceImpl implements PlanSubService { } for (PlanSubDetailDO existingTask : existingTasksForOwner) { if (hasOverlap(start, end, existingTask.getStartTwoDimDate(), existingTask.getTwoDimDate())) { - throw exception(new ErrorCode(1_007_006,"当前插入:"+name+" "+start.toString().substring(0,10)+" -"+end.toString().substring(0,10)+"跟"+existingTask.getName()+"-"+typeName+existingTask.getStartTwoDimDate().toString().substring(0,10)+existingTask.getTwoDimDate().toString().substring(0,10)+"存在交集,请确认!")); + AdminUserDO adminUserDO = adminUserMapper.selectById(owner); + throw exception(new ErrorCode(1_007_006,adminUserDO.getNickname()+" "+start.toString().substring(0,10)+" -"+end.toString().substring(0,10)+"跟"+existingTask.getStartTwoDimDate().toString().substring(0,10)+" -"+existingTask.getTwoDimDate().toString().substring(0,10)+"存在交集,请确认!")); } } }