保养计划更新接口修改

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeep/entity/CmmsUpkeep.java

@@ -102,6 +102,7 @@ public class CmmsUpkeep implements Serializable {
     private java.lang.String linkertel;
 	/**负责人*/
 	@Excel(name = "负责人", width = 15)
+    @Dict(dicCode = "id",dictTable="sys_user",dicText="realname")
     @ApiModelProperty(value = "负责人")
     private java.lang.String chargeruser;
 	/**描述*/

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepPlan/controller/CmmsUpkeepPlanController.java

@@ -210,8 +210,8 @@ public class CmmsUpkeepPlanController extends JeecgController<CmmsUpkeepPlan, IC
 	 @ApiOperation(value="保养计划-更新保养计划状态", notes="保养计划-更新保养计划状态")
 	 @RequestMapping(value = "/updateCmmsUpkeepPlanStatusById", method = {RequestMethod.PUT,RequestMethod.POST})
 	 public Result<String> updateCmmsUpkeepPlanStatusById(@RequestBody CmmsUpkeepPlan cmmsUpkeepPlan) {
-		 int ifupdate = cmmsUpkeepPlanService.updateCmmsUpkeepPlanStatusById(cmmsUpkeepPlan);
-		 if(ifupdate==1){
+		 boolean ifupdate = cmmsUpkeepPlanService.updateCmmsUpkeepPlanStatusById(cmmsUpkeepPlan);
+		 if(ifupdate){
 			 return Result.OK("更新状态成功!");
 		 }else{
 			 return Result.error("更新状态失败!");

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepPlan/mapper/CmmsUpkeepPlanMapper.java

@@ -46,24 +46,24 @@ public interface CmmsUpkeepPlanMapper extends BaseMapper<CmmsUpkeepPlan> {
      * 更新保养计划表
      *
      */
-    public int updateCmmsUpkeepPlanContentById(@Param("cmmsUpkeepPlanDto") CmmsUpkeepPlanDto cmmsUpkeepPlanDto);
+    public boolean updateCmmsUpkeepPlanContentById(@Param("cmmsUpkeepPlanDto") CmmsUpkeepPlanDto cmmsUpkeepPlanDto);
 
     /**
      * 更新保养计划状态
      *
      */
-    public int updateCmmsUpkeepPlanStatusById(@Param("cmmsUpkeepPlan") CmmsUpkeepPlan cmmsUpkeepPlan);
+    public boolean updateCmmsUpkeepPlanStatusById(@Param("cmmsUpkeepPlan") CmmsUpkeepPlan cmmsUpkeepPlan);
 
     /**
      * 根据保养计划批量更新下次生成工单时间及通知信息
      *
      */
-    public int updateCmmsUpkeepCreateNoticeByIds(@Param("cmmsUpkeepPlanList") List<CmmsUpkeepPlan> cmmsUpkeepPlanList);
+    public boolean updateCmmsUpkeepCreateNoticeByIds(@Param("cmmsUpkeepPlanList") List<CmmsUpkeepPlan> cmmsUpkeepPlanList);
 
     /**
      * 根据保养计划批量更新保养计划是否提前通知提醒ifnotice
      *
      */
-    public int updateCmmsUpkeepPlanIfnoticeByIds(@Param("cmmsUpkeepPlanList") List<CmmsUpkeepPlan> cmmsUpkeepPlanList);
+    public boolean updateCmmsUpkeepPlanIfnoticeByIds(@Param("cmmsUpkeepPlanList") List<CmmsUpkeepPlan> cmmsUpkeepPlanList);
 
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepPlan/service/ICmmsUpkeepPlanService.java

@@ -54,25 +54,25 @@ public interface ICmmsUpkeepPlanService extends IService<CmmsUpkeepPlan> {
      * 更新保养计划表
      *
      */
-    public int updateCmmsUpkeepPlanContentById(CmmsUpkeepPlanDto cmmsUpkeepPlanDto);
+    public boolean updateCmmsUpkeepPlanContentById(CmmsUpkeepPlanDto cmmsUpkeepPlanDto);
 
     /**
      * 更新保养计划状态
      *
      */
-    public int updateCmmsUpkeepPlanStatusById(CmmsUpkeepPlan cmmsUpkeepPlan);
+    public boolean updateCmmsUpkeepPlanStatusById(CmmsUpkeepPlan cmmsUpkeepPlan);
 
     /**
      * 根据保养计划批量更新下次生成工单时间及通知信息
      *
      */
-    public int updateCmmsUpkeepCreateNoticeByIds(List<CmmsUpkeepPlan> cmmsUpkeepPlanList);
+    public boolean updateCmmsUpkeepCreateNoticeByIds(List<CmmsUpkeepPlan> cmmsUpkeepPlanList);
 
     /**
      * 根据保养计划批量更新保养计划是否提前通知提醒ifnotice
      *
      */
-    public int updateCmmsUpkeepPlanIfnoticeByIds(List<CmmsUpkeepPlan> cmmsUpkeepPlanList);
+    public boolean updateCmmsUpkeepPlanIfnoticeByIds(List<CmmsUpkeepPlan> cmmsUpkeepPlanList);
 
     /**
      * 将计划放入redis中

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepPlan/service/impl/CmmsUpkeepPlanServiceImpl.java

@@ -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;
     }

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepPlanItem/mapper/CmmsUpkeepPlanItemMapper.java

@@ -27,12 +27,12 @@ public interface CmmsUpkeepPlanItemMapper extends BaseMapper<CmmsUpkeepPlanItem>
      * 根据保养计划id删除 保养计划-保养项
      *
      */
-    public int delCmmsUpkeepPlanItemByPid(@Param("upkeepplanid") String upkeepplanid);
+    public boolean delCmmsUpkeepPlanItemByPid(@Param("upkeepplanid") String upkeepplanid);
 
     /**
      * 根据保养计划ids批量删除 保养计划-保养项
      *
      */
-    public int delCmmsUpkeepPlanItemByPids(@Param("upkeepplanids") List<String> upkeepplanids);
+    public boolean delCmmsUpkeepPlanItemByPids(@Param("upkeepplanids") List<String> upkeepplanids);
 
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepPlanItem/service/ICmmsUpkeepPlanItemService.java

@@ -25,12 +25,12 @@ public interface ICmmsUpkeepPlanItemService extends IService<CmmsUpkeepPlanItem>
      * 根据保养计划id删除 保养计划-保养项
      *
      */
-    public int delCmmsUpkeepPlanItemByPid(@Param("upkeepplanid") String upkeepplanid);
+    public boolean delCmmsUpkeepPlanItemByPid(@Param("upkeepplanid") String upkeepplanid);
 
     /**
      * 根据保养计划ids批量删除 保养计划-保养项
      *
      */
-    public int delCmmsUpkeepPlanItemByPids(List<String> upkeepplanids);
+    public boolean delCmmsUpkeepPlanItemByPids(List<String> upkeepplanids);
 
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepPlanItem/service/impl/CmmsUpkeepPlanItemServiceImpl.java

@@ -37,7 +37,7 @@ public class CmmsUpkeepPlanItemServiceImpl extends ServiceImpl<CmmsUpkeepPlanIte
      * 根据保养计划id删除 保养计划-保养项
      *
      */
-    public int delCmmsUpkeepPlanItemByPid(String upkeepplanid){
+    public boolean delCmmsUpkeepPlanItemByPid(String upkeepplanid){
         return cmmsUpkeepPlanItemMapper.delCmmsUpkeepPlanItemByPid(upkeepplanid);
     }
 
@@ -45,7 +45,7 @@ public class CmmsUpkeepPlanItemServiceImpl extends ServiceImpl<CmmsUpkeepPlanIte
      * 根据保养计划ids批量删除 保养计划-保养项
      *
      */
-    public int delCmmsUpkeepPlanItemByPids(List<String> upkeepplanids){
+    public boolean delCmmsUpkeepPlanItemByPids(List<String> upkeepplanids){
         return cmmsUpkeepPlanItemMapper.delCmmsUpkeepPlanItemByPids(upkeepplanids);
     }