Merge remote-tracking branch 'origin/master'

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

@@ -13,6 +13,7 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.cmmsInspect.entity.CmmsInspect;
+import org.jeecg.modules.cmmsInspect.entity.CmmsInspectVo;
 import org.jeecg.modules.cmmsInspect.service.ICmmsInspectService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -20,6 +21,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.cmmsInspectTcontentItem.entity.CmmsInspectTcontentItem;
+import org.jeecg.modules.cmmsInspectTcontentItem.service.ICmmsInspectTcontentItemService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -49,6 +52,9 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class CmmsInspectController extends JeecgController<CmmsInspect, ICmmsInspectService> {
 	@Autowired
 	private ICmmsInspectService cmmsInspectService;
+	@Autowired
+	@SuppressWarnings("all")
+	private ICmmsInspectTcontentItemService inspectTcontentItemService;
 	
 	/**
 	 * 分页列表查询
@@ -141,8 +147,9 @@ public class CmmsInspectController extends JeecgController<CmmsInspect, ICmmsIns
 	//@AutoLog(value = "巡检工单-通过id查询")
 	@ApiOperation(value="巡检工单-通过id查询", notes="巡检工单-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<CmmsInspect> queryById(@RequestParam(name="id",required=true) String id) {
-		CmmsInspect cmmsInspect = cmmsInspectService.getById(id);
+	public Result<CmmsInspectVo> queryById(@RequestParam(name="id",required=true) String id) {
+		//CmmsInspect cmmsInspect = cmmsInspectService.getById(id);
+		CmmsInspectVo cmmsInspect = cmmsInspectService.getCmmsInspectById(id);
 		if(cmmsInspect==null) {
 			return Result.error("未找到对应数据");
 		}
@@ -174,4 +181,23 @@ public class CmmsInspectController extends JeecgController<CmmsInspect, ICmmsIns
         return super.importExcel(request, response, CmmsInspect.class);
     }
 
-}
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 巡检工单反馈
+    *   date: 2024/1/26
+    */
+	@AutoLog(value = "巡检工单-反馈")
+	@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) {
+		boolean b = inspectTcontentItemService.feedBack(inspectTcontentItem);
+		if (b) {
+			return Result.ok("反馈成功!");
+		}
+		return Result.error("反馈失败!");
+	}
+
+
+ }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspect/convert/CmmsInspectConvert.java

@@ -0,0 +1,27 @@
+package org.jeecg.modules.cmmsInspect.convert;
+
+import org.jeecg.modules.cmmsInspect.entity.CmmsInspect;
+import org.jeecg.modules.cmmsInspect.entity.CmmsInspectVo;
+import org.jeecg.modules.cmmsInspectLine.entity.CmmsInspectLine;
+import org.jeecg.modules.cmmsInspectLine.entity.CmmsInspectLineVo;
+import org.mapstruct.Mapper;
+import org.mapstruct.ReportingPolicy;
+import org.mapstruct.factory.Mappers;
+import org.springframework.util.CollectionUtils;
+
+import java.util.stream.Collectors;
+
+/**
+ * @author dzc
+ * @date 2024/1/24 14:49
+ * @package org.jeecg.modules.cmmsInspectPlan.convert
+ * @project EMS_server
+ * @des
+ */
+@Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE,imports ={ CollectionUtils.class, Collectors.class})
+public interface CmmsInspectConvert {
+
+    CmmsInspectConvert INSTANCE = Mappers.getMapper(CmmsInspectConvert.class);
+
+    CmmsInspectVo convert(CmmsInspect inspect);
+}

module_cmms/src/main/java/org/jeecg/modules/cmmsInspect/entity/CmmsInspect.java

