yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

删除不用的包，设备分页查询增加排序和过滤条件

Browse Source
This commit is contained in:
panshuling321 2022-03-15 11:27:30 +08:00
parent c005314430
commit 9ec9513a3c
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/XhpcWorkOrderApplication.java
View File

@ -5,13 +5,9 @@ import com.xhpc.common.security.annotation.EnableRyFeignClients;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.cloud.openfeign.EnableFeignClients;
@EnableConfigurationProperties
@ConfigurationPropertiesScan(basePackages = {"com.xhpc.workorder.config"})
@EnableCustomConfig
@EnableRyFeignClients
@EnableFeignClients

5
xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcStationDeviceMapper.xml
View File

@ -53,7 +53,7 @@
LEFT JOIN xhpc_work_station s on s.work_station_id=d1.station_id
LEFT JOIN xhpc_station_device d2 on d2.parent_device_id=d1.device_id
LEFT JOIN xhpc_terminal t on t.serial_number = d2.serial_number
WHERE s.del_flag=0 and d1.del_flag=0 and d1.device_type='PILE'
WHERE s.del_flag=0 and d1.del_flag=0 and d2.del_flag=0 and d1.device_type='PILE'
<if test="params.stationName!=null and params.stationName != ''">
and s.name like concat('%', #{params.stationName}, '%')
</if>
@ -66,7 +66,8 @@
<if test="params.tenantId!=null and params.tenantId!=''">
and s.tenant_id=#{params.tenantId}
</if>
order by d1.device_type, d1.sorted, d2.device_type, d2.sorted
GROUP BY d2.device_id
order by s.work_station_id, d1.device_type,d1.device_id, d1.sorted, d2.device_type,d2.device_id, d2.sorted
</select>