From 86eb948f7c678685e179982de6fd54cc8394846a Mon Sep 17 00:00:00 2001 From: xiao-fajia <1665375861@qq.com> Date: Mon, 19 Aug 2024 19:14:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=91=E6=8F=B4=E9=9B=86=E6=88=90=E8=BF=9B?= =?UTF-8?q?=E5=BA=A61/5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/RescueCarInfoController.java | 105 ++++++++++++ .../admin/RescueCarSpendController.java | 89 ++++++++++ .../admin/RescueConfigController.java | 92 +++++++++++ .../admin/RescueCustomerInfoController.java | 93 +++++++++++ .../admin/RescueDeptDriverController.java | 86 ++++++++++ .../admin/RescueRefuelRecordController.java | 97 +++++++++++ .../module/rescue/domain/RescueCarInfo.java | 55 +++++-- .../module/rescue/domain/RescueConfig.java | 53 +----- .../rescue/mapper/RescueCarInfoMapper.java | 4 +- .../mapper/RescueCustomerInfoMapper.java | 5 +- .../rescue/service/IRescueCarInfoService.java | 6 +- .../service/IRescueCustomerInfoService.java | 4 +- .../impl/RescueCarInfoServiceImpl.java | 65 ++++---- .../impl/RescueCustomerInfoServiceImpl.java | 46 +++--- .../mapper/rescue/RescueCarInfoMapper.xml | 154 +++++++++--------- .../rescue/RescueCustomerInfoMapper.xml | 86 +++++----- 16 files changed, 793 insertions(+), 247 deletions(-) create mode 100644 dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueCarInfoController.java create mode 100644 dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueCarSpendController.java create mode 100644 dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueConfigController.java create mode 100644 dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueCustomerInfoController.java create mode 100644 dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueDeptDriverController.java create mode 100644 dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueRefuelRecordController.java diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueCarInfoController.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueCarInfoController.java new file mode 100644 index 00000000..a9034823 --- /dev/null +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueCarInfoController.java @@ -0,0 +1,105 @@ +package cn.iocoder.yudao.module.rescue.controller.admin; + +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; +import cn.iocoder.yudao.module.rescue.core.controller.BaseController; +import cn.iocoder.yudao.module.rescue.domain.RescueCarInfo; +import cn.iocoder.yudao.module.rescue.service.IRescueCarInfoService; +import cn.iocoder.yudao.module.rescue.utils.ExcelUtil; +import cn.iocoder.yudao.module.system.api.user.AdminUserApi; +import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 救援车辆信息Controller + * + * @author zcy + * @date 2023-09-12 + */ +@RestController +@RequestMapping("/system/rescueCar") +public class RescueCarInfoController extends BaseController { + @Autowired + private IRescueCarInfoService rescueCarInfoService; + @Autowired + private AdminUserApi adminUserApi; + + /** + * 查询救援车辆信息列表 + */ + @GetMapping("/list") + public CommonResult> list(RescueCarInfo rescueCarInfo, + @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) { + //获取当前登录用户 + Long userId = SecurityFrameworkUtils.getLoginUserId(); + //所在顶级机构 + AdminUserRespDTO user = adminUserApi.getUser(userId); + rescueCarInfo.setDeptId(user.getDeptId()); + Page page = new Page<>(pageNo, pageSize); + return success(rescueCarInfoService.selectRescueCarInfoList(rescueCarInfo, page)); + } + + /** + * 查询救援车辆信息列表 + */ + @GetMapping("/warnList") + public CommonResult warnList(RescueCarInfo rescueCarInfo) { + List list = rescueCarInfoService.warnList(rescueCarInfo); + return CommonResult.success(list); + } + + /** + * 导出救援车辆信息列表 + */ + @PreAuthorize("@ss.hasPermission('system:rescueCar:list')") +// @Log(title = "救援车辆信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, RescueCarInfo rescueCarInfo) { + List list = rescueCarInfoService.list(); + ExcelUtil util = new ExcelUtil(RescueCarInfo.class); + util.exportExcel(response, list, "救援车辆信息数据"); + } + + /** + * 获取救援车辆信息详细信息 + */ + @GetMapping(value = "/{id}") + public CommonResult getInfo(@PathVariable("id") Long id) { + return success(rescueCarInfoService.selectRescueCarInfoById(id)); + } + + /** + * 新增救援车辆信息 + */ +// @Log(title = "救援车辆信息", businessType = BusinessType.INSERT) + @PostMapping + public CommonResult add(@RequestBody RescueCarInfo rescueCarInfo) { + return toAjax(rescueCarInfoService.insertRescueCarInfo(rescueCarInfo)); + } + + /** + * 修改救援车辆信息 + */ +// @Log(title = "救援车辆信息", businessType = BusinessType.UPDATE) + @PutMapping + public CommonResult edit(@RequestBody RescueCarInfo rescueCarInfo) { + return toAjax(rescueCarInfoService.updateRescueCarInfo(rescueCarInfo)); + } + + /** + * 删除救援车辆信息 + */ +// @Log(title = "救援车辆信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public CommonResult remove(@PathVariable Long[] ids) { + return toAjax(rescueCarInfoService.deleteRescueCarInfoByIds(ids)); + } +} diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueCarSpendController.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueCarSpendController.java new file mode 100644 index 00000000..0526cd68 --- /dev/null +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueCarSpendController.java @@ -0,0 +1,89 @@ +package cn.iocoder.yudao.module.rescue.controller.admin; + +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.module.rescue.core.controller.BaseController; +import cn.iocoder.yudao.module.rescue.core.page.TableDataInfo; +import cn.iocoder.yudao.module.rescue.domain.RescueCarSpend; +import cn.iocoder.yudao.module.rescue.service.IRescueCarSpendService; +import cn.iocoder.yudao.module.rescue.utils.ExcelUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 车辆消费管理Controller + * + * @author zcy + * @date 2023-11-30 + */ +@RestController +@RequestMapping("/rescue/rescueCarSpend") +public class RescueCarSpendController extends BaseController { + @Autowired + private IRescueCarSpendService rescueCarSpendService; + + /** + * 查询车辆消费管理列表 + */ + @PreAuthorize("@ss.hasPermi('rescue:rescueCarSpend:list')") + @GetMapping("/list") + public TableDataInfo list(RescueCarSpend rescueCarSpend) { + startPage(); + List list = rescueCarSpendService.selectRescueCarSpendList(rescueCarSpend); + return getDataTable(list); + } + + /** + * 导出车辆消费管理列表 + */ + @PreAuthorize("@ss.hasPermi('rescue:rescueCarSpend:export')") +// @Log(title = "车辆消费管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, RescueCarSpend rescueCarSpend) { + List list = rescueCarSpendService.selectRescueCarSpendList(rescueCarSpend); + ExcelUtil util = new ExcelUtil(RescueCarSpend.class); + util.exportExcel(response, list, "车辆消费管理数据"); + } + + /** + * 获取车辆消费管理详细信息 + */ + @PreAuthorize("@ss.hasPermi('rescue:rescueCarSpend:query')") + @GetMapping(value = "/{id}") + public CommonResult getInfo(@PathVariable("id") Long id) { + return success(rescueCarSpendService.selectRescueCarSpendById(id)); + } + + /** + * 新增车辆消费管理 + */ + @PreAuthorize("@ss.hasPermi('rescue:rescueCarSpend:add')") +// @Log(title = "车辆消费管理", businessType = BusinessType.INSERT) + @PostMapping + public CommonResult add(@RequestBody RescueCarSpend rescueCarSpend) { + return toAjax(rescueCarSpendService.insertRescueCarSpend(rescueCarSpend)); + } + + /** + * 修改车辆消费管理 + */ + @PreAuthorize("@ss.hasPermi('rescue:rescueCarSpend:edit')") +// @Log(title = "车辆消费管理", businessType = BusinessType.UPDATE) + @PutMapping + public CommonResult edit(@RequestBody RescueCarSpend rescueCarSpend) { + return toAjax(rescueCarSpendService.updateRescueCarSpend(rescueCarSpend)); + } + + /** + * 删除车辆消费管理 + */ + @PreAuthorize("@ss.hasPermi('rescue:rescueCarSpend:remove')") +// @Log(title = "车辆消费管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public CommonResult remove(@PathVariable Long[] ids) { + return toAjax(rescueCarSpendService.deleteRescueCarSpendByIds(ids)); + } +} diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueConfigController.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueConfigController.java new file mode 100644 index 00000000..eb1e8ec6 --- /dev/null +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueConfigController.java @@ -0,0 +1,92 @@ +package cn.iocoder.yudao.module.rescue.controller.admin; + +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.module.rescue.core.controller.BaseController; +import cn.iocoder.yudao.module.rescue.core.page.TableDataInfo; +import cn.iocoder.yudao.module.rescue.domain.RescueConfig; +import cn.iocoder.yudao.module.rescue.service.IRescueConfigService; +import cn.iocoder.yudao.module.rescue.utils.ExcelUtil; +import cn.iocoder.yudao.module.system.api.user.AdminUserApi; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 救援司机提成配置Controller + * + * @author zcy + * @date 2023-12-01 + */ +@RestController +@RequestMapping("/rescue/rescueConfig") +public class RescueConfigController extends BaseController { + @Resource + private IRescueConfigService rescueConfigService; + + @Resource + private AdminUserApi adminUserApi; + + /** + * 查询救援司机提成配置列表 + */ + @PreAuthorize("@ss.hasPermission('rescue:rescueConfig:list')") + @GetMapping("/list") + public TableDataInfo list(RescueConfig rescueConfig) { + startPage(); + List list = rescueConfigService.selectRescueConfigList(rescueConfig); + return getDataTable(list); + } + + /** + * 导出救援司机提成配置列表 + */ + @PreAuthorize("@ss.hasPermission('rescue:rescueConfig:export')") +// @Log(title = "救援司机提成配置", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, RescueConfig rescueConfig) { + List list = rescueConfigService.selectRescueConfigList(rescueConfig); + ExcelUtil util = new ExcelUtil(RescueConfig.class); + util.exportExcel(response, list, "救援司机提成配置数据"); + } + + /** + * 获取救援司机提成配置详细信息 + */ + @GetMapping(value = "/getInfo") + public CommonResult getInfo() { + return success(rescueConfigService.selectRescueConfigByDeptId()); + } + + /** + * 新增救援司机提成配置 + */ + @PreAuthorize("@ss.hasPermission('rescue:rescueConfig:add')") +// @Log(title = "救援司机提成配置", businessType = BusinessType.INSERT) + @PostMapping + public CommonResult add(@RequestBody RescueConfig rescueConfig) { + return toAjax(rescueConfigService.insertRescueConfig(rescueConfig)); + } + + /** + * 修改救援司机提成配置 + */ +// @PreAuthorize("@ss.hasPermission('rescue:rescueConfig:edit')") +// @Log(title = "救援司机提成配置", businessType = BusinessType.UPDATE) + @PutMapping + public CommonResult edit(@RequestBody RescueConfig rescueConfig) { + return toAjax(rescueConfigService.updateRescueConfig(rescueConfig)); + } + + /** + * 删除救援司机提成配置 + */ + @PreAuthorize("@ss.hasPermission('rescue:rescueConfig:remove')") +// @Log(title = "救援司机提成配置", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public CommonResult remove(@PathVariable Long[] ids) { + return toAjax(rescueConfigService.deleteRescueConfigByIds(ids)); + } +} diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueCustomerInfoController.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueCustomerInfoController.java new file mode 100644 index 00000000..c7608076 --- /dev/null +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueCustomerInfoController.java @@ -0,0 +1,93 @@ +package cn.iocoder.yudao.module.rescue.controller.admin; + +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.module.rescue.core.controller.BaseController; +import cn.iocoder.yudao.module.rescue.domain.RescueCustomerInfo; +import cn.iocoder.yudao.module.rescue.service.IRescueCustomerInfoService; +import cn.iocoder.yudao.module.rescue.utils.ExcelUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 救援的客户信息Controller + * + * @author zcy + * @date 2023-09-14 + */ +@RestController +@RequestMapping("/rescueCustomer/rescueCustomer") +public class RescueCustomerInfoController extends BaseController { + @Autowired + private IRescueCustomerInfoService rescueCustomerInfoService; + + /** + * 查询救援的客户信息列表 + */ + @PreAuthorize("@ss.hasPermission('rescueCustomer:rescueCustomer:list')") + @GetMapping("/list") + public CommonResult> list(RescueCustomerInfo rescueCustomerInfo, + @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) { + Page page = new Page<>(pageNo, pageSize); + IPage list = rescueCustomerInfoService.selectRescueCustomerInfoList(rescueCustomerInfo, page); + return success(list); + } + + /** + * 导出救援的客户信息列表 + */ + @PreAuthorize("@ss.hasPermission('rescueCustomer:rescueCustomer:list')") +// @Log(title = "救援的客户信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, RescueCustomerInfo rescueCustomerInfo) { + List list = rescueCustomerInfoService.list(); + ExcelUtil util = new ExcelUtil(RescueCustomerInfo.class); + util.exportExcel(response, list, "救援的客户信息数据"); + } + + /** + * 获取救援的客户信息详细信息 + */ + @PreAuthorize("@ss.hasPermission('rescueCustomer:rescueCustomer:list')") + @GetMapping(value = "/{id}") + public CommonResult getInfo(@PathVariable("id") Long id) { + return success(rescueCustomerInfoService.selectRescueCustomerInfoById(id)); + } + + /** + * 新增救援的客户信息 + */ + @PreAuthorize("@ss.hasPermission('rescueCustomer:rescueCustomer:list')") +// @Log(title = "救援的客户信息", businessType = BusinessType.INSERT) + @PostMapping + public CommonResult add(@RequestBody RescueCustomerInfo rescueCustomerInfo) { + return toAjax(rescueCustomerInfoService.insertRescueCustomerInfo(rescueCustomerInfo)); + } + + /** + * 修改救援的客户信息 + */ + @PreAuthorize("@ss.hasPermission('rescueCustomer:rescueCustomer:list')") +// @Log(title = "救援的客户信息", businessType = BusinessType.UPDATE) + @PutMapping + public CommonResult edit(@RequestBody RescueCustomerInfo rescueCustomerInfo) { + return toAjax(rescueCustomerInfoService.updateRescueCustomerInfo(rescueCustomerInfo)); + } + + /** + * 删除救援的客户信息 + */ + @PreAuthorize("@ss.hasPermission('rescueCustomer:rescueCustomer:list')") +// @Log(title = "救援的客户信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public CommonResult remove(@PathVariable Long[] ids) { + return toAjax(rescueCustomerInfoService.deleteRescueCustomerInfoByIds(ids)); + } +} + diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueDeptDriverController.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueDeptDriverController.java new file mode 100644 index 00000000..4e054aff --- /dev/null +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueDeptDriverController.java @@ -0,0 +1,86 @@ +package cn.iocoder.yudao.module.rescue.controller.admin; + +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.module.rescue.core.controller.BaseController; +import cn.iocoder.yudao.module.rescue.core.page.TableDataInfo; +import cn.iocoder.yudao.module.rescue.domain.RescueDeptDriver; +import cn.iocoder.yudao.module.rescue.service.IRescueDeptDriverService; +import cn.iocoder.yudao.module.rescue.utils.ExcelUtil; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 救援客户司机分配Controller + * + * @author zcy + * @date 2023-09-21 + */ +@RestController +@RequestMapping("/dept_driver/dept_driver") +public class RescueDeptDriverController extends BaseController { + + @Resource + private IRescueDeptDriverService rescueDeptDriverService; + + /** + * 查询救援客户司机分配列表 + */ + @GetMapping("/list") + public TableDataInfo list(RescueDeptDriver rescueDeptDriver) { + startPage(); + List list = rescueDeptDriverService.selectRescueDeptDriverList(rescueDeptDriver); + return getDataTable(list); + } + + /** + * 导出救援客户司机分配列表 + */ +// @Log(title = "救援客户司机分配", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, RescueDeptDriver rescueDeptDriver) { + List list = rescueDeptDriverService.selectRescueDeptDriverList(rescueDeptDriver); + ExcelUtil util = new ExcelUtil(RescueDeptDriver.class); + util.exportExcel(response, list, "救援客户司机分配数据"); + } + + /** + * 获取救援客户司机分配详细信息 + */ + @GetMapping(value = "/{id}") + public CommonResult getInfo(@PathVariable("id") Long id) { + return success(rescueDeptDriverService.selectRescueDeptDriverById(id)); + } + + /** + * 新增救援客户司机分配 + */ +// @Log(title = "救援客户司机分配", businessType = BusinessType.INSERT) + @PostMapping + public CommonResult add(@RequestBody RescueDeptDriver rescueDeptDriver) { + return toAjax(rescueDeptDriverService.insertRescueDeptDriver(rescueDeptDriver)); + } + + /** + * 修改救援客户司机分配 + */ +// @Log(title = "救援客户司机分配", businessType = BusinessType.UPDATE) + @PutMapping + public CommonResult edit(@RequestBody RescueDeptDriver rescueDeptDriver) { + return toAjax(rescueDeptDriverService.updateRescueDeptDriver(rescueDeptDriver)); + } + + /** + * 删除救援客户司机分配 + */ + @PreAuthorize("@ss.hasPermission('dept_driver:dept_driver:remove')") +// @Log(title = "救援客户司机分配", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public CommonResult remove(@PathVariable Long[] ids) { + return toAjax(rescueDeptDriverService.deleteRescueDeptDriverByIds(ids)); + } +} + diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueRefuelRecordController.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueRefuelRecordController.java new file mode 100644 index 00000000..bb6c3e36 --- /dev/null +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueRefuelRecordController.java @@ -0,0 +1,97 @@ +package cn.iocoder.yudao.module.rescue.controller.admin; + +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.module.rescue.core.controller.BaseController; +import cn.iocoder.yudao.module.rescue.core.page.TableDataInfo; +import cn.iocoder.yudao.module.rescue.domain.RescueRefuelRecord; +import cn.iocoder.yudao.module.rescue.service.IRescueRefuelRecordService; +import cn.iocoder.yudao.module.rescue.utils.ExcelUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 加油记录Controller + * + * @author zcy + * @date 2023-09-26 + */ +@RestController +@RequestMapping("/rescue/refuelRecord") +public class RescueRefuelRecordController extends BaseController +{ + @Autowired + private IRescueRefuelRecordService rescueRefuelRecordService; + + /** + * 查询加油记录列表 + */ + @PreAuthorize("@ss.hasPermission('rescue:refuelRecord:list')") + @GetMapping("/list") + public TableDataInfo list(RescueRefuelRecord rescueRefuelRecord) + { + startPage(); + List list = rescueRefuelRecordService.selectRescueRefuelRecordList(rescueRefuelRecord); + return getDataTable(list); + } + + /** + * 导出加油记录列表 + */ + @PreAuthorize("@ss.hasPermission('rescue:refuelRecord:export')") +// @Log(title = "加油记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, RescueRefuelRecord rescueRefuelRecord) + { + List list = rescueRefuelRecordService.selectRescueRefuelRecordList(rescueRefuelRecord); + ExcelUtil util = new ExcelUtil(RescueRefuelRecord.class); + util.exportExcel(response, list, "加油记录数据"); + } + + /** + * 获取加油记录详细信息 + */ + @PreAuthorize("@ss.hasPermission('rescue:refuelRecord:query')") + @GetMapping(value = "/{id}") + public CommonResult getInfo(@PathVariable("id") Long id) + { + return success(rescueRefuelRecordService.selectRescueRefuelRecordById(id)); + } + + /** + * 新增加油记录 + */ + @PreAuthorize("@ss.hasPermission('rescue:refuelRecord:add')") +// @Log(title = "加油记录", businessType = BusinessType.INSERT) + @PostMapping + public CommonResult add(@RequestBody RescueRefuelRecord rescueRefuelRecord) + { + return toAjax(rescueRefuelRecordService.insertRescueRefuelRecord(rescueRefuelRecord)); + } + + /** + * 修改加油记录 + */ + @PreAuthorize("@ss.hasPermission('rescue:refuelRecord:edit')") +// @Log(title = "加油记录", businessType = BusinessType.UPDATE) + @PutMapping + public CommonResult edit(@RequestBody RescueRefuelRecord rescueRefuelRecord) + { + return toAjax(rescueRefuelRecordService.updateRescueRefuelRecord(rescueRefuelRecord)); + } + + /** + * 删除加油记录 + */ + @PreAuthorize("@ss.hasPermission('rescue:refuelRecord:remove')") +// @Log(title = "加油记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public CommonResult remove(@PathVariable Long[] ids) + { + return toAjax(rescueRefuelRecordService.deleteRescueRefuelRecordByIds(ids)); + } +} + diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/domain/RescueCarInfo.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/domain/RescueCarInfo.java index 943341c6..e1cc3be7 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/domain/RescueCarInfo.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/domain/RescueCarInfo.java @@ -17,56 +17,77 @@ import java.util.Date; * @date 2023-09-13 */ @Data -public class RescueCarInfo extends TenantBaseDO -{ +public class RescueCarInfo extends TenantBaseDO { private static final long serialVersionUID = 1L; - /** 主键 */ + /** + * 主键 + */ @TableId(type = IdType.AUTO) private Long id; - /** 车辆类型 */ + /** + * 车辆类型 + */ @Excel(name = "车辆类型") private String rescueCarType; @TableField(exist = false) private String rescueCarTypeStr; - /** 车牌号 */ + /** + * 车牌号 + */ @Excel(name = "车牌号") private String rescueCarNum; - /** 品牌型号 */ + /** + * 品牌型号 + */ @Excel(name = "品牌型号") private String rescueCarBrand; - /** 所属 */ + /** + * 所属 + */ @Excel(name = "所属") private String carOwn; - /** 车辆图片 */ + /** + * 车辆图片 + */ @Excel(name = "车辆图片") private String carImage; - /** 行驶证照片 */ + /** + * 行驶证照片 + */ @Excel(name = "行驶证照片") private String driveLicenseImage; - /** 车辆购买时间 */ + /** + * 车辆购买时间 + */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "车辆购买时间", width = 30, dateFormat = "yyyy-MM-dd") private Date carBuyTime; - /** 拍照颜色 */ + /** + * 拍照颜色 + */ @Excel(name = "拍照颜色") private String carLicenseColor; @TableField(exist = false) private String carLicenseColorStr; - /** 车辆使用性质 */ + /** + * 车辆使用性质 + */ @Excel(name = "车辆使用性质") private String carUseNature; - /** 车架号 */ + /** + * 车架号 + */ @Excel(name = "车架号") private String frameNumber; //车辆保养时间 @@ -79,11 +100,15 @@ public class RescueCarInfo extends TenantBaseDO @JsonFormat(pattern = "yyyy-MM-dd") private Date carCheckTime; - /** 拥有者主键 */ + /** + * 拥有者主键 + */ @Excel(name = "拥有者主键") private Long possessorId; - /** 部门id */ + /** + * 部门id + */ private Long deptId; } diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/domain/RescueConfig.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/domain/RescueConfig.java index 82a15b46..b1d4a325 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/domain/RescueConfig.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/domain/RescueConfig.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.rescue.domain; import cn.iocoder.yudao.annotation.Excel; import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -11,6 +12,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @author zcy * @date 2023-12-01 */ +@Data public class RescueConfig extends TenantBaseDO { private static final long serialVersionUID = 1L; @@ -18,7 +20,9 @@ public class RescueConfig extends TenantBaseDO /** */ private Long id; - + /** 顶级机构 */ + @Excel(name = "顶级机构") + private Long topDeptId; /** 救援大拖车提成比例 */ @Excel(name = "救援大拖车提成比例") @@ -31,51 +35,4 @@ public class RescueConfig extends TenantBaseDO /** 救援小拖车提成比例 */ @Excel(name = "救援小拖车提成比例") private Double rescueTcSmall; - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setRescueTcBig(Double rescueTcBig) - { - this.rescueTcBig = rescueTcBig; - } - - public Double getRescueTcBig() - { - return rescueTcBig; - } - public void setRescueTcMid(Double rescueTcMid) - { - this.rescueTcMid = rescueTcMid; - } - - public Double getRescueTcMid() - { - return rescueTcMid; - } - public void setRescueTcSmall(Double rescueTcSmall) - { - this.rescueTcSmall = rescueTcSmall; - } - - public Double getRescueTcSmall() - { - return rescueTcSmall; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("rescueTcBig", getRescueTcBig()) - .append("rescueTcMid", getRescueTcMid()) - .append("rescueTcSmall", getRescueTcSmall()) - .toString(); - } } diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueCarInfoMapper.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueCarInfoMapper.java index 98b5c98f..3b6ef344 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueCarInfoMapper.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueCarInfoMapper.java @@ -3,6 +3,8 @@ package cn.iocoder.yudao.module.rescue.mapper; import cn.iocoder.yudao.module.rescue.domain.RescueCarInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -31,7 +33,7 @@ public interface RescueCarInfoMapper extends BaseMapper * @param rescueCarInfo 救援车辆信息 * @return 救援车辆信息集合 */ - public List selectRescueCarInfoList(RescueCarInfo rescueCarInfo); + IPage selectRescueCarInfoList(@Param("map") RescueCarInfo rescueCarInfo, Page page); /** * 新增救援车辆信息 diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueCustomerInfoMapper.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueCustomerInfoMapper.java index 61cd5755..d266bb29 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueCustomerInfoMapper.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueCustomerInfoMapper.java @@ -2,7 +2,10 @@ package cn.iocoder.yudao.module.rescue.mapper; import cn.iocoder.yudao.module.rescue.domain.RescueCustomerInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -29,7 +32,7 @@ public interface RescueCustomerInfoMapper extends BaseMapper selectRescueCustomerInfoList(RescueCustomerInfo rescueCustomerInfo); + IPage selectRescueCustomerInfoList(@Param("map") RescueCustomerInfo rescueCustomerInfo, Page page); /** * 新增救援的客户信息 diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueCarInfoService.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueCarInfoService.java index b7e2817a..aa56240c 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueCarInfoService.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueCarInfoService.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.rescue.service; import cn.iocoder.yudao.module.rescue.domain.RescueCarInfo; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -23,7 +25,7 @@ public interface IRescueCarInfoService extends IService /** * 查询救援车辆信息 * - * @param id 救援车辆信息主键 + * @param carNum 救援车辆信息主键 * @return 救援车辆信息 */ public RescueCarInfo selectRescueCarInfoByNum(String carNum); @@ -34,7 +36,7 @@ public interface IRescueCarInfoService extends IService * @param rescueCarInfo 救援车辆信息 * @return 救援车辆信息集合 */ - public List selectRescueCarInfoList(RescueCarInfo rescueCarInfo); + IPage selectRescueCarInfoList(RescueCarInfo rescueCarInfo, Page page); /** * 新增救援车辆信息 diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueCustomerInfoService.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueCustomerInfoService.java index 30071631..1b614906 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueCustomerInfoService.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueCustomerInfoService.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.rescue.service; import cn.iocoder.yudao.module.rescue.domain.RescueCustomerInfo; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; @@ -28,7 +30,7 @@ public interface IRescueCustomerInfoService extends IService * @param rescueCustomerInfo 救援的客户信息 * @return 救援的客户信息集合 */ - public List selectRescueCustomerInfoList(RescueCustomerInfo rescueCustomerInfo); + IPage selectRescueCustomerInfoList(RescueCustomerInfo rescueCustomerInfo, Page page); /** * 新增救援的客户信息 diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueCarInfoServiceImpl.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueCarInfoServiceImpl.java index 3cc6785f..3d648d7d 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueCarInfoServiceImpl.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueCarInfoServiceImpl.java @@ -8,12 +8,15 @@ import cn.iocoder.yudao.module.rescue.mapper.RescueCarInfoMapper; import cn.iocoder.yudao.module.system.api.dict.DictDataApi; import cn.iocoder.yudao.module.rescue.service.IRescueCarInfoService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.time.LocalDate; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser; @@ -25,8 +28,7 @@ import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUti * @date 2023-09-12 */ @Service -public class RescueCarInfoServiceImpl extends ServiceImpl implements IRescueCarInfoService -{ +public class RescueCarInfoServiceImpl extends ServiceImpl implements IRescueCarInfoService { @Autowired private DictDataApi dictDataService; @@ -37,23 +39,23 @@ public class RescueCarInfoServiceImpl extends ServiceImpl queryWrapper =new LambdaQueryWrapper<>(); - queryWrapper.eq(RescueCarInfo::getRescueCarNum,carNum).last("limit 1"); + public RescueCarInfo selectRescueCarInfoByNum(String carNum) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(RescueCarInfo::getRescueCarNum, carNum).last("limit 1"); return this.getOne(queryWrapper); } @@ -65,17 +67,15 @@ public class RescueCarInfoServiceImpl extends ServiceImpl selectRescueCarInfoList(RescueCarInfo rescueCarInfo) - { - List rescueCarInfos = baseMapper.selectRescueCarInfoList(rescueCarInfo); - for (RescueCarInfo carInfo : rescueCarInfos) { + public IPage selectRescueCarInfoList(RescueCarInfo rescueCarInfo, Page page) { + IPage rescueCarInfos = baseMapper.selectRescueCarInfoList(rescueCarInfo, page); + for (RescueCarInfo carInfo : rescueCarInfos.getRecords()) { try { String temp = dictDataService.getDictDataLabel("jyc_type", carInfo.getRescueCarType()); carInfo.setRescueCarTypeStr(temp); - }catch (Exception e){ + } catch (Exception e) { } - } return rescueCarInfos; } @@ -87,11 +87,10 @@ public class RescueCarInfoServiceImpl extends ServiceImpl longs = Arrays.asList(ids); + return baseMapper.deleteByIds(longs); } /** @@ -125,8 +123,7 @@ public class RescueCarInfoServiceImpl extends ServiceImpl warnListBy =baseMapper.warnListBy(format); + List warnListBy = baseMapper.warnListBy(format); //先获取保险即将到期的 - List warnListBx =baseMapper.warnListBx(format); + List warnListBx = baseMapper.warnListBx(format); //先获取年检即将到期的 - List warnListNj =baseMapper.warnListNj(format); - List res =new ArrayList<>(); - if (CollectionUtil.isNotEmpty(warnListBy)){ + List warnListNj = baseMapper.warnListNj(format); + List res = new ArrayList<>(); + if (CollectionUtil.isNotEmpty(warnListBy)) { for (RescueCarInfo carInfo : warnListBy) { - res.add(carInfo.getRescueCarNum()+"的保养将在"+DateUtil.format(carInfo.getCarKeepTime(),"yyyy-MM-dd")+"到期，请及时保养！"); + res.add(carInfo.getRescueCarNum() + "的保养将在" + DateUtil.format(carInfo.getCarKeepTime(), "yyyy-MM-dd") + "到期，请及时保养！"); } } - if (CollectionUtil.isNotEmpty(warnListBx)){ + if (CollectionUtil.isNotEmpty(warnListBx)) { for (RescueCarInfo carInfo : warnListBx) { - res.add(carInfo.getRescueCarNum()+"的保险将在"+DateUtil.format(carInfo.getCarInsuranceTime(),"yyyy-MM-dd")+"到期，请及时续保！"); + res.add(carInfo.getRescueCarNum() + "的保险将在" + DateUtil.format(carInfo.getCarInsuranceTime(), "yyyy-MM-dd") + "到期，请及时续保！"); } } - if (CollectionUtil.isNotEmpty(warnListNj)){ + if (CollectionUtil.isNotEmpty(warnListNj)) { for (RescueCarInfo carInfo : warnListNj) { - res.add(carInfo.getRescueCarNum()+"的年检将在"+DateUtil.format(carInfo.getCarCheckTime(),"yyyy-MM-dd")+"到期，请及时审车！"); + res.add(carInfo.getRescueCarNum() + "的年检将在" + DateUtil.format(carInfo.getCarCheckTime(), "yyyy-MM-dd") + "到期，请及时审车！"); } } return res; diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueCustomerInfoServiceImpl.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueCustomerInfoServiceImpl.java index 10612233..ba099f70 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueCustomerInfoServiceImpl.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueCustomerInfoServiceImpl.java @@ -4,33 +4,35 @@ import cn.iocoder.yudao.module.rescue.domain.RescueCustomerInfo; import cn.iocoder.yudao.module.system.api.dept.DeptApi; import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO; import cn.iocoder.yudao.module.rescue.service.IRescueCustomerInfoService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.iocoder.yudao.module.rescue.mapper.RescueCustomerInfoMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Arrays; import java.util.List; /** * 救援的客户信息Service业务层处理 - * + * * @author zcy * @date 2023-09-14 */ @Service -public class RescueCustomerInfoServiceImpl extends ServiceImpl implements IRescueCustomerInfoService -{ +public class RescueCustomerInfoServiceImpl extends ServiceImpl implements IRescueCustomerInfoService { @Autowired private DeptApi deptService; + /** * 查询救援的客户信息 - * + * * @param id 救援的客户信息主键 * @return 救援的客户信息 */ @Override - public RescueCustomerInfo selectRescueCustomerInfoById(Long id) - { + public RescueCustomerInfo selectRescueCustomerInfoById(Long id) { RescueCustomerInfo rescueCustomerInfo = baseMapper.selectRescueCustomerInfoById(id); DeptRespDTO sysDept = deptService.getDept(rescueCustomerInfo.getCustomerDeptId()); rescueCustomerInfo.setDeptName(sysDept.getName()); @@ -39,61 +41,57 @@ public class RescueCustomerInfoServiceImpl extends ServiceImpl selectRescueCustomerInfoList(RescueCustomerInfo rescueCustomerInfo) - { - return baseMapper.selectRescueCustomerInfoList(rescueCustomerInfo); + public IPage selectRescueCustomerInfoList(RescueCustomerInfo rescueCustomerInfo, Page page) { + return baseMapper.selectRescueCustomerInfoList(rescueCustomerInfo, page); } /** * 新增救援的客户信息 - * + * * @param rescueCustomerInfo 救援的客户信息 * @return 结果 */ @Override - public int insertRescueCustomerInfo(RescueCustomerInfo rescueCustomerInfo) - { + public int insertRescueCustomerInfo(RescueCustomerInfo rescueCustomerInfo) { return baseMapper.insertRescueCustomerInfo(rescueCustomerInfo); } /** * 修改救援的客户信息 - * + * * @param rescueCustomerInfo 救援的客户信息 * @return 结果 */ @Override - public int updateRescueCustomerInfo(RescueCustomerInfo rescueCustomerInfo) - { + public int updateRescueCustomerInfo(RescueCustomerInfo rescueCustomerInfo) { return baseMapper.updateRescueCustomerInfo(rescueCustomerInfo); } /** * 批量删除救援的客户信息 - * + * * @param ids 需要删除的救援的客户信息主键 * @return 结果 */ @Override - public int deleteRescueCustomerInfoByIds(Long[] ids) - { - return baseMapper.deleteRescueCustomerInfoByIds(ids); + public int deleteRescueCustomerInfoByIds(Long[] ids) { + List longs = Arrays.asList(ids); + return baseMapper.deleteByIds(longs); } /** * 删除救援的客户信息信息 - * + * * @param id 救援的客户信息主键 * @return 结果 */ @Override - public int deleteRescueCustomerInfoById(Long id) - { - return baseMapper.deleteRescueCustomerInfoById(id); + public int deleteRescueCustomerInfoById(Long id) { + return baseMapper.deleteById(id); } } diff --git a/dl-module-rescue/src/main/resources/mapper/rescue/RescueCarInfoMapper.xml b/dl-module-rescue/src/main/resources/mapper/rescue/RescueCarInfoMapper.xml index eb8e2127..e72995d0 100644 --- a/dl-module-rescue/src/main/resources/mapper/rescue/RescueCarInfoMapper.xml +++ b/dl-module-rescue/src/main/resources/mapper/rescue/RescueCarInfoMapper.xml @@ -5,63 +5,83 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - select rci.id, rci.rescue_car_type, rci.rescue_car_num, rci.rescue_car_brand, rci.car_own, rci.car_image, rci.drive_license_image, - rci.car_buy_time, rci.car_license_color, rci.car_use_nature, - rci.frame_number,rci.car_keep_time,rci.car_insurance_time,rci.car_check_time,rci.possessor_id, rci.dept_id, rci.creator, rci.create_time, rci.updater, rci.update_time - from rescue_car_info rci + SELECT rci.id, + rci.rescue_car_type, + rci.rescue_car_num, + rci.rescue_car_brand, + rci.car_own, + rci.car_image, + rci.drive_license_image, + rci.car_buy_time, + rci.car_license_color, + rci.car_use_nature, + rci.frame_number, + rci.car_keep_time, + rci.car_insurance_time, + rci.car_check_time, + rci.possessor_id + FROM rescue_car_info rci + where rci.deleted = '0' - - - and rci.rescue_car_type = #{rescueCarType} - and rci.rescue_car_num = #{rescueCarNum} - and rci.rescue_car_brand = #{rescueCarBrand} - and rci.car_own = #{carOwn} - and rci.car_image = #{carImage} - and rci.drive_license_image = #{driveLicenseImage} - and rci.car_buy_time = #{carBuyTime} - and rci.car_license_color = #{carLicenseColor} - and rci.car_use_nature = #{carUseNature} - and rci.frame_number = #{frameNumber} - and rci.possessor_id = #{possessorId} - and rci.dept_id = #{deptId} - - - + and rci.rescue_car_type = + #{map.rescueCarType} + + and rci.rescue_car_num = #{map.rescueCarNum} + + and rci.rescue_car_brand = + #{map.rescueCarBrand} + + and rci.car_own = #{map.carOwn} + and rci.car_image = #{map.carImage} + and rci.drive_license_image = + #{map.driveLicenseImage} + + and rci.car_buy_time = #{map.carBuyTime} + and rci.car_license_color = + #{map.carLicenseColor} + + and rci.car_use_nature = #{map.carUseNature} + + and rci.frame_number = #{map.frameNumber} + and rci.possessor_id = #{map.possessorId} order by rci.create_time desc - - where id = #{id} + AND id = #{id} - + insert into rescue_car_info rescue_car_type, @@ -79,10 +99,6 @@ car_check_time, possessor_id, dept_id, - creator, - create_time, - updater, - update_time, #{rescueCarType}, @@ -100,10 +116,6 @@ #{carCheckTime}, #{possessorId}, #{deptId}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, @@ -125,19 +137,17 @@ car_check_time = #{carCheckTime}, possessor_id = #{possessorId}, dept_id = #{deptId}, - creator = #{createBy}, - create_time = #{createTime}, - updater = #{updateBy}, - update_time = #{updateTime}, where id = #{id} - - delete from rescue_car_info where id = #{id} + + delete + from rescue_car_info + where id = #{id} - + delete from rescue_car_info where id in #{id} @@ -146,27 +156,23 @@ diff --git a/dl-module-rescue/src/main/resources/mapper/rescue/RescueCustomerInfoMapper.xml b/dl-module-rescue/src/main/resources/mapper/rescue/RescueCustomerInfoMapper.xml index 41ab452b..de67e925 100644 --- a/dl-module-rescue/src/main/resources/mapper/rescue/RescueCustomerInfoMapper.xml +++ b/dl-module-rescue/src/main/resources/mapper/rescue/RescueCustomerInfoMapper.xml @@ -1,46 +1,48 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - - - - - - - - - - - - - + + + + + + + + + + - + select rsi.*,d.name as dept_name from rescue_customer_info rsi + left join system_dept d on d.id = rsi.customer_dept_id where rsi.deleted = '0' + and customer_name like concat('%', + #{map.customerName}, '%') + + and customer_phone like concat('%', + #{map.customerPhone}, '%') + + and customer_dept_id = #{map.customerDeptId} + and sign_start_date >= #{map.signStartDate} + and sign_end_date <= #{map.signEndDate} + and default_rescue_type = + #{map.defaultRescueType} + order by rsi.create_time desc - + - + insert into rescue_customer_info @@ -53,11 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order_prefix, default_rescue_type, dept_id, - create_time, - creator, - update_time, - updater, - + #{id}, #{customerName}, @@ -68,11 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{orderPrefix}, #{defaultRescueType}, #{deptId}, - #{createTime}, - #{createBy}, - #{updateTime}, - #{updateBy}, - + @@ -86,20 +80,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order_prefix = #{orderPrefix}, default_rescue_type = #{defaultRescueType}, dept_id = #{deptId}, - create_time = #{createTime}, - creator = #{createBy}, - update_time = #{updateTime}, - updater = #{updateBy}, where id = #{id} - delete from rescue_customer_info where id = #{id} + delete + from rescue_customer_info + where id = #{id} - delete from rescue_customer_info where id in + delete from rescue_customer_info where id in #{id}