@@ -40,16 +40,16 @@ public class CmmsInspect implements Serializable {
     @ApiModelProperty(value = "创建者")
     private java.lang.String createBy;
 	/**创建时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间")
     private java.util.Date createTime;
 	/**更新者*/
     @ApiModelProperty(value = "更新者")
     private java.lang.String updateBy;
 	/**更新时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间")
     private java.util.Date updateTime;
 	/**备注*/

module_cmms/src/main/java/org/jeecg/modules/cmmsInspect/entity/CmmsInspectVo.java

@@ -0,0 +1,30 @@
+package org.jeecg.modules.cmmsInspect.entity;
+
+import lombok.Data;
+import org.jeecg.modules.cmmsInspectLine.entity.CmmsInspectLineVo;
+import org.jeecg.modules.cmmsInspectPlanTask.entity.CmmsInspectPlanTaskVo;
+import org.jeecg.modules.cmmsInspectSpot.entity.CmmsInspectSpotVo;
+
+import java.util.List;
+
+/**
+ * @author dzc
+ * @date 2024/1/25 9:26
+ * @package org.jeecg.modules.cmmsInspect.entity
+ * @project EMS_server
+ * @des
+ */
+@Data
+public class CmmsInspectVo extends CmmsInspect {
+
+    /** 巡检工单-路线列表 */
+    private List<CmmsInspectLineVo> lineList;
+
+    /** 巡检工单-巡检点列表 */
+    private List<CmmsInspectSpotVo> spotList;
+
+    /** 巡检工单 - 巡检计划列表 */
+    private List<CmmsInspectPlanTaskVo> planList;
+
+
+}

module_cmms/src/main/java/org/jeecg/modules/cmmsInspect/mapper/CmmsInspectMapper.java

@@ -5,6 +5,8 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.cmmsInspect.entity.CmmsInspect;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.cmmsInspectPlan.entity.CmmsInspectPlan;
+import org.jeecg.modules.cmmsInspectPlanTask.entity.CmmsInspectPlanTaskVo;
 
 /**
  * @Description: 巡检工单
@@ -14,4 +16,19 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface CmmsInspectMapper extends BaseMapper<CmmsInspect> {
 
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 根据id查询巡检计划
+    *   date: 2024/1/25
+    */
+    public CmmsInspectPlan getCmmsInspectPlanById(@Param("id") String id);
+
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 根据巡检计划id查询任务集合
+    *   date: 2024/1/25
+    */
+    List<CmmsInspectPlanTaskVo> getTaskByPlanId(@Param("id") String id);
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspect/mapper/xml/CmmsInspectMapper.xml

@@ -2,4 +2,36 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.cmmsInspect.mapper.CmmsInspectMapper">
 
+
+
+    <select id="getCmmsInspectPlanById" resultType="org.jeecg.modules.cmmsInspectPlan.entity.CmmsInspectPlan">
+        select * from cmms_inspect_plan where id = #{id}
+    </select>
+
+    <resultMap type="org.jeecg.modules.cmmsInspectPlanTask.entity.CmmsInspectPlanTaskVo" id="CmmsInspectPlanTaskResult">
+        <result property="id"    column="id"    />
+        <result property="inspectplanid"    column="inspectplanid"    />
+        <result property="tasktype"    column="tasktype"    />
+        <result property="relid"    column="relid"    />
+        <result property="ifmustexec"    column="ifmustexec"    />
+
+        <result property="linecode"    column="linecode"    />
+        <result property="linename"    column="linename"    />
+
+        <result property="contentcode"    column="contentcode"    />
+        <result property="contentname"    column="contentname"    />
+        <result property="equipdefid"    column="equipdefid"    />
+        <result property="equipdefname"    column="equipdefname"    />
+    </resultMap>
+
+    <sql id="selectCmmsInspectPlanTaskVo">
+        select id, inspectplanid, tasktype, relid, ifmustexec
+        from cmms_inspect_plan_task
+    </sql>
+
+    <select id="getTaskByPlanId" parameterType="String" resultMap="CmmsInspectPlanTaskResult">
+        <include refid="selectCmmsInspectPlanTaskVo"/>
+        where inspectplanid = #{id}
+    </select>
+
 </mapper>

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

@@ -2,6 +2,8 @@ package org.jeecg.modules.cmmsInspect.service;
 
 import org.jeecg.modules.cmmsInspect.entity.CmmsInspect;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.cmmsInspect.entity.CmmsInspectVo;
+import org.jeecg.modules.cmmsInspectPlan.entity.CmmsInspectPlanVo;
 
 /**
  * @Description: 巡检工单
@@ -11,4 +13,12 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ICmmsInspectService extends IService<CmmsInspect> {
 
+    CmmsInspectVo getCmmsInspectById(String id);
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 通过巡检计划id 查询出对应的巡检计划id详情(巡检项的格式为 巡检工单-巡检项的格式)
+    *   date: 2024/1/26
+    */
+    CmmsInspectPlanVo getCmmsInspectPlanById(String inspectplanid);
 }

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

@@ -1,12 +1,24 @@
 package org.jeecg.modules.cmmsInspect.service.impl;
 
+import org.jeecg.modules.cmmsInspect.convert.CmmsInspectConvert;
 import org.jeecg.modules.cmmsInspect.entity.CmmsInspect;
+import org.jeecg.modules.cmmsInspect.entity.CmmsInspectVo;
 import org.jeecg.modules.cmmsInspect.mapper.CmmsInspectMapper;
 import org.jeecg.modules.cmmsInspect.service.ICmmsInspectService;
+import org.jeecg.modules.cmmsInspectLine.service.ICmmsInspectLineService;
+import org.jeecg.modules.cmmsInspectPlan.convert.CmmsInspectPlanConvert;
+import org.jeecg.modules.cmmsInspectPlan.entity.CmmsInspectPlan;
+import org.jeecg.modules.cmmsInspectPlan.entity.CmmsInspectPlanVo;
+import org.jeecg.modules.cmmsInspectPlan.service.ICmmsInspectPlanService;
+import org.jeecg.modules.cmmsInspectPlanTask.entity.CmmsInspectPlanTaskVo;
+import org.jeecg.modules.cmmsInspectSpot.service.ICmmsInspectSpotService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.List;
+
 /**
  * @Description: 巡检工单
  * @Author: jeecg-boot
@@ -16,4 +28,51 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class CmmsInspectServiceImpl extends ServiceImpl<CmmsInspectMapper, CmmsInspect> implements ICmmsInspectService {
 
+    @Autowired
+    @SuppressWarnings("all")
+    private CmmsInspectMapper cmmsInspectMapper;
+    @Autowired
+    @SuppressWarnings("all")
+    private ICmmsInspectSpotService inspectSpotService;
+    @Autowired
+    @SuppressWarnings("all")
+    private ICmmsInspectLineService inspectLineService;
+
+    @Override
+    public CmmsInspectVo getCmmsInspectById(String id) {
+        // 根据巡检工单id查询出对应的巡检工单
+        CmmsInspect cmmInspect = this.getById(id);
+        CmmsInspectVo inspectVo = CmmsInspectConvert.INSTANCE.convert(cmmInspect);
+
+        // 根据 巡检工单表中的 巡检计划id查询出巡检计划的详情
+        CmmsInspectPlanVo cmmsInspectPlanById = this.getCmmsInspectPlanById(cmmInspect.getInspectplanid());
+
+        inspectVo.setPlanList(cmmsInspectPlanById.getTaskList());
+
+        return inspectVo;
+    }
+
+
+    @Override
+    public CmmsInspectPlanVo getCmmsInspectPlanById(String inspectplanid) {
+        CmmsInspectPlan cmmsInspectPlan = cmmsInspectMapper.getCmmsInspectPlanById(inspectplanid);
+        CmmsInspectPlanVo cmmsInspectPlanVo = CmmsInspectPlanConvert.INSTANCE.convert(cmmsInspectPlan);
+
+        List<CmmsInspectPlanTaskVo> taskList = cmmsInspectMapper.getTaskByPlanId(inspectplanid);
+
+        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())){
+                    taskList.get(i).setInspectSpotVo(inspectSpotService.getCmmsInspectSpotListByIdA(relid));
+                }else {
+                    taskList.get(i).setInspectLineVo(inspectLineService.getCmmsInspectLineByIdA(relid));
+                }
+            }
+        }
+
+        cmmsInspectPlanVo.setTaskList(taskList);
+
+        return cmmsInspectPlanVo;
+    }
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectContent/controller/CmmsInspectContentController.java

@@ -241,4 +241,26 @@ public class CmmsInspectContentController extends JeecgController<CmmsInspectCon
         return super.importExcel(request, response, CmmsInspectContent.class);
     }
 
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 分页列表查询 （查询出所有的启用的巡检内容以及对应的巡检项信息）
+    *   date: 2024/1/26
+    */
+	//@AutoLog(value = "巡检内容-分页列表查询")
+	@ApiOperation(value="巡检内容-查询启用的巡检内容-巡检项", notes="巡检内容-查询启用的巡检内容-巡检项")
+	@GetMapping(value = "/listDetails")
+	public Result<IPage<CmmsInspectContentVo>> queryPageDetaiList(CmmsInspectContent cmmsInspectContent,
+															 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+															 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+															 HttpServletRequest req) {
+		//QueryWrapper<CmmsInspectContent> queryWrapper = QueryGenerator.initQueryWrapper(cmmsInspectContent, req.getParameterMap());
+		Page<CmmsInspectContentVo> page = new Page<>(pageNo, pageSize);
+		//IPage<CmmsInspectContent> pageList = cmmsInspectContentService.page(page, queryWrapper);
+		cmmsInspectContent.setStatus("0");
+		List<CmmsInspectContentVo> list = cmmsInspectContentService.getCmmsInspectContentDetail(page, cmmsInspectContent);
+		page.setRecords(list);
+		return Result.OK(page);
+	}
+
 }

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

