0909

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

@@ -172,6 +172,12 @@ public class RescueInfoController extends BaseController {
     }
 //
 
+    @PutMapping("/revokeRescueInfo")
+    public CommonResult revokeRescueInfo(Long id) {
+        rescueInfoService.revokeRescueInfo(id);
+        return success();
+    }
+
     /**
      * 查询【请填写功能名称】列表
      */

dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/domain/RescueInfo.java

@@ -335,6 +335,26 @@ public class RescueInfo extends TenantBaseDO
      */
     private Long zwxUserId;
 
+    /**
+     * 是否撤消
+     */
+    private String isRevoke;
+
+    /**
+     * 撤消时间
+     */
+    private Date revokeTime;
+
+    /**
+     * 撤销人userId
+     */
+    private Long revokeUserId;
+
+    /**
+     * 撤消人姓名
+     */
+    private String revokeUserName;
+
     @TableField(exist = false)
     private String adviserId;
 

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

@@ -97,4 +97,6 @@ public interface RescueInfoMapper extends BaseMapper<RescueInfo>
     DriverStaffSaveVO getOnInternal(Long id);
 
     List<DriverInfoExportVO> getAll(@Param("entity") DriverInfoDto query);
+
+    void revokeRescueInfo(@Param("id") Long id, @Param("userId") Long userId, @Param("userName") String userName);
 }

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

@@ -85,6 +85,7 @@ public interface IRescueInfoService extends IService<RescueInfo>
      * @return 结果
      */
     public void deleteRescueInfoById(Long id);
+    void revokeRescueInfo(Long id);
     IPage<DriverInfo> driverList(DriverInfoDto user, Page<DriverInfo> page);
     IPage<DriverInfo> driverListNew(DriverInfoDto user, Page<DriverInfo> page);
     IPage<DriverInfo> driverAndCarList(DriverInfoDto user, Page<DriverInfo> page);

dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueDriverInfoServiceImpl.java

@@ -437,7 +437,7 @@ public class RescueDriverInfoServiceImpl extends ServiceImpl<RescueDriverInfoMap
         String car_type = dictDataService.getDictDataLabel("rescue_car_type", rescueInfo.getCarType());
         rescueInfo.setCarTypeStr(car_type);
         String rescue_status = dictDataService.getDictDataLabel("jy_status", rescueInfo.getRescueStatus());
-        rescueInfo.setRescueStatus(rescue_status);
+        rescueInfo.setRescueStatusStr(rescue_status);
         String feeStr = dictDataService.getDictDataLabel("fee_type", rescueInfo.getFeeType());
         rescueInfo.setFeeTypeStr(feeStr);
         if (StringUtils.isNotEmpty(rescueInfo.getRescueSceneImage())) {

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

@@ -136,6 +136,9 @@ public class RescueInfoServiceImpl extends ServiceImpl<RescueInfoMapper, RescueI
     @Resource
     private IRescueDriverCarRelationService driverCarRelationService;
 
+    @Resource
+    private AdminUserApi userApi;
+
 
 
     /**
@@ -568,6 +571,14 @@ public class RescueInfoServiceImpl extends ServiceImpl<RescueInfoMapper, RescueI
         baseMapper.deleteOtherInfo2(id);
     }
 
+    @Override
+    public void revokeRescueInfo(Long id) {
+        Long userId = SecurityFrameworkUtils.getLoginUserId();
+        AdminUserRespDTO user = userApi.getUser(userId);
+        String userName = user.getNickname();
+        baseMapper.revokeRescueInfo(id, userId, userName);
+    }
+
     @Override
     public IPage<DriverInfo> driverList(DriverInfoDto driverInfo, Page<DriverInfo> page) {
         IPage<DriverInfo> driverInfos = baseMapper.driverList(driverInfo, page);

dl-module-rescue/src/main/resources/mapper/rescue/RescueDriverInfoMapper.xml

@@ -137,6 +137,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="map.rescueStatus == '5'.toString()">
             and  (ri.rescue_status = '5' or ri.rescue_status = '6')
         </if>
+        <if test="map.connectionName != null and map.connectionName != ''">
+            and (ri.connection_name like concat('%', #{map.connectionName}, '%')
+            or ri.connection_phone like concat('%', #{map.connectionName}, '%')
+            or ri.license_num like concat('%', #{map.connectionName}, '%')
+            or ri.car_owner like concat('%', #{map.connectionName}, '%'))
+            or ri.car_owner_phone like concat('%', #{map.connectionName}, '%'))
+        </if>
         ORDER BY ri.create_time desc
     </select>
     <select id="dqrList" resultType="java.lang.Integer">

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

@@ -19,7 +19,7 @@
         left join rescue_order_info roi on roi.rescue_info_id = ri.id
         <where>
             1 = 1
-            and ri.deleted = '0'
+            and ri.deleted = '0' AND ri.is_revoke = '0'
             <if test="map.rescueStatus != null">
                 <choose>
                     <when test="map.rescueStatus == '1'.toString()">
@@ -84,7 +84,7 @@
         left join rescue_order_info roi on roi.rescue_info_id = ri.id
         <where>
             1 = 1
-            and ri.deleted = '0'
+            and ri.deleted = '0' AND ri.is_revoke = '0'
             and ri.second_dispatch_id = #{map.userId}
             <if test="map.rescueStatus != null">
                 <choose>
@@ -728,5 +728,9 @@
         ORDER BY su.nickname
     </select>
 
+    <update id="revokeRescueInfo">
+        update rescue_info set is_revoke = 1,revoke_user_id = #{userId},revoke_user_name = #{userName}, revoke_time = now() where id = #{id}
+    </update>
+
 
 </mapper>