维修管理相关问题修改

module_cmms/src/main/java/org/jeecg/modules/cmmsRepair/controller/CmmsRepairController.java

@@ -77,10 +77,12 @@ public class CmmsRepairController extends JeecgController<CmmsRepair, ICmmsRepai
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<CmmsRepair> queryWrapper = QueryGenerator.initQueryWrapper(cmmsRepair, req.getParameterMap());
+		//QueryWrapper<CmmsRepair> queryWrapper = QueryGenerator.initQueryWrapper(cmmsRepair, req.getParameterMap());
 		Page<CmmsRepair> page = new Page<CmmsRepair>(pageNo, pageSize);
-		IPage<CmmsRepair> pageList = cmmsRepairService.page(page, queryWrapper);
-		return Result.OK(pageList);
+		//IPage<CmmsRepair> pageList = cmmsRepairService.page(page, queryWrapper);
+		List<CmmsRepair> list = cmmsRepairService.getPageList(page,cmmsRepair);
+		page.setRecords(list);
+		return Result.OK(page);
 	}
 	
 	/**
@@ -200,7 +202,9 @@ public class CmmsRepairController extends JeecgController<CmmsRepair, ICmmsRepai
 		 Subject subject = SecurityUtils.getSubject();
 		 LoginUser loginUser = (LoginUser)subject.getPrincipal();
 		 String username = loginUser.getUsername();
-		 cmmsRepair.setRepairuser(username);
+		 String userId = loginUser.getId();
+		 //cmmsRepair.setRepairuser(username);
+		 cmmsRepair.setRepairuser(userId);
 		 Page<CmmsRepair> page = new Page<CmmsRepair>(pageNo, pageSize);
 		 List<CmmsRepair> list = cmmsRepairService.selectList(page,cmmsRepair);
 		 page.setRecords(list);

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

@@ -3,6 +3,7 @@ package org.jeecg.modules.cmmsRepair.mapper;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.cmmsRepair.entity.CmmsRepair;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -24,4 +25,5 @@ public interface CmmsRepairMapper extends BaseMapper<CmmsRepair> {
 
     List<Integer> getIndexRepairNum();
 
+    List<CmmsRepair> getPageList(@Param("page") Page<CmmsRepair> page,@Param("cmmsRepair") CmmsRepair cmmsRepair);
 }

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

@@ -33,23 +33,23 @@
         equipmentcode,equipmentname,priority,faultdate,faultdesc,repairuser,repairdate,feedback,result,status,relid,repairstatus
         from cmms_repair
         <where>
-            <if test="cmmsRepair.repaircode !=null and cmmsRepair.repaircode !=''">
-                AND (repaircode like CONCAT('%', #{cmmsRepair.repaircode}, '%') or repairname like CONCAT('%', #{cmmsRepair.repaircode}, '%'))
-            </if>
-            <if test="cmmsRepair.repairuser !=null and cmmsRepair.repairuser !=''">
-                AND CONCAT(repairuser) like CONCAT('%', #{cmmsRepair.repairuser}, '%')
-            </if>
-            <if test="cmmsRepair.equipmentcode !=null and cmmsRepair.equipmentcode !=''">
-                AND (equipmentcode like CONCAT('%', #{cmmsRepair.equipmentcode}, '%') or equipmentname like CONCAT('%', #{cmmsRepair.equipmentcode}, '%'))
+            <if test="cmmsRepair.equipmentname !=null and cmmsRepair.equipmentname !=''">
+                AND equipmentname like CONCAT('%', #{cmmsRepair.equipmentname}, '%')
             </if>
             <if test="cmmsRepair.priority !=null and cmmsRepair.priority !=''">
                 AND priority = #{cmmsRepair.priority}
             </if>
-            <if test="cmmsRepair.faultdate !=null">
-                AND DATE_FORMAT(faultdate, '%Y-%m-%d') = DATE_FORMAT(#{cmmsRepair.faultdate}, '%Y-%m-%d')
+            <if test="cmmsRepair.repairuser !=null and cmmsRepair.repairuser !=''">
+                AND repairuser like CONCAT('%', #{cmmsRepair.repairuser}, '%')
+            </if>
+            <if test="cmmsRepair.status !=null and cmmsRepair.status !=''">
+                AND status = #{cmmsRepair.status}
+            </if>
+            <if test="cmmsRepair.repairstatus !=null and cmmsRepair.repairstatus != ''">
+                AND repairstatus like CONCAT('%', #{cmmsRepair.repairstatus}, '%')
             </if>
         </where>
-        order by id desc
+        order by create_time desc
     </select>
 
 
@@ -89,4 +89,28 @@
         union
         select count(*) as todaynum from cmms_repair where status in ('0') and date_format(create_time, '%Y-%m-%d')=date_format(now(), '%Y-%m-%d')
     </select>
+
+    <select id="getPageList" parameterType="org.jeecg.modules.cmmsRepair.entity.CmmsRepair" resultMap="cmmsRepairResult">
+        select id,create_by,create_time,update_by,update_time,remark,repaircode,repairname,equipmentid,
+        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>
+            <if test="cmmsRepair.priority !=null and cmmsRepair.priority !=''">
+                AND priority = #{cmmsRepair.priority}
+            </if>
+            <if test="cmmsRepair.repairuser !=null and cmmsRepair.repairuser !=''">
+                AND repairuser like CONCAT('%', #{cmmsRepair.repairuser}, '%')
+            </if>
+            <if test="cmmsRepair.status !=null and cmmsRepair.status !=''">
+                AND status = #{cmmsRepair.status}
+            </if>
+            <if test="cmmsRepair.repairstatus !=null and cmmsRepair.repairstatus != ''">
+                AND repairstatus like CONCAT('%', #{cmmsRepair.repairstatus}, '%')
+            </if>
+        </where>
+        order by create_time desc
+    </select>
 </mapper>

module_cmms/src/main/java/org/jeecg/modules/cmmsRepair/service/ICmmsRepairService.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.cmmsRepair.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.cmmsRepair.entity.CmmsRepair;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.cmmsRepair.entity.CmmsRepairVo;
@@ -64,4 +65,5 @@ public interface ICmmsRepairService extends IService<CmmsRepair> {
     */
     IndexNum IndexRepairNum();
 
+    List<CmmsRepair> getPageList(Page<CmmsRepair> page, CmmsRepair cmmsRepair);
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsRepair/service/impl/CmmsRepairServiceImpl.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.cmmsRepair.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.subject.Subject;
@@ -169,4 +170,9 @@ public class CmmsRepairServiceImpl extends ServiceImpl<CmmsRepairMapper, CmmsRep
         indexNum.setTotalnum(list.get(0));
         return indexNum;
     }
+
+    @Override
+    public List<CmmsRepair> getPageList(Page<CmmsRepair> page, CmmsRepair cmmsRepair) {
+        return cmmsRepairMapper.getPageList(page,cmmsRepair);
+    }
 }