@@ -3,6 +3,7 @@ package org.jeecg.modules.cmmsInspectContent.entity;
 import lombok.Data;
 import org.jeecg.modules.cmmsInspectContentItem.entity.CmmsInspectContentItem;
 import org.jeecg.modules.cmmsInspectContentItem.entity.CmmsInspectContentItemVo;
+import org.jeecg.modules.cmmsInspectTcontentItem.entity.CmmsInspectTcontentItem;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
 import java.util.List;
@@ -23,4 +24,7 @@ public class CmmsInspectContentVo extends CmmsInspectContent{
 
     /** 巡检内容-巡检项信息 */
     private List<CmmsInspectContentItemVo> cmmsInspectContentItemList;
+
+    /** 巡检工单下的巡检内容下的巡检项信息 */
+    private List<CmmsInspectTcontentItem> inspectTcontentItemList;
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectContent/mapper/xml/CmmsInspectContentMapper.xml

@@ -34,7 +34,7 @@
             <if test="cmmsInspectContent.equipmentid != null "> and c.equipmentid = #{cmmsInspectContent.equipmentid}</if>
             <if test="cmmsInspectContent.status != null "> and c.status = #{cmmsInspectContent.status}</if>
         </where>
-        order by c.create_time
+        order by c.create_time desc
     </select>
 
 
@@ -60,6 +60,6 @@
         from cmms_inspect_content a
         left join tpm_equipment as e on a.equipmentid = e.id
         where a.equipmentid = #{eqid}
-        order by a.create_time
+        order by a.create_time desc
     </select>
 </mapper>

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

@@ -23,7 +23,23 @@ public interface ICmmsInspectContentService extends IService<CmmsInspectContent>
 
     CmmsInspectContentVo getCmmsInspectContentById(String id);
 
+    /**
+     *   author: dzc
+     *   version: 1.0
+     *   des: 通过id查询（将巡检项变成 巡检工单-巡检项的格式）
+     *   date: 2024/1/26
+     */
+    CmmsInspectContentVo getCmmsInspectContentByIdA(String id);
+
     boolean updateStatua(String id,String status);
 
     CmmsInspectContentVo getCmmsInspectContentByEqId(String eqid);
+
+    /**
+     *   author: dzc
+     *   version: 1.0
+     *   des: 分页列表查询 （查询出所有的启用的巡检内容以及对应的巡检项信息）
+     *   date: 2024/1/26
+     */
+    List<CmmsInspectContentVo> getCmmsInspectContentDetail(Page<CmmsInspectContentVo> page, CmmsInspectContent cmmsInspectContent);
 }

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

@@ -10,6 +10,8 @@ import org.jeecg.modules.cmmsInspectContent.service.ICmmsInspectContentService;
 import org.jeecg.modules.cmmsInspectContentItem.entity.CmmsInspectContentItem;
 import org.jeecg.modules.cmmsInspectContentItem.entity.CmmsInspectContentItemVo;
 import org.jeecg.modules.cmmsInspectContentItem.service.ICmmsInspectContentItemService;
+import org.jeecg.modules.cmmsInspectTcontentItem.entity.CmmsInspectTcontentItem;
+import org.jeecg.modules.cmmsInspectTcontentItem.service.ICmmsInspectTcontentItemService;
 import org.jeecg.modules.util.AutoCodeUtil;
 import org.jeecg.modules.util.UserConstants;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,13 +40,13 @@ public class CmmsInspectContentServiceImpl extends ServiceImpl<CmmsInspectConten
     @Autowired
     @SuppressWarnings("all")
     private ICmmsInspectContentItemService iCmmsInspectContentItemService;
+    @Autowired
+    @SuppressWarnings("all")
+    private ICmmsInspectTcontentItemService inspectTcontentItemService;
 
     @Override
     public List<CmmsInspectContentVo> getCmmsInspectContent(Page<CmmsInspectContentVo> page, CmmsInspectContent cmmsInspectContent) {
         List<CmmsInspectContentVo> list = inspectContentMapper.getCmmsInspectContent(page, cmmsInspectContent);
-
-
-
         return list;
     }
 
