巡检计划查询详情

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

@@ -19,4 +19,6 @@ 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

@@ -13,4 +13,8 @@
             <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

@@ -60,4 +60,6 @@ public interface ICmmsInspectLineService extends IService<CmmsInspectLine> {
     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

@@ -154,14 +154,14 @@ public class CmmsInspectLineServiceImpl extends ServiceImpl<CmmsInspectLineMappe
                 list.get(i).setTitle(list.get(i).getContentname());
                 list.get(i).setKey(list.get(i).getContentname());
                 list.get(i).setType("巡检点");
-                list.get(i).setChildren(contentList);
+                list.get(i).setSonList(contentList);
             }
         }
 
         inspectLineVo.setTitle(cmmsInspectLine.getLinename());
         inspectLineVo.setKey(cmmsInspectLine.getLinename());
         inspectLineVo.setType("巡检路线");
-        inspectLineVo.setChildren(list);
+        inspectLineVo.setSonList(list);
 
         return inspectLineVo;
     }
@@ -282,6 +282,11 @@ public class CmmsInspectLineServiceImpl extends ServiceImpl<CmmsInspectLineMappe
         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/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/impl/CmmsInspectPlanServiceImpl.java

@@ -234,16 +234,20 @@ public class CmmsInspectPlanServiceImpl extends ServiceImpl<CmmsInspectPlanMappe
                 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).setChildren(inspectSpotService.getCmmsInspectSpotListTreeById(relid).getChildren());
+                    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).setChildren(inspectLineService.getCmmsInspectLineTreeById(relid).getChildren());
+                    taskList.get(i).setLinecode(code);
+                    taskList.get(i).setSonList(inspectLineService.getCmmsInspectLineTreeById(relid).getSonList());
                 }
             }
         }
@@ -251,7 +255,7 @@ public class CmmsInspectPlanServiceImpl extends ServiceImpl<CmmsInspectPlanMappe
         cmmsInspectPlanVo.setTitle(cmmsInspectPlan.getPlanname());
         cmmsInspectPlanVo.setKey(cmmsInspectPlan.getPlanname());
         cmmsInspectPlanVo.setType("巡检计划");
-        cmmsInspectPlanVo.setChildren(taskList);
+        cmmsInspectPlanVo.setSonList(taskList);
 
         return cmmsInspectPlanVo;
     }

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

@@ -43,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

@@ -124,7 +124,7 @@ public class CmmsInspectSpotServiceImpl extends ServiceImpl<CmmsInspectSpotMappe
         cmmsInspectSpotVo.setTitle(cmmsInspectSport.getContentname());
         cmmsInspectSpotVo.setKey(cmmsInspectSport.getContentname());
         cmmsInspectSpotVo.setType("巡检点");
-        cmmsInspectSpotVo.setChildren(contList);
+        cmmsInspectSpotVo.setSonList(contList);
         return cmmsInspectSpotVo;
     }
 
@@ -215,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();