Merge remote-tracking branch 'origin/master'

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectContent/entity/CmmsInspectContent.java

@@ -49,8 +49,9 @@ public class CmmsInspectContent implements Serializable {
     @ApiModelProperty(value = "设备id")
     private java.lang.String equipmentid;
 	/**状态：启用：0、禁用:1*/
-	@Excel(name = "状态：启用：0、禁用:1", width = 15)
+	@Excel(name = "状态：启用：0、禁用:1", width = 15, dicCode = "common_status")
     @ApiModelProperty(value = "状态：启用：0、禁用:1")
+    @Dict(dicCode = "common_status")
     private java.lang.String status;
 	/**创建人*/
     @ApiModelProperty(value = "创建人")

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectContent/service/ICmmsInspectContentService.java

@@ -22,6 +22,7 @@ public interface ICmmsInspectContentService extends IService<CmmsInspectContent>
     boolean updateCmmsInspectContent(CmmsInspectContentVo cmmsInspectContent);
 
     CmmsInspectContentVo getCmmsInspectContentById(String id);
+    CmmsInspectContentVo getCmmsInspectContentTreeById(String id);
 
     /**
      *   author: dzc

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectContent/service/impl/CmmsInspectContentServiceImpl.java

@@ -100,6 +100,19 @@ public class CmmsInspectContentServiceImpl extends ServiceImpl<CmmsInspectConten
         return cmmsInspectContent;
     }
 
+    @Override
+    public CmmsInspectContentVo getCmmsInspectContentTreeById(String id) {
+        CmmsInspectContentVo cmmsInspectContent = inspectContentMapper.getCmmsInspectContentById(id);
+        if (ObjectUtil.isNotNull(cmmsInspectContent)){
+            List<CmmsInspectContentItemVo> list = iCmmsInspectContentItemService.getCmmsInspectContentItemListByCountId(cmmsInspectContent.getId());
+            cmmsInspectContent.setCmmsInspectContentItemList(list);
+            cmmsInspectContent.setTitle(cmmsInspectContent.getContentname());
+            cmmsInspectContent.setKey(cmmsInspectContent.getContentname());
+            cmmsInspectContent.setType("巡检内容");
+        }
+        return cmmsInspectContent;
+    }
+
     /**
     *   author: dzc
     *   version: 1.0

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectLine/controller/CmmsInspectLineController.java

@@ -202,4 +202,23 @@ public class CmmsInspectLineController extends JeecgController<CmmsInspectLine,
         return super.importExcel(request, response, CmmsInspectLine.class);
     }
 
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 查询出所有巡检路线下的详情
+    *   date: 2024/1/30
+    */
+	@ApiOperation(value="巡检路线-分页列表查询详情", notes="巡检路线-分页列表查询详情")
+	@GetMapping(value = "/listDetails")
+	public Result<IPage<CmmsInspectLineVo>> queryPageDetailsList(CmmsInspectLine cmmsInspectLine,
+														@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+														@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+														HttpServletRequest req) {
+		//QueryWrapper<CmmsInspectLine> queryWrapper = QueryGenerator.initQueryWrapper(cmmsInspectLine, req.getParameterMap());
+		Page<CmmsInspectLineVo> page = new Page<CmmsInspectLineVo>(pageNo, pageSize);
+		List<CmmsInspectLineVo> pageList = cmmsInspectLineService.getCmmsInspectLineListDetails(page, cmmsInspectLine);
+		page.setRecords(pageList);
+		return Result.OK(page);
+	}
+
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectLine/entity/CmmsInspectLineVo.java

@@ -27,6 +27,7 @@ public class CmmsInspectLineVo extends CmmsInspectLine{
     private String type;
     /** 巡检工单 - 巡检计划列表 children 用于前端展示树形结构 */
     private List<CmmsInspectLineDetailVo> children;
+    private List<CmmsInspectLineDetailVo> sonList;
 
     /** completionStatus  用于前端展示树形结构是否完成巡检 0未完成 1已完成 */
     private String completionStatus;

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectLine/mapper/CmmsInspectLineMapper.java

@@ -2,9 +2,11 @@ package org.jeecg.modules.cmmsInspectLine.mapper;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.cmmsInspectLine.entity.CmmsInspectLine;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.cmmsInspectLine.entity.CmmsInspectLineVo;
 
 /**
  * @Description: 巡检路线
@@ -15,4 +17,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface CmmsInspectLineMapper extends BaseMapper<CmmsInspectLine> {
 
     String getNameById(@Param("id") String id);
+
+    List<CmmsInspectLineVo> getCmmsInspectLineListDetails(@Param("page") Page<CmmsInspectLineVo> page,@Param("cmmsInspectLine") CmmsInspectLine cmmsInspectLine);
+
+    String getCodeById(@Param("relid") String relid);
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectLine/mapper/xml/CmmsInspectLineMapper.xml

@@ -5,4 +5,16 @@
     <select id="getNameById" resultType="string">
         select linename from cmms_inspect_line where id = #{id}
     </select>
+
+
+    <select id="getCmmsInspectLineListDetails" parameterType="org.jeecg.modules.cmmsInspectLine.entity.CmmsInspectLine" resultType="org.jeecg.modules.cmmsInspectLine.entity.CmmsInspectLineVo">
+        select * from cmms_inspect_line
+        <where>
+            <if test="cmmsInspectLine.linecode != null and cmmsInspectLine.linecode != ''">and (linecode like CONCAT('%',#{cmmsInspectLine.linecode},'%') or linename like CONCAT('%',#{cmmsInspectLine.linecode},'%')) </if>
+        </where>
+    </select>
+
+    <select id="getCodeById" resultType="string">
+        select linecode from cmms_inspect_line where id = #{relid}
+    </select>
 </mapper>

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectLine/service/ICmmsInspectLineService.java

@@ -1,9 +1,13 @@
 package org.jeecg.modules.cmmsInspectLine.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.cmmsInspectLine.entity.CmmsInspectLine;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.cmmsInspectLine.entity.CmmsInspectLineVo;
 
+import java.util.List;
+
 /**
  * @Description: 巡检路线
  * @Author: jeecg-boot
@@ -35,6 +39,7 @@ public interface ICmmsInspectLineService extends IService<CmmsInspectLine> {
     *   date: 2024/1/24
     */
     CmmsInspectLineVo getCmmsInspectLineById(String id);
+    CmmsInspectLineVo getCmmsInspectLineTreeById(String id);
 
     /**
      *   author: dzc
@@ -53,4 +58,8 @@ public interface ICmmsInspectLineService extends IService<CmmsInspectLine> {
     *   date: 2024/1/29
     */
     public String getNameById(String id);
+
+    List<CmmsInspectLineVo> getCmmsInspectLineListDetails(Page<CmmsInspectLineVo> page, CmmsInspectLine cmmsInspectLine);
+
+    String getCodeById(String relid);
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectLine/service/impl/CmmsInspectLineServiceImpl.java

@@ -2,6 +2,8 @@ package org.jeecg.modules.cmmsInspectLine.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.cmmsInspectContent.entity.CmmsInspectContentVo;
 import org.jeecg.modules.cmmsInspectContent.service.ICmmsInspectContentService;
 import org.jeecg.modules.cmmsInspectLine.convert.CmmsInspectLineConvert;
@@ -129,6 +131,41 @@ public class CmmsInspectLineServiceImpl extends ServiceImpl<CmmsInspectLineMappe
         return inspectLineVo;
     }
 
+    @Override
+    public CmmsInspectLineVo getCmmsInspectLineTreeById(String id) {
+        // 查询巡检路线
+        CmmsInspectLine cmmsInspectLine = this.getById(id);
+        CmmsInspectLineVo inspectLineVo = CmmsInspectLineConvert.INSTANCE.convert(cmmsInspectLine);
+
+        // 查询巡检路线详情
+        List<CmmsInspectLineDetailVo> list = inspectLineDetailService.selectCmmsInspectLineDetailList(id);
+
+        if (list != null && list.size() > 0) {
+            for (int i = 0; i < list.size(); i++) {
+                // 查询出每个巡检的下的巡检内容
+                List<CmmsInspectSpotEquip> spotcountList = inspectSpotEquipService.getInspectSpotEquipBySprtId(list.get(i).getInspectspotid());
+                ArrayList<CmmsInspectContentVo> contentList = new ArrayList<>();
+                if (spotcountList != null && spotcountList.size() > 0) {
+                    for (int j = 0; j < spotcountList.size(); j++) {
+                        CmmsInspectContentVo cmmsInspectContent = inspectContentService.getCmmsInspectContentTreeById(spotcountList.get(j).getInspectcontid());
+                        contentList.add(cmmsInspectContent);
+                    }
+                }
+                list.get(i).setTitle(list.get(i).getContentname());
+                list.get(i).setKey(list.get(i).getContentname());
+                list.get(i).setType("巡检点");
+                list.get(i).setSonList(contentList);
+            }
+        }
+
+        inspectLineVo.setTitle(cmmsInspectLine.getLinename());
+        inspectLineVo.setKey(cmmsInspectLine.getLinename());
+        inspectLineVo.setType("巡检路线");
+        inspectLineVo.setSonList(list);
+
+        return inspectLineVo;
+    }
+
     /**
      *   author: dzc
      *   version: 1.0
@@ -231,6 +268,25 @@ public class CmmsInspectLineServiceImpl extends ServiceImpl<CmmsInspectLineMappe
         return inspectLineMapper.getNameById(id);
     }
 
+
+    @Override
+    public List<CmmsInspectLineVo> getCmmsInspectLineListDetails(Page<CmmsInspectLineVo> page, CmmsInspectLine cmmsInspectLine) {
+        List<CmmsInspectLineVo> lineList = inspectLineMapper.getCmmsInspectLineListDetails(page, cmmsInspectLine);
+        ArrayList<CmmsInspectLineVo> list = new ArrayList<>();
+
+        for (CmmsInspectLineVo vo : lineList) {
+            CmmsInspectLineVo inspectLine = this.getCmmsInspectLineById(vo.getId());
+            list.add(inspectLine);
+        }
+
+        return list;
+    }
+
+    @Override
+    public String getCodeById(String relid) {
+        return inspectLineMapper.getCodeById(relid);
+    }
+
     private void batchSaveSub(CmmsInspectLineVo cmmsInspectLine) {
         List<CmmsInspectLineDetailVo> detailList = cmmsInspectLine.getDetailList();
         ArrayList<CmmsInspectLineDetail> list = new ArrayList<>();

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectLineDetail/entity/CmmsInspectLineDetailVo.java

@@ -40,6 +40,7 @@ public class CmmsInspectLineDetailVo extends CmmsInspectLineDetail{
     private String type;
     /** 巡检工单 - 巡检计划列表 children 用于前端展示树形结构 */
     private List<CmmsInspectContentVo> children;
+    private List<CmmsInspectContentVo> sonList;
     /** completionStatus 用于前端展示树形结构是否完成巡检 0未完成 1已完成 */
     private String completionStatus;
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectPlan/controller/CmmsInspectPlanController.java

@@ -228,4 +228,23 @@ public class CmmsInspectPlanController extends JeecgController<CmmsInspectPlan,
 		return Result.error("生成工单失败！");
 	}
 