@@ -98,6 +100,22 @@ public class CmmsInspectContentServiceImpl extends ServiceImpl<CmmsInspectConten
         return cmmsInspectContent;
     }
 
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 通过id查询（将巡检项变成 巡检工单-巡检项的格式）
+    *   date: 2024/1/26
+    */
+    @Override
+    public CmmsInspectContentVo getCmmsInspectContentByIdA(String id) {
+        CmmsInspectContentVo cmmsInspectContent = inspectContentMapper.getCmmsInspectContentById(id);
+        if (ObjectUtil.isNotNull(cmmsInspectContent)){
+            List<CmmsInspectTcontentItem> inspectTcontentItems = inspectTcontentItemService.getInspectTcontentItems(cmmsInspectContent.getId());
+            cmmsInspectContent.setInspectTcontentItemList(inspectTcontentItems);
+        }
+        return cmmsInspectContent;
+    }
+
     @Override
     public boolean updateStatua(String id,String status) {
         return inspectContentMapper.updateStatua(id,status);
@@ -113,6 +131,27 @@ public class CmmsInspectContentServiceImpl extends ServiceImpl<CmmsInspectConten
         return cmmsInspectContent;
     }
 
+    /**
+     *   author: dzc
+     *   version: 1.0
+     *   des: 分页列表查询 （查询出所有的启用的巡检内容以及对应的巡检项信息）
+     *   date: 2024/1/26
+     */
+
+    @Override
+    public List<CmmsInspectContentVo> getCmmsInspectContentDetail(Page<CmmsInspectContentVo> page, CmmsInspectContent cmmsInspectContent) {
+        List<CmmsInspectContentVo> list = inspectContentMapper.getCmmsInspectContent(page, cmmsInspectContent);
+        for (int i = 0; i < list.size(); i++) {
+            List<CmmsInspectContentItemVo> itemList = iCmmsInspectContentItemService.getCmmsInspectContentItemListByCountId(list.get(i).getId());
+            list.get(i).setCmmsInspectContentItemList(itemList);
+        }
+        return list;
+    }
+
+
+
+
+
     private void insertCmmsInspectcheckContentItem(CmmsInspectContentVo cmmsInspectContent) {
         // 巡检内容巡检项
         List<CmmsInspectContentItemVo> contentList = cmmsInspectContent.getCmmsInspectContentItemList();

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectItem/mapper/xml/CmmsInspectItemMapper.xml

@@ -38,7 +38,7 @@
             <if test="cmmsInspectItem.equipdefid != null "> and c.equipdefid = #{cmmsInspectItem.equipdefid}</if>
             <if test="cmmsInspectItem.classification != null "> and c.classification = #{cmmsInspectItem.classification}</if>
         </where>
-        order by c.create_time
+        order by c.create_time desc
     </select>
 
 

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

@@ -35,4 +35,12 @@ public interface ICmmsInspectLineService extends IService<CmmsInspectLine> {
     *   date: 2024/1/24
     */
     CmmsInspectLineVo getCmmsInspectLineById(String id);
+
+    /**
+     *   author: dzc
+     *   version: 1.0
+     *   des: 通过id查询（将巡检项变成 巡检工单-巡检项的格式）
+     *   date: 2024/1/26
+     */
+    CmmsInspectLineVo getCmmsInspectLineByIdA(String id);
 }

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

@@ -16,6 +16,7 @@ import org.jeecg.modules.cmmsInspectSpot.entity.CmmsInspectSpotVo;
 import org.jeecg.modules.cmmsInspectSpot.service.ICmmsInspectSpotService;
 import org.jeecg.modules.cmmsInspectSpotEquip.entity.CmmsInspectSpotEquip;
 import org.jeecg.modules.cmmsInspectSpotEquip.service.ICmmsInspectSpotEquipService;
+import org.jeecg.modules.cmmsInspectTcontentItem.service.ICmmsInspectTcontentItemService;
 import org.jeecg.modules.util.AutoCodeUtil;
 import org.jeecg.modules.util.UserConstants;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,6 +54,9 @@ public class CmmsInspectLineServiceImpl extends ServiceImpl<CmmsInspectLineMappe
     @Autowired
     @SuppressWarnings("all")
     private ICmmsInspectSpotService inspectSpotService;
+    @Autowired
+    @SuppressWarnings("all")
+    private ICmmsInspectTcontentItemService inspectTcontentItemService;
 
     /**
     *   author: dzc
@@ -90,6 +94,12 @@ public class CmmsInspectLineServiceImpl extends ServiceImpl<CmmsInspectLineMappe
         return this.updateById(cmmsInspectLine);
     }
 
+    /**
+     *   author: dzc
+     *   version: 1.0
+     *   des: 根据id查询巡检路线详情
+     *   date: 2024/1/24
+     */
     @Override
     public CmmsInspectLineVo getCmmsInspectLineById(String id) {
         // 查询巡检路线
@@ -120,12 +130,39 @@ public class CmmsInspectLineServiceImpl extends ServiceImpl<CmmsInspectLineMappe
     }
 
     /**
-    *   author: dzc
-    *   version: 1.0
-    *   des: 根据id查询巡检路线详情
-    *   date: 2024/1/24
-    */
+     *   author: dzc
+     *   version: 1.0
+     *   des: 通过id查询（将巡检项变成 巡检工单-巡检项的格式）
+     *   date: 2024/1/26
+     */
+    @Override
+    public CmmsInspectLineVo getCmmsInspectLineByIdA(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.getCmmsInspectContentByIdA(spotcountList.get(j).getInspectcontid());
+                        contentList.add(cmmsInspectContent);
+                    }
+                }
+                list.get(i).setInspectContentList(contentList);
+            }
+        }
+
+        inspectLineVo.setDetailList(list);
+
+        return inspectLineVo;
+    }
 
     private void batchSaveSub(CmmsInspectLineVo cmmsInspectLine) {
         List<CmmsInspectLineDetailVo> detailList = cmmsInspectLine.getDetailList();

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

@@ -211,4 +211,21 @@ public class CmmsInspectPlanController extends JeecgController<CmmsInspectPlan,
 		return Result.error("修改失败!");
 	}
 
