修改巡检工单反馈相关的bug

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

@@ -226,8 +226,8 @@ public class CmmsInspectController extends JeecgController<CmmsInspect, ICmmsIns
 	*/
 	@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);
+	public Result<List<CmmsInspectTcontentItem>> queryItemByCountId(@RequestParam(name="countId",required=true) String countId,@RequestParam(name="inspectId",required=true) String inspectId,@RequestParam(name = "tasktype",required = true) String tasktype) {
+		List<CmmsInspectTcontentItem> list = inspectTcontentItemService.getInspectTcontentItemsById(countId,inspectId,tasktype);
 		if(list.size() == 0 || list == null) {
 			return Result.error("未找到对应数据");
 		}

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

@@ -73,9 +73,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,inspectid));
+                    taskList.get(i).setInspectSpotVo(inspectSpotService.getCmmsInspectSpotListByIdA(relid,inspectid,taskList.get(i).getTasktype()));
                 }else {
-                    taskList.get(i).setInspectLineVo(inspectLineService.getCmmsInspectLineByIdA(relid,inspectid));
+                    taskList.get(i).setInspectLineVo(inspectLineService.getCmmsInspectLineByIdA(relid,inspectid,taskList.get(i).getTasktype()));
                 }
             }
         }
@@ -139,7 +139,7 @@ public class CmmsInspectServiceImpl extends ServiceImpl<CmmsInspectMapper, CmmsI
                     taskList.get(i).setKey(name);
                     taskList.get(i).setType("巡检点");
                     //taskList.get(i).setInspectSpotVo(inspectSpotService.getCmmsInspectSpotListTreeByIdA(relid));
