Merge remote-tracking branch 'origin/master'

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectTcontentItem/controller/CmmsInspectTcontentItemController.java

@@ -65,7 +65,7 @@ public class CmmsInspectTcontentItemController extends JeecgController<CmmsInspe
 	//@AutoLog(value = "巡检工单-路线-内容-设备-巡检项-分页列表查询")
 	@ApiOperation(value="巡检工单-异常项目查询", notes="巡检工单-异常项目查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<CmmsInspectTcontentItemVo>> queryPageList(CmmsInspectTcontentItem cmmsInspectTcontentItem,
+	public Result<IPage<CmmsInspectTcontentItemVo>> queryPageList(CmmsInspectTcontentItemVo cmmsInspectTcontentItem,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {

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

@@ -28,7 +28,7 @@ public interface CmmsInspectTcontentItemMapper extends BaseMapper<CmmsInspectTco
 
     int getCountIstatus(@Param("id") String id,@Param("inspectid") String inspectid);
 
-    List<CmmsInspectTcontentItemVo> getItemList(Page<CmmsInspectTcontentItemVo> page, CmmsInspectTcontentItem cmmsInspectTcontentItem);
+    List<CmmsInspectTcontentItemVo> getItemList(@Param("page") Page<CmmsInspectTcontentItemVo> page,@Param("cmmsInspectTcontentItem") CmmsInspectTcontentItemVo cmmsInspectTcontentItem);
 
     boolean updateStatusByInspectId(@Param("status") String status,@Param("inspectid") String inspectid);
 

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

@@ -64,6 +64,12 @@
         left join cmms_inspect t on t.id = i.inspectid
         left join tpm_equipment e on i.tcontequiptid = e.id
         where i.iresult = '1'
+        <if test="cmmsInspectTcontentItem.tcontequiptid != null and cmmsInspectTcontentItem.tcontequiptid != ''">
+            and i.tcontequiptid like concat('%',#{cmmsInspectTcontentItem.tcontequiptid},'%')
+        </if>
+        <if test="cmmsInspectTcontentItem.inspectname != null and cmmsInspectTcontentItem.inspectname != ''">
+            and t.inspectname like concat('%',#{cmmsInspectTcontentItem.inspectname},'%')
+        </if>
         order by i.itime desc
     </select>
 

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

@@ -69,5 +69,5 @@ public interface ICmmsInspectTcontentItemService extends IService<CmmsInspectTco
      */
     int getCountIstatus(String id, String inspectid);
 
-    List<CmmsInspectTcontentItemVo> getItemList(Page<CmmsInspectTcontentItemVo> page, CmmsInspectTcontentItem cmmsInspectTcontentItem);
+    List<CmmsInspectTcontentItemVo> getItemList(Page<CmmsInspectTcontentItemVo> page, CmmsInspectTcontentItemVo cmmsInspectTcontentItem);
 }

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

@@ -168,7 +168,7 @@ public class CmmsInspectTcontentItemServiceImpl extends ServiceImpl<CmmsInspectT
     }
 
     @Override
-    public List<CmmsInspectTcontentItemVo> getItemList(Page<CmmsInspectTcontentItemVo> page, CmmsInspectTcontentItem cmmsInspectTcontentItem) {
+    public List<CmmsInspectTcontentItemVo> getItemList(Page<CmmsInspectTcontentItemVo> page, CmmsInspectTcontentItemVo cmmsInspectTcontentItem) {
         return mapper.getItemList(page, cmmsInspectTcontentItem);
     }
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsRepair/mapper/xml/CmmsRepairMapper.xml

@@ -33,8 +33,14 @@
         equipmentcode,equipmentname,priority,faultdate,faultdesc,repairuser,repairdate,feedback,result,status,relid,repairstatus
         from cmms_repair
         <where>
-            <if test="cmmsRepair.equipmentname !=null and cmmsRepair.equipmentname !=''">
-                AND equipmentname like CONCAT('%', #{cmmsRepair.equipmentname}, '%')
+            <if test="cmmsRepair.repaircode !=null and cmmsRepair.repaircode !=''">
+                AND repaircode like CONCAT('%', #{cmmsRepair.repaircode}, '%')
+            </if>
+            <if test="cmmsRepair.repairname !=null and cmmsRepair.repairname !=''">
+                AND repairname like CONCAT('%', #{cmmsRepair.repairname}, '%')
+            </if>
+            <if test="cmmsRepair.equipmentid !=null and cmmsRepair.equipmentid !=''">
+                AND equipmentid like CONCAT('%', #{cmmsRepair.equipmentid}, '%')
             </if>
             <if test="cmmsRepair.priority !=null and cmmsRepair.priority !=''">
                 AND priority = #{cmmsRepair.priority}
@@ -95,8 +101,14 @@
         equipmentcode,equipmentname,priority,faultdate,faultdesc,repairuser,repairdate,feedback,result,status,relid,repairstatus
         from cmms_repair
         <where>
-            <if test="cmmsRepair.equipmentname !=null and cmmsRepair.equipmentname !=''">
-                AND equipmentname like CONCAT('%', #{cmmsRepair.equipmentname}, '%')
+            <if test="cmmsRepair.repaircode !=null and cmmsRepair.repaircode !=''">
+                AND repaircode like CONCAT('%', #{cmmsRepair.repaircode}, '%')
+            </if>
+            <if test="cmmsRepair.repairname !=null and cmmsRepair.repairname !=''">
+                AND repairname like CONCAT('%', #{cmmsRepair.repairname}, '%')
+            </if>
+            <if test="cmmsRepair.equipmentid !=null and cmmsRepair.equipmentid !=''">
+                AND equipmentid like CONCAT('%', #{cmmsRepair.equipmentid}, '%')
             </if>
             <if test="cmmsRepair.priority !=null and cmmsRepair.priority !=''">
                 AND priority = #{cmmsRepair.priority}