救援代码补正
This commit is contained in:
xiao-fajia
parent
e535d73918
commit
49dd8c8515
@ -483,4 +483,16 @@ public class RescueInfoSystem extends BaseController {
|
||||
rescueInfoService.returnCar(returnCarVO);
|
||||
return CommonResult.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 入库方法
|
||||
* @author 小李
|
||||
* @date 10:37 2024/9/7
|
||||
* @param returnCarVO 订单信息
|
||||
**/
|
||||
@PostMapping("/inBase")
|
||||
public CommonResult inBase(@RequestBody ReturnCarVO returnCarVO){
|
||||
rescueInfoService.inBase(returnCarVO);
|
||||
return CommonResult.ok();
|
||||
}
|
||||
}
|
||||
|
||||
@ -127,4 +127,11 @@ public interface IRescueInfoService extends IService<RescueInfo>
|
||||
**/
|
||||
void returnCar(ReturnCarVO returnCarVO);
|
||||
|
||||
/**
|
||||
* 入库方法
|
||||
* @author 小李
|
||||
* @date 10:37 2024/9/7
|
||||
* @param returnCarVO 订单信息
|
||||
**/
|
||||
void inBase(ReturnCarVO returnCarVO);
|
||||
}
|
||||
|
||||
@ -1159,6 +1159,14 @@ public class RescueInfoServiceImpl extends ServiceImpl<RescueInfoMapper, RescueI
|
||||
@Override
|
||||
@DSTransactional
|
||||
public void returnCar(ReturnCarVO returnCarVO){
|
||||
// 先判断是否存在和解扣
|
||||
RescueInfo flag = baseMapper.selectOne(new LambdaQueryWrapper<RescueInfo>().eq(RescueInfo::getId, returnCarVO.getId()));
|
||||
if (ObjectUtil.isEmpty(flag)){
|
||||
throw exception0(500, "订单不存在");
|
||||
}
|
||||
if (!flag.getRescueStatus().equals("6")){
|
||||
throw exception0(500, "车辆未解扣");
|
||||
}
|
||||
// 更新插入一条工单记录，因为还车也要拍照什么的
|
||||
RescueInfoDetail detail = new RescueInfoDetail();
|
||||
detail.setRescueInfoId(returnCarVO.getId());
|
||||
@ -1177,4 +1185,39 @@ public class RescueInfoServiceImpl extends ServiceImpl<RescueInfoMapper, RescueI
|
||||
rescueInfo.setRescueStatus("8");
|
||||
baseMapper.updateById(rescueInfo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 入库方法
|
||||
* @author 小李
|
||||
* @date 10:37 2024/9/7
|
||||
* @param returnCarVO 订单信息
|
||||
**/
|
||||
@Override
|
||||
public void inBase(ReturnCarVO returnCarVO){
|
||||
// 先判断是否存在和完成
|
||||
RescueInfo flag = baseMapper.selectOne(new LambdaQueryWrapper<RescueInfo>().eq(RescueInfo::getId, returnCarVO.getId()));
|
||||
if (ObjectUtil.isEmpty(flag)){
|
||||
throw exception0(500, "订单不存在");
|
||||
}
|
||||
if (!flag.getRescueStatus().equals("5")){
|
||||
throw exception0(500, "订单未完成");
|
||||
}
|
||||
// 更新插入一条工单记录，因为扣车也要拍照什么的
|
||||
RescueInfoDetail detail = new RescueInfoDetail();
|
||||
detail.setRescueInfoId(returnCarVO.getId());
|
||||
// type不知道是什么，暂时先不要
|
||||
// detail.setType()
|
||||
detail.setTitle("入库");
|
||||
detail.setRemark(returnCarVO.getRemark());
|
||||
detail.setImages(returnCarVO.getImages());
|
||||
Long deptId = getLoginUserDeptId();
|
||||
detail.setDeptId(deptId);
|
||||
rescueInfoDetailService.save(detail);
|
||||
|
||||
// 更新工单状态为扣车中(9)
|
||||
RescueInfo rescueInfo = new RescueInfo();
|
||||
rescueInfo.setId(returnCarVO.getId());
|
||||
rescueInfo.setRescueStatus("9");
|
||||
baseMapper.updateById(rescueInfo);
|
||||
}
|
||||
}
|
||||
|
||||
@ -3,17 +3,17 @@
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="cn.iocoder.yudao.module.rescue.mapper.RescueInfoMapper">
|
||||
|
||||
<select id="selectRescueInfoList" parameterType="cn.iocoder.yudao.module.rescue.domain.RescueInfo"
|
||||
resultType="cn.iocoder.yudao.module.rescue.domain.RescueInfo">
|
||||
SELECT
|
||||
ri.*,roi.order_status,roi.set_money
|
||||
FROM
|
||||
rescue_info ri
|
||||
left join rescue_order_info roi on roi.rescue_info_id = ri.id
|
||||
SELECT ri.*,
|
||||
roi.order_status,
|
||||
roi.set_money
|
||||
FROM rescue_info ri
|
||||
left join rescue_order_info roi on roi.rescue_info_id = ri.id
|
||||
<where>
|
||||
1=1 and ri.deleted = '0'
|
||||
<if test="map.rescueStatus != null ">
|
||||
1 = 1
|
||||
and ri.deleted = '0'
|
||||
<if test="map.rescueStatus != null">
|
||||
<choose>
|
||||
<when test="map.rescueStatus == '1'.toString()">
|
||||
<!-- 救援中 -->
|
||||
@ -21,158 +21,211 @@
|
||||
</when>
|
||||
<when test="map.rescueStatus == '2'.toString()">
|
||||
<!--待支付 -->
|
||||
and roi.order_status ='1'
|
||||
and roi.order_status = '1'
|
||||
</when>
|
||||
<when test="map.rescueStatus == '3'.toString()">
|
||||
<!-- 待取车 -->
|
||||
and ri.rescue_status ='6'
|
||||
and ri.rescue_status = '6'
|
||||
</when>
|
||||
<when test="map.rescueStatus == '4'.toString()">
|
||||
<!-- 评价 -->
|
||||
and roi.order_status ='2'
|
||||
and roi.order_status = '2'
|
||||
</when>
|
||||
<when test="map.rescueStatus == '5'.toString()">
|
||||
<!-- 评价 -->
|
||||
and roi.order_status ='3'
|
||||
and roi.order_status = '3'
|
||||
</when>
|
||||
<when test="map.rescueStatus == '8'.toString()">
|
||||
<!-- 已还车 -->
|
||||
and ri.rescue_status ='8'
|
||||
and ri.rescue_status = '8'
|
||||
</when>
|
||||
<when test="map.rescueStatus == '9'.toString()">
|
||||
<!-- 扣车中未解扣 -->
|
||||
and (ri.rescue_type ='5' and ri.rescue_status <![CDATA[<]]> '6')
|
||||
and (ri.rescue_type = '5' and ri.rescue_status <![CDATA[<]]> '6')
|
||||
</when>
|
||||
</choose>
|
||||
</if>
|
||||
<if test="map.licenseNum != null ">
|
||||
and ri.license_num like concat('%',#{map.licenseNum},'%')
|
||||
<if test="map.licenseNum != null">
|
||||
and ri.license_num like concat('%', #{map.licenseNum}, '%')
|
||||
</if>
|
||||
</where>
|
||||
order by ri.create_time desc
|
||||
</select>
|
||||
|
||||
<select id="selectRescueListSystem2" resultType="cn.iocoder.yudao.module.rescue.domain.RescueInfo">
|
||||
SELECT
|
||||
ri.*,roi.order_status,roi.set_money,roi.id as rescueOrderId,roi.pay_money,roi.pay_time
|
||||
FROM
|
||||
rescue_info ri
|
||||
left join rescue_order_info roi on roi.rescue_info_id = ri.id
|
||||
SELECT ri.*,
|
||||
roi.order_status,
|
||||
roi.set_money,
|
||||
roi.id as rescueOrderId,
|
||||
roi.pay_money,
|
||||
roi.pay_time
|
||||
FROM rescue_info ri
|
||||
left join rescue_order_info roi on roi.rescue_info_id = ri.id
|
||||
where ri.deleted = '0'
|
||||
<if test="map.orderStatus != null and map.orderStatus != ''">
|
||||
and roi.order_status = #{map.orderStatus}
|
||||
</if>
|
||||
<if test="map.rescueStatus != null and map.rescueStatus != ''">
|
||||
and ri.rescue_status = #{map.rescueStatus}
|
||||
and if(#{map.rescueStatus} = 0, ri.rescue_status not in(6,8,9), ri.rescue_status = #{map.rescueStatus})
|
||||
</if>
|
||||
<if test="map.licenseNum != null ">
|
||||
and ri.license_num like concat('%',#{map.licenseNum},'%')
|
||||
<if test="map.licenseNum != null">
|
||||
and ri.license_num like concat('%', #{map.licenseNum}, '%')
|
||||
</if>
|
||||
<if test="map.connectionName != null ">
|
||||
and ri.connection_name like concat('%',#{map.connectionName},'%')
|
||||
<if test="map.connectionName != null">
|
||||
and ri.connection_name like concat('%', #{map.connectionName}, '%')
|
||||
</if>
|
||||
<if test="map.driverName != null ">
|
||||
and ri.driver_name like concat('%',#{map.driverName},'%')
|
||||
<if test="map.driverName != null">
|
||||
and ri.driver_name like concat('%', #{map.driverName}, '%')
|
||||
</if>
|
||||
<if test="map.driverCarNum != null ">
|
||||
and ri.driver_car_num like concat('%',#{map.driverCarNum},'%')
|
||||
<if test="map.driverCarNum != null">
|
||||
and ri.driver_car_num like concat('%', #{map.driverCarNum}, '%')
|
||||
</if>
|
||||
<if test="map.rescueType != null ">
|
||||
<if test="map.rescueType != null">
|
||||
and ri.rescue_type = #{map.rescueType}
|
||||
</if>
|
||||
<if test="map.feeType != null ">
|
||||
<if test="map.feeType != null">
|
||||
and ri.fee_type = #{map.feeType}
|
||||
</if>
|
||||
<if test="map.flag != null ">
|
||||
<if test="map.flag != null">
|
||||
and ri.driver_id is not null
|
||||
</if>
|
||||
<if test="map.rescueStart != null and map.rescueEnd != null">and rescue_time between
|
||||
concat(#{map.rescueStart},' 00:00:00') and concat(#{map.rescueEnd},' 23:59:59')
|
||||
<if test="map.rescueStart != null and map.rescueEnd != null">
|
||||
and rescue_time between
|
||||
concat(#{map.rescueStart}, ' 00:00:00') and concat(#{map.rescueEnd}, ' 23:59:59')
|
||||
</if>
|
||||
<if test="map.deptId != null">
|
||||
and if(#{map.deptId} = 0,ri.dept_id is null, ri.dept_id = #{map.deptId} )
|
||||
and if(#{map.deptId} = 0, ri.dept_id is null, ri.dept_id = #{map.deptId})
|
||||
</if>
|
||||
order by ri.create_time desc
|
||||
</select>
|
||||
|
||||
|
||||
<select id="listData" resultType="com.alibaba.fastjson.JSONObject">
|
||||
SELECT
|
||||
sum(set_money/100) as allMoney,count(1) as allNum,sum(case when ri.car_type ='1' then (set_money/100)*
|
||||
${rescueTcBig}
|
||||
when ri.car_type ='2' then (set_money/100)* ${rescueTcMid}
|
||||
when ri.car_type ='3' then (set_money/100)* ${rescueTcSmall} else 0 end) as tcAll
|
||||
FROM
|
||||
rescue_info ri
|
||||
left join rescue_order_info roi on roi.rescue_info_id = ri.id
|
||||
SELECT sum(set_money / 100) as allMoney,
|
||||
count(1) as allNum,
|
||||
sum(case
|
||||
when ri.car_type = '1' then (set_money / 100) *
|
||||
${rescueTcBig}
|
||||
when ri.car_type = '2' then (set_money / 100) * ${rescueTcMid}
|
||||
when ri.car_type = '3' then (set_money / 100) * ${rescueTcSmall}
|
||||
else 0 end) as tcAll
|
||||
FROM rescue_info ri
|
||||
left join rescue_order_info roi on roi.rescue_info_id = ri.id
|
||||
<where>
|
||||
<if test="driverName != null ">
|
||||
and ri.driver_name like concat('%',#{driverName},'%')
|
||||
<if test="driverName != null">
|
||||
and ri.driver_name like concat('%', #{driverName}, '%')
|
||||
</if>
|
||||
<if test="driverCarNum != null ">
|
||||
and ri.driver_car_num like concat('%',#{driverCarNum},'%')
|
||||
<if test="driverCarNum != null">
|
||||
and ri.driver_car_num like concat('%', #{driverCarNum}, '%')
|
||||
</if>
|
||||
<if test="flag != null ">
|
||||
<if test="flag != null">
|
||||
and ri.driver_id is not null
|
||||
</if>
|
||||
<if test="rescueStart != null ">and rescue_time like concat(#{rescueStart},'%')</if>
|
||||
<if test="rescueStart != null">
|
||||
and rescue_time like concat(#{rescueStart}, '%')
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectRescueInfoListApp" parameterType="cn.iocoder.yudao.module.rescue.domain.RescueInfo"
|
||||
resultType="cn.iocoder.yudao.module.rescue.domain.RescueInfo">
|
||||
SELECT
|
||||
ri.*,roi.order_status,roi.set_money
|
||||
FROM
|
||||
rescue_info ri
|
||||
left join rescue_order_info roi on roi.rescue_info_id = ri.id
|
||||
SELECT ri.*,
|
||||
roi.order_status,
|
||||
roi.set_money
|
||||
FROM rescue_info ri
|
||||
left join rescue_order_info roi on roi.rescue_info_id = ri.id
|
||||
<where>
|
||||
(ri.user_id = #{map.userId} or connection_phone =#{map.connectionPhone})
|
||||
<if test="map.rescueStatus != null ">
|
||||
(ri.user_id = #{map.userId} or connection_phone = #{map.connectionPhone})
|
||||
<if test="map.rescueStatus != null">
|
||||
<!-- <choose>-->
|
||||
<!-- <when test="map.rescueStatus == '1'.toString()">-->
|
||||
<!-- <!– 救援中 –>-->
|
||||
<!-- and (ri.rescue_status = '1' or ri.rescue_status = '2' or ri.rescue_status = '3')-->
|
||||
<!-- </when>-->
|
||||
<!-- <when test="map.rescueStatus == '2'.toString()">-->
|
||||
<!-- <!–待支付 –>-->
|
||||
<!-- and roi.order_status ='1'-->
|
||||
<!-- </when>-->
|
||||
<!-- <when test="map.rescueStatus == '3'.toString()">-->
|
||||
<!-- <!– 待取车 –>-->
|
||||
<!-- and ri.rescue_status ='6'-->
|
||||
<!-- </when>-->
|
||||
<!-- <when test="map.rescueStatus == '4'.toString()">-->
|
||||
<!-- <!– 评价 –>-->
|
||||
<!-- and roi.order_status ='2'-->
|
||||
<!-- </when>-->
|
||||
<!-- <when test="map.rescueStatus == '5'.toString()">-->
|
||||
<!-- <!– 评价 –>-->
|
||||
<!-- and roi.order_status ='3'-->
|
||||
<!-- </when>-->
|
||||
<!-- <when test="map.rescueStatus == '8'.toString()">-->
|
||||
<!-- <!– 已还车 –>-->
|
||||
<!-- and ri.rescue_status ='8'-->
|
||||
<!-- </when>-->
|
||||
<!-- </choose>-->
|
||||
<!--
|
||||
目前数据库有救援状态：2、3、4、5、6、8、9，订单状态：0，1，2，3几个状态
|
||||
救援状态：
|
||||
2：待救援
|
||||
3：救援中
|
||||
5：已完成
|
||||
6：待取车/已解扣
|
||||
8：已取走/已还车
|
||||
9：扣车中
|
||||
订单状态：
|
||||
0：已成单
|
||||
1：待支付
|
||||
2：待评价
|
||||
3：已完成
|
||||
字典：救援状态:jy_status:记A,扣车状态:rescue_status:记B,救援订单状态：jy_order_status:记C
|
||||
2、3、5独在A
|
||||
6、8在A、B都有，使用地方不一样
|
||||
9独在B
|
||||
订单状态只在C
|
||||
-->
|
||||
<choose>
|
||||
<when test="map.rescueStatus == '1'.toString()">
|
||||
<!-- 救援中 -->
|
||||
and (ri.rescue_status = '1' or ri.rescue_status = '2' or ri.rescue_status = '3')
|
||||
<!-- 首页查询：待救援和救援中 -->
|
||||
<when test="map.rescueStatus == '1'.toString() ">
|
||||
and (ri.rescue_status = '2' or ri.rescue_status = '3')
|
||||
</when>
|
||||
<when test="map.rescueStatus == '2'.toString()">
|
||||
<!--待支付 -->
|
||||
<!-- 待支付 -->
|
||||
<when test="map.rescueStatus == '2'.toString() ">
|
||||
and roi.order_status ='1'
|
||||
</when>
|
||||
<when test="map.rescueStatus == '3'.toString()">
|
||||
<!-- 待取车 -->
|
||||
<!-- 待取车 -->
|
||||
<when test="map.rescueStatus == '3'.toString() ">
|
||||
and ri.rescue_status ='6'
|
||||
</when>
|
||||
<when test="map.rescueStatus == '4'.toString()">
|
||||
<!-- 评价 -->
|
||||
<!-- 待评价 -->
|
||||
<when test="map.rescueStatus == '4'.toString() ">
|
||||
and roi.order_status ='2'
|
||||
</when>
|
||||
<when test="map.rescueStatus == '5'.toString()">
|
||||
<!-- 评价 -->
|
||||
<!-- 已完成 -->
|
||||
<when test="map.rescueStatus == '5'.toString() ">
|
||||
and roi.order_status ='3'
|
||||
</when>
|
||||
<when test="map.rescueStatus == '8'.toString()">
|
||||
<!-- 已还车 -->
|
||||
and ri.rescue_status ='8'
|
||||
</when>
|
||||
</choose>
|
||||
</if>
|
||||
<if test="map.licenseNum != null ">
|
||||
and ri.license_num like concat('%',#{map.licenseNum},'%')
|
||||
<if test="map.licenseNum != null">
|
||||
and ri.license_num like concat('%', #{map.licenseNum}, '%')
|
||||
</if>
|
||||
</where>
|
||||
order by ri.create_time desc
|
||||
|
||||
</select>
|
||||
<select id="getKcList" parameterType="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>
|
||||
dept_id = #{map.deptId} and rescue_type = '5'
|
||||
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}, '%'))
|
||||
#{map.connectionPhone},
|
||||
'%') or
|
||||
license_num like concat('%', #{map.licenseNum}, '%'))
|
||||
</if>
|
||||
<if test="map.rescueStatus != null ">
|
||||
<if test="map.rescueStatus != null">
|
||||
<choose>
|
||||
<when test="map.rescueStatus == '1'.toString()">
|
||||
<!-- 扣车中 -->
|
||||
@ -189,51 +242,50 @@
|
||||
</select>
|
||||
|
||||
<select id="driverList" resultType="cn.iocoder.yudao.module.rescue.domain.DriverInfo">
|
||||
SELECT
|
||||
su.id AS userId,
|
||||
su.nickname AS nickName,
|
||||
su.mobile AS phonenumber,
|
||||
su.sex as sex,
|
||||
su.avatar as avatar,
|
||||
di.*
|
||||
FROM
|
||||
driver_info di
|
||||
INNER JOIN system_users su ON di.user_id = su.id
|
||||
AND su.deleted = '0'
|
||||
WHERE 1=1
|
||||
<if test="map.nickName !=null and map.nickName !=''">
|
||||
and su.nickname like concat('%',#{map.nickName},'%')
|
||||
SELECT su.id AS userId,
|
||||
su.nickname AS nickName,
|
||||
su.mobile AS phonenumber,
|
||||
su.sex as sex,
|
||||
su.avatar as avatar,
|
||||
di.*
|
||||
FROM driver_info di
|
||||
INNER JOIN system_users su ON di.user_id = su.id
|
||||
AND su.deleted = '0'
|
||||
WHERE 1 = 1
|
||||
<if test="map.nickName != null and map.nickName != ''">
|
||||
and su.nickname like concat('%', #{map.nickName}, '%')
|
||||
</if>
|
||||
<if test="map.phonenumber!=null and map.phonenumber!=''">
|
||||
<if test="map.phonenumber != null and map.phonenumber != ''">
|
||||
and su.mobile like concat('%', #{map.phonenumber}, '%')
|
||||
</if>
|
||||
<if test="map.driveStatus!=null and map.driveStatus!=''">
|
||||
<if test="map.driveStatus != null and map.driveStatus != ''">
|
||||
and di.driver_status = #{map.driveStatus}
|
||||
</if>
|
||||
<if test="map.authStatus!=null and map.authStatus!=''">
|
||||
<if test="map.authStatus != null and map.authStatus != ''">
|
||||
and di.auth_status = #{map.authStatus}
|
||||
</if>
|
||||
<if test="map.carType!=null and map.carType!=''">
|
||||
<if test="map.carType != null and map.carType != ''">
|
||||
and di.car_type = #{map.carType}
|
||||
</if>
|
||||
<if test="map.carLicenseNum!=null and map.carLicenseNum!=''">
|
||||
and di.car_license_num like concat('%',#{map.carLicenseNum},'%')
|
||||
<if test="map.carLicenseNum != null and map.carLicenseNum != ''">
|
||||
and di.car_license_num like concat('%', #{map.carLicenseNum}, '%')
|
||||
</if>
|
||||
order by di.create_time desc
|
||||
</select>
|
||||
|
||||
<select id="driverListApp" resultType="cn.iocoder.yudao.module.rescue.dto.DriverInfo2Dto">
|
||||
SELECT
|
||||
di.*,su.nickname as real_name,rci.rescue_car_num
|
||||
FROM
|
||||
driver_info di
|
||||
INNER JOIN system_users su ON di.user_id = su.id AND su.deleted = '0'
|
||||
left join system_dept sd on sd.id = di.dept_id
|
||||
inner join rescue_car_info rci on rci.possessor_id = di.id
|
||||
WHERE di.auth_status='2'
|
||||
<if test="searchValue!=null and searchValue!=''">
|
||||
and (su.nickname like concat('%',#{searchValue},'%') or di.phonenumber like concat('%',#{searchValue},'%')
|
||||
or rci.rescue_car_num like concat('%',#{searchValue},'%'))
|
||||
SELECT di.*,
|
||||
su.nickname as real_name,
|
||||
rci.rescue_car_num
|
||||
FROM driver_info di
|
||||
INNER JOIN system_users su ON di.user_id = su.id AND su.deleted = '0'
|
||||
left join system_dept sd on sd.id = di.dept_id
|
||||
inner join rescue_car_info rci on rci.possessor_id = di.id
|
||||
WHERE di.auth_status = '2'
|
||||
<if test="searchValue != null and searchValue != ''">
|
||||
and (su.nickname like concat('%', #{searchValue}, '%') or
|
||||
di.phonenumber like concat('%', #{searchValue}, '%')
|
||||
or rci.rescue_car_num like concat('%', #{searchValue}, '%'))
|
||||
</if>
|
||||
order by di.create_time desc
|
||||
</select>
|
||||
@ -255,8 +307,8 @@
|
||||
WHERE need_system = '0'
|
||||
AND driver_id IS NULL
|
||||
AND TIMESTAMPDIFF(
|
||||
MINUTE, rescue_time,
|
||||
NOW()) > 5
|
||||
MINUTE, rescue_time,
|
||||
NOW()) > 5
|
||||
AND rescue_status = '2'
|
||||
</update>
|
||||
<select id="getOverTimeRescue" resultType="cn.iocoder.yudao.module.rescue.domain.RescueInfo">
|
||||
@ -268,8 +320,8 @@
|
||||
AND ri.rescue_status = '2'
|
||||
GROUP BY ri.id
|
||||
HAVING TIMESTAMPDIFF(
|
||||
MINUTE, MAX(rdi.create_time),
|
||||
NOW()) <![CDATA[>]]> 3
|
||||
MINUTE, MAX(rdi.create_time),
|
||||
NOW()) <![CDATA[>]]> 3
|
||||
</select>
|
||||
<select id="getRescueStatistics" resultType="java.util.Map">
|
||||
SELECT IFNULL(sum(ri.rescue_status = '2' or ri.rescue_status = '3'), 0) as jyzNum,
|
||||
@ -294,8 +346,6 @@
|
||||
DELETE
|
||||
FROM rescue_info_detail
|
||||
WHERE rescue_info_id = #{rescueId};
|
||||
|
||||
|
||||
</delete>
|
||||
<delete id="deleteOtherInfo2">
|
||||
DELETE
|
||||
@ -315,44 +365,48 @@
|
||||
and rescue_time like concat(#{time}, '%')
|
||||
</select>
|
||||
<select id="getRescueInfoByDriver" resultType="cn.iocoder.yudao.module.rescue.domain.RescueInfo">
|
||||
SELECT
|
||||
ri.*,roi.order_status,roi.set_money,roi.id as rescueOrderId,roi.pay_money,roi.pay_time
|
||||
FROM
|
||||
rescue_info ri
|
||||
left join rescue_order_info roi on roi.rescue_info_id = ri.id
|
||||
where
|
||||
driver_id is not null
|
||||
<if test="map.rescueStart != null and map.rescueEnd != null">and rescue_time between concat(#{map.rescueStart},' 00:00:00')
|
||||
and concat(#{map.rescueEnd},' 23:59:59')
|
||||
SELECT ri.*,
|
||||
roi.order_status,
|
||||
roi.set_money,
|
||||
roi.id as rescueOrderId,
|
||||
roi.pay_money,
|
||||
roi.pay_time
|
||||
FROM rescue_info ri
|
||||
left join rescue_order_info roi on roi.rescue_info_id = ri.id
|
||||
where driver_id is not null
|
||||
<if test="map.rescueStart != null and map.rescueEnd != null">
|
||||
and rescue_time between concat(#{map.rescueStart}, ' 00:00:00')
|
||||
and concat(#{map.rescueEnd}, ' 23:59:59')
|
||||
</if>
|
||||
<if test="map.licenseNum != null ">
|
||||
and ri.license_num like concat('%',#{map.licenseNum},'%')
|
||||
<if test="map.licenseNum != null">
|
||||
and ri.license_num like concat('%', #{map.licenseNum}, '%')
|
||||
</if>
|
||||
<if test="map.feeType != null ">
|
||||
<if test="map.feeType != null">
|
||||
and ri.fee_type = #{map.feeType}
|
||||
</if>
|
||||
<if test="map.flag != null ">
|
||||
<if test="map.flag != null">
|
||||
and ri.driver_id is not null
|
||||
</if>
|
||||
<if test="map.rescueStart != null and map.rescueEnd != null">and rescue_time between concat(#{map.rescueStart},' 00:00:00')
|
||||
and concat(#{map.rescueEnd},' 23:59:59')
|
||||
<if test="map.rescueStart != null and map.rescueEnd != null">
|
||||
and rescue_time between concat(#{map.rescueStart}, ' 00:00:00')
|
||||
and concat(#{map.rescueEnd}, ' 23:59:59')
|
||||
</if>
|
||||
|
||||
<if test="map.driverName != null ">
|
||||
and ri.driver_name like concat('%',#{map.driverName},'%')
|
||||
<if test="map.driverName != null">
|
||||
and ri.driver_name like concat('%', #{map.driverName}, '%')
|
||||
</if>
|
||||
<if test="map.driverCarNum != null ">
|
||||
and ri.driver_car_num like concat('%',#{map.driverCarNum},'%')
|
||||
<if test="map.driverCarNum != null">
|
||||
and ri.driver_car_num like concat('%', #{map.driverCarNum}, '%')
|
||||
</if>
|
||||
<if test="map.rescueStartMonth != null">
|
||||
and rescue_time like concat(#{map.rescueStartMonth},'%')
|
||||
and rescue_time like concat(#{map.rescueStartMonth}, '%')
|
||||
</if>
|
||||
order by ri.driver_name desc
|
||||
</select>
|
||||
<select id="statisticsInfo" resultType="com.alibaba.fastjson.JSONObject">
|
||||
SELECT IFNULL(sum(roi.set_money), 0) / 100 as money,
|
||||
count(ri.id) as rescueNum,
|
||||
su.nickname as driverName
|
||||
su.nickname as driverName
|
||||
FROM driver_info di
|
||||
LEFT JOIN rescue_info ri on ri.driver_id = di.id and ri.rescue_time <![CDATA[>=]]> #{startTime} and
|
||||
ri.rescue_time <![CDATA[<=]]> #{endTime}
|
||||
@ -366,13 +420,13 @@
|
||||
SELECT sd.id,
|
||||
sd.name AS buckle_name,
|
||||
t1.buckle_count
|
||||
FROM
|
||||
(SELECT dept_id,
|
||||
count(*) AS buckle_count
|
||||
FROM rescue_info
|
||||
WHERE rescue_type = '5' AND deleted = '0'
|
||||
GROUP BY dept_id) t1
|
||||
LEFT JOIN system_dept sd ON t1.dept_id = sd.id
|
||||
FROM (SELECT dept_id,
|
||||
count(*) AS buckle_count
|
||||
FROM rescue_info
|
||||
WHERE rescue_type = '5'
|
||||
AND deleted = '0'
|
||||
GROUP BY dept_id) t1
|
||||
LEFT JOIN system_dept sd ON t1.dept_id = sd.id
|
||||
ORDER BY sd.id desc
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user