+
+	 /**
+	  * 通过id查询
+	  *
+	  * @param id
+	  * @return
+	  */
+	 //@AutoLog(value = "巡检计划-通过id查询")
+	 @ApiOperation(value="巡检计划-通过id查询(树)", notes="巡检计划-通过id查询(树)")
+	 @GetMapping(value = "/queryTreeById")
+	 public Result<CmmsInspectPlanVo> queryTreeById(@RequestParam(name="id",required=true) String id) {
+		 //CmmsInspectPlan cmmsInspectPlan = cmmsInspectPlanService.getById(id);
+		 CmmsInspectPlanVo cmmsInspectPlan = cmmsInspectPlanService.getCmmsInspectPlanTreeById(id);
+		 if(cmmsInspectPlan==null) {
+			 return Result.error("未找到对应数据");
+		 }
+		 return Result.OK(cmmsInspectPlan);
+	 }
+
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectPlan/entity/CmmsInspectPlan.java

@@ -91,8 +91,9 @@ public class CmmsInspectPlan implements Serializable {
     @ApiModelProperty(value = "提前通知类型：天、时、分")
     private java.lang.String noticetype;
 	/**状态（0启用 1停用）*/
-	@Excel(name = "状态（0启用 1停用）", width = 15)
+	@Excel(name = "状态（0启用 1停用）", width = 15,dicCode = "common_status")
     @ApiModelProperty(value = "状态（0启用 1停用）")
+    @Dict(dicCode = "common_status")
     private java.lang.String status;
 	/**待办人*/
 	@Excel(name = "待办人", width = 15)

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectPlan/entity/CmmsInspectPlanVo.java

@@ -29,4 +29,5 @@ public class CmmsInspectPlanVo extends CmmsInspectPlan{
     private String type;
     /** children 用于前端展示树形结构 */
     private List<CmmsInspectPlanTaskVo> children;
+    private List<CmmsInspectPlanTaskVo> sonList;
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectPlan/service/ICmmsInspectPlanService.java

@@ -94,4 +94,6 @@ public interface ICmmsInspectPlanService extends IService<CmmsInspectPlan> {
      */
     public void setRedisCache();
 
+    CmmsInspectPlanVo getCmmsInspectPlanTreeById(String id);
+
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectPlan/service/impl/CmmsInspectPlanServiceImpl.java

@@ -222,6 +222,44 @@ public class CmmsInspectPlanServiceImpl extends ServiceImpl<CmmsInspectPlanMappe
         return cmmsInspectPlanVo;
     }
 
+    @Override
+    public CmmsInspectPlanVo getCmmsInspectPlanTreeById(String id) {
+        CmmsInspectPlan cmmsInspectPlan = this.getById(id);
+        CmmsInspectPlanVo cmmsInspectPlanVo = CmmsInspectPlanConvert.INSTANCE.convert(cmmsInspectPlan);
+
+        List<CmmsInspectPlanTaskVo> taskList = inspectPlanTaskService.getTaskByPlanId(id);
+
+        if (taskList != null && taskList.size() > 0) {
+            for (int i = 0; i < taskList.size(); i++) {
+                String relid = taskList.get(i).getRelid();
+                if ("巡检点".equals(taskList.get(i).getTasktype())){
+                    String name = inspectSpotService.getNameById(taskList.get(i).getRelid());
+                    String code = inspectSpotService.getCodeById(taskList.get(i).getRelid());
+                    taskList.get(i).setTitle(name);
+                    taskList.get(i).setKey(name);
+                    taskList.get(i).setType("巡检点");
+                    taskList.get(i).setContentcode(code);
+                    taskList.get(i).setSonList(inspectSpotService.getCmmsInspectSpotListTreeById(relid).getSonList());
+                }else {
+                    String name = inspectLineService.getNameById(taskList.get(i).getRelid());
+                    String code = inspectLineService.getCodeById(taskList.get(i).getRelid());
+                    taskList.get(i).setTitle(name);
+                    taskList.get(i).setKey(name);
+                    taskList.get(i).setType("巡检路线");
+                    taskList.get(i).setLinecode(code);
+                    taskList.get(i).setSonList(inspectLineService.getCmmsInspectLineTreeById(relid).getSonList());
+                }
+            }
+        }
+
+        cmmsInspectPlanVo.setTitle(cmmsInspectPlan.getPlanname());
+        cmmsInspectPlanVo.setKey(cmmsInspectPlan.getPlanname());
+        cmmsInspectPlanVo.setType("巡检计划");
+        cmmsInspectPlanVo.setSonList(taskList);
+
+        return cmmsInspectPlanVo;
+    }
+
     /**
     *   author: dzc
     *   version: 1.0

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectPlanTask/entity/CmmsInspectPlanTaskVo.java

@@ -61,6 +61,7 @@ public class CmmsInspectPlanTaskVo<T> extends CmmsInspectPlanTask{
     private String type;
     /** children  用于前端展示树形结构 */
     private List<T> children;
+    private List<T> sonList;
 
     /** completionStatus  用于前端展示树形结构是否完成巡检 0未完成 1已完成 */
     private String completionStatus;

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectSpot/entity/CmmsInspectSpotVo.java

@@ -28,6 +28,7 @@ public class CmmsInspectSpotVo extends CmmsInspectSpot{
     private String type;
     /** children 用于前端展示树形结构 */
     private List<CmmsInspectContentVo> children;
+    private List<CmmsInspectContentVo> sonList;
     /** completionStatus  用于前端展示树形结构是否完成巡检 0未完成 1已完成 */
     private String completionStatus;
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectSpot/mapper/CmmsInspectSpotMapper.java

@@ -19,4 +19,6 @@ public interface CmmsInspectSpotMapper extends BaseMapper<CmmsInspectSpot> {
     List<CmmsInspectSpotVo> getCmmsInspectSpotList(@Param("page") Page<CmmsInspectSpotVo> page,@Param("cmmsInspectSpot") CmmsInspectSpot cmmsInspectSpot);
 
     String getNameById(@Param("id") String id);
+
+    String getCodeById(@Param("relid") String relid);
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectSpot/mapper/xml/CmmsInspectSpotMapper.xml

@@ -32,4 +32,8 @@
     <select id="getNameById" resultType="String">
         select contentname from cmms_inspect_spot where id = #{id}
     </select>
+
+    <select id="getCodeById" resultType="String">
+        select contentcode from cmms_inspect_spot where id = #{relid}
+    </select>
 </mapper>

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectSpot/service/ICmmsInspectSpotService.java

@@ -22,6 +22,7 @@ public interface ICmmsInspectSpotService extends IService<CmmsInspectSpot> {
     boolean updateCmmsInspectSpot(CmmsInspectSpotVo cmmsInspectSpot);
 
     CmmsInspectSpotVo getCmmsInspectSpotListById(String id);
+    CmmsInspectSpotVo getCmmsInspectSpotListTreeById(String id);
 
     /**
      *   author: dzc
@@ -42,4 +43,6 @@ public interface ICmmsInspectSpotService extends IService<CmmsInspectSpot> {
     *   date: 2024/1/29
     */
     public String getNameById(String id);
+
+    String getCodeById(String relid);
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectSpot/service/impl/CmmsInspectSpotServiceImpl.java

@@ -106,6 +106,28 @@ public class CmmsInspectSpotServiceImpl extends ServiceImpl<CmmsInspectSpotMappe
         return cmmsInspectSpotVo;
     }
 
+
+    @Override
+    public CmmsInspectSpotVo getCmmsInspectSpotListTreeById(String id) {
+        // 根据id查询出巡检点的信息
+        CmmsInspectSpot cmmsInspectSport = this.getById(id);
+
+        CmmsInspectSpotVo cmmsInspectSpotVo = CmmsInspectSpotConvert.INSTANCE.convert(cmmsInspectSport);
+        // 根据 巡检点的id 查询出巡检点-巡检内容的信息
+        List<CmmsInspectSpotEquip> list = inspectSpotEquipService.getInspectSpotEquipBySprtId(cmmsInspectSport.getId());
+        ArrayList<CmmsInspectContentVo> contList = new ArrayList<>();
+        for (CmmsInspectSpotEquip eq:list) {
+            String equipmentid = eq.getInspectcontid();
+            CmmsInspectContentVo cmmsInspectContent = iCmmsInspectContentService.getCmmsInspectContentTreeById(equipmentid);
+            contList.add(cmmsInspectContent);
+        }
+        cmmsInspectSpotVo.setTitle(cmmsInspectSport.getContentname());
+        cmmsInspectSpotVo.setKey(cmmsInspectSport.getContentname());
+        cmmsInspectSpotVo.setType("巡检点");
+        cmmsInspectSpotVo.setSonList(contList);
+        return cmmsInspectSpotVo;
+    }
+
     /**
      *   author: dzc
      *   version: 1.0
@@ -193,6 +215,11 @@ public class CmmsInspectSpotServiceImpl extends ServiceImpl<CmmsInspectSpotMappe
         return inspectSpotMapper.getNameById(id);
     }
 
+    @Override
+    public String getCodeById(String relid) {
+        return inspectSpotMapper.getCodeById(relid);
+    }
+
     private void insertCmmsInspectcheckContentItem(CmmsInspectSpotVo cmmsInspectSpot) {
         List<CmmsInspectContentVo> list = cmmsInspectSpot.getInspectContentList();
         String id = cmmsInspectSpot.getId();

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/cmmsUpkeepItem/mapper/CmmsUpkeepItemMapper.java

@@ -24,6 +24,18 @@ public interface CmmsUpkeepItemMapper extends BaseMapper<CmmsUpkeepItem> {
     public List<CmmsUpkeepItemDto> getAllCmmsUpkeepItem(Page<CmmsUpkeepItemDto> page, CmmsUpkeepItem cmmsUpkeepItem);
 
     /**
+     * 根据id查询保养项
+     *
+     */
+    public List<CmmsUpkeepItemDto> getCmmsUpkeepItemById(@Param("id") String id);
+
+    /**
+     * 根据保养计划id查找保养项
+     *
+     */
+    public List<CmmsUpkeepItemDto> getCmmsUpkeepItemByPid(@Param("upkeepplanid") String upkeepplanid);
+
+    /**
      * 根据设备id查找设备类型id以及设备类型名称，根据设备类型id查询保养项
      *
      */

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepItem/mapper/xml/CmmsUpkeepItemMapper.xml

@@ -27,6 +27,18 @@
         order by c.create_time desc
     </select>
 
+    <select id="getCmmsUpkeepItemById" parameterType="String" resultMap="CmmsUpkeepItemResult">
+        select c.id, c.create_by, c.create_time, c.update_by, c.update_time, c.itemcode, c.itemname, c.equipdefid, c.itemcontent, c.remark, t.name as equiptypeName
+        from cmms_upkeep_item as c left join tpm_equipment_tree as t on c.equipdefid = t.id
+        where c.id=#{id}
+    </select>
+
+    <select id="getCmmsUpkeepItemByPid" parameterType="String" resultMap="CmmsUpkeepItemResult">
+        select c.id, c.create_by, c.create_time, c.update_by, c.update_time, c.itemcode, c.itemname, c.equipdefid, c.itemcontent, c.remark, t.name as equiptypeName
+        from cmms_upkeep_plan_item as pi left join cmms_upkeep_item as c on pi.upkeepitemid=c.id left join tpm_equipment_tree as t on c.equipdefid = t.id
+        where pi.upkeepplanid=#{upkeepplanid}
+    </select>
+
     <select id="getCmmsUpkeepItemByEqid" parameterType="String" resultMap="CmmsUpkeepItemResult">
         select c.id, c.create_by, c.create_time, c.update_by, c.update_time, c.itemcode, c.itemname, c.equipdefid, c.itemcontent, c.remark, t.name as equiptypeName
         from tpm_equipment as e

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepItem/service/ICmmsUpkeepItemService.java

@@ -24,6 +24,18 @@ public interface ICmmsUpkeepItemService extends IService<CmmsUpkeepItem> {
     public List<CmmsUpkeepItemDto> getAllCmmsUpkeepItem(Page<CmmsUpkeepItemDto> page, CmmsUpkeepItem cmmsUpkeepItem);
 
     /**
+     * 根据id查询保养项
+     *
+     */
+    public List<CmmsUpkeepItemDto> getCmmsUpkeepItemById(String id);
+
+    /**
+     * 根据保养计划id查找保养项
+     *
+     */
+    public List<CmmsUpkeepItemDto> getCmmsUpkeepItemByPid(String upkeepplanid);
+
+    /**
      * 新增保养项
      *
      * @param cmmsUpkeepItem 保养项

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepItem/service/impl/CmmsUpkeepItemServiceImpl.java

@@ -54,6 +54,22 @@ public class CmmsUpkeepItemServiceImpl extends ServiceImpl<CmmsUpkeepItemMapper,
     }
 
     /**
+     * 根据id查询保养项
+     *
+     */
+    public List<CmmsUpkeepItemDto> getCmmsUpkeepItemById(String id){
+        return cmmsUpkeepItemMapper.getCmmsUpkeepItemById(id);
+    }
+
+    /**
+     * 根据保养计划id查找保养项
+     *
+     */
+    public List<CmmsUpkeepItemDto> getCmmsUpkeepItemByPid(String upkeepplanid){
+        return cmmsUpkeepItemMapper.getCmmsUpkeepItemByPid(upkeepplanid);
+    }
+
+    /**
      * 新增保养项
      * 单选设备类型  多选设备类型ID
      *

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

@@ -166,12 +166,13 @@ public class CmmsUpkeepPlanController extends JeecgController<CmmsUpkeepPlan, IC
 	//@AutoLog(value = "保养计划-通过id查询")
 	@ApiOperation(value="保养计划-通过id查询", notes="保养计划-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<CmmsUpkeepPlan> queryById(@RequestParam(name="id",required=true) String id) {
-		CmmsUpkeepPlan cmmsUpkeepPlan = cmmsUpkeepPlanService.getById(id);
-		if(cmmsUpkeepPlan==null) {
+	public Result<CmmsUpkeepPlanDto> queryById(@RequestParam(name="id",required=true) String id) {
+		CmmsUpkeepPlanDto cmmsUpkeepPlanDto = cmmsUpkeepPlanService.getCmmsUpkeepPlanById(id);
+//		CmmsUpkeepPlan cmmsUpkeepPlan = cmmsUpkeepPlanService.getById(id);
+		if(cmmsUpkeepPlanDto==null) {
 			return Result.error("未找到对应数据");
 		}
-		return Result.OK(cmmsUpkeepPlan);
+		return Result.OK(cmmsUpkeepPlanDto);
 	}
 
     /**
@@ -207,10 +208,10 @@ public class CmmsUpkeepPlanController extends JeecgController<CmmsUpkeepPlan, IC
 	  */
 	 @AutoLog(value = "保养计划-更新保养计划状态")
 	 @ApiOperation(value="保养计划-更新保养计划状态", notes="保养计划-更新保养计划状态")
-	 @GetMapping(value = "/updateCmmsUpkeepPlanStatusById")
-	 public Result<String> updateCmmsUpkeepPlanStatusById(CmmsUpkeepPlan cmmsUpkeepPlan) {
-		 int ifupdate = cmmsUpkeepPlanService.updateCmmsUpkeepPlanStatusById(cmmsUpkeepPlan);
-		 if(ifupdate==1){
+	 @RequestMapping(value = "/updateCmmsUpkeepPlanStatusById", method = {RequestMethod.PUT,RequestMethod.POST})
+	 public Result<String> updateCmmsUpkeepPlanStatusById(@RequestBody CmmsUpkeepPlan cmmsUpkeepPlan) {
+		 boolean ifupdate = cmmsUpkeepPlanService.updateCmmsUpkeepPlanStatusById(cmmsUpkeepPlan);
+		 if(ifupdate){
 			 return Result.OK("更新状态成功!");
 		 }else{
 			 return Result.error("更新状态失败!");

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepPlan/entity/CmmsUpkeepPlan.java

@@ -93,8 +93,9 @@ public class CmmsUpkeepPlan implements Serializable {
     @ApiModelProperty(value = "联系人电话")
     private java.lang.String linkertel;
 	/**负责人*/
-	@Excel(name = "负责人", width = 15)
+	@Excel(name = "负责人", width = 15, dicCode = "id")
     @ApiModelProperty(value = "负责人")
+    @Dict(dicCode = "id",dictTable="sys_user",dicText="realname")
     private java.lang.String chargeruser;
 	/**描述*/
 	@Excel(name = "描述", width = 15)
@@ -144,6 +145,7 @@ public class CmmsUpkeepPlan implements Serializable {
     private java.lang.String ifnotice;
     /**设备id（根据设备id查找保养项内容）*/
     @Excel(name = "设备id（根据设备id查找保养项内容）", width = 15)
+    @Dict(dicCode = "id", dictTable = "tpm_equipment", dicText = "equipmentname")
     @ApiModelProperty(value = "设备id（根据设备id查找保养项内容）")
     private java.lang.String equipmentid;
 }

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

@@ -32,7 +32,7 @@ public interface CmmsUpkeepPlanMapper extends BaseMapper<CmmsUpkeepPlan> {
      * 根据id查找保养计划
      *
      */
-    public List<CmmsUpkeepPlanDto> getCmmsUpkeepPlanContentById(@Param("id") String id);
+    public CmmsUpkeepPlanDto getCmmsUpkeepPlanContentById(@Param("id") String id);
 
     /**
      *
@@ -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/mapper/xml/CmmsUpkeepPlanMapper.xml

@@ -33,7 +33,7 @@
     </resultMap>
 
     <select id="getAllCmmsUpkeepPlan" parameterType="org.jeecg.modules.cmmsUpkeepPlan.entity.CmmsUpkeepPlan" resultMap="CmmsUpkeepPlanResult">
-        select p.id, p.create_by, p.create_time, p.update_by, p.update_time, p.remark, p.plancode, p.planname, p.upkeepprojid, p.projectname, p.address, p.supplier, p.suppliertel, p.linker, p.linkertel, p.chargeruser, p.plandesc, p.begintime, p.repeatnum, p.repeattype, p.noticenum, p.noticetype, p.status, p.nexttime, p.ifnotice, p.noticetime, e.equipmentname as equipmentName
+        select p.id, p.create_by, p.create_time, p.update_by, p.update_time, p.remark, p.plancode, p.planname, p.upkeepprojid, p.projectname, p.address, p.supplier, p.suppliertel, p.linker, p.linkertel, p.chargeruser, p.plandesc, p.begintime, p.repeatnum, p.repeattype, p.noticenum, p.noticetype, p.status, p.nexttime, p.ifnotice, p.noticetime,e.id as equipmentid, e.equipmentname as equipmentName
         from cmms_upkeep_plan as p left join tpm_equipment as e on p.equipmentid = e.id
         <where>
             <if test="cmmsUpkeepPlan.planname != null and cmmsUpkeepPlan.planname != ''"> and p.planname like concat('%', #{cmmsUpkeepPlan.planname}, '%')</if>
@@ -46,9 +46,9 @@
     </select>
 
     <select id="getCmmsUpkeepPlanContentById" parameterType="String" resultMap="CmmsUpkeepPlanResult">
-        select p.id, p.create_by, p.create_time, p.update_by, p.update_time, p.remark, p.plancode, p.planname, p.upkeepprojid, p.projectname, p.address, p.supplier, p.suppliertel, p.linker, p.linkertel, p.chargeruser, p.plandesc, p.begintime, p.repeatnum, p.repeattype, p.noticenum, p.noticetype, p.status, p.nexttime, p.ifnotice, p.noticetime, e.equipmentname as equipmentName
+        select p.id, p.create_by, p.create_time, p.update_by, p.update_time, p.remark, p.plancode, p.planname, p.upkeepprojid, p.projectname, p.address, p.supplier, p.suppliertel, p.linker, p.linkertel, p.chargeruser, p.plandesc, p.begintime, p.repeatnum, p.repeattype, p.noticenum, p.noticetype, p.status, p.nexttime, p.ifnotice, p.noticetime, e.id as equipmentid, e.equipmentname as equipmentName
         from cmms_upkeep_plan as p left join tpm_equipment as e on p.equipmentid = e.id
-        where a.id = #{id}
+        where p.id = #{id}
     </select>
 
     <select id="getCmmsUpkeepPlanByStatus" parameterType="String" resultType="org.jeecg.modules.cmmsUpkeepPlan.entity.CmmsUpkeepPlan">

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

@@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.cmmsUpkeepPlan.entity.CmmsUpkeepPlan;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.cmmsUpkeepPlan.entity.CmmsUpkeepPlanDto;
+import org.jeecg.modules.util.CacheKey;
 
 import java.util.List;
 
@@ -24,6 +25,12 @@ public interface ICmmsUpkeepPlanService extends IService<CmmsUpkeepPlan> {
     public List<CmmsUpkeepPlanDto> getAllCmmsUpkeepPlan(Page<CmmsUpkeepPlanDto> page, CmmsUpkeepPlan cmmsUpkeepPlan);
 
     /**
+     * 根据id查询  查询保养计划，还有保养计划-保养项
+     *
+     */
+    public CmmsUpkeepPlanDto getCmmsUpkeepPlanById(String id);
+
+    /**
      * 根据status查找启用的保养计划
      */
     public List<CmmsUpkeepPlan> getCmmsUpkeepPlanByStatus(String status);
@@ -47,24 +54,34 @@ 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中
+     */
+    public void setRedisCache();
+
+    /**
+     * 从redis中获取启用的所有保养计划
+     */
+    public List<CmmsUpkeepPlan> selectAllPlan0Status();
 
 }

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

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Update;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.util.RedisUtil;
 import org.jeecg.modules.cmmsUpkeepItem.entity.CmmsUpkeepItemDto;
+import org.jeecg.modules.cmmsUpkeepItem.service.ICmmsUpkeepItemService;
 import org.jeecg.modules.cmmsUpkeepPlan.entity.CmmsUpkeepPlan;
 import org.jeecg.modules.cmmsUpkeepPlan.entity.CmmsUpkeepPlanDto;
 import org.jeecg.modules.cmmsUpkeepPlan.mapper.CmmsUpkeepPlanMapper;
@@ -42,6 +43,10 @@ public class CmmsUpkeepPlanServiceImpl extends ServiceImpl<CmmsUpkeepPlanMapper,
 
     @Autowired
     @SuppressWarnings("all")
+    private ICmmsUpkeepItemService cmmsUpkeepItemService;
+
+    @Autowired
+    @SuppressWarnings("all")
     private AutoCodeUtil autoCodeUtil;
 
     @Autowired
@@ -98,6 +103,17 @@ public class CmmsUpkeepPlanServiceImpl extends ServiceImpl<CmmsUpkeepPlanMapper,
     }
 
     /**
+     * 根据id查询  查询保养计划，还有保养计划-保养项
+     *
+     */
+    public CmmsUpkeepPlanDto getCmmsUpkeepPlanById(String id){
+        CmmsUpkeepPlanDto cmmsUpkeepPlanDto = cmmsUpkeepPlanMapper.getCmmsUpkeepPlanContentById(id);
+        List<CmmsUpkeepItemDto> cmmsUpkeepItemDtoList = cmmsUpkeepItemService.getCmmsUpkeepItemByPid(id);
+        cmmsUpkeepPlanDto.setCmmsUpkeepItemDtoList(cmmsUpkeepItemDtoList);
+        return cmmsUpkeepPlanDto;
+    }
+
+    /**
      * 根据status查找启用的保养计划
      */
     public List<CmmsUpkeepPlan> getCmmsUpkeepPlanByStatus(String status){
@@ -134,7 +150,7 @@ public class CmmsUpkeepPlanServiceImpl extends ServiceImpl<CmmsUpkeepPlanMapper,
         if(cmmsUpkeepPlanDto.getNoticenum() != null) cmmsUpkeepPlan.setNoticenum(cmmsUpkeepPlanDto.getNoticenum());//保养计划执行提前通知时间
         if(cmmsUpkeepPlanDto.getNoticetype() != null) cmmsUpkeepPlan.setNoticetype(cmmsUpkeepPlanDto.getNoticetype());//保养计划执行提前通知时间单位
         if(cmmsUpkeepPlanDto.getStatus() != null) cmmsUpkeepPlan.setStatus(cmmsUpkeepPlanDto.getStatus());//保养计划是否启用状态 0启用 1停用
-        if(cmmsUpkeepPlanDto.getIfnotice() != null) cmmsUpkeepPlan.setIfnotice(cmmsUpkeepPlanDto.getIfnotice());//保养计划即将执行是否已通知 是/否
+        if(cmmsUpkeepPlanDto.getIfnotice() != null) cmmsUpkeepPlan.setIfnotice("否");//保养计划即将执行是否已通知 是/否
         if(cmmsUpkeepPlanDto.getEquipmentid() != null) cmmsUpkeepPlan.setEquipmentid(cmmsUpkeepPlanDto.getEquipmentid());//保养计划对应的设备id
         if(cmmsUpkeepPlanDto.getRemark() != null & (!("".equals(cmmsUpkeepPlanDto.getRemark())))) cmmsUpkeepPlan.setRemark(cmmsUpkeepPlanDto.getRemark());//保养计划备注
 //        cmmsUpkeepPlan.setNexttime(getNextTime(cmmsUpkeepPlanDto.getBegintime(), cmmsUpkeepPlanDto.getRepeattype(), cmmsUpkeepPlanDto.getRepeatnum()));//下次保养计划执行时间
@@ -152,7 +168,7 @@ public class CmmsUpkeepPlanServiceImpl extends ServiceImpl<CmmsUpkeepPlanMapper,
         }
         boolean b2 = cmmsUpkeepPlanItemService.saveBatch(cmmsUpkeepPlanItemList);
         setRedisCache();
-        return b1 && b2;
+        return b1;
     }
 
     /**
@@ -161,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())) {
@@ -170,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();
@@ -186,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;
     }
 
     /**
@@ -194,7 +210,7 @@ public class CmmsUpkeepPlanServiceImpl extends ServiceImpl<CmmsUpkeepPlanMapper,
      * 更新保养计划表
      *
      */
-    public int updateCmmsUpkeepPlanContentById(CmmsUpkeepPlanDto cmmsUpkeepPlanDto){
+    public boolean updateCmmsUpkeepPlanContentById(CmmsUpkeepPlanDto cmmsUpkeepPlanDto){
         return cmmsUpkeepPlanMapper.updateCmmsUpkeepPlanContentById(cmmsUpkeepPlanDto);
     }
 
@@ -202,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;
     }
@@ -212,8 +228,10 @@ public class CmmsUpkeepPlanServiceImpl extends ServiceImpl<CmmsUpkeepPlanMapper,
      * 根据保养计划批量更新下次生成工单时间及通知信息
      *
      */
-    public int updateCmmsUpkeepCreateNoticeByIds(List<CmmsUpkeepPlan> cmmsUpkeepPlanList){
-        return cmmsUpkeepPlanMapper.updateCmmsUpkeepCreateNoticeByIds(cmmsUpkeepPlanList);
+    public boolean updateCmmsUpkeepCreateNoticeByIds(List<CmmsUpkeepPlan> cmmsUpkeepPlanList){
+        boolean rtn = cmmsUpkeepPlanMapper.updateCmmsUpkeepCreateNoticeByIds(cmmsUpkeepPlanList);
+        setRedisCache();
+        return rtn;
     }
 
 
@@ -221,8 +239,10 @@ public class CmmsUpkeepPlanServiceImpl extends ServiceImpl<CmmsUpkeepPlanMapper,
      * 根据保养计划批量更新保养计划是否提前通知提醒ifnotice
      *
      */
-    public int updateCmmsUpkeepPlanIfnoticeByIds(List<CmmsUpkeepPlan> cmmsUpkeepPlanList){
-        return 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

@@ -3,6 +3,7 @@ package org.jeecg.modules.cmmsUpkeepPlanItem.mapper;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.cmmsUpkeepItem.entity.CmmsUpkeepItemDto;
 import org.jeecg.modules.cmmsUpkeepPlanItem.entity.CmmsUpkeepPlanItem;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.jeecg.modules.cmmsUpkeepPlanItem.entity.CmmsUpkeepPlanItemDto;
@@ -21,16 +22,17 @@ public interface CmmsUpkeepPlanItemMapper extends BaseMapper<CmmsUpkeepPlanItem>
      */
     public List<CmmsUpkeepPlanItemDto> getCmmsUpkeepPlanItemByPid(@Param("upkeepplanid") String upkeepplanid);
 
+
     /**
      * 根据保养计划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);
     }