sz 查询全部方法修改

common/src/main/java/com/jpsoft/smart/modules/base/dao/PersonDeviceLogDAO.java

@@ -25,8 +25,6 @@ public interface PersonDeviceLogDAO {
 
     List<PersonDeviceLog> search(Map<String, Object> searchParams, List<Sort> sortList);
 
-    List<PersonDeviceLog> pageList(Map<String, Object> searchParams, List<Sort> sortList);
-
     List<PersonDeviceLog> simpleSearch(Map<String, Object> searchParams, List<Sort> sortList);
 
     List<PersonDeviceLog> findByPersonAndDate(@Param("personId") Long personId, @Param("startDate")Date startDate, @Param("endDate")Date endDate);

common/src/main/java/com/jpsoft/smart/modules/base/service/impl/PersonDeviceLogServiceImpl.java

@@ -168,7 +168,7 @@ public class PersonDeviceLogServiceImpl implements PersonDeviceLogService {
 
     @Override
     public List<PersonDeviceLog> pageList(Map<String, Object> searchParams, List<Sort> sortList){
-        return personDeviceLogDAO.pageList(searchParams, sortList);
+        return personDeviceLogDAO.search(searchParams, sortList);
     }
 
 

common/src/main/resources/mapper/base/PersonDeviceLog.xml

@@ -433,90 +433,4 @@
         </foreach>
         and a.del_flag = 0
     </select>
-
-    <select id="pageList" parameterType="hashmap" resultMap="PersonDeviceLogMap">
-        <![CDATA[
-			select a.* from base_person_device_log a left join base_device_info b
-			on  a.device_no = b.device_no left join base_person_info c
-			on a.person_id = c.id_
-		]]>
-        <where>
-            and a.del_flag = false
-            <if test="searchParams.deviceIdList != null">
-                and b.id_ in
-                <foreach item="item" collection="searchParams.deviceIdList"  open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="searchParams.companyCode != null">
-                and exists (
-                select t1.id_ from base_person_info t1,base_company_info t2
-                where t1.company_id =t2.id_
-                and t2.code_ like #{searchParams.companyCode}
-                and t1.del_flag=0 and t1.id_ = a.person_id
-                )
-            </if>
-            <if test="searchParams.personId != null">
-                and a.person_id = #{searchParams.personId}
-            </if>
-            <if test="searchParams.deviceNo != null">
-                and a.device_no like #{searchParams.deviceNo}
-            </if>
-            <if test="searchParams.aliasName != null">
-                and b.alias_name like #{searchParams.aliasName}
-            </if>
-            <if test="searchParams.personName != null">
-                and c.name_ like #{searchParams.personName}
-            </if>
-            <if test="searchParams.matchStatus != null">
-                and a.match_status = #{searchParams.matchStatus}
-            </if>
-            <if test="searchParams.beginTime != null">
-                <![CDATA[
-                  and a.record_time >= #{searchParams.beginTime}
-                ]]>
-            </if>
-            <if test="searchParams.endTime != null">
-                <![CDATA[
-                  and a.record_time <= #{searchParams.endTime}
-                ]]>
-            </if>
-            <if test="searchParams.minTemperature != null">
-                <![CDATA[
-                  and a.temperature_ >= #{searchParams.minTemperature}
-                ]]>
-            </if>
-            <if test="searchParams.maxTempedistinctrature != null">
-                <![CDATA[
-                  and a.temperature_ <= #{searchParams.maxTemperature}
-                ]]>
-            </if>
-            <if test="searchParams.matchMsg != null">
-                and a.match_msg like #{searchParams.matchMsg}
-            </if>
-            <if test="searchParams.distinct">
-                and a.rownum_ in (
-                SELECT max(rownum_)
-                from base_person_device_log
-                <where>
-                    del_flag=0
-                    <if test="searchParams.beginTime != null">
-                        <![CDATA[
-                          and record_time >= #{searchParams.beginTime}
-                        ]]>
-                    </if>
-                    <if test="searchParams.endTime != null">
-                        <![CDATA[
-                          and record_time <= #{searchParams.endTime}
-                        ]]>
-                    </if>
-                </where>
-                GROUP BY person_id
-                )
-            </if>
-        </where>
-        <foreach item="sort" collection="sortList"  open="order by" separator=",">
-            ${sort.name} ${sort.order}
-        </foreach>
-    </select>
 </mapper>