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

Compare commits

base: dianliang:dbf60d496d498c75c9cf6be83d960575c203a2fe
Branches Tags
dianliang:master
dianliang:driver
dianliang:insp
dianliang:repair
dianliang:dev
..
compare: dianliang:447943c12cb90c5af600ec97cfd73b919a7f89d4
Branches Tags
dianliang:driver
dianliang:insp
dianliang:master
dianliang:repair
dianliang:dev

No commits in common. "dbf60d496d498c75c9cf6be83d960575c203a2fe" and "447943c12cb90c5af600ec97cfd73b919a7f89d4" have entirely different histories.
dbf60d496d ... 447943c12c

6 changed files with 24 additions and 26 deletions
Show Stats 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,12 +181,11 @@ public class RescueInfoController extends BaseController {
* 获取扣车订单 * 获取扣车订单
*/ */
@GetMapping("/getKcList") @GetMapping("/getKcList")
public CommonResult getKcList(RescueInfo rescueInfo, public TableDataInfo getKcList(RescueInfo rescueInfo) {
@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) { startPage();
Page<RescueInfo> page = new Page<>(pageNum, pageSize); List<RescueInfo> rescueInfos = rescueInfoService.getKcList(rescueInfo);
IPage<RescueInfo> rescueInfos = rescueInfoService.getKcList(rescueInfo, page); return getDataTable(rescueInfos);
return success(rescueInfos);
} }
/** /**
@ -235,12 +234,11 @@ public class RescueInfoController extends BaseController {
* 获取扣车订单 * 获取扣车订单
*/ */
@GetMapping("/getHcList") @GetMapping("/getHcList")
public CommonResult getHcList(RescueInfo rescueInfo, public TableDataInfo getHcList(RescueInfo rescueInfo) {
@RequestParam(value = "pageNum", defaultValue = "1")Integer pageNum,
@RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize) { startPage();
Page<RescueInfo> page = new Page<>(pageNum, pageSize); List<RescueInfo> rescueInfos = rescueInfoService.getHcList(rescueInfo);
IPage<RescueInfo> rescueInfos = rescueInfoService.getHcList(rescueInfo, page); return getDataTable(rescueInfos);
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 结果 // * @return 结果
// */ // */
// @PostMapping("/loginSmsCode") // @PostMapping("/loginSmsCode")
// public CommonResult loginSmsCode(String phone) { // public AjaxResult loginSmsCode(String phone) {
// return loginService.loginSmsCode(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 【请填写功能名称】集合 * @return 【请填写功能名称】集合
*/ */
IPage<RescueInfo> selectRescueInfoListApp(@Param("map") RescueInfo rescueInfo, Page<RescueInfo> page); IPage<RescueInfo> selectRescueInfoListApp(@Param("map") RescueInfo rescueInfo, Page<RescueInfo> page);
IPage<RescueInfo> getKcList(@Param("map") RescueInfo rescueInfo, Page<RescueInfo> page); List<RescueInfo> getKcList(RescueInfo rescueInfo);

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 【请填写功能名称】集合 * @return 【请填写功能名称】集合
*/ */
IPage<RescueInfo> selectRescueInfoList(RescueInfo rescueInfo, Page<RescueInfo> page); IPage<RescueInfo> selectRescueInfoList(RescueInfo rescueInfo, Page<RescueInfo> page);
IPage<RescueInfo> getKcList(RescueInfo rescueInfo, Page<RescueInfo> page); List<RescueInfo> getKcList(RescueInfo rescueInfo);
IPage<RescueInfo> getHcList(RescueInfo rescueInfo, Page<RescueInfo> page); List<RescueInfo> getHcList(RescueInfo rescueInfo);
void openKc(Long rescueId) throws Exception; 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 @Override
public IPage<RescueInfo> getKcList(RescueInfo rescueInfo, Page<RescueInfo> page) { public List<RescueInfo> getKcList(RescueInfo rescueInfo) {
Long deptId = getLoginUserDeptId(); Long deptId = getLoginUserDeptId();
rescueInfo.setDeptId(deptId); rescueInfo.setDeptId(deptId);
IPage<RescueInfo> rescueInfos = baseMapper.getKcList(rescueInfo, page); List<RescueInfo> rescueInfos = baseMapper.getKcList(rescueInfo);
return rescueInfos; return rescueInfos;
} }
@Override @Override
public IPage<RescueInfo> getHcList(RescueInfo rescueInfo, Page<RescueInfo> page) { public List<RescueInfo> getHcList(RescueInfo rescueInfo) {
return null; 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"> resultType="cn.iocoder.yudao.module.rescue.domain.RescueInfo">
select * from rescue_info ri select * from rescue_info ri
<where> <where>
dept_id = #{map.deptId} and rescue_type = '5' dept_id = #{deptId} and rescue_type = '5'
<if test="map.connectionName != null and map.connectionName != ''"> <if test="connectionName != null and connectionName != ''">
and (connection_name like concat('%', #{map.connectionName}, '%') or connection_phone like concat('%', and (connection_name like concat('%', #{connectionName}, '%') or connection_phone like concat('%',
#{map.connectionPhone}, '%') or license_num like concat('%',#{map.licenseNum}, '%')) #{connectionPhone}, '%') or license_num like concat('%',#{licenseNum}, '%'))
</if> </if>
<if test="map.rescueStatus != null "> <if test="rescueStatus != null ">
<choose> <choose>
<when test="map.rescueStatus == '1'.toString()"> <when test="rescueStatus == '1'.toString()">
<!-- 扣车中 --> <!-- 扣车中 -->
and rescue_status <![CDATA[<]]> '6' and rescue_status <![CDATA[<]]> '6'
</when> </when>
<when test="map.rescueStatus == '2'.toString()"> <when test="rescueStatus == '2'.toString()">
<!-- 已解 --> <!-- 已解 -->
and rescue_status <![CDATA[>=]]> '6' and rescue_status <![CDATA[>=]]> '6'
</when> </when>