dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

救援APP

Browse Source
This commit is contained in:
xiao-fajia 2024-08-24 08:56:38 +08:00
parent af06d9e095
commit 4ba061390d
6 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/RescueInfoController.java
View File

@ -181,11 +181,12 @@ public class RescueInfoController extends BaseController {
* 获取扣车订单
*/
@GetMapping("/getKcList")
public TableDataInfo getKcList(RescueInfo rescueInfo) {
startPage();
List<RescueInfo> rescueInfos = rescueInfoService.getKcList(rescueInfo);
return getDataTable(rescueInfos);
public CommonResult getKcList(RescueInfo rescueInfo,
@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
Page<RescueInfo> page = new Page<>(pageNum, pageSize);
IPage<RescueInfo> rescueInfos = rescueInfoService.getKcList(rescueInfo, page);
return success(rescueInfos);
}
/**
@ -234,11 +235,12 @@ public class RescueInfoController extends BaseController {
* 获取扣车订单
*/
@GetMapping("/getHcList")
public TableDataInfo getHcList(RescueInfo rescueInfo) {
startPage();
List<RescueInfo> rescueInfos = rescueInfoService.getHcList(rescueInfo);
return getDataTable(rescueInfos);
public CommonResult getHcList(RescueInfo rescueInfo,
@RequestParam(value = "pageNum", defaultValue = "1")Integer pageNum,
@RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize) {
Page<RescueInfo> page = new Page<>(pageNum, pageSize);
IPage<RescueInfo> rescueInfos = rescueInfoService.getHcList(rescueInfo, page);
return success(rescueInfos);
}
/**

2
dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/SysLoginController.java
View File

@ -159,7 +159,7 @@ public class SysLoginController {
// * @return 结果
// */
// @PostMapping("/loginSmsCode")
// public AjaxResult loginSmsCode(String phone) {
// public CommonResult loginSmsCode(String phone) {
// return loginService.loginSmsCode(phone);
// }
/**

2
dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueInfoMapper.java
View File

@ -44,7 +44,7 @@ public interface RescueInfoMapper extends BaseMapper<RescueInfo>
* @return 【请填写功能名称】集合
*/
IPage<RescueInfo> selectRescueInfoListApp(@Param("map") RescueInfo rescueInfo, Page<RescueInfo> page);
List<RescueInfo> getKcList(RescueInfo rescueInfo);
IPage<RescueInfo> getKcList(@Param("map") RescueInfo rescueInfo, Page<RescueInfo> page);

4
dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueInfoService.java
View File

@ -39,8 +39,8 @@ public interface IRescueInfoService extends IService<RescueInfo>
* @return 【请填写功能名称】集合
*/
IPage<RescueInfo> selectRescueInfoList(RescueInfo rescueInfo, Page<RescueInfo> page);
List<RescueInfo> getKcList(RescueInfo rescueInfo);
List<RescueInfo> getHcList(RescueInfo rescueInfo);
IPage<RescueInfo> getKcList(RescueInfo rescueInfo, Page<RescueInfo> page);
IPage<RescueInfo> getHcList(RescueInfo rescueInfo, Page<RescueInfo> page);
void openKc(Long rescueId) throws Exception;

6
dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueInfoServiceImpl.java
View File

@ -144,15 +144,15 @@ public class RescueInfoServiceImpl extends ServiceImpl<RescueInfoMapper, RescueI
}
@Override
public List<RescueInfo> getKcList(RescueInfo rescueInfo) {
public IPage<RescueInfo> getKcList(RescueInfo rescueInfo, Page<RescueInfo> page) {
Long deptId = getLoginUserDeptId();
rescueInfo.setDeptId(deptId);
List<RescueInfo> rescueInfos = baseMapper.getKcList(rescueInfo);
IPage<RescueInfo> rescueInfos = baseMapper.getKcList(rescueInfo, page);
return rescueInfos;
}
@Override
public List<RescueInfo> getHcList(RescueInfo rescueInfo) {
public IPage<RescueInfo> getHcList(RescueInfo rescueInfo, Page<RescueInfo> page) {
return null;
}

14
dl-module-rescue/src/main/resources/mapper/rescue/RescueInfoMapper.xml
View File

@ -164,18 +164,18 @@
resultType="cn.iocoder.yudao.module.rescue.domain.RescueInfo">
select * from rescue_info ri
<where>
dept_id = #{deptId} and rescue_type = '5'
<if test="connectionName != null and connectionName != ''">
and (connection_name like concat('%', #{connectionName}, '%') or connection_phone like concat('%',
#{connectionPhone}, '%') or license_num like concat('%',#{licenseNum}, '%'))
dept_id = #{map.deptId} and rescue_type = '5'
<if test="map.connectionName != null and map.connectionName != ''">
and (connection_name like concat('%', #{map.connectionName}, '%') or connection_phone like concat('%',
#{map.connectionPhone}, '%') or license_num like concat('%',#{map.licenseNum}, '%'))
</if>
<if test="rescueStatus != null ">
<if test="map.rescueStatus != null ">
<choose>
<when test="rescueStatus == '1'.toString()">
<when test="map.rescueStatus == '1'.toString()">
<!-- 扣车中 -->
and rescue_status <![CDATA[<]]> '6'
</when>
<when test="rescueStatus == '2'.toString()">
<when test="map.rescueStatus == '2'.toString()">
<!-- 已解 -->
and rescue_status <![CDATA[>=]]> '6'
</when>