-                    List<CmmsInspectContentVo> childrenList = inspectSpotService.getCmmsInspectSpotListTreeByIdA(relid, inspectid).getChildren();
+                    List<CmmsInspectContentVo> childrenList = inspectSpotService.getCmmsInspectSpotListTreeByIdA(relid, inspectid, taskList.get(i).getTasktype()).getChildren();
                     boolean flag = true;
                     for (CmmsInspectContentVo cont:childrenList) {
                         // 如果巡检内容中 的countStatus有一个不为1 则该巡检点状态为0
@@ -160,7 +160,7 @@ public class CmmsInspectServiceImpl extends ServiceImpl<CmmsInspectMapper, CmmsI
                     taskList.get(i).setKey(name);
                     taskList.get(i).setType("巡检路线");
                     //taskList.get(i).setInspectLineVo(inspectLineService.getCmmsInspectLineTreeByIdA(relid));
-                    List<CmmsInspectLineDetailVo> childrenList = inspectLineService.getCmmsInspectLineTreeByIdA(relid, inspectid).getChildren();
+                    List<CmmsInspectLineDetailVo> childrenList = inspectLineService.getCmmsInspectLineTreeByIdA(relid, inspectid, taskList.get(i).getTasktype()).getChildren();
                     boolean flag = true;
                     for (CmmsInspectLineDetailVo vo:childrenList) {
                         if ("0".equals(vo.getCompletionStatus())){

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

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

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

@@ -120,20 +120,20 @@ public class CmmsInspectContentServiceImpl extends ServiceImpl<CmmsInspectConten
     *   date: 2024/1/26
     */
     @Override
-    public CmmsInspectContentVo getCmmsInspectContentByIdA(String id,String inspectid) {
+    public CmmsInspectContentVo getCmmsInspectContentByIdA(String id,String inspectid,String tasktype) {
         CmmsInspectContentVo cmmsInspectContent = inspectContentMapper.getCmmsInspectContentById(id);
         if (ObjectUtil.isNotNull(cmmsInspectContent)){
-            List<CmmsInspectTcontentItem> inspectTcontentItems = inspectTcontentItemService.getInspectTcontentItemsById(cmmsInspectContent.getId(),inspectid);
+            List<CmmsInspectTcontentItem> inspectTcontentItems = inspectTcontentItemService.getInspectTcontentItemsById(cmmsInspectContent.getId(),inspectid,tasktype);
             cmmsInspectContent.setInspectTcontentItemList(inspectTcontentItems);
         }
         return cmmsInspectContent;
     }
 
     @Override
-    public CmmsInspectContentVo getCmmsInspectContentTreeByIdA(String id,String inspectid) {
+    public CmmsInspectContentVo getCmmsInspectContentTreeByIdA(String id,String inspectid,String tasktype) {
         CmmsInspectContentVo cmmsInspectContent = inspectContentMapper.getCmmsInspectContentById(id);
         if (ObjectUtil.isNotNull(cmmsInspectContent)){
-            List<CmmsInspectTcontentItem> inspectTcontentItems = inspectTcontentItemService.getInspectTcontentItemsById(cmmsInspectContent.getId(),inspectid);
+            List<CmmsInspectTcontentItem> inspectTcontentItems = inspectTcontentItemService.getInspectTcontentItemsById(cmmsInspectContent.getId(),inspectid,tasktype);
             // 查询未反馈巡检项的数量
             int countIstatus = inspectTcontentItemService.getCountIstatus(cmmsInspectContent.getId(), inspectid);
             if (countIstatus == 0){

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectContentItem/entity/CmmsInspectContentItemVo.java

@@ -61,4 +61,7 @@ public class CmmsInspectContentItemVo extends CmmsInspectContentItem{
     @Dict(dicCode = "item_type")
     private java.lang.String classification;
 
+    /** 类型：巡检点还是巡检路线 */
+    private java.lang.String tasktype;
+
 }

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

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

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

@@ -174,7 +174,7 @@ public class CmmsInspectLineServiceImpl extends ServiceImpl<CmmsInspectLineMappe
      *   date: 2024/1/26
      */
     @Override
-    public CmmsInspectLineVo getCmmsInspectLineByIdA(String id,String inspectid) {
+    public CmmsInspectLineVo getCmmsInspectLineByIdA(String id,String inspectid,String tasktype) {
         // 查询巡检路线
         CmmsInspectLine cmmsInspectLine = this.getById(id);
         CmmsInspectLineVo inspectLineVo = CmmsInspectLineConvert.INSTANCE.convert(cmmsInspectLine);
@@ -189,7 +189,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(),inspectid);
+                        CmmsInspectContentVo cmmsInspectContent = inspectContentService.getCmmsInspectContentByIdA(spotcountList.get(j).getInspectcontid(),inspectid,tasktype);
                         contentList.add(cmmsInspectContent);
                     }
                 }
@@ -204,7 +204,7 @@ public class CmmsInspectLineServiceImpl extends ServiceImpl<CmmsInspectLineMappe
 
 
     @Override
-    public CmmsInspectLineVo getCmmsInspectLineTreeByIdA(String id,String inspectid) {
+    public CmmsInspectLineVo getCmmsInspectLineTreeByIdA(String id,String inspectid,String tasktype) {
         // 查询巡检路线
         CmmsInspectLine cmmsInspectLine = this.getById(id);
         CmmsInspectLineVo inspectLineVo = CmmsInspectLineConvert.INSTANCE.convert(cmmsInspectLine);
@@ -219,7 +219,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(),inspectid);
+                        CmmsInspectContentVo cmmsInspectContent = inspectContentService.getCmmsInspectContentTreeByIdA(spotcountList.get(j).getInspectcontid(),inspectid,tasktype);
                         contentList.add(cmmsInspectContent);
                     }
                 }

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

@@ -130,7 +130,7 @@ public class CmmsInspectPlanServiceImpl extends ServiceImpl<CmmsInspectPlanMappe
     public boolean updateCmmsInspectPlan(CmmsInspectPlanVo cmmsInspectPlan) {
         PlanToOrderUtils planToOrderUtils = new PlanToOrderUtils();
         // 不管以前有没有通过此计划生成过工单，都将下次执行时间赋值为开始时间
-        if (cmmsInspectPlan.getBegintime().after(new Date())) {
+        if ("Y".equals(cmmsInspectPlan.getIftimeset()) && cmmsInspectPlan.getBegintime().after(new Date())) {
             cmmsInspectPlan.setNexttime(cmmsInspectPlan.getBegintime());
             cmmsInspectPlan.setIfnotice("否");
             cmmsInspectPlan.setNoticetime(planToOrderUtils.generateNoticeTime(cmmsInspectPlan.getBegintime(),
@@ -337,6 +337,9 @@ public class CmmsInspectPlanServiceImpl extends ServiceImpl<CmmsInspectPlanMappe
                             // 巡检内容 - 巡检项集合
                             if (ObjectUtil.isNotNull(content)){
                                 List<CmmsInspectContentItemVo> cmmsInspectContentItemList = content.getCmmsInspectContentItemList();
+                                for (int i = 0; i < cmmsInspectContentItemList.size(); i++) {
+                                    cmmsInspectContentItemList.get(i).setTasktype("巡检路线");
+                                }
                                 itemList.addAll(cmmsInspectContentItemList);
                             }
                         }
@@ -349,6 +352,9 @@ public class CmmsInspectPlanServiceImpl extends ServiceImpl<CmmsInspectPlanMappe
                         // 巡检内容 - 巡检项集合
                         if (ObjectUtil.isNotNull(content)){
                             List<CmmsInspectContentItemVo> cmmsInspectContentItemList = content.getCmmsInspectContentItemList();
+                            for (int i = 0; i < cmmsInspectContentItemList.size(); i++) {
+                                cmmsInspectContentItemList.get(i).setTasktype("巡检点");
+                            }
                             itemList.addAll(cmmsInspectContentItemList);
                         }
                     }
@@ -372,6 +378,7 @@ public class CmmsInspectPlanServiceImpl extends ServiceImpl<CmmsInspectPlanMappe
             if (ObjectUtil.isNotNull(item.getInspectionstandards())) cmmsInspectTcontentItem.setInspectionstandards(item.getInspectionstandards());
             if (ObjectUtil.isNotNull(item.getClassification())) cmmsInspectTcontentItem.setClassification(item.getClassification());
             if (ObjectUtil.isNotNull(item.getTag())) cmmsInspectTcontentItem.setTag(item.getTag());
+            if (ObjectUtil.isNotNull(item.getTasktype())) cmmsInspectTcontentItem.setTasktype(item.getTasktype());
             cmmsInspectTcontentItem.setIstatus("0");
             tcontentItemList.add(cmmsInspectTcontentItem);
         }

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

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

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

@@ -136,7 +136,7 @@ public class CmmsInspectSpotServiceImpl extends ServiceImpl<CmmsInspectSpotMappe
      *   date: 2024/1/26
      */
     @Override
-    public CmmsInspectSpotVo getCmmsInspectSpotListByIdA(String id,String inspectid) {
+    public CmmsInspectSpotVo getCmmsInspectSpotListByIdA(String id,String inspectid,String tasktype) {
         // 根据id查询出巡检点的信息
         CmmsInspectSpot cmmsInspectSport = this.getById(id);
 
@@ -146,7 +146,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,inspectid);
+            CmmsInspectContentVo cmmsInspectContentByIdA = iCmmsInspectContentService.getCmmsInspectContentByIdA(equipmentid,inspectid,tasktype);
             contList.add(cmmsInspectContentByIdA);
         }
         cmmsInspectSpotVo.setInspectContentList(contList);
@@ -155,7 +155,7 @@ public class CmmsInspectSpotServiceImpl extends ServiceImpl<CmmsInspectSpotMappe
 
 
     @Override
-    public CmmsInspectSpotVo getCmmsInspectSpotListTreeByIdA(String id,String inspectid) {
+    public CmmsInspectSpotVo getCmmsInspectSpotListTreeByIdA(String id,String inspectid,String tasktype) {
         // 根据id查询出巡检点的信息
         CmmsInspectSpot cmmsInspectSport = this.getById(id);
 
@@ -165,7 +165,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,inspectid);
+            CmmsInspectContentVo cmmsInspectContentByIdA = iCmmsInspectContentService.getCmmsInspectContentTreeByIdA(equipmentid,inspectid,tasktype);
             contList.add(cmmsInspectContentByIdA);
         }
         boolean flag = true;

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectTcontentItem/controller/CmmsInspectTcontentItemController.java

@@ -64,15 +64,17 @@ public class CmmsInspectTcontentItemController extends JeecgController<CmmsInspe
 	//@AutoLog(value = "巡检工单-路线-内容-设备-巡检项-分页列表查询")
 	@ApiOperation(value="巡检工单-异常项目查询", notes="巡检工单-异常项目查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<CmmsInspectTcontentItem>> queryPageList(CmmsInspectTcontentItem cmmsInspectTcontentItem,
+	public Result<IPage<CmmsInspectTcontentItemVo>> queryPageList(CmmsInspectTcontentItem cmmsInspectTcontentItem,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		cmmsInspectTcontentItem.setIresult("1");
-		QueryWrapper<CmmsInspectTcontentItem> queryWrapper = QueryGenerator.initQueryWrapper(cmmsInspectTcontentItem, req.getParameterMap());
-		Page<CmmsInspectTcontentItem> page = new Page<CmmsInspectTcontentItem>(pageNo, pageSize);
-		IPage<CmmsInspectTcontentItem> pageList = cmmsInspectTcontentItemService.page(page, queryWrapper);
-		return Result.OK(pageList);
+		//cmmsInspectTcontentItem.setIresult("1");
+		//QueryWrapper<CmmsInspectTcontentItem> queryWrapper = QueryGenerator.initQueryWrapper(cmmsInspectTcontentItem, req.getParameterMap());
+		Page<CmmsInspectTcontentItemVo> page = new Page<CmmsInspectTcontentItemVo>(pageNo, pageSize);
+		//IPage<CmmsInspectTcontentItem> pageList = cmmsInspectTcontentItemService.page(page, queryWrapper);
+		List<CmmsInspectTcontentItemVo> list = cmmsInspectTcontentItemService.getItemList(page,cmmsInspectTcontentItem);
+		page.setRecords(list);
+		return Result.OK(page);
 	}
 	
 	/**

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectTcontentItem/entity/CmmsInspectTcontentItem.java

@@ -157,4 +157,7 @@ public class CmmsInspectTcontentItem implements Serializable {
 	/**所属部门*/
     @ApiModelProperty(value = "所属部门")
     private java.lang.String sysOrgCode;
+
+    /**分类*/
+    private java.lang.String tasktype;
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectTcontentItem/entity/CmmsInspectTcontentItemVo.java

@@ -18,6 +18,13 @@ public class CmmsInspectTcontentItemVo extends CmmsInspectTcontentItem{
     @Excel(name = "设备编号", width = 15)
     @ApiModelProperty(value = "设备编号")
     private java.lang.String equipmentcode;
+    @Excel(name = "设备名称", width = 15)
+    @ApiModelProperty(value = "设备名称")
+    private java.lang.String equipmentname;
+    /**安装地点*/
+    @Excel(name = "安装地点", width = 15)
+    @ApiModelProperty(value = "安装地点")
+    private java.lang.String address;
     /**工单编号*/
     @Excel(name = "工单编号", width = 15)
     @ApiModelProperty(value = "工单编号")

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

@@ -2,11 +2,13 @@ package org.jeecg.modules.cmmsInspectTcontentItem.mapper;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.cmmsInspect.entity.CmmsInspect;
 import org.jeecg.modules.cmmsInspectContent.entity.CmmsInspectContent;
 import org.jeecg.modules.cmmsInspectTcontentItem.entity.CmmsInspectTcontentItem;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.cmmsInspectTcontentItem.entity.CmmsInspectTcontentItemVo;
 
 /**
  * @Description: 巡检工单-路线-内容-设备-巡检项
@@ -22,8 +24,9 @@ public interface CmmsInspectTcontentItemMapper extends BaseMapper<CmmsInspectTco
 
     CmmsInspect getInspectById(String inspectid);
 
-    List<CmmsInspectTcontentItem> getInspectTcontentItemsById(@Param("countid") String countId,@Param("inspectid") String inspectId);
+    List<CmmsInspectTcontentItem> getInspectTcontentItemsById(@Param("countid") String countId,@Param("inspectid") String inspectId,@Param("tasktype") String tasktype);
 
     int getCountIstatus(@Param("id") String id,@Param("inspectid") String inspectid);
 
+    List<CmmsInspectTcontentItemVo> getItemList(Page<CmmsInspectTcontentItemVo> page, CmmsInspectTcontentItem cmmsInspectTcontentItem);
 }

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

@@ -16,10 +16,54 @@
     </select>
 
     <select id="getInspectTcontentItemsById" resultType="org.jeecg.modules.cmmsInspectTcontentItem.entity.CmmsInspectTcontentItem">
-        select * from cmms_inspect_tcontent_item where contitemtid = #{countid} and inspectid = #{inspectid}
+        select * from cmms_inspect_tcontent_item where contitemtid = #{countid} and inspectid = #{inspectid} and tasktype = #{tasktype}
     </select>
 
     <select id="getCountIstatus" resultType="int">
         select count(*) from cmms_inspect_tcontent_item where contitemtid = #{id} and inspectid = #{inspectid} and istatus = '0'
     </select>
+
+    <resultMap id="itemResult" type="org.jeecg.modules.cmmsInspectTcontentItem.entity.CmmsInspectTcontentItemVo">
+        <result property="id"    column="id"    />
+        <result property="contitemtid"    column="contitemtid"    />
+        <result property="tcontequiptid"    column="tcontequiptid"    />
+        <result property="inspectitemid"    column="inspectitemid"    />
+        <result property="remark"    column="remark"    />
+        <result property="itemcode"    column="itemcode"    />
+        <result property="itemname"    column="itemname"    />
+        <result property="equipdefid"    column="equipdefid"    />
+        <result property="equipdefname"    column="equipdefname"    />
+        <result property="conditions"    column="conditions"    />
+        <result property="refervalue"    column="refervalue"    />
+        <result property="tag"    column="tag"    />
+        <result property="iresult"    column="iresult"    />
+        <result property="itag"    column="itag"    />
+        <result property="iremark"    column="iremark"    />
+        <result property="istatus"    column="istatus"    />
+        <result property="itime"    column="itime"    />
+        <result property="ifile"    column="ifile"    />
+        <result property="handleuser"    column="handleuser"    />
+        <result property="unusualstatus"    column="unusualstatus"    />
+        <result property="confirmcontent"    column="confirmcontent"    />
+        <result property="confirmuser"    column="confirmuser"    />
+        <result property="confirmtime"    column="confirmtime"    />
+        <result property="reportuser"    column="reportuser"    />
+        <result property="reporttime"    column="reporttime"    />
+        <result property="equipmentcode"    column="equipmentcode"    />
+        <result property="equipmentname"    column="equipmentname"    />
+        <result property="address"    column="address"    />
+        <result property="inspectname"    column="inspectname"    />
+    </resultMap>
+
+    <select id="getItemList" parameterType="org.jeecg.modules.cmmsInspectTcontentItem.entity.CmmsInspectTcontentItem" resultMap="itemResult">
+        select i.id, i.contitemtid, i.tcontequiptid, i.inspectitemid, i.remark, i.itemcode, i.itemname,
+               i.equipdefid, i.equipdefname, i.conditions, i.refervalue, i.tag, i.iresult, i.itag, i.iremark, i.istatus,
+               i.itime, i.ifile, i.handleuser, i.unusualstatus, i.confirmcontent, i.confirmuser, i.confirmtime,
+               i.reportuser, i.reporttime, e.equipmentcode, e.equipmentname, e.address,t.inspectname
+        from cmms_inspect_tcontent_item as i
+        left join cmms_inspect t on t.id = i.inspectid
+        left join tpm_equipment e on i.tcontequiptid = e.id
+        where i.iresult = '1'
+        order by i.itime desc
+    </select>
 </mapper>

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.cmmsInspectTcontentItem.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.cmmsInspectTcontentItem.entity.CmmsInspectTcontentItem;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.cmmsInspectTcontentItem.entity.CmmsInspectTcontentItemVo;
@@ -57,7 +58,7 @@ public interface ICmmsInspectTcontentItemService extends IService<CmmsInspectTco
     */
     boolean transrepair(CmmsRepair cmmsRepair, HttpServletRequest req);
 
-    List<CmmsInspectTcontentItem> getInspectTcontentItemsById(String countId, String inspectId);
+    List<CmmsInspectTcontentItem> getInspectTcontentItemsById(String countId, String inspectId,String tasktype);
 
     /**
      *   author: dzc
@@ -66,4 +67,6 @@ public interface ICmmsInspectTcontentItemService extends IService<CmmsInspectTco
      *   date: 2024/1/29
      */
     int getCountIstatus(String id, String inspectid);
+
+    List<CmmsInspectTcontentItemVo> getItemList(Page<CmmsInspectTcontentItemVo> page, CmmsInspectTcontentItem cmmsInspectTcontentItem);
 }

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

@@ -2,6 +2,7 @@ package org.jeecg.modules.cmmsInspectTcontentItem.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.modules.cmmsInspect.entity.CmmsInspect;
@@ -70,6 +71,10 @@ public class CmmsInspectTcontentItemServiceImpl extends ServiceImpl<CmmsInspectT
         //return this.updateById(inspectTcontentItem);
 
         for (int i = 0; i < inspectTcontentItemList.size(); i++) {
+            //如果巡检结果为异常，将异常状态改为"0"待处理
+            if ("1".equals(inspectTcontentItemList.get(i).getIresult())){
+                inspectTcontentItemList.get(i).setUnusualstatus("0");
+            }
             inspectTcontentItemList.get(i).setIstatus("1");
             inspectTcontentItemList.get(i).setHandleuser(userName);
             inspectTcontentItemList.get(i).setItime(DateUtils.getDate());
@@ -127,8 +132,8 @@ public class CmmsInspectTcontentItemServiceImpl extends ServiceImpl<CmmsInspectT
     }
 
     @Override
-    public List<CmmsInspectTcontentItem> getInspectTcontentItemsById(String countId, String inspectId) {
-        return mapper.getInspectTcontentItemsById(countId, inspectId);
+    public List<CmmsInspectTcontentItem> getInspectTcontentItemsById(String countId, String inspectId,String tasktype) {
+        return mapper.getInspectTcontentItemsById(countId, inspectId, tasktype);
     }
 
     /**
@@ -141,4 +146,9 @@ public class CmmsInspectTcontentItemServiceImpl extends ServiceImpl<CmmsInspectT
     public int getCountIstatus(String id, String inspectid) {
         return mapper.getCountIstatus(id, inspectid);
     }
+
+    @Override
+    public List<CmmsInspectTcontentItemVo> getItemList(Page<CmmsInspectTcontentItemVo> page, CmmsInspectTcontentItem cmmsInspectTcontentItem) {
+        return mapper.getItemList(page, cmmsInspectTcontentItem);
+    }
 }