+	/**
+	*   author: dzc
+	*   version: 1.0
+	*   des: 生成巡检工单
+	*   date: 2024/1/25
+	*/
+	@AutoLog(value = "巡检计划-生成巡检工单")
+	@ApiOperation(value="巡检计划-生成巡检工单", notes="巡检计划-生成巡检工单")
+	@GetMapping(value = "/generateinspect")
+	public Result<String> generateInspect(@RequestParam(name="id",required=true) String id) {
+		boolean b = cmmsInspectPlanService.generateInspect(id);
+		if(b){
+			return Result.ok("生成工单成功！");
+		}
+		return Result.error("生成工单失败！");
+	}
+
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectPlan/mapper/CmmsInspectPlanMapper.java

@@ -15,4 +15,20 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface CmmsInspectPlanMapper extends BaseMapper<CmmsInspectPlan> {
 
     List<CmmsInspectPlan> selectCmmsInspectPlanList(CmmsInspectPlan cmmsInspectPlan);
+
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 更新下次执行时间
+    *   date: 2024/1/25
+    */
+    public int refreshNextTime(List<CmmsInspectPlan> subPlanList);
+
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 修改下次通知信息
+    *   date: 2024/1/25
+    */
+    public int updateNotice(List<CmmsInspectPlan> inspectPlanList);
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectPlan/mapper/xml/CmmsInspectPlanMapper.xml

@@ -40,4 +40,24 @@
             <if test="iftimeset != null and iftimeset != ''"> and iftimeset = #{iftimeset}</if>
         </where>
     </select>
+
+
+    <!--修改下次生成工单时间及通知信息-->
+    <update id="refreshNextTime">
+        <foreach item="item" collection="list">
+            update cmms_inspect_plan
+            set nexttime = #{item.nexttime}, ifnotice = #{item.ifnotice}, noticetime = #{item.noticetime}
+            where id=#{item.id};
+        </foreach>
+    </update>
+
+    <!--修改巡检计划的通知信息-->
+    <update id="updateNotice">
+        <foreach item="item" collection="list">
+            update cmms_inspect_plan
+            set ifnotice = #{item.ifnotice}
+            where inspectplanid=#{item.inspectplanid};
+        </foreach>
+    </update>
+
 </mapper>

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

@@ -59,4 +59,12 @@ public interface ICmmsInspectPlanService extends IService<CmmsInspectPlan> {
     *   date: 2024/1/24
     */
     CmmsInspectPlanVo getCmmsInspectPlanById(String id);
+
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 生成巡检工单
+    *   date: 2024/1/25
+    */
+    boolean generateInspect(String id);
 }

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

@@ -1,9 +1,21 @@
 package org.jeecg.modules.cmmsInspectPlan.service.impl;
 
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import org.jeecg.common.api.dto.message.MessageDTO;
+import org.jeecg.common.constant.enums.MessageTypeEnum;
+import org.jeecg.common.system.api.ISysBaseAPI;
+import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.RedisUtil;
+import org.jeecg.modules.cmmsInspect.entity.CmmsInspect;
+import org.jeecg.modules.cmmsInspect.service.ICmmsInspectService;
+import org.jeecg.modules.cmmsInspectContent.entity.CmmsInspectContentVo;
+import org.jeecg.modules.cmmsInspectContentItem.entity.CmmsInspectContentItemVo;
 import org.jeecg.modules.cmmsInspectLine.service.ICmmsInspectLineService;
+import org.jeecg.modules.cmmsInspectLineDetail.entity.CmmsInspectLineDetail;
+import org.jeecg.modules.cmmsInspectLineDetail.entity.CmmsInspectLineDetailVo;
 import org.jeecg.modules.cmmsInspectPlan.convert.CmmsInspectPlanConvert;
 import org.jeecg.modules.cmmsInspectPlan.entity.CmmsInspectPlan;
 import org.jeecg.modules.cmmsInspectPlan.entity.CmmsInspectPlanVo;
@@ -13,6 +25,13 @@ import org.jeecg.modules.cmmsInspectPlanTask.entity.CmmsInspectPlanTask;
 import org.jeecg.modules.cmmsInspectPlanTask.entity.CmmsInspectPlanTaskVo;
 import org.jeecg.modules.cmmsInspectPlanTask.service.ICmmsInspectPlanTaskService;
 import org.jeecg.modules.cmmsInspectSpot.service.ICmmsInspectSpotService;
+import org.jeecg.modules.cmmsInspectTcontent.entity.CmmsInspectTcontent;
+import org.jeecg.modules.cmmsInspectTcontentEquip.entity.CmmsInspectTcontentEquip;
+import org.jeecg.modules.cmmsInspectTcontentItem.entity.CmmsInspectTcontentItem;
+import org.jeecg.modules.cmmsInspectTcontentItem.service.ICmmsInspectTcontentItemService;
+import org.jeecg.modules.cmmsInspectTline.entity.CmmsInspectTline;
+import org.jeecg.modules.cmmsOrderNode.entity.CmmsOrderNode;
+import org.jeecg.modules.cmmsOrderNode.service.ICmmsOrderNodeService;
 import org.jeecg.modules.util.AutoCodeUtil;
 import org.jeecg.modules.util.CacheKey;
 import org.jeecg.modules.util.PlanToOrderUtils;
@@ -52,6 +71,18 @@ public class CmmsInspectPlanServiceImpl extends ServiceImpl<CmmsInspectPlanMappe
     @Autowired
     @SuppressWarnings("all")
     private ICmmsInspectLineService inspectLineService;
+    @Autowired
+    @SuppressWarnings("all")
+    private ICmmsInspectService inspectService;
+    @Autowired
+    @SuppressWarnings("all")
+    private ICmmsInspectTcontentItemService inspectTcontentItemService;
+    @Autowired
+    @SuppressWarnings("all")
+    private ICmmsOrderNodeService orderNodeService;
+    @Autowired
+    @SuppressWarnings("all")
+    private ISysBaseAPI sysBaseApi;
 
 
     /**
@@ -194,6 +225,158 @@ public class CmmsInspectPlanServiceImpl extends ServiceImpl<CmmsInspectPlanMappe
     /**
     *   author: dzc
     *   version: 1.0
+    *   des: 生成巡检工单
+    *   date: 2024/1/25
+    */
+    @Override
+    public boolean generateInspect(String id) {
+        PlanToOrderUtils planToOrderUtils = new PlanToOrderUtils();
+        CmmsInspectPlan plan = this.getById(id);
+        if (plan == null) {
+            return false;
+        }
+        String nowTime = DateUtils.getDate("yyyy-MM-dd HH:mm:ss");
+
+        // 需要刷新下次执行时间的巡检计划
+        List<CmmsInspectPlan> resreshPlanList = new ArrayList<>();
+        // 循环遍历巡检计划，对于符合条件的，生成巡检工单
+        List<CmmsInspect> inspectList = new ArrayList<>();
+        // 巡检工单-路线-内容-设备-巡检项
+        List<CmmsInspectTcontentItem> tcontentItemList = new ArrayList<>();
+        // 巡检内容集合
+        ArrayList<CmmsInspectContentVo> contentList = new ArrayList<>();
+        // 巡检内容 巡检项 集合
+        ArrayList<CmmsInspectContentItemVo> itemList = new ArrayList<>();
+        // 操作节点
+        List<CmmsOrderNode> nodeList = new ArrayList<>();
+
+        // 更新下次执行时间的巡检计划
+        Date nextTime = planToOrderUtils.generateNextTime(plan.getRepeatnum(), plan.getRepeattype());
+        plan.setNexttime(nextTime);
+        Date noticeTime = planToOrderUtils.generateNoticeTime(nextTime, plan.getNoticenum(), plan.getNoticetype());
+        plan.setNoticetime(noticeTime);
+        plan.setIfnotice("否");
+        resreshPlanList.add(plan);
+        inspectPlanMapper.refreshNextTime(resreshPlanList);
+
+
+        // 巡检工单生成
+        CmmsInspect inspect = new CmmsInspect();
+        // 生成巡检工单编号
+        inspect.setInspectcode(autoCodeUtil.genSerialCode(UserConstants.CMMSINSPECT_CODE, null));
+        inspect.setInspectname(plan.getPlanname() + "-" + nowTime);
+        inspect.setInspectplanid(plan.getId());
+        if ("Y".equals(plan.getIftimeset())) {
+            inspect.setTasktype("周期任务");
+        }
+        else {
+            inspect.setTasktype("周期任务");
+        }
+        inspect.setChargeruser(plan.getChargeruser());
+        inspect.setStatus("0");
+
+        boolean b1 = inspectService.save(inspect);
+
+        CmmsInspectPlanVo cmmsInspectPlan = this.getCmmsInspectPlanById(id);
+
+        List<CmmsInspectPlanTaskVo> taskList = cmmsInspectPlan.getTaskList();
+
+        //List<CmmsInspectPlanTaskVo> taskList = inspectPlanTaskService.getTaskByPlanId(id);
+        if (taskList != null && taskList.size() > 0) {
+            for (CmmsInspectPlanTaskVo task : taskList) {
+                if ("巡检路线".equals(task.getTasktype()) && ObjectUtil.isNotNull(task.getInspectLineVo()) && ObjectUtil.isNotNull(task.getInspectLineVo().getDetailList()) && task.getInspectLineVo().getDetailList().size() > 0) {
+                    // 巡检路线下的巡检点的集合
+                    List<CmmsInspectLineDetailVo> detailList = task.getInspectLineVo().getDetailList();
+                    for (CmmsInspectLineDetailVo detail : detailList){
+                        // 每个巡检点下的巡检内容的集合
+                        List<CmmsInspectContentVo> inspectContentList = detail.getInspectContentList();
+                        for (CmmsInspectContentVo content : inspectContentList) {
+                            // 巡检内容 - 巡检项集合
+                            if (ObjectUtil.isNotNull(content)){
+                                List<CmmsInspectContentItemVo> cmmsInspectContentItemList = content.getCmmsInspectContentItemList();
+                                itemList.addAll(cmmsInspectContentItemList);
+                            }
+                        }
+                        contentList.addAll(inspectContentList);
+                    }
+                }else if ("巡检点".equals(task.getTasktype()) && ObjectUtil.isNotNull(task.getInspectSpotVo()) && ObjectUtil.isNotNull(task.getInspectSpotVo().getInspectContentList()) && task.getInspectSpotVo().getInspectContentList().size() > 0){
+                    // 巡检点下的巡检内容集合
+                    List<CmmsInspectContentVo> inspectContentList = task.getInspectSpotVo().getInspectContentList();
+                    for (CmmsInspectContentVo content:inspectContentList) {
+                        // 巡检内容 - 巡检项集合
+                        if (ObjectUtil.isNotNull(content)){
+                            List<CmmsInspectContentItemVo> cmmsInspectContentItemList = content.getCmmsInspectContentItemList();
+                            itemList.addAll(cmmsInspectContentItemList);
+                        }
+                    }
+                    contentList.addAll(inspectContentList);
+                }else {
+                    continue;
+                }
+            }
+        }
+
+        for (CmmsInspectContentItemVo item : itemList) {
+            CmmsInspectTcontentItem cmmsInspectTcontentItem = new CmmsInspectTcontentItem();
+            cmmsInspectTcontentItem.setInspectid(inspect.getId());
+            if (ObjectUtil.isNotNull(item.getInspectcheckcontid())) cmmsInspectTcontentItem.setContitemtid(item.getInspectcheckcontid());
+            if (item.getInspectcheckitemid() != null) cmmsInspectTcontentItem.setInspectitemid(item.getInspectcheckitemid());
+            if (ObjectUtil.isNotNull(item.getRemark())) cmmsInspectTcontentItem.setRemark(item.getRemark());
+            if (ObjectUtil.isNotNull(item.getItemcode())) cmmsInspectTcontentItem.setItemcode(item.getItemcode());
+            if (ObjectUtil.isNotNull(item.getItemname())) cmmsInspectTcontentItem.setItemname(item.getItemname());
+            if (ObjectUtil.isNotNull(item.getEquipdefid())) cmmsInspectTcontentItem.setEquipdefid(item.getEquipdefid());
+            if (ObjectUtil.isNotNull(item.getEquipdefname())) cmmsInspectTcontentItem.setEquipdefname(item.getEquipdefname());
+            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());
+            cmmsInspectTcontentItem.setIstatus("0");
+            tcontentItemList.add(cmmsInspectTcontentItem);
+        }
+
+        boolean b2 = inspectTcontentItemService.saveBatch(tcontentItemList);
+
+        int eqNum = contentList.size();// 一共有多少设备/资产
+        int itemNum = itemList.size();// 一共有多少个巡检项
+
+        UpdateWrapper<CmmsInspect> updateWapper = new UpdateWrapper<>();
+        updateWapper.set("inspectdetail","包含 "+eqNum+" 个设备/资产，共 "+itemNum+" 个巡检项")
+                    .eq("id",inspect.getId());
+        boolean b3 = inspectService.update(updateWapper);
+
+
+        // 巡检操作记录生成
+        CmmsOrderNode node = new CmmsOrderNode();
+        node.setNodename("0");
+        node.setRelid(inspect.getId());
+        node.setCreateBy("admin");
+        node.setHandledate(DateUtils.getDate());
+        node.setOpinion("——");
+        boolean b4 = orderNodeService.save(node);
+        inspectList.add(inspect);
+        if (b1 && b2 && b3){
+            // 更新巡检计划缓存信息
+            setRedisCache();
+            // 生成消息通知
+            List<MessageDTO> noticeList = new ArrayList<>();
+            for (CmmsInspect cmmsInspect:inspectList) {
+                MessageDTO message = new MessageDTO();
+                message.setTitle("巡检工单");
+                message.setToUser(cmmsInspect.getChargeruser());
+                message.setToAll(false);
+                message.setFromUser(cmmsInspect.getCreateBy());
+                message.setType(MessageTypeEnum.XT.getType());
+                message.setContent("巡检工单[" + cmmsInspect.getInspectcode() + " " + cmmsInspect.getInspectname() + "]已生成，请及时处理！");
+                noticeList.add(message);
+                sysBaseApi.sendTemplateMessage(message);//发送系统消息
+            }
+            return true;
+        }
+        return false;
+    }
+
+    /**
+    *   author: dzc
+    *   version: 1.0
     *   des: 批量添加 巡检计划 - 任务
     *   date: 2024/1/23
     */

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectSpot/convert/CmmsInspectSpotConvert.java

