保养工单分列页表查询修改

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

@@ -113,8 +113,10 @@ public class CmmsUpkeepController extends JeecgController<CmmsUpkeep, ICmmsUpkee
 		List<CmmsUpkeepDto> pageList = new ArrayList<>();
 		//0我的相关  1我的代办
 		if(cmmsUpkeepDto.getCmmsUpkeepType().equals("0")){
+			System.out.println("0");
 			pageList = cmmsUpkeepService.selectMyRelateList(page, cmmsUpkeepDto);
-		}else{
+		}else if(cmmsUpkeepDto.getCmmsUpkeepType().equals("1")){
+			System.out.println("1");
 			pageList = cmmsUpkeepService.selectMyChargeList(page, cmmsUpkeepDto);
 		}
 		page.setRecords(pageList);

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

@@ -23,7 +23,7 @@ public interface CmmsUpkeepMapper extends BaseMapper<CmmsUpkeep> {
      * @param cmmsUpkeepDto 保养工单
      * @return 保养工单集合
      */
-    public List<CmmsUpkeepDto> selectMyChargeList(Page<CmmsUpkeepDto> page, @Param("cmmsUpkeepDto") CmmsUpkeepDto cmmsUpkeepDto);
+    public List<CmmsUpkeepDto> selectMyChargeList(Page<CmmsUpkeepDto> page, CmmsUpkeepDto cmmsUpkeepDto);
 
     /**
      * 查询保养工单列表-我的相关
@@ -31,7 +31,7 @@ public interface CmmsUpkeepMapper extends BaseMapper<CmmsUpkeep> {
      * @param cmmsUpkeepDto 保养工单
      * @return 保养工单集合
      */
-    public List<CmmsUpkeepDto> selectMyRelateList(Page<CmmsUpkeepDto> page, @Param("cmmsUpkeepDto") CmmsUpkeepDto cmmsUpkeepDto);
+    public List<CmmsUpkeepDto> selectMyRelateList(Page<CmmsUpkeepDto> page, CmmsUpkeepDto cmmsUpkeepDto);
 
 
 

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.cmmsUpkeep.mapper.CmmsUpkeepMapper">
 
-    <resultMap type="org.jeecg.modules.cmmsUpkeep.entity.CmmsUpkeep" id="CmmsUpkeepResult">
+    <resultMap type="org.jeecg.modules.cmmsUpkeep.entity.CmmsUpkeepDto" id="CmmsUpkeepResult">
         <result property="id"    column="id"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -38,7 +38,7 @@
             <if test="cmmsUpkeepDto.planname != null and cmmsUpkeepDto.planname != ''"> and c.planname like concat('%', #{cmmsUpkeepDto.planname}, '%')</if>
             <if test="cmmsUpkeepDto.address != null and cmmsUpkeepDto.address != ''"> and c.address = #{cmmsUpkeepDto.address}</if>
             <if test="cmmsUpkeepDto.chargeruser != null and cmmsUpkeepDto.chargeruser != ''"> and c.chargeruser = #{cmmsUpkeepDto.chargeruser}</if>
-            <if test="cmmsUpkeepDto.equipmentid != null and cmmsUpkeepDto.equipmentid != ''"> and c.equipmentid = #{cmmsUpkeepDto.equipmentid}</if>
+            <if test="cmmsUpkeepDto.equipmentid != null and cmmsUpkeepDto.equipmentid != ''"> and p.equipmentid = #{cmmsUpkeepDto.equipmentid}</if>
             <if test="cmmsUpkeepDto.status != null and cmmsUpkeepDto.status != ''"> and c.status = #{cmmsUpkeepDto.status}</if>
             <if test="cmmsUpkeepDto.status == null or cmmsUpkeepDto.status == ''"> and c.status in ('0','1')</if>
         </where>
@@ -46,7 +46,7 @@
     </select>
 
     <!-- 查询我的相关 -->
-    <select id="selectMyRelateList" parameterType="org.jeecg.modules.cmmsUpkeep.entity.CmmsUpkeep" resultMap="CmmsUpkeepResult">
+    <select id="selectMyRelateList" parameterType="org.jeecg.modules.cmmsUpkeep.entity.CmmsUpkeepDto" resultMap="CmmsUpkeepResult">
         select c.id, c.create_by, c.create_time, c.update_by, c.update_time, c.remark, c.upkeepcode,
         c.upkeepplanid, c.upkeepprojid, c.projectname, c.planname, c.address, c.supplier, c.suppliertel,
         c.linker, c.linkertel, c.chargeruser, c.upkeepname, c.upkeepdesc, c.status, c.opinion, p.equipmentid
@@ -56,7 +56,7 @@
             <if test="cmmsUpkeepDto.planname != null and cmmsUpkeepDto.planname != ''"> and c.planname like concat('%', #{cmmsUpkeepDto.planname}, '%')</if>
             <if test="cmmsUpkeepDto.address != null and cmmsUpkeepDto.address != ''"> and c.address = #{cmmsUpkeepDto.address}</if>
             <if test="cmmsUpkeepDto.chargeruser != null and cmmsUpkeepDto.chargeruser != ''"> and c.chargeruser = #{cmmsUpkeepDto.chargeruser}</if>
-            <if test="cmmsUpkeepDto.equipmentid != null and cmmsUpkeepDto.equipmentid != ''"> and c.equipmentid = #{cmmsUpkeepDto.equipmentid}</if>
+            <if test="cmmsUpkeepDto.equipmentid != null and cmmsUpkeepDto.equipmentid != ''"> and p.equipmentid = #{cmmsUpkeepDto.equipmentid}</if>
             <if test="cmmsUpkeepDto.status != null and cmmsUpkeepDto.status != ''"> and c.status = #{cmmsUpkeepDto.status}</if>
         </where>
         order by c.create_time desc