|
@@ -168,7 +168,7 @@ public class CmmsUpkeepPlanServiceImpl extends ServiceImpl<CmmsUpkeepPlanMapper,
|
|
|
}
|
|
|
boolean b2 = cmmsUpkeepPlanItemService.saveBatch(cmmsUpkeepPlanItemList);
|
|
|
setRedisCache();
|
|
|
- return b1 && b2;
|
|
|
+ return b1;
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -177,7 +177,7 @@ public class CmmsUpkeepPlanServiceImpl extends ServiceImpl<CmmsUpkeepPlanMapper,
|
|
|
*/
|
|
|
public boolean updateCmmsUpkeepPlan(CmmsUpkeepPlanDto cmmsUpkeepPlanDto){
|
|
|
//一、删除之前保养计划-保养项表中关于该计划的保养项 通过planid删除
|
|
|
- int ifdelplanitem = cmmsUpkeepPlanItemService.delCmmsUpkeepPlanItemByPid(cmmsUpkeepPlanDto.getId());
|
|
|
+ boolean ifdelplanitem = cmmsUpkeepPlanItemService.delCmmsUpkeepPlanItemByPid(cmmsUpkeepPlanDto.getId());
|
|
|
|
|
|
//二、更新保养计划表 // 如果计划第一次开始时间还没到时间执行,不管以前有没有通过此计划生成过保养工单,都将下次执行时间赋值为开始时间,同时修改通知时间;如果已经过了时间说明计划开始时间未改,下次执行时间等不变
|
|
|
if (cmmsUpkeepPlanDto.getBegintime().after(new Date())) {
|
|
@@ -186,7 +186,7 @@ public class CmmsUpkeepPlanServiceImpl extends ServiceImpl<CmmsUpkeepPlanMapper,
|
|
|
cmmsUpkeepPlanDto.setIfnotice("否");//更新计划是否已经通知
|
|
|
cmmsUpkeepPlanDto.setNoticetime(getNextTime(cmmsUpkeepPlanDto.getNexttime(), cmmsUpkeepPlanDto.getNoticetype(), -(cmmsUpkeepPlanDto.getNoticenum())));//更新保养计划执行提醒时间
|
|
|
}
|
|
|
- int ifupdateplan = updateCmmsUpkeepPlanContentById(cmmsUpkeepPlanDto);
|
|
|
+ boolean ifupdateplan = updateCmmsUpkeepPlanContentById(cmmsUpkeepPlanDto);
|
|
|
|
|
|
//三、将新的保养计划对应的保养项存入保养计划-保养项表
|
|
|
List<CmmsUpkeepItemDto> cmmsUpkeepItemDtoList = cmmsUpkeepPlanDto.getCmmsUpkeepItemDtoList();
|
|
@@ -202,7 +202,7 @@ public class CmmsUpkeepPlanServiceImpl extends ServiceImpl<CmmsUpkeepPlanMapper,
|
|
|
System.out.println(ifupdateplan);
|
|
|
System.out.println(b2);
|
|
|
setRedisCache();
|
|
|
- return (ifdelplanitem==1)&&(ifupdateplan==1)&&b2;
|
|
|
+ return ifupdateplan;
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -210,7 +210,7 @@ public class CmmsUpkeepPlanServiceImpl extends ServiceImpl<CmmsUpkeepPlanMapper,
|
|
|
* 更新保养计划表
|
|
|
*
|
|
|
*/
|
|
|
- public int updateCmmsUpkeepPlanContentById(CmmsUpkeepPlanDto cmmsUpkeepPlanDto){
|
|
|
+ public boolean updateCmmsUpkeepPlanContentById(CmmsUpkeepPlanDto cmmsUpkeepPlanDto){
|
|
|
return cmmsUpkeepPlanMapper.updateCmmsUpkeepPlanContentById(cmmsUpkeepPlanDto);
|
|
|
}
|
|
|
|
|
@@ -218,8 +218,8 @@ public class CmmsUpkeepPlanServiceImpl extends ServiceImpl<CmmsUpkeepPlanMapper,
|
|
|
* 更新保养计划状态
|
|
|
*
|
|
|
*/
|
|
|
- public int updateCmmsUpkeepPlanStatusById(CmmsUpkeepPlan cmmsUpkeepPlan){
|
|
|
- int rtn = cmmsUpkeepPlanMapper.updateCmmsUpkeepPlanStatusById(cmmsUpkeepPlan);
|
|
|
+ public boolean updateCmmsUpkeepPlanStatusById(CmmsUpkeepPlan cmmsUpkeepPlan){
|
|
|
+ boolean rtn = cmmsUpkeepPlanMapper.updateCmmsUpkeepPlanStatusById(cmmsUpkeepPlan);
|
|
|
setRedisCache();
|
|
|
return rtn;
|
|
|
}
|
|
@@ -228,8 +228,8 @@ public class CmmsUpkeepPlanServiceImpl extends ServiceImpl<CmmsUpkeepPlanMapper,
|
|
|
* 根据保养计划批量更新下次生成工单时间及通知信息
|
|
|
*
|
|
|
*/
|
|
|
- public int updateCmmsUpkeepCreateNoticeByIds(List<CmmsUpkeepPlan> cmmsUpkeepPlanList){
|
|
|
- int rtn = cmmsUpkeepPlanMapper.updateCmmsUpkeepCreateNoticeByIds(cmmsUpkeepPlanList);
|
|
|
+ public boolean updateCmmsUpkeepCreateNoticeByIds(List<CmmsUpkeepPlan> cmmsUpkeepPlanList){
|
|
|
+ boolean rtn = cmmsUpkeepPlanMapper.updateCmmsUpkeepCreateNoticeByIds(cmmsUpkeepPlanList);
|
|
|
setRedisCache();
|
|
|
return rtn;
|
|
|
}
|
|
@@ -239,8 +239,8 @@ public class CmmsUpkeepPlanServiceImpl extends ServiceImpl<CmmsUpkeepPlanMapper,
|
|
|
* 根据保养计划批量更新保养计划是否提前通知提醒ifnotice
|
|
|
*
|
|
|
*/
|
|
|
- public int updateCmmsUpkeepPlanIfnoticeByIds(List<CmmsUpkeepPlan> cmmsUpkeepPlanList){
|
|
|
- int rtn = cmmsUpkeepPlanMapper.updateCmmsUpkeepPlanIfnoticeByIds(cmmsUpkeepPlanList);
|
|
|
+ public boolean updateCmmsUpkeepPlanIfnoticeByIds(List<CmmsUpkeepPlan> cmmsUpkeepPlanList){
|
|
|
+ boolean rtn = cmmsUpkeepPlanMapper.updateCmmsUpkeepPlanIfnoticeByIds(cmmsUpkeepPlanList);
|
|
|
setRedisCache();
|
|
|
return rtn;
|
|
|
}
|