巡检相关查询修改

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

@@ -29,6 +29,7 @@
             <if test="cmmsInspectContent.contentcode != null  and cmmsInspectContent.contentcode != ''"> and c.contentcode like concat('%', #{cmmsInspectContent.contentcode}, '%')</if>
             <if test="cmmsInspectContent.equipmentid != null "> and c.equipmentid = #{cmmsInspectContent.equipmentid}</if>
             <if test="cmmsInspectContent.status != null "> and c.status = #{cmmsInspectContent.status}</if>
+            <if test="cmmsInspectContent.classification != null and cmmsInspectContent.classification != ''"> and c.classification = #{cmmsInspectContent.classification}</if>
         </where>
         order by c.create_time desc
     </select>

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

@@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.util.ObjectUtil;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
@@ -75,6 +77,12 @@ public class CmmsInspectLineController extends JeecgController<CmmsInspectLine,
 								   HttpServletRequest req) {
 		QueryWrapper<CmmsInspectLine> queryWrapper = QueryGenerator.initQueryWrapper(cmmsInspectLine, req.getParameterMap());
 		Page<CmmsInspectLine> page = new Page<CmmsInspectLine>(pageNo, pageSize);
+		if (ObjectUtil.isNotNull(cmmsInspectLine.getLinename())){
+			QueryWrapper<CmmsInspectLine> query = new QueryWrapper<>();
+			query.like("linename",cmmsInspectLine.getLinename()).orderByDesc("create_time");
+			IPage<CmmsInspectLine> page1 = cmmsInspectLineService.page(page, query);
+			return Result.OK(page1);
+		}
 		IPage<CmmsInspectLine> pageList = cmmsInspectLineService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}