Merge remote-tracking branch 'origin/master'

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

@@ -233,4 +233,22 @@ public class CmmsInspectController extends JeecgController<CmmsInspect, ICmmsIns
 		}
 		return Result.OK(list);
 	}
+
+	/**
+	*   author: dzc
+	*   version: 1.0
+	*   des: 根据设备id 查询单个设备的巡检记录
+	*   date: 2024/2/4
+	*/
+	@ApiOperation(value = "巡检工单-根据设备id查询该设备的巡检记录",notes = "巡检工单-根据设备id查询该设备的巡检记录")
+	@GetMapping(value = "/queryInspectByEqId")
+	public Result<Page<CmmsInspectVo>>  queryInspectByEqId(CmmsInspectVo cmmsInspect,
+														   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+														   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+														   HttpServletRequest req){
+		Page<CmmsInspectVo> page = new Page<CmmsInspectVo>(pageNo, pageSize);
+		List<CmmsInspectVo> list = cmmsInspectService.getInspectByEqId(page,cmmsInspect);
+		page.setRecords(list);
+		return Result.ok(page);
+	}
  }

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

@@ -40,4 +40,11 @@ public class CmmsInspectVo extends CmmsInspect {
 
     /** completionStatus  用于前端展示树形结构是否完成巡检 0未完成 1已完成 */
     private String completionStatus;
+
+    /** 设备id */
+    private String equipmentid;
+    /** 设备名称 */
+    private String equipmentname;
+    /** 设备编号 */
+    private String equipmentcode;
 }

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

@@ -43,4 +43,5 @@ public interface CmmsInspectMapper extends BaseMapper<CmmsInspect> {
     */
     List<CmmsInspectPlanTaskVo> getTaskByPlanId(@Param("id") String id);
 
+    List<CmmsInspectVo> getInspectByEqId(@Param("page") Page<CmmsInspectVo> page,@Param("cmmsInspect") CmmsInspectVo cmmsInspect);
 }

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

@@ -67,4 +67,39 @@
         where inspectplanid = #{id}
     </select>
 
+    <resultMap id="cmmInspectResultvo" type="org.jeecg.modules.cmmsInspect.entity.CmmsInspectVo">
+        <result property="id" column="id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+        <result property="inspectcode" column="inspectcode"/>
+        <result property="inspectname" column="inspectname"/>
+        <result property="tasktype" column="tasktype"/>
+        <result property="status" column="status"/>
+        <result property="inspectdetail" column="inspectdetail"/>
+        <result property="inspectplanid" column="inspectplanid"/>
+        <result property="chargeruser" column="chargeruser"/>
+        <result property="sysOrgCode" column="sys_org_code"/>
+        <result property="equipmentname" column="equipmentname"/>
+        <result property="equipmentid" column="equipmentid"/>
+        <result property="equipmentcode" column="equipmentcode"/>
+    </resultMap>
+    <select id="getInspectByEqId" parameterType="org.jeecg.modules.cmmsInspect.entity.CmmsInspectVo" resultMap="cmmInspectResultvo">
+        SELECT DISTINCT(e.equipmentname) as equipmentname,e.id as equipmentid,e.equipmentcode as equipmentcode,t.id,t.create_by,t.create_time,t.update_by,t.update_time,t.remark,t.inspectcode,t.inspectname,
+        t.tasktype,t.`status`,t.inspectdetail,t.inspectplanid,t.chargeruser,t.sys_org_code
+        from cmms_inspect t
+        LEFT JOIN cmms_inspect_tcontent_item i
+        on t.id = i.inspectid
+        LEFT JOIN cmms_inspect_content c
+        on i.contitemtid = c.id
+        LEFT JOIN tpm_equipment e
+        on c.equipmentid = e.id
+        <where>
+            <if test="cmmsInspect.equipmentid != null and cmmsInspect.equipmentid != ''">c.equipmentid = #{cmmsInspect.equipmentid}</if>
+        </where>
+        ORDER BY t.create_time desc
+    </select>
+
 </mapper>

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

@@ -51,4 +51,11 @@ public interface ICmmsInspectService extends IService<CmmsInspect> {
      */
     CmmsInspectPlanVo getCmmsInspectPlanTreeById(String inspectplanid,String inspectid);
 
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 根据设备id 查询单个设备的巡检记录
+    *   date: 2024/2/4
+    */
+    List<CmmsInspectVo> getInspectByEqId(Page<CmmsInspectVo> page,CmmsInspectVo cmmsInspect);
 }

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

@@ -182,4 +182,10 @@ public class CmmsInspectServiceImpl extends ServiceImpl<CmmsInspectMapper, CmmsI
 
         return cmmsInspectPlanVo;
     }
+
+
+    @Override
+    public List<CmmsInspectVo> getInspectByEqId(Page<CmmsInspectVo> page,CmmsInspectVo cmmsInspect) {
+        return cmmsInspectMapper.getInspectByEqId(page,cmmsInspect);
+    }
 }