@@ -0,0 +1,27 @@
+package org.jeecg.modules.cmmsInspectSpot.convert;
+
+import org.jeecg.modules.cmmsInspectPlan.entity.CmmsInspectPlan;
+import org.jeecg.modules.cmmsInspectPlan.entity.CmmsInspectPlanVo;
+import org.jeecg.modules.cmmsInspectSpot.entity.CmmsInspectSpot;
+import org.jeecg.modules.cmmsInspectSpot.entity.CmmsInspectSpotVo;
+import org.mapstruct.Mapper;
+import org.mapstruct.ReportingPolicy;
+import org.mapstruct.factory.Mappers;
+import org.springframework.util.CollectionUtils;
+
+import java.util.stream.Collectors;
+
+/**
+ * @author dzc
+ * @date 2024/1/24 14:49
+ * @package org.jeecg.modules.cmmsInspectPlan.convert
+ * @project EMS_server
+ * @des
+ */
+@Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE,imports ={ CollectionUtils.class, Collectors.class})
+public interface CmmsInspectSpotConvert {
+
+    CmmsInspectSpotConvert INSTANCE = Mappers.getMapper(CmmsInspectSpotConvert.class);
+
+    CmmsInspectSpotVo convert(CmmsInspectSpot inspectSpot);
+}

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

