修正巡检工单查询详情+反馈

module_cmms/src/main/java/org/jeecg/modules/cmmsInspect/controller/CmmsInspectController.java

@@ -191,8 +191,8 @@ public class CmmsInspectController extends JeecgController<CmmsInspect, ICmmsIns
 	@ApiOperation(value="巡检工单-反馈", notes="巡检工单-反馈")
 	//@RequiresPermissions("org.jeecg.modules:cmms_inspect:edit")
 	@RequestMapping(value = "/feedback", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> feedBack(@RequestBody CmmsInspectTcontentItem inspectTcontentItem,HttpServletRequest req) {
-		boolean b = inspectTcontentItemService.feedBack(inspectTcontentItem,req);
+	public Result<String> feedBack(@RequestBody List<CmmsInspectTcontentItem> inspectTcontentItemList,HttpServletRequest req) {
+		boolean b = inspectTcontentItemService.feedBack(inspectTcontentItemList,req);
 		if (b) {
 			return Result.ok("反馈成功!");
 		}
@@ -216,5 +216,19 @@ public class CmmsInspectController extends JeecgController<CmmsInspect, ICmmsIns
 		return Result.OK(cmmsInspect);
 	}
 
-
+	/**
+	*   author: dzc
+	*   version: 1.0
+	*   des: 根据巡检内容id查询巡检项信息(包含反馈情况)
+	*   date: 2024/1/29
+	*/
+	@ApiOperation(value="巡检工单-通过巡检内容id查询", notes="巡检工单-通过巡检内容id查询")
+	@GetMapping(value = "/queryItemByCountId")
+	public Result<List<CmmsInspectTcontentItem>> queryItemByCountId(@RequestParam(name="countId",required=true) String countId,@RequestParam(name="inspectId",required=true) String inspectId) {
+		List<CmmsInspectTcontentItem> list = inspectTcontentItemService.getInspectTcontentItemsById(countId,inspectId);
+		if(list.size() == 0 || list == null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(list);
+	}
  }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspect/service/ICmmsInspectService.java

@@ -20,7 +20,7 @@ public interface ICmmsInspectService extends IService<CmmsInspect> {
     *   des: 通过巡检计划id 查询出对应的巡检计划id详情(巡检项的格式为 巡检工单-巡检项的格式)
     *   date: 2024/1/26
     */
-    CmmsInspectPlanVo getCmmsInspectPlanById(String inspectplanid);
+    CmmsInspectPlanVo getCmmsInspectPlanById(String inspectplanid,String inspectid);
 
     /**
     *   author: dzc
@@ -36,6 +36,6 @@ public interface ICmmsInspectService extends IService<CmmsInspect> {
      *   des: 通过巡检计划id 查询出对应的巡检计划id详情(巡检项的格式为 巡检工单-巡检项的格式) 用于前端展示树形结构
      *   date: 2024/1/26
      */
-    CmmsInspectPlanVo getCmmsInspectPlanTreeById(String inspectplanid);
+    CmmsInspectPlanVo getCmmsInspectPlanTreeById(String inspectplanid,String inspectid);
 
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspect/service/impl/CmmsInspectServiceImpl.java

@@ -45,7 +45,7 @@ public class CmmsInspectServiceImpl extends ServiceImpl<CmmsInspectMapper, CmmsI
         CmmsInspectVo inspectVo = CmmsInspectConvert.INSTANCE.convert(cmmInspect);
 
         // 根据 巡检工单表中的 巡检计划id查询出巡检计划的详情
-        CmmsInspectPlanVo cmmsInspectPlanById = this.getCmmsInspectPlanById(cmmInspect.getInspectplanid());
+        CmmsInspectPlanVo cmmsInspectPlanById = this.getCmmsInspectPlanById(cmmInspect.getInspectplanid(),id);
 
         inspectVo.setPlanList(cmmsInspectPlanById.getTaskList());
 
@@ -54,7 +54,7 @@ public class CmmsInspectServiceImpl extends ServiceImpl<CmmsInspectMapper, CmmsI
 
 
     @Override
-    public CmmsInspectPlanVo getCmmsInspectPlanById(String inspectplanid) {
+    public CmmsInspectPlanVo getCmmsInspectPlanById(String inspectplanid,String inspectid) {
         CmmsInspectPlan cmmsInspectPlan = cmmsInspectMapper.getCmmsInspectPlanById(inspectplanid);
         CmmsInspectPlanVo cmmsInspectPlanVo = CmmsInspectPlanConvert.INSTANCE.convert(cmmsInspectPlan);
 
@@ -64,9 +64,9 @@ public class CmmsInspectServiceImpl extends ServiceImpl<CmmsInspectMapper, CmmsI
             for (int i = 0; i < taskList.size(); i++) {
                 String relid = taskList.get(i).getRelid();
                 if ("巡检点".equals(taskList.get(i).getTasktype())){
-                    taskList.get(i).setInspectSpotVo(inspectSpotService.getCmmsInspectSpotListByIdA(relid));
+                    taskList.get(i).setInspectSpotVo(inspectSpotService.getCmmsInspectSpotListByIdA(relid,inspectid));
                 }else {
-                    taskList.get(i).setInspectLineVo(inspectLineService.getCmmsInspectLineByIdA(relid));
+                    taskList.get(i).setInspectLineVo(inspectLineService.getCmmsInspectLineByIdA(relid,inspectid));
                 }
             }
         }
@@ -89,7 +89,7 @@ public class CmmsInspectServiceImpl extends ServiceImpl<CmmsInspectMapper, CmmsI
         CmmsInspectVo inspectVo = CmmsInspectConvert.INSTANCE.convert(cmmInspect);
 
         // 根据 巡检工单表中的 巡检计划id查询出巡检计划的详情
-        CmmsInspectPlanVo cmmsInspectPlanById = this.getCmmsInspectPlanTreeById(cmmInspect.getInspectplanid());
+        CmmsInspectPlanVo cmmsInspectPlanById = this.getCmmsInspectPlanTreeById(cmmInspect.getInspectplanid(),id);
 
         inspectVo.setTitle(cmmInspect.getInspectname());
         inspectVo.setKey(cmmInspect.getInspectname());
@@ -100,7 +100,7 @@ public class CmmsInspectServiceImpl extends ServiceImpl<CmmsInspectMapper, CmmsI
     }
 
     @Override
-    public CmmsInspectPlanVo getCmmsInspectPlanTreeById(String inspectplanid) {
+    public CmmsInspectPlanVo getCmmsInspectPlanTreeById(String inspectplanid,String inspectid) {
         CmmsInspectPlan cmmsInspectPlan = cmmsInspectMapper.getCmmsInspectPlanById(inspectplanid);
         CmmsInspectPlanVo cmmsInspectPlanVo = CmmsInspectPlanConvert.INSTANCE.convert(cmmsInspectPlan);
 
@@ -114,13 +114,13 @@ public class CmmsInspectServiceImpl extends ServiceImpl<CmmsInspectMapper, CmmsI
                     taskList.get(i).setTitle(name);
                     taskList.get(i).setKey(name);
                     //taskList.get(i).setInspectSpotVo(inspectSpotService.getCmmsInspectSpotListTreeByIdA(relid));
-                    taskList.get(i).setChildren(inspectSpotService.getCmmsInspectSpotListTreeByIdA(relid).getChildren());
+                    taskList.get(i).setChildren(inspectSpotService.getCmmsInspectSpotListTreeByIdA(relid,inspectid).getChildren());
                 }else {
                     String name = inspectLineService.getNameById(taskList.get(i).getRelid());
                     taskList.get(i).setTitle(name);
                     taskList.get(i).setKey(name);
                     //taskList.get(i).setInspectLineVo(inspectLineService.getCmmsInspectLineTreeByIdA(relid));
-                    taskList.get(i).setChildren(inspectLineService.getCmmsInspectLineTreeByIdA(relid).getChildren());
+                    taskList.get(i).setChildren(inspectLineService.getCmmsInspectLineTreeByIdA(relid,inspectid).getChildren());
                 }
             }
         }

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

@@ -29,9 +29,9 @@ public interface ICmmsInspectContentService extends IService<CmmsInspectContent>
      *   des: 通过id查询（将巡检项变成 巡检工单-巡检项的格式）
      *   date: 2024/1/26
      */
-    CmmsInspectContentVo getCmmsInspectContentByIdA(String id);
+    CmmsInspectContentVo getCmmsInspectContentByIdA(String id,String inspectid);
 
-    CmmsInspectContentVo getCmmsInspectContentTreeByIdA(String id);
+    CmmsInspectContentVo getCmmsInspectContentTreeByIdA(String id,String inspectid);
 
     boolean updateStatua(String id,String status);
 

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

@@ -107,20 +107,20 @@ public class CmmsInspectContentServiceImpl extends ServiceImpl<CmmsInspectConten
     *   date: 2024/1/26
     */
     @Override
-    public CmmsInspectContentVo getCmmsInspectContentByIdA(String id) {
+    public CmmsInspectContentVo getCmmsInspectContentByIdA(String id,String inspectid) {
         CmmsInspectContentVo cmmsInspectContent = inspectContentMapper.getCmmsInspectContentById(id);
         if (ObjectUtil.isNotNull(cmmsInspectContent)){
-            List<CmmsInspectTcontentItem> inspectTcontentItems = inspectTcontentItemService.getInspectTcontentItems(cmmsInspectContent.getId());
+            List<CmmsInspectTcontentItem> inspectTcontentItems = inspectTcontentItemService.getInspectTcontentItemsById(cmmsInspectContent.getId(),inspectid);
             cmmsInspectContent.setInspectTcontentItemList(inspectTcontentItems);
         }
         return cmmsInspectContent;
     }
 
     @Override
-    public CmmsInspectContentVo getCmmsInspectContentTreeByIdA(String id) {
+    public CmmsInspectContentVo getCmmsInspectContentTreeByIdA(String id,String inspectid) {
         CmmsInspectContentVo cmmsInspectContent = inspectContentMapper.getCmmsInspectContentById(id);
         if (ObjectUtil.isNotNull(cmmsInspectContent)){
-            List<CmmsInspectTcontentItem> inspectTcontentItems = inspectTcontentItemService.getInspectTcontentItems(cmmsInspectContent.getId());
+            List<CmmsInspectTcontentItem> inspectTcontentItems = inspectTcontentItemService.getInspectTcontentItemsById(cmmsInspectContent.getId(),inspectid);
             cmmsInspectContent.setInspectTcontentItemList(inspectTcontentItems);
             cmmsInspectContent.setTitle(cmmsInspectContent.getContentname());
             cmmsInspectContent.setKey(cmmsInspectContent.getContentname());

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

@@ -42,9 +42,9 @@ public interface ICmmsInspectLineService extends IService<CmmsInspectLine> {
      *   des: 通过id查询（将巡检项变成 巡检工单-巡检项的格式）
      *   date: 2024/1/26
      */
-    CmmsInspectLineVo getCmmsInspectLineByIdA(String id);
+    CmmsInspectLineVo getCmmsInspectLineByIdA(String id,String inspectid);
 
-    CmmsInspectLineVo getCmmsInspectLineTreeByIdA(String id);
+    CmmsInspectLineVo getCmmsInspectLineTreeByIdA(String id,String inspectid);
 
     /**
     *   author: dzc

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

@@ -136,7 +136,7 @@ public class CmmsInspectLineServiceImpl extends ServiceImpl<CmmsInspectLineMappe
      *   date: 2024/1/26
      */
     @Override
-    public CmmsInspectLineVo getCmmsInspectLineByIdA(String id) {
+    public CmmsInspectLineVo getCmmsInspectLineByIdA(String id,String inspectid) {
         // 查询巡检路线
         CmmsInspectLine cmmsInspectLine = this.getById(id);
         CmmsInspectLineVo inspectLineVo = CmmsInspectLineConvert.INSTANCE.convert(cmmsInspectLine);
@@ -151,7 +151,7 @@ public class CmmsInspectLineServiceImpl extends ServiceImpl<CmmsInspectLineMappe
                 ArrayList<CmmsInspectContentVo> contentList = new ArrayList<>();
                 if (spotcountList != null && spotcountList.size() > 0) {
                     for (int j = 0; j < spotcountList.size(); j++) {
-                        CmmsInspectContentVo cmmsInspectContent = inspectContentService.getCmmsInspectContentByIdA(spotcountList.get(j).getInspectcontid());
+                        CmmsInspectContentVo cmmsInspectContent = inspectContentService.getCmmsInspectContentByIdA(spotcountList.get(j).getInspectcontid(),inspectid);
                         contentList.add(cmmsInspectContent);
                     }
                 }
@@ -166,7 +166,7 @@ public class CmmsInspectLineServiceImpl extends ServiceImpl<CmmsInspectLineMappe
 
 
     @Override
-    public CmmsInspectLineVo getCmmsInspectLineTreeByIdA(String id) {
+    public CmmsInspectLineVo getCmmsInspectLineTreeByIdA(String id,String inspectid) {
         // 查询巡检路线
         CmmsInspectLine cmmsInspectLine = this.getById(id);
         CmmsInspectLineVo inspectLineVo = CmmsInspectLineConvert.INSTANCE.convert(cmmsInspectLine);
@@ -181,7 +181,7 @@ public class CmmsInspectLineServiceImpl extends ServiceImpl<CmmsInspectLineMappe
                 ArrayList<CmmsInspectContentVo> contentList = new ArrayList<>();
                 if (spotcountList != null && spotcountList.size() > 0) {
                     for (int j = 0; j < spotcountList.size(); j++) {
-                        CmmsInspectContentVo cmmsInspectContent = inspectContentService.getCmmsInspectContentTreeByIdA(spotcountList.get(j).getInspectcontid());
+                        CmmsInspectContentVo cmmsInspectContent = inspectContentService.getCmmsInspectContentTreeByIdA(spotcountList.get(j).getInspectcontid(),inspectid);
                         contentList.add(cmmsInspectContent);
                     }
                 }

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

@@ -29,9 +29,9 @@ public interface ICmmsInspectSpotService extends IService<CmmsInspectSpot> {
      *   des: 通过id查询（将巡检项变成 巡检工单-巡检项的格式）
      *   date: 2024/1/26
      */
-    CmmsInspectSpotVo getCmmsInspectSpotListByIdA(String id);
+    CmmsInspectSpotVo getCmmsInspectSpotListByIdA(String id,String inspectid);
 
-    CmmsInspectSpotVo getCmmsInspectSpotListTreeByIdA(String id);
+    CmmsInspectSpotVo getCmmsInspectSpotListTreeByIdA(String id,String inspectid);
 
     List<CmmsInspectSpotVo> getCmmsInspectSpotListDetails(Page<CmmsInspectSpotVo> page, CmmsInspectSpot cmmsInspectSpot);
 

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

@@ -113,7 +113,7 @@ public class CmmsInspectSpotServiceImpl extends ServiceImpl<CmmsInspectSpotMappe
      *   date: 2024/1/26
      */
     @Override
-    public CmmsInspectSpotVo getCmmsInspectSpotListByIdA(String id) {
+    public CmmsInspectSpotVo getCmmsInspectSpotListByIdA(String id,String inspectid) {
         // 根据id查询出巡检点的信息
         CmmsInspectSpot cmmsInspectSport = this.getById(id);
 
@@ -123,7 +123,7 @@ public class CmmsInspectSpotServiceImpl extends ServiceImpl<CmmsInspectSpotMappe
         ArrayList<CmmsInspectContentVo> contList = new ArrayList<>();
         for (CmmsInspectSpotEquip eq:list) {
             String equipmentid = eq.getInspectcontid();
-            CmmsInspectContentVo cmmsInspectContentByIdA = iCmmsInspectContentService.getCmmsInspectContentByIdA(equipmentid);
+            CmmsInspectContentVo cmmsInspectContentByIdA = iCmmsInspectContentService.getCmmsInspectContentByIdA(equipmentid,inspectid);
             contList.add(cmmsInspectContentByIdA);
         }
         cmmsInspectSpotVo.setInspectContentList(contList);
@@ -132,7 +132,7 @@ public class CmmsInspectSpotServiceImpl extends ServiceImpl<CmmsInspectSpotMappe
 
 
     @Override
-    public CmmsInspectSpotVo getCmmsInspectSpotListTreeByIdA(String id) {
+    public CmmsInspectSpotVo getCmmsInspectSpotListTreeByIdA(String id,String inspectid) {
         // 根据id查询出巡检点的信息
         CmmsInspectSpot cmmsInspectSport = this.getById(id);
 
@@ -142,7 +142,7 @@ public class CmmsInspectSpotServiceImpl extends ServiceImpl<CmmsInspectSpotMappe
         ArrayList<CmmsInspectContentVo> contList = new ArrayList<>();
         for (CmmsInspectSpotEquip eq:list) {
             String equipmentid = eq.getInspectcontid();
-            CmmsInspectContentVo cmmsInspectContentByIdA = iCmmsInspectContentService.getCmmsInspectContentTreeByIdA(equipmentid);
+            CmmsInspectContentVo cmmsInspectContentByIdA = iCmmsInspectContentService.getCmmsInspectContentTreeByIdA(equipmentid,inspectid);
             contList.add(cmmsInspectContentByIdA);
         }
         cmmsInspectSpotVo.setTitle(cmmsInspectSport.getContentname());

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectTcontentItem/mapper/CmmsInspectTcontentItemMapper.java

@@ -21,4 +21,6 @@ public interface CmmsInspectTcontentItemMapper extends BaseMapper<CmmsInspectTco
     CmmsInspectContent getInspectContentById(String contitemtid);
 
     CmmsInspect getInspectById(String inspectid);
+
+    List<CmmsInspectTcontentItem> getInspectTcontentItemsById(@Param("countid") String countId,@Param("inspectid") String inspectId);
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectTcontentItem/mapper/xml/CmmsInspectTcontentItemMapper.xml

@@ -14,4 +14,9 @@
     <select id="getInspectById" resultType="org.jeecg.modules.cmmsInspect.entity.CmmsInspect">
         select * from cmms_inspect where id = #{inspectid}
     </select>
+
+    <select id="getInspectTcontentItemsById" resultType="org.jeecg.modules.cmmsInspectTcontentItem.entity.CmmsInspectTcontentItem">
+        select * from cmms_inspect_tcontent_item where contitemtid = #{countid} and inspectid = #{inspectid}
+    </select>
+
 </mapper>

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectTcontentItem/service/ICmmsInspectTcontentItemService.java

@@ -31,7 +31,7 @@ public interface ICmmsInspectTcontentItemService extends IService<CmmsInspectTco
     *   des: 巡检工单反馈
     *   date: 2024/1/26
     */
-    boolean feedBack(CmmsInspectTcontentItem inspectTcontentItem,HttpServletRequest req);
+    boolean feedBack(List<CmmsInspectTcontentItem> inspectTcontentItemList,HttpServletRequest req);
 
     /**
     *   author: dzc
@@ -56,4 +56,6 @@ public interface ICmmsInspectTcontentItemService extends IService<CmmsInspectTco
     *   date: 2024/1/26
     */
     boolean transrepair(CmmsRepair cmmsRepair, HttpServletRequest req);
+
+    List<CmmsInspectTcontentItem> getInspectTcontentItemsById(String countId, String inspectId);
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectTcontentItem/service/impl/CmmsInspectTcontentItemServiceImpl.java

@@ -62,12 +62,19 @@ public class CmmsInspectTcontentItemServiceImpl extends ServiceImpl<CmmsInspectT
     *   date: 2024/1/26
     */
     @Override
-    public boolean feedBack(CmmsInspectTcontentItem inspectTcontentItem, HttpServletRequest req) {
+    public boolean feedBack(List<CmmsInspectTcontentItem> inspectTcontentItemList, HttpServletRequest req) {
         String userName = JwtUtil.getUserNameByToken(req);
-        inspectTcontentItem.setIstatus("1");
-        inspectTcontentItem.setHandleuser(userName);
-        inspectTcontentItem.setItime(DateUtils.getDate());
-        return this.updateById(inspectTcontentItem);
+        //inspectTcontentItem.setIstatus("1");
+        //inspectTcontentItem.setHandleuser(userName);
+        //inspectTcontentItem.setItime(DateUtils.getDate());
+        //return this.updateById(inspectTcontentItem);
+
+        for (int i = 0; i < inspectTcontentItemList.size(); i++) {
+            inspectTcontentItemList.get(i).setIstatus("1");
+            inspectTcontentItemList.get(i).setHandleuser(userName);
+            inspectTcontentItemList.get(i).setItime(DateUtils.getDate());
+        }
+        return this.updateBatchById(inspectTcontentItemList);
     }
 
     @Override
@@ -118,4 +125,9 @@ public class CmmsInspectTcontentItemServiceImpl extends ServiceImpl<CmmsInspectT
         boolean b2 = this.updateById(inspectTcontentItem);
         return b1 && b2;
     }
+
+    @Override
+    public List<CmmsInspectTcontentItem> getInspectTcontentItemsById(String countId, String inspectId) {
+        return mapper.getInspectTcontentItemsById(countId, inspectId);
+    }
 }