查询所有巡检路线的详情

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectLine/controller/CmmsInspectLineController.java

@@ -202,4 +202,23 @@ public class CmmsInspectLineController extends JeecgController<CmmsInspectLine,
         return super.importExcel(request, response, CmmsInspectLine.class);
     }
 
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 查询出所有巡检路线下的详情
+    *   date: 2024/1/30
+    */
+	@ApiOperation(value="巡检路线-分页列表查询详情", notes="巡检路线-分页列表查询详情")
+	@GetMapping(value = "/listDetails")
+	public Result<IPage<CmmsInspectLineVo>> queryPageDetailsList(CmmsInspectLine cmmsInspectLine,
+														@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+														@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+														HttpServletRequest req) {
+		//QueryWrapper<CmmsInspectLine> queryWrapper = QueryGenerator.initQueryWrapper(cmmsInspectLine, req.getParameterMap());
+		Page<CmmsInspectLineVo> page = new Page<CmmsInspectLineVo>(pageNo, pageSize);
+		List<CmmsInspectLineVo> pageList = cmmsInspectLineService.getCmmsInspectLineListDetails(page, cmmsInspectLine);
+		page.setRecords(pageList);
+		return Result.OK(page);
+	}
+
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectLine/mapper/CmmsInspectLineMapper.java

@@ -2,9 +2,11 @@ package org.jeecg.modules.cmmsInspectLine.mapper;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.cmmsInspectLine.entity.CmmsInspectLine;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.cmmsInspectLine.entity.CmmsInspectLineVo;
 
 /**
  * @Description: 巡检路线
@@ -15,4 +17,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface CmmsInspectLineMapper extends BaseMapper<CmmsInspectLine> {
 
     String getNameById(@Param("id") String id);
+
+    List<CmmsInspectLineVo> getCmmsInspectLineListDetails(@Param("page") Page<CmmsInspectLineVo> page,@Param("cmmsInspectLine") CmmsInspectLine cmmsInspectLine);
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectLine/mapper/xml/CmmsInspectLineMapper.xml

@@ -5,4 +5,12 @@
     <select id="getNameById" resultType="string">
         select linename from cmms_inspect_line where id = #{id}
     </select>
+
+
+    <select id="getCmmsInspectLineListDetails" parameterType="org.jeecg.modules.cmmsInspectLine.entity.CmmsInspectLine" resultType="org.jeecg.modules.cmmsInspectLine.entity.CmmsInspectLineVo">
+        select * from cmms_inspect_line
+        <where>
+            <if test="cmmsInspectLine.linecode != null and cmmsInspectLine.linecode != ''">and (linecode like CONCAT('%',#{cmmsInspectLine.linecode},'%') or linename like CONCAT('%',#{cmmsInspectLine.linecode},'%')) </if>
+        </where>
+    </select>
 </mapper>

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

@@ -1,9 +1,13 @@
 package org.jeecg.modules.cmmsInspectLine.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.cmmsInspectLine.entity.CmmsInspectLine;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.cmmsInspectLine.entity.CmmsInspectLineVo;
 
+import java.util.List;
+
 /**
  * @Description: 巡检路线
  * @Author: jeecg-boot
@@ -54,4 +58,6 @@ public interface ICmmsInspectLineService extends IService<CmmsInspectLine> {
     *   date: 2024/1/29
     */
     public String getNameById(String id);
+
+    List<CmmsInspectLineVo> getCmmsInspectLineListDetails(Page<CmmsInspectLineVo> page, CmmsInspectLine cmmsInspectLine);
 }

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

@@ -2,6 +2,8 @@ package org.jeecg.modules.cmmsInspectLine.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.cmmsInspectContent.entity.CmmsInspectContentVo;
 import org.jeecg.modules.cmmsInspectContent.service.ICmmsInspectContentService;
 import org.jeecg.modules.cmmsInspectLine.convert.CmmsInspectLineConvert;
@@ -266,6 +268,20 @@ public class CmmsInspectLineServiceImpl extends ServiceImpl<CmmsInspectLineMappe
         return inspectLineMapper.getNameById(id);
     }
 
+
+    @Override
+    public List<CmmsInspectLineVo> getCmmsInspectLineListDetails(Page<CmmsInspectLineVo> page, CmmsInspectLine cmmsInspectLine) {
+        List<CmmsInspectLineVo> lineList = inspectLineMapper.getCmmsInspectLineListDetails(page, cmmsInspectLine);
+        ArrayList<CmmsInspectLineVo> list = new ArrayList<>();
+
+        for (CmmsInspectLineVo vo : lineList) {
+            CmmsInspectLineVo inspectLine = this.getCmmsInspectLineById(vo.getId());
+            list.add(inspectLine);
+        }
+
+        return list;
+    }
+
     private void batchSaveSub(CmmsInspectLineVo cmmsInspectLine) {
         List<CmmsInspectLineDetailVo> detailList = cmmsInspectLine.getDetailList();
         ArrayList<CmmsInspectLineDetail> list = new ArrayList<>();