新增根据设备id查询保养工单接口

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeep/controller/CmmsUpkeepController.java

@@ -282,4 +282,29 @@ public class CmmsUpkeepController extends JeecgController<CmmsUpkeep, ICmmsUpkee
         return super.importExcel(request, response, CmmsUpkeep.class);
     }
 
+
+	 /**
+	  * 分页列表查询---  查询保养工单情况----根据设备id查询该设备的所有保养情况
+	  *
+	  * @param equipmentid
+	  * @param pageNo
+	  * @param pageSize
+	  * @param req
+	  * @return
+	  */
+	 //@AutoLog(value = "保养工单-通过设备id分页列表查询")
+	 @ApiOperation(value="保养工单-通过设备id分页列表查询", notes="保养工单-通过设备id分页列表查询")
+	 @GetMapping(value = "/selectEquipUpkeepDetailByEqid")
+	 public Result<IPage<CmmsUpkeepDto>> selectEquipUpkeepDetailByEqid(String equipmentid,
+													@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+													@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+													HttpServletRequest req) {
+//		QueryWrapper<CmmsUpkeep> queryWrapper = QueryGenerator.initQueryWrapper(cmmsUpkeep, req.getParameterMap());
+		 Page<CmmsUpkeepDto> page = new Page<CmmsUpkeepDto>(pageNo, pageSize);
+//		IPage<CmmsUpkeep> pageList = cmmsUpkeepService.page(page, queryWrapper);
+		 List<CmmsUpkeepDto> cmmsUpkeepDtoList = cmmsUpkeepService.selectEquipUpkeepDetailByEqid(page, equipmentid);
+		 page.setRecords(cmmsUpkeepDtoList);
+		 return Result.OK(page);
+	 }
+
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeep/mapper/CmmsUpkeepMapper.java

@@ -49,6 +49,13 @@ public interface CmmsUpkeepMapper extends BaseMapper<CmmsUpkeep> {
      */
     public List<CmmsUpkeepDto> selectMyOperateList(Page<CmmsUpkeepDto> page, CmmsUpkeepDto cmmsUpkeepDto);
 
+    /**
+     * 查询保养工单情况----根据设备id查询该设备的所有保养情况
+     *
+     * @param equipmentid 保养工单
+     * @return 保养工单集合
+     */
+    public List<CmmsUpkeepDto> selectEquipUpkeepDetailByEqid(Page<CmmsUpkeepDto> page, String equipmentid);
 
 
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeep/mapper/xml/CmmsUpkeepMapper.xml

@@ -97,6 +97,14 @@
         order by c.create_time desc
     </select>
 
+    <!-- 查询保养工单情况  根据设备id查询该设备的所有保养情况 -->
+    <select id="selectEquipUpkeepDetailByEqid" parameterType="String" resultMap="CmmsUpkeepResult">
+        select u.*, p.equipmentid
+        from `cmms_upkeep` as u
+        left join cmms_upkeep_plan as p on u.upkeepplanid=p.id
+        where p.equipmentid=#{equipmentid}
+    </select>
+
 
 
 </mapper>

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeep/service/ICmmsUpkeepService.java

@@ -1,10 +1,13 @@
 package org.jeecg.modules.cmmsUpkeep.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.cmmsUpkeep.entity.CmmsUpkeep;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.cmmsUpkeep.entity.CmmsUpkeepDto;
 import org.jeecg.modules.cmmsUpkeepPlan.entity.CmmsUpkeepPlanDto;
+import org.springframework.web.bind.annotation.GetMapping;
 
 import java.util.List;
 
@@ -88,4 +91,12 @@ public interface ICmmsUpkeepService extends IService<CmmsUpkeep> {
      */
     public boolean deleteCmmsUpkeepById(String id);
 
+    /**
+     * 分页列表查询---  查询保养工单情况----根据设备id查询该设备的所有保养情况
+     *
+     * @param equipmentid  设备id
+     * @return
+     */
+    public List<CmmsUpkeepDto> selectEquipUpkeepDetailByEqid(Page<CmmsUpkeepDto> page, String equipmentid);
+
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeep/service/impl/CmmsUpkeepServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeecg.dingtalk.api.user.vo.User;
 import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.cmmsOrderNode.entity.CmmsOrderNode;
 import org.jeecg.modules.cmmsOrderNode.service.ICmmsOrderNodeService;
@@ -285,4 +286,14 @@ public class CmmsUpkeepServiceImpl extends ServiceImpl<CmmsUpkeepMapper, CmmsUpk
         return this.removeById(id);
     }
 
+    /**
+     * 分页列表查询---  查询保养工单情况----根据设备id查询该设备的所有保养情况
+     *
+     * @param equipmentid  设备id
+     * @return
+     */
+    public List<CmmsUpkeepDto> selectEquipUpkeepDetailByEqid(Page<CmmsUpkeepDto> page, String equipmentid){
+        return cmmsUpkeepMapper.selectEquipUpkeepDetailByEqid(page, equipmentid);
+    }
+
 }