@@ -26,5 +26,6 @@
             <if test="cmmsInspectSpot.contentcode != null  and cmmsInspectSpot.contentcode != ''"> and (c.contentcode like concat('%', #{cmmsInspectSpot.contentcode}, '%') or c.contentname like concat('%', #{cmmsInspectSpot.contentcode}, '%'))</if>
             <if test="cmmsInspectSpot.equipdefid != null "> and c.equipdefid = #{cmmsInspectSpot.equipdefid}</if>
         </where>
+        order by c.create_time desc
     </select>
 </mapper>

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

@@ -22,4 +22,12 @@ public interface ICmmsInspectSpotService extends IService<CmmsInspectSpot> {
     boolean updateCmmsInspectSpot(CmmsInspectSpotVo cmmsInspectSpot);
 
     CmmsInspectSpotVo getCmmsInspectSpotListById(String id);
+
+    /**
+     *   author: dzc
+     *   version: 1.0
+     *   des: 通过id查询（将巡检项变成 巡检工单-巡检项的格式）
+     *   date: 2024/1/26
+     */
+    CmmsInspectSpotVo getCmmsInspectSpotListByIdA(String id);
 }

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

@@ -7,6 +7,7 @@ import org.jeecg.modules.cmmsInspectContent.entity.CmmsInspectContent;
 import org.jeecg.modules.cmmsInspectContent.entity.CmmsInspectContentVo;
 import org.jeecg.modules.cmmsInspectContent.service.ICmmsInspectContentService;
 import org.jeecg.modules.cmmsInspectContentItem.entity.CmmsInspectContentItem;
+import org.jeecg.modules.cmmsInspectSpot.convert.CmmsInspectSpotConvert;
 import org.jeecg.modules.cmmsInspectSpot.entity.CmmsInspectSpot;
 import org.jeecg.modules.cmmsInspectSpot.entity.CmmsInspectSpotVo;
 import org.jeecg.modules.cmmsInspectSpot.mapper.CmmsInspectSpotMapper;
@@ -92,6 +93,7 @@ public class CmmsInspectSpotServiceImpl extends ServiceImpl<CmmsInspectSpotMappe
         // 根据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<>();
@@ -100,17 +102,30 @@ public class CmmsInspectSpotServiceImpl extends ServiceImpl<CmmsInspectSpotMappe
             CmmsInspectContentVo cmmsInspectContent = iCmmsInspectContentService.getCmmsInspectContentById(equipmentid);
             contList.add(cmmsInspectContent);
         }
-        CmmsInspectSpotVo cmmsInspectSpotVo = new CmmsInspectSpotVo();
-        if (ObjectUtil.isNotNull(cmmsInspectSport.getContentcode())) cmmsInspectSpotVo.setContentcode(cmmsInspectSport.getContentcode());
-        if (ObjectUtil.isNotNull(cmmsInspectSport.getContentname())) cmmsInspectSpotVo.setContentname(cmmsInspectSport.getContentname());
-        if (ObjectUtil.isNotNull(cmmsInspectSport.getEquipdefid())) cmmsInspectSpotVo.setEquipdefid(cmmsInspectSport.getEquipdefid());
-        if (ObjectUtil.isNotNull(cmmsInspectSport.getRemark())) cmmsInspectSpotVo.setRemark(cmmsInspectSport.getRemark());
-        if (ObjectUtil.isNotNull(cmmsInspectSport.getId())) cmmsInspectSpotVo.setId(cmmsInspectSport.getId());
-        if (ObjectUtil.isNotNull(cmmsInspectSport.getSysOrgCode())) cmmsInspectSpotVo.setSysOrgCode(cmmsInspectSport.getSysOrgCode());
-        if (ObjectUtil.isNotNull(cmmsInspectSport.getCreateBy())) cmmsInspectSpotVo.setCreateBy(cmmsInspectSport.getCreateBy());
-        if (ObjectUtil.isNotNull(cmmsInspectSport.getCreateTime())) cmmsInspectSpotVo.setCreateTime(cmmsInspectSport.getCreateTime());
-        if (ObjectUtil.isNotNull(cmmsInspectSport.getUpdateBy())) cmmsInspectSpotVo.setUpdateBy(cmmsInspectSport.getUpdateBy());
-        if (ObjectUtil.isNotNull(cmmsInspectSport.getUpdateTime())) cmmsInspectSpotVo.setUpdateTime(cmmsInspectSport.getUpdateTime());
+        cmmsInspectSpotVo.setInspectContentList(contList);
+        return cmmsInspectSpotVo;
+    }
+
+    /**
+     *   author: dzc
+     *   version: 1.0
+     *   des: 通过id查询（将巡检项变成 巡检工单-巡检项的格式）
+     *   date: 2024/1/26
+     */
+    @Override
+    public CmmsInspectSpotVo getCmmsInspectSpotListByIdA(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 cmmsInspectContentByIdA = iCmmsInspectContentService.getCmmsInspectContentByIdA(equipmentid);
+            contList.add(cmmsInspectContentByIdA);
+        }
         cmmsInspectSpotVo.setInspectContentList(contList);
         return cmmsInspectSpotVo;
     }

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

@@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface CmmsInspectTcontentItemMapper extends BaseMapper<CmmsInspectTcontentItem> {
 
+    List<CmmsInspectTcontentItem> getInspectTcontentItems(String countid);
 }

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

@@ -2,4 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.cmmsInspectTcontentItem.mapper.CmmsInspectTcontentItemMapper">
 
+
+    <select id="getInspectTcontentItems" resultType="org.jeecg.modules.cmmsInspectTcontentItem.entity.CmmsInspectTcontentItem">
+        select * from cmms_inspect_tcontent_item where contitemtid = #{countid}
+    </select>
+
 </mapper>

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

@@ -3,6 +3,8 @@ package org.jeecg.modules.cmmsInspectTcontentItem.service;
 import org.jeecg.modules.cmmsInspectTcontentItem.entity.CmmsInspectTcontentItem;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * @Description: 巡检工单-路线-内容-设备-巡检项
  * @Author: jeecg-boot
@@ -11,4 +13,20 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ICmmsInspectTcontentItemService extends IService<CmmsInspectTcontentItem> {
 
+
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 根据巡检内容id查询 巡检工单设备巡检项 的详情
+    *   date: 2024/1/25
+    */
+    public List<CmmsInspectTcontentItem> getInspectTcontentItems(String countid);
+
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 巡检工单反馈
+    *   date: 2024/1/26
+    */
+    boolean feedBack(CmmsInspectTcontentItem inspectTcontentItem);
 }

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

@@ -1,12 +1,16 @@
 package org.jeecg.modules.cmmsInspectTcontentItem.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import org.jeecg.modules.cmmsInspectTcontentItem.entity.CmmsInspectTcontentItem;
 import org.jeecg.modules.cmmsInspectTcontentItem.mapper.CmmsInspectTcontentItemMapper;
 import org.jeecg.modules.cmmsInspectTcontentItem.service.ICmmsInspectTcontentItemService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.List;
+
 /**
  * @Description: 巡检工单-路线-内容-设备-巡检项
  * @Author: jeecg-boot
@@ -16,4 +20,24 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class CmmsInspectTcontentItemServiceImpl extends ServiceImpl<CmmsInspectTcontentItemMapper, CmmsInspectTcontentItem> implements ICmmsInspectTcontentItemService {
 
+    @Autowired
+    @SuppressWarnings("all")
+    private CmmsInspectTcontentItemMapper mapper;
+
+    @Override
+    public List<CmmsInspectTcontentItem> getInspectTcontentItems(String countid) {
+        return mapper.getInspectTcontentItems(countid);
+    }
+
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 巡检工单反馈
+    *   date: 2024/1/26
+    */
+    @Override
+    public boolean feedBack(CmmsInspectTcontentItem inspectTcontentItem) {
+        inspectTcontentItem.setIstatus("1");
+        return this.updateById(inspectTcontentItem);
+    }
 }