diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairAddressFloorController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairAddressFloorController.java new file mode 100644 index 0000000..c3f7f77 --- /dev/null +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairAddressFloorController.java @@ -0,0 +1,76 @@ +package com.ics.admin.controller; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.ics.common.core.domain.R; +import com.ics.common.core.controller.BaseController; +import com.ics.admin.domain.RepairAddressFloor; +import com.ics.admin.service.IRepairAddressFloorService; +import org.wf.jwtp.annotation.RequiresPermissions; + +/** + * 地点楼层 + * + * @author ics + * @date 2024-08-06 + */ +@RestController +@RequestMapping("repairAddressFloor") +public class RepairAddressFloorController extends BaseController { + + @Autowired + private IRepairAddressFloorService repairAddressFloorService; + + /** + * 查询地点楼层 + */ + @GetMapping("get/{id}") + public RepairAddressFloor get(@PathVariable("id") Long id) { + return repairAddressFloorService.selectRepairAddressFloorById(id); + } + + /** + * 查询地点楼层列表 + */ + @RequiresPermissions("floor:floor:list") + @GetMapping("list") + public R list(RepairAddressFloor repairAddressFloor) { + startPage(); + return result(repairAddressFloorService.selectRepairAddressFloorList(repairAddressFloor)); + } + + + /** + * 新增保存地点楼层 + */ + @RequiresPermissions("floor:floor:add") + @PostMapping("save") + public R addSave(@RequestBody RepairAddressFloor repairAddressFloor) { + return toAjax(repairAddressFloorService.insertRepairAddressFloor(repairAddressFloor)); + } + + /** + * 修改保存地点楼层 + */ + @RequiresPermissions("floor:floor:edit") + @PostMapping("update") + public R editSave(@RequestBody RepairAddressFloor repairAddressFloor) { + return toAjax(repairAddressFloorService.updateRepairAddressFloor(repairAddressFloor)); + } + + /** + * 删除地点楼层 + */ + @RequiresPermissions("floor:floor:remove") + @PostMapping("remove") + public R remove(String ids) { + return toAjax(repairAddressFloorService.deleteRepairAddressFloorByIds(ids)); + } + +} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairAttachController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairAttachController.java new file mode 100644 index 0000000..4f17d59 --- /dev/null +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairAttachController.java @@ -0,0 +1,76 @@ +package com.ics.admin.controller; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.ics.common.core.domain.R; +import com.ics.common.core.controller.BaseController; +import com.ics.admin.domain.RepairAttach; +import com.ics.admin.service.IRepairAttachService; +import org.wf.jwtp.annotation.RequiresPermissions; + +/** + * 附件 提供者 + * + * @author chen + * @date 2024-07-31 + */ +@RestController +@RequestMapping("repairAttach") +public class RepairAttachController extends BaseController { + + @Autowired + private IRepairAttachService repairAttachService; + + /** + * 查询附件 + */ + @GetMapping("get/{id}") + public RepairAttach get(@PathVariable("id") Long id) { + return repairAttachService.selectRepairAttachById(id); + } + + /** + * 查询附件列表 + */ + @RequiresPermissions("admin:attach:list") + @GetMapping("list") + public R list(RepairAttach repairAttach) { + startPage(); + return result(repairAttachService.selectRepairAttachList(repairAttach)); + } + + + /** + * 新增保存附件 + */ + @RequiresPermissions("admin:attach:add") + @PostMapping("save") + public R addSave(@RequestBody RepairAttach repairAttach) { + return toAjax(repairAttachService.insertRepairAttach(repairAttach)); + } + + /** + * 修改保存附件 + */ + @RequiresPermissions("admin:attach:edit") + @PostMapping("update") + public R editSave(@RequestBody RepairAttach repairAttach) { + return toAjax(repairAttachService.updateRepairAttach(repairAttach)); + } + + /** + * 删除附件 + */ + @RequiresPermissions("admin:attach:remove") + @PostMapping("remove") + public R remove(String ids) { + return toAjax(repairAttachService.deleteRepairAttachByIds(ids)); + } + +} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairController.java index f04d0dc..389d78c 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairController.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairController.java @@ -1,23 +1,9 @@ package com.ics.admin.controller; -import com.ics.admin.domain.*; import com.ics.admin.service.*; -import com.ics.admin.vo.ParkVO; -import com.ics.admin.vo.RepairVO; -import com.ics.common.annotation.LoginUser; import com.ics.common.core.controller.BaseController; -import com.ics.common.core.domain.IcsCustomerStaff; -import com.ics.common.core.domain.R; -import com.ics.common.utils.bean.BeanUtils; -import com.ics.system.domain.User; -import com.ics.system.domain.vo.UserVO; -import org.checkerframework.checker.units.qual.A; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import org.wf.jwtp.annotation.Ignore; -import org.wf.jwtp.annotation.RequiresPermissions; - -import java.util.List; /** * 工单管理 提供者 @@ -39,7 +25,7 @@ public class RepairController extends BaseController { private IIcsCustomerStaffService customerStaffService; @Autowired - private IRepairTypeService repairTypeService; + private IRepairDeviceTypeService repairTypeService; @Autowired private IRepairDeviceService deviceService; @@ -47,153 +33,153 @@ public class RepairController extends BaseController { @Autowired private IRepairFailureTypeService repairFailureTypeService; - @Autowired - private IRepairRecordService repairRecordService; +// @Autowired +// private IRepairRecordService repairRecordService; /** * 查询工单管理 */ - @RequiresPermissions("admin:repair:edit") - @GetMapping("get/{id}") - public RepairVO get(@PathVariable("id") Long id) { - RepairVO repairVO = new RepairVO(); - Repair repair = repairService.selectRepairById(id); - if (repair != null) { - BeanUtils.copyBeanProp(repairVO, repair); - repairVO.setStatus(repair.getStatus().getValue()); - repairVO.setStatusName(repair.getStatus().getName()); - //设备类型 - RepairType repairType = repairTypeService.selectRepairTypeById(Long.valueOf(repair.getTypeId())); - if (null != repairType){ - repairVO.setTypeName(repairType.getName()); - } - //设备名称 - RepairDevice repairDevice = deviceService.selectRepairDeviceById(Long.valueOf(repair.getRepairDevice())); - if (repairDevice != null) { - repairVO.setRepairDeviceName(repairDevice.getName()); - } - //故障 - RepairFailureType repairFailureType = repairFailureTypeService.selectRepairFailureTypeById(repair.getFailureTypeId()); - if (repairFailureType != null) { - repairVO.setFailureTypeName(repairFailureType.getName()); - } - IcsCustomerStaff staff = customerStaffService.selectIcsCustomerStaffById(Long.valueOf(repair.getUserId())); - if (null != staff){ - repairVO.setUserName(staff.getUsername()); - } - - IcsCustomerStaff worker = customerStaffService.selectIcsCustomerStaffById(repair.getWorkerId()); - if (null != worker){ - repairVO.setWorkerName(worker.getUsername()); - } - - RepairRecord repairRecord = repairRecordService.selectByRepairId(id); - if (null != repairRecord){ - repairVO.setSpeed(repairRecord.getSpeed()); - repairVO.setServe(repairRecord.getServe()); - repairVO.setEffect(repairRecord.getEffect()); - } - RepairLog repairLog = new RepairLog(); - repairLog.setRepairId(id); - List repairLogs = repairLogService.selectRepairLogList(repairLog); - repairVO.setRepairLogs(repairLogs); - } - return repairVO; - } - - /** - * 查询工单管理列表 - */ - @RequiresPermissions("admin:repair:list") - @GetMapping("list") - public R list(Repair repair, @LoginUser User user) { - startPage(); - List repairList = repairService.selectRepairList(repair); - for (Repair repair1 : repairList) { - repair1.setStatusValue(repair1.getStatus().getValue()); - repair1.setStatusName(repair1.getStatus().getName()); - //设备类型 - if (repair1.getTypeId() != null) { - RepairType repairType = repairTypeService.selectRepairTypeById(Long.valueOf(repair1.getTypeId())); - repair1.setTypeName(repairType.getName()); - } - //设备名称 - if (repair1.getRepairDevice() != null){ - RepairDevice repairDevice = deviceService.selectRepairDeviceById(Long.valueOf(repair1.getRepairDevice())); - repair1.setRepairDeviceName(repairDevice.getName()); - } - //故障 - if (repair1.getFailureTypeId() != null){ - - RepairFailureType repairFailureType = repairFailureTypeService.selectRepairFailureTypeById(repair1.getFailureTypeId()); - repair1.setFailureTypeName(repairFailureType.getName()); - } - if (repair1.getUserId() != null){ - IcsCustomerStaff staff = customerStaffService.selectIcsCustomerStaffById(Long.valueOf(repair1.getUserId())); - repair1.setUserName(staff.getUsername()); - } - - if (repair1.getWorkerId() != null){ - IcsCustomerStaff worker = customerStaffService.selectIcsCustomerStaffById(repair1.getWorkerId()); - repair1.setWorkerName(worker.getUsername()); - } - } - return result(repairList); - } - - /** - * 新增 - */ - @RequiresPermissions("admin:repair:edit") - @PostMapping("/review") - public R review(@RequestBody Repair repair) { - Repair pRepair = repairService.selectRepairById(repair.getId()); -// if (repair == null || !Repair.Status.PENDING_ASSIGN.equals(pRepair.getStatus())) { -// return R.error("报修为空或状态不是待分配"); +// @RequiresPermissions("admin:repair:edit") +// @GetMapping("get/{id}") +// public RepairVO get(@PathVariable("id") Long id) { +// RepairVO repairVO = new RepairVO(); +// Repair repair = repairService.selectRepairById(id); +// if (repair != null) { +// BeanUtils.copyBeanProp(repairVO, repair); +// repairVO.setStatus(repair.getStatus().getValue()); +// repairVO.setStatusName(repair.getStatus().getName()); +// //设备类型 +// RepairDeviceType repairType = repairTypeService.selectRepairTypeById(Long.valueOf(repair.getTypeId())); +// if (null != repairType){ +// repairVO.setTypeName(repairType.getName()); +// } +// //设备名称 +// RepairDevice repairDevice = deviceService.selectRepairDeviceById(Long.valueOf(repair.getRepairDevice())); +// if (repairDevice != null) { +// repairVO.setRepairDeviceName(repairDevice.getName()); +// } +// //故障 +// RepairFailureType repairFailureType = repairFailureTypeService.selectRepairFailureTypeById(repair.getFailureTypeId()); +// if (repairFailureType != null) { +// repairVO.setFailureTypeName(repairFailureType.getName()); +// } +// IcsCustomerStaff staff = customerStaffService.selectIcsCustomerStaffById(Long.valueOf(repair.getUserId())); +// if (null != staff){ +// repairVO.setUserName(staff.getUsername()); +// } +// +// IcsCustomerStaff worker = customerStaffService.selectIcsCustomerStaffById(repair.getWorkerId()); +// if (null != worker){ +// repairVO.setWorkerName(worker.getUsername()); +// } +// +// RepairEval repairRecord = repairRecordService.selectByRepairId(id); +// if (null != repairRecord){ +// repairVO.setSpeed(repairRecord.getSpeed()); +// repairVO.setServe(repairRecord.getServe()); +// repairVO.setEffect(repairRecord.getEffect()); +// } +// RepairLog repairLog = new RepairLog(); +// repairLog.setRepairId(id); +// List repairLogs = repairLogService.selectRepairLogList(repairLog); +// repairVO.setRepairLogs(repairLogs); // } +// return repairVO; +// } +// +// /** +// * 查询工单管理列表 +// */ +// @RequiresPermissions("admin:repair:list") +// @GetMapping("list") +// public R list(Repair repair, @LoginUser User user) { +// startPage(); +// List repairList = repairService.selectRepairList(repair); +// for (Repair repair1 : repairList) { +// repair1.setStatusValue(repair1.getStatus().getValue()); +// repair1.setStatusName(repair1.getStatus().getName()); +// //设备类型 +// if (repair1.getTypeId() != null) { +// RepairDeviceType repairType = repairTypeService.selectRepairTypeById(Long.valueOf(repair1.getTypeId())); +// repair1.setTypeName(repairType.getName()); +// } +// //设备名称 +// if (repair1.getRepairDevice() != null){ +// RepairDevice repairDevice = deviceService.selectRepairDeviceById(Long.valueOf(repair1.getRepairDevice())); +// repair1.setRepairDeviceName(repairDevice.getName()); +// } +// //故障 +// if (repair1.getFailureTypeId() != null){ +// +// RepairFailureType repairFailureType = repairFailureTypeService.selectRepairFailureTypeById(repair1.getFailureTypeId()); +// repair1.setFailureTypeName(repairFailureType.getName()); +// } +// if (repair1.getUserId() != null){ +// IcsCustomerStaff staff = customerStaffService.selectIcsCustomerStaffById(Long.valueOf(repair1.getUserId())); +// repair1.setUserName(staff.getUsername()); +// } +// +// if (repair1.getWorkerId() != null){ +// IcsCustomerStaff worker = customerStaffService.selectIcsCustomerStaffById(repair1.getWorkerId()); +// repair1.setWorkerName(worker.getUsername()); +// } +// } +// return result(repairList); +// } +// +// /** +// * 新增 +// */ +// @RequiresPermissions("admin:repair:edit") +// @PostMapping("/review") +// public R review(@RequestBody Repair repair) { +// Repair pRepair = repairService.selectRepairById(repair.getId()); +//// if (repair == null || !Repair.Status.PENDING_ASSIGN.equals(pRepair.getStatus())) { +//// return R.error("报修为空或状态不是待分配"); +//// } +//// repair.setStatus(Repair.Status.PENDING_PROCESS); // repair.setStatus(Repair.Status.PENDING_PROCESS); - repair.setStatus(Repair.Status.PENDING_PROCESS); - return toAjax(repairService.insertRepair(repair)); - } - - /** - * 完成 - */ - @RequiresPermissions("admin:repair:edit") - @PostMapping("/complete") - public R complete(@RequestBody Repair repair) { - Repair pRepair = repairService.selectRepairById(repair.getId()); - if (repair == null || !Repair.Status.PENDING_PROCESS.equals(pRepair.getStatus())) { - return R.error("报修为空或状态不是待处理"); - } - repair.setStatus(Repair.Status.COMPLETED); - return toAjax(repairService.updateRepair(repair)); - } - - /** - * 删除工单管理 - */ - @RequiresPermissions("admin:repair:remove") - @PostMapping("remove") - public R remove(String ids) { - return toAjax(repairService.deleteRepairByIds(ids)); - } - - - - @Ignore - @GetMapping("selectWorkerIdByTypeId") - public R selectWorkerIdByTypeId(String typeId) { - List customerStaffs = repairService.selectWorkerIdByTypeId(typeId); - return R.data(customerStaffs); - } - - //查询派单员列表 - @Ignore - @GetMapping("selectDispatcher") - public R selectDispatcher() { - List customerStaffs = repairService.selectDispatcher(); - return R.data(customerStaffs); - } +// return toAjax(repairService.insertRepair(repair)); +// } +// +// /** +// * 完成 +// */ +// @RequiresPermissions("admin:repair:edit") +// @PostMapping("/complete") +// public R complete(@RequestBody Repair repair) { +// Repair pRepair = repairService.selectRepairById(repair.getId()); +// if (repair == null || !Repair.Status.PENDING_PROCESS.equals(pRepair.getStatus())) { +// return R.error("报修为空或状态不是待处理"); +// } +// repair.setStatus(Repair.Status.COMPLETED); +// return toAjax(repairService.updateRepair(repair)); +// } +// +// /** +// * 删除工单管理 +// */ +// @RequiresPermissions("admin:repair:remove") +// @PostMapping("remove") +// public R remove(String ids) { +// return toAjax(repairService.deleteRepairByIds(ids)); +// } +// +// +// +// @Ignore +// @GetMapping("selectWorkerIdByTypeId") +// public R selectWorkerIdByTypeId(String typeId) { +// List customerStaffs = repairService.selectWorkerIdByTypeId(typeId); +// return R.data(customerStaffs); +// } +// +// //查询派单员列表 +// @Ignore +// @GetMapping("selectDispatcher") +// public R selectDispatcher() { +// List customerStaffs = repairService.selectDispatcher(); +// return R.data(customerStaffs); +// } } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairDeviceController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairDeviceController.java index e66abe5..e317f2c 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairDeviceController.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairDeviceController.java @@ -15,7 +15,7 @@ import com.ics.admin.service.IRepairDeviceService; import org.wf.jwtp.annotation.RequiresPermissions; /** - * 保修设备类型 提供者 + * 保修设备 提供者 * * @author ics * @date 2024-07-30 @@ -28,7 +28,7 @@ public class RepairDeviceController extends BaseController { private IRepairDeviceService repairDeviceService; /** - * 查询保修设备类型 + * 查询报修设备 */ @GetMapping("get/{id}") public RepairDevice get(@PathVariable("id") Long id) { @@ -36,9 +36,9 @@ public class RepairDeviceController extends BaseController { } /** - * 查询保修设备类型列表 + * 查询报修设备列表 */ - @RequiresPermissions("core:repairDevice:list") + @RequiresPermissions("RepairDevice:device:list") @GetMapping("list") public R list(RepairDevice repairDevice) { startPage(); @@ -47,33 +47,30 @@ public class RepairDeviceController extends BaseController { /** - * 新增保存保修设备类型 + * 新增保存报修设备 */ - @RequiresPermissions("core:repairDevice:add") + @RequiresPermissions("RepairDevice:device:add") @PostMapping("save") public R addSave(@RequestBody RepairDevice repairDevice) { return toAjax(repairDeviceService.insertRepairDevice(repairDevice)); } /** - * 修改保存保修设备类型 + * 修改保存报修设备 */ - @RequiresPermissions("core:repairDevice:edit") + @RequiresPermissions("RepairDevice:device:edit") @PostMapping("update") public R editSave(@RequestBody RepairDevice repairDevice) { return toAjax(repairDeviceService.updateRepairDevice(repairDevice)); } /** - * 删除保修设备类型 + * 删除报修设备 */ - @RequiresPermissions("core:repairDevice:remove") + @RequiresPermissions("RepairDevice:device:remove") @PostMapping("remove") public R remove(String ids) { return toAjax(repairDeviceService.deleteRepairDeviceByIds(ids)); } - - - } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairDeviceTypeController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairDeviceTypeController.java new file mode 100644 index 0000000..e134fb1 --- /dev/null +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairDeviceTypeController.java @@ -0,0 +1,75 @@ +package com.ics.admin.controller; + +import com.ics.admin.domain.RepairDeviceType; +import com.ics.admin.service.IRepairDeviceTypeService; +import com.ics.common.core.controller.BaseController; +import com.ics.common.core.domain.R; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.wf.jwtp.annotation.RequiresPermissions; + +/** + * 设备类型 提供者 + * + * @author ics + * @date 2024-07-30 + */ +@RestController +@RequestMapping("repairDeviceType") +public class RepairDeviceTypeController extends BaseController { + + @Autowired + private IRepairDeviceTypeService repairDeviceTypeService; + + /** + * 查询设备类型 + */ + @GetMapping("get/{id}") + public RepairDeviceType get(@PathVariable("id") Long id) { + return repairDeviceTypeService.selectRepairDeviceTypeById(id); + } + + /** + * 查询设备类型列表 + */ + @RequiresPermissions("RepairDeviceType:type:list") + @GetMapping("list") + public R list(RepairDeviceType repairDeviceType) { + startPage(); + return result(repairDeviceTypeService.selectRepairDeviceTypeList(repairDeviceType)); + } + + + /** + * 新增保存设备类型 + */ + @RequiresPermissions("RepairDeviceType:type:add") + @PostMapping("save") + public R addSave(@RequestBody RepairDeviceType repairDeviceType) { + return toAjax(repairDeviceTypeService.insertRepairDeviceType(repairDeviceType)); + } + + /** + * 修改保存设备类型 + */ + @RequiresPermissions("RepairDeviceType:type:edit") + @PostMapping("update") + public R editSave(@RequestBody RepairDeviceType repairDeviceType) { + return toAjax(repairDeviceTypeService.updateRepairDeviceType(repairDeviceType)); + } + + /** + * 删除设备类型 + */ + @RequiresPermissions("RepairDeviceType:type:remove") + @PostMapping("remove") + public R remove(String ids) { + return toAjax(repairDeviceTypeService.deleteRepairDeviceTypeByIds(ids)); + } + +} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairRecordController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairRecordController.java deleted file mode 100644 index 9f01c11..0000000 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairRecordController.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.ics.admin.controller; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.ics.common.core.domain.R; -import com.ics.common.core.controller.BaseController; -import com.ics.admin.domain.RepairRecord; -import com.ics.admin.service.IRepairRecordService; -import org.wf.jwtp.annotation.RequiresPermissions; - -/** - * 保修评价 提供者 - * - * @author ics - * @date 2024-07-30 - */ -@RestController -@RequestMapping("repairRecord") -public class RepairRecordController extends BaseController { - - @Autowired - private IRepairRecordService repairRecordService; - - /** - * 查询保修评价 - */ - @GetMapping("get/{id}") - public RepairRecord get(@PathVariable("id") Long id) { - return repairRecordService.selectRepairRecordById(id); - } - - /** - * 查询保修评价列表 - */ - @RequiresPermissions("RepairRecord:record:list") - @GetMapping("list") - public R list(RepairRecord repairRecord) { - startPage(); - return result(repairRecordService.selectRepairRecordList(repairRecord)); - } - - - /** - * 新增保存保修评价 - */ - @RequiresPermissions("RepairRecord:record:add") - @PostMapping("save") - public R addSave(@RequestBody RepairRecord repairRecord) { - return toAjax(repairRecordService.insertRepairRecord(repairRecord)); - } - - /** - * 修改保存保修评价 - */ - @RequiresPermissions("RepairRecord:record:edit") - @PostMapping("update") - public R editSave(@RequestBody RepairRecord repairRecord) { - return toAjax(repairRecordService.updateRepairRecord(repairRecord)); - } - - /** - * 删除保修评价 - */ - @RequiresPermissions("RepairRecord:record:remove") - @PostMapping("remove") - public R remove(String ids) { - return toAjax(repairRecordService.deleteRepairRecordByIds(ids)); - } - -} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairRelationalController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairRelationalController.java new file mode 100644 index 0000000..6c7e03b --- /dev/null +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairRelationalController.java @@ -0,0 +1,76 @@ +package com.ics.admin.controller; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.ics.common.core.domain.R; +import com.ics.common.core.controller.BaseController; +import com.ics.admin.domain.RepairRelational; +import com.ics.admin.service.IRepairRelationalService; +import org.wf.jwtp.annotation.RequiresPermissions; + +/** + * 设备类型与派单员、维修人员的关联关系 提供者 + * + * @author chen + * @date 2024-07-30 + */ +@RestController +@RequestMapping("repairRelational") +public class RepairRelationalController extends BaseController { + + @Autowired + private IRepairRelationalService repairRelationalService; + + /** + * 查询设备类型与派单员、维修人员的关联关系 + */ + @GetMapping("get/{id}") + public RepairRelational get(@PathVariable("id") Long id) { + return repairRelationalService.selectRepairRelationalById(id); + } + + /** + * 查询设备类型与派单员、维修人员的关联关系列表 + */ + @RequiresPermissions("admin:relational:list") + @GetMapping("list") + public R list(RepairRelational repairRelational) { + startPage(); + return result(repairRelationalService.selectRepairRelationalList(repairRelational)); + } + + + /** + * 新增保存设备类型与派单员、维修人员的关联关系 + */ + @RequiresPermissions("admin:relational:add") + @PostMapping("save") + public R addSave(@RequestBody RepairRelational repairRelational) { + return toAjax(repairRelationalService.insertRepairRelational(repairRelational)); + } + + /** + * 修改保存设备类型与派单员、维修人员的关联关系 + */ + @RequiresPermissions("admin:relational:edit") + @PostMapping("update") + public R editSave(@RequestBody RepairRelational repairRelational) { + return toAjax(repairRelationalService.updateRepairRelational(repairRelational)); + } + + /** + * 删除设备类型与派单员、维修人员的关联关系 + */ + @RequiresPermissions("admin:relational:remove") + @PostMapping("remove") + public R remove(String ids) { + return toAjax(repairRelationalService.deleteRepairRelationalByIds(ids)); + } + +} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairRoomController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairRoomController.java deleted file mode 100644 index a3672e3..0000000 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairRoomController.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.ics.admin.controller; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.ics.common.core.domain.R; -import com.ics.common.core.controller.BaseController; -import com.ics.admin.domain.RepairRoom; -import com.ics.admin.service.IRepairRoomService; -import org.wf.jwtp.annotation.RequiresPermissions; - -/** - * 报修房间 提供者 - * - * @author ics - * @date 2024-08-06 - */ -@RestController -@RequestMapping("repairRoom") -public class RepairRoomController extends BaseController { - - @Autowired - private IRepairRoomService repairRoomService; - - /** - * 查询报修房间 - */ - @GetMapping("get/{id}") - public RepairRoom get(@PathVariable("id") Long id) { - return repairRoomService.selectRepairRoomById(id); - } - - /** - * 查询报修房间列表 - */ - @RequiresPermissions("repair:room:list") - @GetMapping("list") - public R list(RepairRoom repairRoom) { - startPage(); - return result(repairRoomService.selectRepairRoomList(repairRoom)); - } - - - /** - * 新增保存报修房间 - */ - @RequiresPermissions("repair:room:add") - @PostMapping("save") - public R addSave(@RequestBody RepairRoom repairRoom) { - return toAjax(repairRoomService.insertRepairRoom(repairRoom)); - } - - /** - * 修改保存报修房间 - */ - @RequiresPermissions("repair:room:edit") - @PostMapping("update") - public R editSave(@RequestBody RepairRoom repairRoom) { - return toAjax(repairRoomService.updateRepairRoom(repairRoom)); - } - - /** - * 删除报修房间 - */ - @RequiresPermissions("repair:room:remove") - @PostMapping("remove") - public R remove(String ids) { - return toAjax(repairRoomService.deleteRepairRoomByIds(ids)); - } - -} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairStaffTypeController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairStaffTypeController.java deleted file mode 100644 index efec80d..0000000 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairStaffTypeController.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.ics.admin.controller; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.ics.common.core.domain.R; -import com.ics.common.core.controller.BaseController; -import com.ics.admin.domain.RepairStaffType; -import com.ics.admin.service.IRepairStaffTypeService; -import org.wf.jwtp.annotation.RequiresPermissions; - -/** - * RepairStaffType 提供者 - * - * @author chen - * @date 2024-07-30 - */ -@RestController -@RequestMapping("staffType") -public class RepairStaffTypeController extends BaseController { - - @Autowired - private IRepairStaffTypeService repairStaffTypeService; - - /** - * 查询RepairStaffType - */ - @GetMapping("get/{id}") - public RepairStaffType get(@PathVariable("id") Long id) { - return repairStaffTypeService.selectRepairStaffTypeById(id); - } - - /** - * 查询RepairStaffType列表 - */ - @RequiresPermissions("RepairStaffType:type:list") - @GetMapping("list") - public R list(RepairStaffType repairStaffType) { - startPage(); - return result(repairStaffTypeService.selectRepairStaffTypeList(repairStaffType)); - } - - - /** - * 新增保存RepairStaffType - */ - @RequiresPermissions("RepairStaffType:type:add") - @PostMapping("save") - public R addSave(@RequestBody RepairStaffType repairStaffType) { - return toAjax(repairStaffTypeService.insertRepairStaffType(repairStaffType)); - } - - /** - * 修改保存RepairStaffType - */ - @RequiresPermissions("RepairStaffType:type:edit") - @PostMapping("update") - public R editSave(@RequestBody RepairStaffType repairStaffType) { - return toAjax(repairStaffTypeService.updateRepairStaffType(repairStaffType)); - } - - /** - * 删除RepairStaffType - */ - @RequiresPermissions("RepairStaffType:type:remove") - @PostMapping("remove") - public R remove(String ids) { - return toAjax(repairStaffTypeService.deleteRepairStaffTypeByIds(ids)); - } - -} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairTypeController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairTypeController.java deleted file mode 100644 index 5fa3e6b..0000000 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairTypeController.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.ics.admin.controller; - -import com.ics.admin.domain.RepairStaffType; -import com.ics.admin.domain.RepairWorkerType; -import com.ics.admin.domain.meeting.StaffCustomer; -import com.ics.admin.service.IIcsCustomerStaffService; -import com.ics.admin.service.IRepairStaffTypeService; -import com.ics.admin.service.IRepairWorkerTypeService; -import com.ics.common.core.domain.IcsCustomerStaff; -import com.ics.common.utils.DateUtils; -import org.checkerframework.checker.units.qual.A; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.ics.common.core.domain.R; -import com.ics.common.core.controller.BaseController; -import com.ics.admin.domain.RepairType; -import com.ics.admin.service.IRepairTypeService; -import org.wf.jwtp.annotation.RequiresPermissions; - -import java.util.List; - -/** - * 设备类型 提供者 - * - * @author ics - * @date 2024-07-30 - */ -@RestController -@RequestMapping("repairType") -public class RepairTypeController extends BaseController { - - @Autowired - private IRepairTypeService repairTypeService; - - @Autowired - private IRepairStaffTypeService repairStaffTypeService; - - @Autowired - private IIcsCustomerStaffService customerStaffService; - - @Autowired - private IRepairWorkerTypeService workerTypeService; - - - /** - * 查询设备类型 - */ - @GetMapping("get/{id}") - public RepairType get(@PathVariable("id") Long id) { - return repairTypeService.selectRepairTypeById(id); - } - - /** - * 查询设备类型列表 - */ - @RequiresPermissions("RepairType:repairType:list") - @GetMapping("list") - public R list(RepairType repairType) { - startPage(); - List repairTypes = repairTypeService.selectRepairTypeList(repairType); - for (RepairType type : repairTypes) { - //获取派单员名称 - RepairStaffType repairStaffType = repairStaffTypeService.selectStaffIdByTypeId(type.getId()); - if (repairStaffType != null) { - IcsCustomerStaff staff = customerStaffService.selectIcsCustomerStaffById(repairStaffType.getStaffId()); - if (staff != null) { - type.setStaffName(staff.getName()); - } - } - //获取维修工人数据 - List customerStaffs = workerTypeService.selectRepairWorkerTypeListByTypeId(type.getId()); - if (customerStaffs != null && customerStaffs.size() > 0) { - type.setWorkerNames(customerStaffs.get(0).getUsername()+"等"+customerStaffs.size()+"人"); - type.setWorkerList(customerStaffs); - } - } - return result(repairTypes); - } - - - /** - * 新增保存设备类型 - */ - @RequiresPermissions("RepairType:repairType:add") - @PostMapping("save") - public R addSave(@RequestBody RepairType repairType) { - int i = repairTypeService.insertRepairType(repairType); - if (i <= 0) { - return R.error("添加失败"); - } - //添加设备类型和用户关联关系 - RepairStaffType repairStaffType = new RepairStaffType(); - repairStaffType.setTypeId(repairType.getId()); - repairStaffType.setStaffId(repairType.getStaffId()); - repairStaffType.setCreateTime(DateUtils.getNowDate()); - - repairStaffTypeService.insertRepairStaffType(repairStaffType); - - IcsCustomerStaff staff = new IcsCustomerStaff(); - staff.setStaffId(repairType.getStaffId()); - staff.setDataType("2"); - //更新用户数据类型 - customerStaffService.updateIcsCustomerStaff(staff); - - return toAjax(i); - } - - /** - * 修改保存设备类型 - */ - @RequiresPermissions("RepairType:repairType:edit") - @PostMapping("update") - public R editSave(@RequestBody RepairType repairType) { - return toAjax(repairTypeService.updateRepairType(repairType)); - } - - /** - * 删除设备类型 - */ - @RequiresPermissions("RepairType:repairType:remove") - @PostMapping("remove") - public R remove(String ids) { - return toAjax(repairTypeService.deleteRepairTypeByIds(ids)); - } - -} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairWorkerTypeController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairWorkerTypeController.java deleted file mode 100644 index a8b6189..0000000 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairWorkerTypeController.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.ics.admin.controller; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.ics.common.core.domain.R; -import com.ics.common.core.controller.BaseController; -import com.ics.admin.domain.RepairWorkerType; -import com.ics.admin.service.IRepairWorkerTypeService; -import org.wf.jwtp.annotation.RequiresPermissions; - -/** - * 维修人分类关联 提供者 - * - * @author chen - * @date 2024-07-31 - */ -@RestController -@RequestMapping("type") -public class RepairWorkerTypeController extends BaseController { - - @Autowired - private IRepairWorkerTypeService repairWorkerTypeService; - - /** - * 查询维修人分类关联 - */ - @GetMapping("get/{id}") - public RepairWorkerType get(@PathVariable("id") Long id) { - return repairWorkerTypeService.selectRepairWorkerTypeById(id); - } - - /** - * 查询维修人分类关联列表 - */ - @RequiresPermissions("RepairWorkerType:type:list") - @GetMapping("list") - public R list(RepairWorkerType repairWorkerType) { - startPage(); - return result(repairWorkerTypeService.selectRepairWorkerTypeList(repairWorkerType)); - } - - - /** - * 新增保存维修人分类关联 - */ - @RequiresPermissions("RepairWorkerType:type:add") - @PostMapping("save") - public R addSave(@RequestBody RepairWorkerType repairWorkerType) { - return toAjax(repairWorkerTypeService.insertRepairWorkerType(repairWorkerType)); - } - - /** - * 修改保存维修人分类关联 - */ - @RequiresPermissions("RepairWorkerType:type:edit") - @PostMapping("update") - public R editSave(@RequestBody RepairWorkerType repairWorkerType) { - return toAjax(repairWorkerTypeService.updateRepairWorkerType(repairWorkerType)); - } - - /** - * 删除维修人分类关联 - */ - @RequiresPermissions("RepairWorkerType:type:remove") - @PostMapping("remove") - public R remove(String ids) { - return toAjax(repairWorkerTypeService.deleteRepairWorkerTypeByIds(ids)); - } - -} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/Repair.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/Repair.java index 83d0434..988c71d 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/Repair.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/Repair.java @@ -1,20 +1,15 @@ package com.ics.admin.domain; -import com.baomidou.mybatisplus.annotation.IEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ics.admin.handler.BannerImageHandler; import com.ics.common.core.domain.BaseEntity; -import com.ics.system.domain.User; import lombok.Data; -import java.util.ArrayList; import java.util.Date; -import java.util.List; /** - * 工单管理对象 ics_repair + * 工单 * * @author ics * @date 2021-03-25 @@ -22,37 +17,40 @@ import java.util.List; @Data @TableName("ics_repair") public class Repair extends BaseEntity { - private static final long serialVersionUID = 1L; - + private static final long serialVersionUID = -202408072032L; /** * 报修单号 */ private String sn; - + /** + * 报修名称 + */ private String repairName; - + /** + * 故障等级 + */ private String repairLevel; - + /** + * 故障时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date repairTime; + /** + * 设备类别id + */ private Integer typeId; - - @TableField(exist = false) + /** + * 设备类别名称 + */ private String typeName; - - private Integer repairDevice; - @TableField(exist = false) - private String repairDeviceName; - - private String repairVoice; - - private Integer userId; - - @TableField(exist = false) - private String userName; - - private Integer dispatcherId; - - @TableField(exist = false) - private String dispatcherName; + /** + * 设备id + */ + private Integer deviceId; + /** + * 设备名称 + */ + private String deviceName; /** * 报修人 @@ -63,206 +61,152 @@ public class Repair extends BaseEntity { * 联系电话 */ private String phone; - /** - * 报修区域 + * 报修地点id */ - private String area; - + private String addressId; /** - * 状态:待分配,待评估,处理中,已处理, 已处理,待评价,已评价 + * 报修地点名称 */ - private Status status; - - @TableField(exist = false) - private Integer statusValue; - - @TableField(exist = false) - private String statusName; - - public enum Status implements IEnum { - /** - * 待分配 - */ - PENDING_ASSIGN("待分配", 1), - - - /** - * 提交反馈 - */ - SUBMIT_FEEDBACK("提交反馈", 2), - - /** - * 维修员：显示待处理， 派单员：已派单 - */ - PENDING_PROCESS("待处理", 3), - - /** - * 处理中 - */ - - PROCESSING("处理中", 4), - - /** - * 已完成 - */ - COMPLETED("已完成", 5), - - /** - * 已评价 - */ - SCORE("已评价", 6), - - /** - * 已取消 - */ - CANCELED("已取消", 7); - - private String name; - private int value; - - Status(String name, int value) { - this.name = name; - this.value = value; - } - - @Override - public Integer getValue() { - return this.value; - } - - public String getName() { - return this.name; - } - - public static Status parse(Integer value) { - for (Status status : values()) { - if (status.getValue().equals(value)) { - return status; - } - } - return null; - } - - } - + private String address; + /** + * 报修楼层id + */ + private String floorId; + /** + * 报修楼层名称 + */ + private String floor; + /** + * 门牌号 + */ + private String room; /** * 描述 */ private String content; + //--派单 /** - * failure_date 故障时间 + * 派单员id + */ + private long perUserId; + /** + * 派单员姓名 + */ + @TableField(exist = false) + private String perUserrName; + /** + * 预计完成时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date failureDate; + private Date preDate; + + //--维修人员反馈 /** - * 报修时间 + * 分析原因 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date repairTime; + private String cause; /** - * 报修图片 + * 解决方案 */ - private String repairImages; - + private String solution; /** - * 维修费 + * 故障类型id */ - private Long repairFee; - + private Long failureTypeId; /** - * 评价 + * 故障类型名称 */ - private Long repairScore; + private Long failureTypeName; /** - * 维修材料 + * 是否解决 1 已解决 0 未解决 */ - private String repairMateriel; - + private Integer resolve; /** - * 开始时间 + * 维修人员id */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date beginDate; - + private long repairUserId; /** - * 结束时间 + * 维修人员姓名 + */ + @TableField(exist = false) + private String repairUserName; + /** + * 维修人员反馈时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endDate; + //--评价 + /** 服务评价 */ + private Integer evalService; + + /** 留言反馈 */ + private String feedback; /** - * 意见建议 + * 评价时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date evalTime; + /** + * 评价人id + */ + private long evalUserId; + + /** + * 评价人姓名 + */ + @TableField(exist = false) + private long evalUserName; + + //--超时 + /** + * 设置超时时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date timeout; + + /** 预警状态， 默认0 没有预警；设置时间后 1 绿色 3橙色 5红色 */ + private Integer warn; + + //工单状态，流程相关 + /** + * 状态:1 待派单,3 重新派单,5 已派单,7 处理中, 9已完成 待评价, 11 已关闭 13 已评价 + * 1 报修给派单员 + * 3 给到网格长重新派单 + * 5 指派维修工 + * 7 维修工接单 + * 9 维修工完成工单 + * 11 派单员无效申请 + * 13 已评价 + * + * + * 报修人：全部、处理中、待评价、已评价 + * 派单员：重新派单、待派单、已派单、已关闭 + * 维修工：待完成、进行中、已完成 + * 管理员：重派单，全部 + * + */ + private Integer status; + + /** + * 当前日志记录id + */ + private long logId; + + /** + * 备注 */ private String remark; - /** - * 评价工人 - */ - private Long workerScore; - - /** - * 维修工人 - */ - private Long workerId; - - @TableField(exist = false) - private String workerName; - - /** - * 维修说明 - */ - private String workerExplain; - - /** - * 维修凭证 - */ - private String workerProof; - - /** - * 公司ID - */ - private Long customerId; - - /** - * 公司 - */ - @TableField(exist = false) - private Customer customer; - - /** - * 园区 - */ - @TableField(exist = false) - private Park park; - - /** - * 用户 - */ - @TableField(exist = false) - private User user; - - private Long parkId; - - private Long failureTypeId; - - private Long addressId; - - @TableField(exist = false) - private String addressName; - - private Long roomId; - - @TableField(exist = false) - private String roomName; - - @TableField(exist = false) - private String failureTypeName; + private String ext1; + private String ext2; + private String ext3; } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairAddress.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairAddress.java index 74eb02b..3fc2863 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairAddress.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairAddress.java @@ -5,7 +5,7 @@ import com.ics.common.core.domain.BaseEntity; import lombok.Data; /** - * 报修地址对象 ics_repair_address + * 报修地点 * * @author ics * @date 2024-08-06 @@ -13,15 +13,14 @@ import lombok.Data; @Data @TableName("ics_repair_address") public class RepairAddress extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** $column.columnComment */ + private static final long serialVersionUID = -202408082125L; + /** + * 地点名称 + */ private String name; /** 备注 */ private String remark; - /** 园区ID */ - private Long parkId; } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairAddressFloor.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairAddressFloor.java new file mode 100644 index 0000000..56c8178 --- /dev/null +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairAddressFloor.java @@ -0,0 +1,36 @@ +package com.ics.admin.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.ics.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * 报修地点楼层 ---ics_repair_room + * + * @author ics + * @date 2024-08-06 + */ +@Data +@TableName("ics_repair_address_floor") +public class RepairAddressFloor extends BaseEntity { + private static final long serialVersionUID = -202408082126L; + + /** 地点id */ + private Long addressId; + + /** + * 楼层名称 + */ + private String name; + + /** 楼层管理员id */ + private Long adminId; + + /** 备注 */ + private String remark; + + + + + +} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairAttach.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairAttach.java new file mode 100644 index 0000000..32ecac1 --- /dev/null +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairAttach.java @@ -0,0 +1,46 @@ +package com.ics.admin.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.ics.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * 附件 --ics_repair_worker_type + * + * @author chen + * @date 2024-07-31 + */ +@Data +@TableName("ics_repair_attach") +public class RepairAttach extends BaseEntity { + private static final long serialVersionUID = -202408082136L; + /** + * 工单id + */ + private Long repairId; + + /** + * 文件所属环节 1保修 9维修工反馈附件 13 评价附件 + */ + private Integer nodeId; + /** + * 源文件名 + */ + private String originalFilename; + /** + * 附件名称 + */ + private String fileName; + /** + * 文件路径 + */ + private String url; + /** + * 文件大小 + */ + private Long fileSize; + /**扩展*/ + private String ext1; + private String ext2; + private String ext3; +} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairDevice.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairDevice.java index f570ee8..cdc710d 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairDevice.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairDevice.java @@ -5,7 +5,7 @@ import com.ics.common.core.domain.BaseEntity; import lombok.Data; /** - * 保修设备类型对象 ics_repair_device + * 报修设备类型对象 * * @author ics * @date 2024-07-30 @@ -13,7 +13,12 @@ import lombok.Data; @Data @TableName("ics_repair_device") public class RepairDevice extends BaseEntity { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = -202408072130L; + + /** + * 类别id + */ + private Long typeId; /** 名称 */ private String name; @@ -24,18 +29,9 @@ public class RepairDevice extends BaseEntity { /** 规格 */ private String specification; - /** 图片url */ - private String picUrl; - - /** 附件url */ - private String fileUrl; - /** 备注 */ private String remark; - /** 园区ID */ - private Long parkId; - private Long typeId; } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairDeviceType.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairDeviceType.java new file mode 100644 index 0000000..18c63a5 --- /dev/null +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairDeviceType.java @@ -0,0 +1,25 @@ +package com.ics.admin.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.ics.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * 设备类型对象 ics_repair_type + * + * @author ics + * @date 2024-07-30 + */ +@Data +@TableName("ics_repair_device_type") +public class RepairDeviceType extends BaseEntity { + private static final long serialVersionUID = -20240808202541L; + + /** 名称 */ + private String name; + + /** 备注 */ + private String remark; + + +} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairFailureType.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairFailureType.java index b68734d..524c90d 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairFailureType.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairFailureType.java @@ -5,7 +5,7 @@ import com.ics.common.core.domain.BaseEntity; import lombok.Data; /** - * 故障类型对象 ics_repair_failure_type + * 故障类型，维修人员反馈 * * @author chen * @date 2024-08-05 @@ -13,15 +13,17 @@ import lombok.Data; @Data @TableName("ics_repair_failure_type") public class RepairFailureType extends BaseEntity { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = -202408082153L; /** 名称 */ private String name; + /** + * 故障类型值 + */ + private Integer kind; /** 备注 */ private String remark; - /** 园区ID */ - private Long parkId; } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairLog.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairLog.java index 79d61c2..9450b44 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairLog.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairLog.java @@ -1,14 +1,14 @@ package com.ics.admin.domain; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.ics.admin.domain.enumHandler.RepairStatusEnumHandler; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ics.common.core.domain.BaseEntity; import lombok.Data; +import java.util.Date; + /** - * 报修记录对象 ics_repair_log + * 工单流程日志 * * @author ics * @date 2021-03-25 @@ -16,26 +16,79 @@ import lombok.Data; @Data @TableName("ics_repair_log") public class RepairLog extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** 类型 */ - @TableField(typeHandler = RepairStatusEnumHandler.class) - private Repair.Status type; - - /** 详情 */ - private String detail; - - /** 报修单 */ - private Long repairId; - - @TableField(exist = false) - private Long tenantId; + private static final long serialVersionUID = -202408082032L; /** - * 关联园区ID + * 父id */ -// @TableField(fill = FieldFill.INSERT) - @TableField(exist = false) - private Long parkId; + private Long pid; + + /** + * 工单id + */ + private Long repairId; + + /** + * 源节点 + */ + private Integer form; + + /** + * 去向节点 + */ + private Integer to; + + /** + * 发送人id + */ + private long sendUserId; + /** + * 发送人姓名 + */ + private String sendUserName; + + /** + * 接受人id + */ + private long recUserId; + /** + * 接受人姓名 + */ + private String recUserName; + + /** + * 是否已读 0，未读 1，已读 + */ + private Integer read; + /** + * 已读时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date readTime; + + /** + * 完成状态 0，未完成 1，已完成 + */ + private Integer status; + /** + * 结束时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date closeTime; + + + /** 日志内容 */ + private String content; + + /** + * 备注 + */ + private String remark; + /** + * 扩展 + */ + private String ext1; + private String ext2; + private String ext3; } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairRecord.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairRecord.java deleted file mode 100644 index bc344c9..0000000 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairRecord.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.ics.admin.domain; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.ics.common.core.domain.BaseEntity; -import lombok.Data; - -/** - * 保修评价对象 ics_repair_record - * - * @author ics - * @date 2024-07-30 - */ -@Data -@TableName("ics_repair_record") -public class RepairRecord extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** 维修速度 */ - private Integer speed; - - /** 服务评价 */ - private Integer serve; - - /** 效果评价 */ - private Integer effect; - - /** 留言反馈 */ - private String remark; - - /** 图片 */ - private String img; - - /** 园区ID */ - private Long parkId; - - /** 保修id */ - private Long repairId; - - /** 维修人员id */ - private Long workerId; - - /** 评价人id */ - private Long userId; - -} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairRelational.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairRelational.java new file mode 100644 index 0000000..ba71b88 --- /dev/null +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairRelational.java @@ -0,0 +1,42 @@ +package com.ics.admin.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.ics.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * 设备类型与派单员、维修人员的关联关系---ics_repair_staff_type + * + * @author chen + * @date 2024-07-30 + */ +@Data +@TableName("ics_repair_relational") +public class RepairRelational extends BaseEntity { + private static final long serialVersionUID = 202408082157L; + + /** + * 设备类型id + */ + private Long typeId; + + /** + * 关系类型 1 派单员 3 维修工 + */ + private Integer kind; + + /** + * 组名，暂时无用 + */ + private String groupName; + + /** + * 人员id + */ + private Long userId; + + + + + +} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairRoom.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairRoom.java deleted file mode 100644 index ba6b8d3..0000000 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairRoom.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.ics.admin.domain; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.ics.common.core.domain.BaseEntity; -import lombok.Data; - -/** - * 报修房间对象 ics_repair_room - * - * @author ics - * @date 2024-08-06 - */ -@Data -@TableName("ics_repair_room") -public class RepairRoom extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** $column.columnComment */ - private String name; - - /** 备注 */ - private String remark; - - /** 园区ID */ - private Long parkId; - - /** 地址id */ - private Long addressId; - -} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairStaffType.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairStaffType.java deleted file mode 100644 index a4012a6..0000000 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairStaffType.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.ics.admin.domain; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.ics.common.core.domain.BaseEntity; -import lombok.Data; - -/** - * RepairStaffType对象 ics_repair_staff_type - * - * @author chen - * @date 2024-07-30 - */ -@Data -@TableName("ics_repair_staff_type") -public class RepairStaffType extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** 派单员id */ - private Long staffId; - - /** 设备类型id */ - private Long typeId; - - /** 园区ID */ - private Long parkId; - -} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairType.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairType.java deleted file mode 100644 index ca47b34..0000000 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairType.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.ics.admin.domain; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.ics.common.core.domain.BaseEntity; -import com.ics.common.core.domain.IcsCustomerStaff; -import lombok.Data; - -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import java.util.List; - -/** - * 设备类型对象 ics_repair_type - * - * @author ics - * @date 2024-07-30 - */ -@Data -@TableName("ics_repair_type") -public class RepairType extends BaseEntity { - private static final long serialVersionUID = 1L; - - - - /** 名称 */ - private String name; - - /** 备注 */ - private String remark; - - /** 园区ID */ - private Long parkId; - - //派单员id - @TableField(exist = false) - private Long staffId; - - @TableField(exist = false) - private String staffName; - - @TableField(exist = false) - private String workerNames; - - @TableField(exist = false) - private List workerList; - -} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairWorkerType.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairWorkerType.java deleted file mode 100644 index 3c52e2d..0000000 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/RepairWorkerType.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.ics.admin.domain; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.ics.common.core.domain.BaseEntity; -import lombok.Data; - -/** - * 维修人分类关联对象 ics_repair_worker_type - * - * @author chen - * @date 2024-07-31 - */ -@Data -@TableName("ics_repair_worker_type") -public class RepairWorkerType extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** 维修人id */ - private Long workerId; - - /** 设备类型id */ - private Long typeId; - - /** 园区ID */ - private Long parkId; - -} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/enumHandler/RepairStatusEnumHandler.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/enumHandler/RepairStatusEnumHandler.java deleted file mode 100644 index 4ba37b4..0000000 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/enumHandler/RepairStatusEnumHandler.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.ics.admin.domain.enumHandler; - -import com.ics.admin.domain.Repair; -import org.apache.ibatis.type.BaseTypeHandler; -import org.apache.ibatis.type.JdbcType; -import org.apache.ibatis.type.MappedJdbcTypes; -import org.apache.ibatis.type.MappedTypes; - -import java.sql.CallableStatement; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; - - -/** - * @author 29361 - */ -@MappedJdbcTypes({JdbcType.INTEGER}) -@MappedTypes({Repair.Status.class}) -public class RepairStatusEnumHandler extends BaseTypeHandler { - @Override - public void setNonNullParameter(PreparedStatement preparedStatement, int i, Repair.Status status, JdbcType jdbcType) throws SQLException { - preparedStatement.setInt(i,status.getValue()); - } - - @Override - public Repair.Status getNullableResult(ResultSet resultSet, String columnName) throws SQLException { - int value = resultSet.getInt(columnName); - Repair.Status instance = Repair.Status.parse(value); - return instance; - } - - @Override - public Repair.Status getNullableResult(ResultSet resultSet, int columnIndex) throws SQLException { - int value = resultSet.getInt(columnIndex); - Repair.Status instance = Repair.Status.parse(value); - return instance; - } - - @Override - public Repair.Status getNullableResult(CallableStatement callableStatement, int i) throws SQLException { - return null; - } -} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairAddressFloorMapper.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairAddressFloorMapper.java new file mode 100644 index 0000000..76ea2a4 --- /dev/null +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairAddressFloorMapper.java @@ -0,0 +1,64 @@ +package com.ics.admin.mapper; + +import com.ics.admin.domain.RepairAddressFloor; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 地点楼层Mapper接口 + * + * @author ics + * @date 2024-08-06 + */ +@Mapper +public interface RepairAddressFloorMapper extends BaseMapper { + /** + * 查询地点楼层 + * + * @param id 地点楼层ID + * @return 地点楼层 + */ + RepairAddressFloor selectRepairAddressFloorById(Long id); + + /** + * 查询地点楼层列表 + * + * @param repairAddressFloor 地点楼层 + * @return 地点楼层集合 + */ + List selectRepairAddressFloorList(RepairAddressFloor repairAddressFloor); + + /** + * 新增地点楼层 + * + * @param repairAddressFloor 地点楼层 + * @return 结果 + */ + int insertRepairAddressFloor(RepairAddressFloor repairAddressFloor); + + /** + * 修改地点楼层 + * + * @param repairAddressFloor 地点楼层 + * @return 结果 + */ + int updateRepairAddressFloor(RepairAddressFloor repairAddressFloor); + + /** + * 删除地点楼层 + * + * @param id 地点楼层ID + * @return 结果 + */ + int deleteRepairAddressFloorById(Long id); + + /** + * 批量删除地点楼层 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + int deleteRepairAddressFloorByIds(String[] ids); +} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairAddressMapper.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairAddressMapper.java index c4ccfb3..106ef42 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairAddressMapper.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairAddressMapper.java @@ -16,7 +16,7 @@ import java.util.List; public interface RepairAddressMapper extends BaseMapper { /** * 查询报修地址 - * + * * @param id 报修地址ID * @return 报修地址 */ @@ -24,7 +24,7 @@ public interface RepairAddressMapper extends BaseMapper { /** * 查询报修地址列表 - * + * * @param repairAddress 报修地址 * @return 报修地址集合 */ @@ -32,7 +32,7 @@ public interface RepairAddressMapper extends BaseMapper { /** * 新增报修地址 - * + * * @param repairAddress 报修地址 * @return 结果 */ @@ -40,7 +40,7 @@ public interface RepairAddressMapper extends BaseMapper { /** * 修改报修地址 - * + * * @param repairAddress 报修地址 * @return 结果 */ @@ -48,7 +48,7 @@ public interface RepairAddressMapper extends BaseMapper { /** * 删除报修地址 - * + * * @param id 报修地址ID * @return 结果 */ @@ -56,7 +56,7 @@ public interface RepairAddressMapper extends BaseMapper { /** * 批量删除报修地址 - * + * * @param ids 需要删除的数据ID * @return 结果 */ diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairAttachMapper.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairAttachMapper.java new file mode 100644 index 0000000..1834b0d --- /dev/null +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairAttachMapper.java @@ -0,0 +1,64 @@ +package com.ics.admin.mapper; + +import com.ics.admin.domain.RepairAttach; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 维修人分类关联Mapper接口 + * + * @author chen + * @date 2024-07-31 + */ +@Mapper +public interface RepairAttachMapper extends BaseMapper { + /** + * 查询附件 + * + * @param id 附件ID + * @return 附件 + */ + RepairAttach selectRepairAttachById(Long id); + + /** + * 查询附件列表 + * + * @param repairAttach 附件 + * @return 附件集合 + */ + List selectRepairAttachList(RepairAttach repairAttach); + + /** + * 新增附件 + * + * @param repairAttach 附件 + * @return 结果 + */ + int insertRepairAttach(RepairAttach repairAttach); + + /** + * 修改附件 + * + * @param repairAttach 附件 + * @return 结果 + */ + int updateRepairAttach(RepairAttach repairAttach); + + /** + * 删除附件 + * + * @param id 附件ID + * @return 结果 + */ + int deleteRepairAttachById(Long id); + + /** + * 批量删除附件 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + int deleteRepairAttachByIds(String[] ids); +} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairDeviceMapper.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairDeviceMapper.java index 23e3036..c317cfc 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairDeviceMapper.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairDeviceMapper.java @@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; /** - * 保修设备类型Mapper接口 + * 报修设备Mapper接口 * * @author ics * @date 2024-07-30 @@ -15,48 +15,48 @@ import java.util.List; @Mapper public interface RepairDeviceMapper extends BaseMapper { /** - * 查询保修设备类型 - * - * @param id 保修设备类型ID - * @return 保修设备类型 + * 查询报修设备 + * + * @param id 报修设备ID + * @return 报修设备 */ RepairDevice selectRepairDeviceById(Long id); /** - * 查询保修设备类型列表 - * - * @param repairDevice 保修设备类型 - * @return 保修设备类型集合 + * 查询报修设备列表 + * + * @param repairDevice 报修设备 + * @return 报修设备集合 */ List selectRepairDeviceList(RepairDevice repairDevice); /** - * 新增保修设备类型 - * - * @param repairDevice 保修设备类型 + * 新增报修设备 + * + * @param repairDevice 报修设备 * @return 结果 */ int insertRepairDevice(RepairDevice repairDevice); /** - * 修改保修设备类型 - * - * @param repairDevice 保修设备类型 + * 修改报修设备 + * + * @param repairDevice 报修设备 * @return 结果 */ int updateRepairDevice(RepairDevice repairDevice); /** - * 删除保修设备类型 - * - * @param id 保修设备类型ID + * 删除报修设备 + * + * @param id 报修设备ID * @return 结果 */ int deleteRepairDeviceById(Long id); /** - * 批量删除保修设备类型 - * + * 批量删除报修设备 + * * @param ids 需要删除的数据ID * @return 结果 */ diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairTypeMapper.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairDeviceTypeMapper.java similarity index 53% rename from shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairTypeMapper.java rename to shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairDeviceTypeMapper.java index fc28945..1e3ebb3 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairTypeMapper.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairDeviceTypeMapper.java @@ -1,6 +1,6 @@ package com.ics.admin.mapper; -import com.ics.admin.domain.RepairType; +import com.ics.admin.domain.RepairDeviceType; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -13,52 +13,52 @@ import java.util.List; * @date 2024-07-30 */ @Mapper -public interface RepairTypeMapper extends BaseMapper { +public interface RepairDeviceTypeMapper extends BaseMapper { /** * 查询设备类型 - * + * * @param id 设备类型ID * @return 设备类型 */ - RepairType selectRepairTypeById(Long id); + RepairDeviceType selectRepairDeviceTypeById(Long id); /** * 查询设备类型列表 - * - * @param repairType 设备类型 + * + * @param repairDeviceType 设备类型 * @return 设备类型集合 */ - List selectRepairTypeList(RepairType repairType); + List selectRepairDeviceTypeList(RepairDeviceType repairDeviceType); /** * 新增设备类型 - * - * @param repairType 设备类型 + * + * @param repairDeviceType 设备类型 * @return 结果 */ - int insertRepairType(RepairType repairType); + int insertRepairDeviceType(RepairDeviceType repairDeviceType); /** * 修改设备类型 - * - * @param repairType 设备类型 + * + * @param repairDeviceType 设备类型 * @return 结果 */ - int updateRepairType(RepairType repairType); + int updateRepairDeviceType(RepairDeviceType repairDeviceType); /** * 删除设备类型 - * + * * @param id 设备类型ID * @return 结果 */ - int deleteRepairTypeById(Long id); + int deleteRepairDeviceTypeById(Long id); /** * 批量删除设备类型 - * + * * @param ids 需要删除的数据ID * @return 结果 */ - int deleteRepairTypeByIds(String[] ids); + int deleteRepairDeviceTypeByIds(String[] ids); } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairLogMapper.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairLogMapper.java index 13cde1c..cdbd7fe 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairLogMapper.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairLogMapper.java @@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; /** - * 报修记录Mapper接口 + * 流程日志Mapper接口 * * @author ics * @date 2021-03-25 @@ -16,10 +16,50 @@ import java.util.List; public interface RepairLogMapper extends BaseMapper { /** - * 查询报修记录列表 + * 查询流程日志 * - * @param repairLog 报修记录 - * @return 报修记录集合 + * @param id 流程日志ID + * @return 流程日志 + */ + RepairLog selectRepairLogById(Long id); + + /** + * 查询流程日志列表 + * + * @param repairLog 流程日志 + * @return 流程日志集合 */ List selectRepairLogList(RepairLog repairLog); + + /** + * 新增流程日志 + * + * @param repairLog 流程日志 + * @return 结果 + */ + int insertRepairLog(RepairLog repairLog); + + /** + * 修改流程日志 + * + * @param repairLog 流程日志 + * @return 结果 + */ + int updateRepairLog(RepairLog repairLog); + + /** + * 删除流程日志 + * + * @param id 流程日志ID + * @return 结果 + */ + int deleteRepairLogById(Long id); + + /** + * 批量删除流程日志 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + int deleteRepairLogByIds(String[] ids); } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairMapper.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairMapper.java index a4d8400..88b88c1 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairMapper.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairMapper.java @@ -15,27 +15,51 @@ import java.util.List; @Mapper public interface RepairMapper extends BaseMapper { /** - * 查询工单管理 - * - * @param id 工单管理ID - * @return 工单管理 + * 查询工单 + * + * @param id 工单ID + * @return 工单 */ Repair selectRepairById(Long id); /** - * 查询工单管理列表 - * - * @param repair 工单管理 - * @return 工单管理集合 + * 查询工单列表 + * + * @param repair 工单 + * @return 工单集合 */ List selectRepairList(Repair repair); /** - * 查询我的工单管理列表 + * 新增工单 * - * @param repair 工单管理 - * @return 工单管理集合 + * @param repair 工单 + * @return 结果 */ - List selectMyRepairList(Repair repair); + int insertRepair(Repair repair); + + /** + * 修改工单 + * + * @param repair 工单 + * @return 结果 + */ + int updateRepair(Repair repair); + + /** + * 删除工单 + * + * @param id 工单ID + * @return 结果 + */ + int deleteRepairById(Long id); + + /** + * 批量删除工单 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + int deleteRepairByIds(String[] ids); } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairRecordMapper.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairRecordMapper.java deleted file mode 100644 index e69b5bb..0000000 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairRecordMapper.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.ics.admin.mapper; - -import com.ics.admin.domain.RepairRecord; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 保修评价Mapper接口 - * - * @author ics - * @date 2024-07-30 - */ -@Mapper -public interface RepairRecordMapper extends BaseMapper { - /** - * 查询保修评价 - * - * @param id 保修评价ID - * @return 保修评价 - */ - RepairRecord selectRepairRecordById(Long id); - - /** - * 查询保修评价列表 - * - * @param repairRecord 保修评价 - * @return 保修评价集合 - */ - List selectRepairRecordList(RepairRecord repairRecord); - - /** - * 新增保修评价 - * - * @param repairRecord 保修评价 - * @return 结果 - */ - int insertRepairRecord(RepairRecord repairRecord); - - /** - * 修改保修评价 - * - * @param repairRecord 保修评价 - * @return 结果 - */ - int updateRepairRecord(RepairRecord repairRecord); - - /** - * 删除保修评价 - * - * @param id 保修评价ID - * @return 结果 - */ - int deleteRepairRecordById(Long id); - - /** - * 批量删除保修评价 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - int deleteRepairRecordByIds(String[] ids); -} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairRelationalMapper.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairRelationalMapper.java new file mode 100644 index 0000000..d4ae58c --- /dev/null +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairRelationalMapper.java @@ -0,0 +1,64 @@ +package com.ics.admin.mapper; + +import com.ics.admin.domain.RepairRelational; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * RepairStaffTypeMapper接口 + * + * @author chen + * @date 2024-07-30 + */ +@Mapper +public interface RepairRelationalMapper extends BaseMapper { + /** + * 查询设备类型与派单员、维修人员的关联关系 + * + * @param id 设备类型与派单员、维修人员的关联关系ID + * @return 设备类型与派单员、维修人员的关联关系 + */ + RepairRelational selectRepairRelationalById(Long id); + + /** + * 查询设备类型与派单员、维修人员的关联关系列表 + * + * @param repairRelational 设备类型与派单员、维修人员的关联关系 + * @return 设备类型与派单员、维修人员的关联关系集合 + */ + List selectRepairRelationalList(RepairRelational repairRelational); + + /** + * 新增设备类型与派单员、维修人员的关联关系 + * + * @param repairRelational 设备类型与派单员、维修人员的关联关系 + * @return 结果 + */ + int insertRepairRelational(RepairRelational repairRelational); + + /** + * 修改设备类型与派单员、维修人员的关联关系 + * + * @param repairRelational 设备类型与派单员、维修人员的关联关系 + * @return 结果 + */ + int updateRepairRelational(RepairRelational repairRelational); + + /** + * 删除设备类型与派单员、维修人员的关联关系 + * + * @param id 设备类型与派单员、维修人员的关联关系ID + * @return 结果 + */ + int deleteRepairRelationalById(Long id); + + /** + * 批量删除设备类型与派单员、维修人员的关联关系 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + int deleteRepairRelationalByIds(String[] ids); +} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairRoomMapper.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairRoomMapper.java deleted file mode 100644 index c127120..0000000 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairRoomMapper.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.ics.admin.mapper; - -import com.ics.admin.domain.RepairRoom; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 报修房间Mapper接口 - * - * @author ics - * @date 2024-08-06 - */ -@Mapper -public interface RepairRoomMapper extends BaseMapper { - /** - * 查询报修房间 - * - * @param id 报修房间ID - * @return 报修房间 - */ - RepairRoom selectRepairRoomById(Long id); - - /** - * 查询报修房间列表 - * - * @param repairRoom 报修房间 - * @return 报修房间集合 - */ - List selectRepairRoomList(RepairRoom repairRoom); - - /** - * 新增报修房间 - * - * @param repairRoom 报修房间 - * @return 结果 - */ - int insertRepairRoom(RepairRoom repairRoom); - - /** - * 修改报修房间 - * - * @param repairRoom 报修房间 - * @return 结果 - */ - int updateRepairRoom(RepairRoom repairRoom); - - /** - * 删除报修房间 - * - * @param id 报修房间ID - * @return 结果 - */ - int deleteRepairRoomById(Long id); - - /** - * 批量删除报修房间 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - int deleteRepairRoomByIds(String[] ids); -} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairStaffTypeMapper.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairStaffTypeMapper.java deleted file mode 100644 index c83d88f..0000000 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairStaffTypeMapper.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.ics.admin.mapper; - -import com.ics.admin.domain.RepairStaffType; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * RepairStaffTypeMapper接口 - * - * @author chen - * @date 2024-07-30 - */ -@Mapper -public interface RepairStaffTypeMapper extends BaseMapper { - /** - * 查询RepairStaffType - * - * @param id RepairStaffTypeID - * @return RepairStaffType - */ - RepairStaffType selectRepairStaffTypeById(Long id); - - /** - * 查询RepairStaffType列表 - * - * @param repairStaffType RepairStaffType - * @return RepairStaffType集合 - */ - List selectRepairStaffTypeList(RepairStaffType repairStaffType); - - /** - * 新增RepairStaffType - * - * @param repairStaffType RepairStaffType - * @return 结果 - */ - int insertRepairStaffType(RepairStaffType repairStaffType); - - /** - * 修改RepairStaffType - * - * @param repairStaffType RepairStaffType - * @return 结果 - */ - int updateRepairStaffType(RepairStaffType repairStaffType); - - /** - * 删除RepairStaffType - * - * @param id RepairStaffTypeID - * @return 结果 - */ - int deleteRepairStaffTypeById(Long id); - - /** - * 批量删除RepairStaffType - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - int deleteRepairStaffTypeByIds(String[] ids); -} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairWorkerTypeMapper.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairWorkerTypeMapper.java deleted file mode 100644 index 212f913..0000000 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/RepairWorkerTypeMapper.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.ics.admin.mapper; - -import com.ics.admin.domain.RepairWorkerType; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 维修人分类关联Mapper接口 - * - * @author chen - * @date 2024-07-31 - */ -@Mapper -public interface RepairWorkerTypeMapper extends BaseMapper { - /** - * 查询维修人分类关联 - * - * @param id 维修人分类关联ID - * @return 维修人分类关联 - */ - RepairWorkerType selectRepairWorkerTypeById(Long id); - - /** - * 查询维修人分类关联列表 - * - * @param repairWorkerType 维修人分类关联 - * @return 维修人分类关联集合 - */ - List selectRepairWorkerTypeList(RepairWorkerType repairWorkerType); - - /** - * 新增维修人分类关联 - * - * @param repairWorkerType 维修人分类关联 - * @return 结果 - */ - int insertRepairWorkerType(RepairWorkerType repairWorkerType); - - /** - * 修改维修人分类关联 - * - * @param repairWorkerType 维修人分类关联 - * @return 结果 - */ - int updateRepairWorkerType(RepairWorkerType repairWorkerType); - - /** - * 删除维修人分类关联 - * - * @param id 维修人分类关联ID - * @return 结果 - */ - int deleteRepairWorkerTypeById(Long id); - - /** - * 批量删除维修人分类关联 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - int deleteRepairWorkerTypeByIds(String[] ids); -} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairAddressFloorService.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairAddressFloorService.java new file mode 100644 index 0000000..65418da --- /dev/null +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairAddressFloorService.java @@ -0,0 +1,61 @@ +package com.ics.admin.service; + +import com.ics.admin.domain.RepairAddressFloor; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * 报修房间Service接口 + * + * @author ics + * @date 2024-08-06 + */ +public interface IRepairAddressFloorService extends IService { + /** + * 查询地点楼层 + * + * @param id 地点楼层ID + * @return 地点楼层 + */ + RepairAddressFloor selectRepairAddressFloorById(Long id); + + /** + * 查询地点楼层列表 + * + * @param repairAddressFloor 地点楼层 + * @return 地点楼层集合 + */ + List selectRepairAddressFloorList(RepairAddressFloor repairAddressFloor); + + /** + * 新增地点楼层 + * + * @param repairAddressFloor 地点楼层 + * @return 结果 + */ + int insertRepairAddressFloor(RepairAddressFloor repairAddressFloor); + + /** + * 修改地点楼层 + * + * @param repairAddressFloor 地点楼层 + * @return 结果 + */ + int updateRepairAddressFloor(RepairAddressFloor repairAddressFloor); + + /** + * 批量删除地点楼层 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + int deleteRepairAddressFloorByIds(String ids); + + /** + * 删除地点楼层信息 + * + * @param id 地点楼层ID + * @return 结果 + */ + int deleteRepairAddressFloorById(Long id); +} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairAddressService.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairAddressService.java index 1519613..04a5456 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairAddressService.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairAddressService.java @@ -13,7 +13,7 @@ import java.util.List; public interface IRepairAddressService extends IService { /** * 查询报修地址 - * + * * @param id 报修地址ID * @return 报修地址 */ @@ -21,7 +21,7 @@ public interface IRepairAddressService extends IService { /** * 查询报修地址列表 - * + * * @param repairAddress 报修地址 * @return 报修地址集合 */ @@ -29,7 +29,7 @@ public interface IRepairAddressService extends IService { /** * 新增报修地址 - * + * * @param repairAddress 报修地址 * @return 结果 */ @@ -37,7 +37,7 @@ public interface IRepairAddressService extends IService { /** * 修改报修地址 - * + * * @param repairAddress 报修地址 * @return 结果 */ @@ -45,7 +45,7 @@ public interface IRepairAddressService extends IService { /** * 批量删除报修地址 - * + * * @param ids 需要删除的数据ID * @return 结果 */ @@ -53,7 +53,7 @@ public interface IRepairAddressService extends IService { /** * 删除报修地址信息 - * + * * @param id 报修地址ID * @return 结果 */ diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairAttachService.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairAttachService.java new file mode 100644 index 0000000..b5085be --- /dev/null +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairAttachService.java @@ -0,0 +1,64 @@ +package com.ics.admin.service; + +import com.ics.admin.domain.RepairAttach; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ics.common.core.domain.IcsCustomerStaff; + +import java.util.List; + +/** + * 附件Service接口 + * + * @author chen + * @date 2024-07-31 + */ +public interface IRepairAttachService extends IService { + /** + * 查询附件 + * + * @param id 附件ID + * @return 附件 + */ + RepairAttach selectRepairAttachById(Long id); + + /** + * 查询附件列表 + * + * @param repairAttach 附件 + * @return 附件集合 + */ + List selectRepairAttachList(RepairAttach repairAttach); + + /** + * 新增附件 + * + * @param repairAttach 附件 + * @return 结果 + */ + int insertRepairAttach(RepairAttach repairAttach); + + /** + * 修改附件 + * + * @param repairAttach 附件 + * @return 结果 + */ + int updateRepairAttach(RepairAttach repairAttach); + + /** + * 批量删除附件 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + int deleteRepairAttachByIds(String ids); + + /** + * 删除附件信息 + * + * @param id 附件ID + * @return 结果 + */ + int deleteRepairAttachById(Long id); + +} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairDeviceService.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairDeviceService.java index b9433f7..3321cdf 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairDeviceService.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairDeviceService.java @@ -5,56 +5,56 @@ import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; /** - * 保修设备类型Service接口 + * 保修设备Service接口 * * @author ics * @date 2024-07-30 */ public interface IRepairDeviceService extends IService { /** - * 查询保修设备类型 - * - * @param id 保修设备类型ID - * @return 保修设备类型 + * 查询报修设备 + * + * @param id 报修设备ID + * @return 报修设备 */ RepairDevice selectRepairDeviceById(Long id); /** - * 查询保修设备类型列表 - * - * @param repairDevice 保修设备类型 - * @return 保修设备类型集合 + * 查询报修设备列表 + * + * @param repairDevice 报修设备 + * @return 报修设备集合 */ List selectRepairDeviceList(RepairDevice repairDevice); /** - * 新增保修设备类型 - * - * @param repairDevice 保修设备类型 + * 新增报修设备 + * + * @param repairDevice 报修设备 * @return 结果 */ int insertRepairDevice(RepairDevice repairDevice); /** - * 修改保修设备类型 - * - * @param repairDevice 保修设备类型 + * 修改报修设备 + * + * @param repairDevice 报修设备 * @return 结果 */ int updateRepairDevice(RepairDevice repairDevice); /** - * 批量删除保修设备类型 - * + * 批量删除报修设备 + * * @param ids 需要删除的数据ID * @return 结果 */ int deleteRepairDeviceByIds(String ids); /** - * 删除保修设备类型信息 - * - * @param id 保修设备类型ID + * 删除报修设备信息 + * + * @param id 报修设备ID * @return 结果 */ int deleteRepairDeviceById(Long id); diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairTypeService.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairDeviceTypeService.java similarity index 51% rename from shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairTypeService.java rename to shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairDeviceTypeService.java index a207ed7..e78bf89 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairTypeService.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairDeviceTypeService.java @@ -1,6 +1,6 @@ package com.ics.admin.service; -import com.ics.admin.domain.RepairType; +import com.ics.admin.domain.RepairDeviceType; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -10,54 +10,54 @@ import java.util.List; * @author ics * @date 2024-07-30 */ -public interface IRepairTypeService extends IService { +public interface IRepairDeviceTypeService extends IService { /** * 查询设备类型 - * + * * @param id 设备类型ID * @return 设备类型 */ - RepairType selectRepairTypeById(Long id); + RepairDeviceType selectRepairDeviceTypeById(Long id); /** * 查询设备类型列表 - * - * @param repairType 设备类型 + * + * @param repairDeviceType 设备类型 * @return 设备类型集合 */ - List selectRepairTypeList(RepairType repairType); + List selectRepairDeviceTypeList(RepairDeviceType repairDeviceType); /** * 新增设备类型 - * - * @param repairType 设备类型 + * + * @param repairDeviceType 设备类型 * @return 结果 */ - int insertRepairType(RepairType repairType); + int insertRepairDeviceType(RepairDeviceType repairDeviceType); /** * 修改设备类型 - * - * @param repairType 设备类型 + * + * @param repairDeviceType 设备类型 * @return 结果 */ - int updateRepairType(RepairType repairType); + int updateRepairDeviceType(RepairDeviceType repairDeviceType); /** * 批量删除设备类型 - * + * * @param ids 需要删除的数据ID * @return 结果 */ - int deleteRepairTypeByIds(String ids); + int deleteRepairDeviceTypeByIds(String ids); /** * 删除设备类型信息 - * + * * @param id 设备类型ID * @return 结果 */ - int deleteRepairTypeById(Long id); + int deleteRepairDeviceTypeById(Long id); } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairLogService.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairLogService.java index 6ba2ee0..caa4db1 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairLogService.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairLogService.java @@ -13,49 +13,49 @@ import java.util.List; */ public interface IRepairLogService extends IService { /** - * 查询报修记录 - * - * @param id 报修记录ID - * @return 报修记录 + * 查询流程日志 + * + * @param id 流程日志ID + * @return 流程日志 */ RepairLog selectRepairLogById(Long id); /** - * 查询报修记录列表 - * - * @param repairLog 报修记录 - * @return 报修记录集合 + * 查询流程日志列表 + * + * @param repairLog 流程日志 + * @return 流程日志集合 */ List selectRepairLogList(RepairLog repairLog); /** - * 新增报修记录 - * - * @param repairLog 报修记录 + * 新增流程日志 + * + * @param repairLog 流程日志 * @return 结果 */ int insertRepairLog(RepairLog repairLog); /** - * 修改报修记录 - * - * @param repairLog 报修记录 + * 修改流程日志 + * + * @param repairLog 流程日志 * @return 结果 */ int updateRepairLog(RepairLog repairLog); /** - * 批量删除报修记录 - * + * 批量删除流程日志 + * * @param ids 需要删除的数据ID * @return 结果 */ int deleteRepairLogByIds(String ids); /** - * 删除报修记录信息 - * - * @param id 报修记录ID + * 删除流程日志信息 + * + * @param id 流程日志ID * @return 结果 */ int deleteRepairLogById(Long id); diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairRecordService.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairRecordService.java deleted file mode 100644 index 05faaf0..0000000 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairRecordService.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.ics.admin.service; - -import com.ics.admin.domain.Repair; -import com.ics.admin.domain.RepairRecord; -import com.baomidou.mybatisplus.extension.service.IService; -import java.util.List; - -/** - * 保修评价Service接口 - * - * @author ics - * @date 2024-07-30 - */ -public interface IRepairRecordService extends IService { - /** - * 查询保修评价 - * - * @param id 保修评价ID - * @return 保修评价 - */ - RepairRecord selectRepairRecordById(Long id); - - /** - * 查询保修评价列表 - * - * @param repairRecord 保修评价 - * @return 保修评价集合 - */ - List selectRepairRecordList(RepairRecord repairRecord); - - /** - * 新增保修评价 - * - * @param repairRecord 保修评价 - * @return 结果 - */ - int insertRepairRecord(RepairRecord repairRecord); - - /** - * 修改保修评价 - * - * @param repairRecord 保修评价 - * @return 结果 - */ - int updateRepairRecord(RepairRecord repairRecord); - - /** - * 批量删除保修评价 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - int deleteRepairRecordByIds(String ids); - - /** - * 删除保修评价信息 - * - * @param id 保修评价ID - * @return 结果 - */ - int deleteRepairRecordById(Long id); - - RepairRecord selectByRepairId(Long id); -} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairRelationalService.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairRelationalService.java new file mode 100644 index 0000000..037faf8 --- /dev/null +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairRelationalService.java @@ -0,0 +1,62 @@ +package com.ics.admin.service; + +import com.ics.admin.domain.RepairRelational; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * RepairStaffTypeService接口 + * + * @author chen + * @date 2024-07-30 + */ +public interface IRepairRelationalService extends IService { + /** + * 查询设备类型与派单员、维修人员的关联关系 + * + * @param id 设备类型与派单员、维修人员的关联关系ID + * @return 设备类型与派单员、维修人员的关联关系 + */ + RepairRelational selectRepairRelationalById(Long id); + + /** + * 查询设备类型与派单员、维修人员的关联关系列表 + * + * @param repairRelational 设备类型与派单员、维修人员的关联关系 + * @return 设备类型与派单员、维修人员的关联关系集合 + */ + List selectRepairRelationalList(RepairRelational repairRelational); + + /** + * 新增设备类型与派单员、维修人员的关联关系 + * + * @param repairRelational 设备类型与派单员、维修人员的关联关系 + * @return 结果 + */ + int insertRepairRelational(RepairRelational repairRelational); + + /** + * 修改设备类型与派单员、维修人员的关联关系 + * + * @param repairRelational 设备类型与派单员、维修人员的关联关系 + * @return 结果 + */ + int updateRepairRelational(RepairRelational repairRelational); + + /** + * 批量删除设备类型与派单员、维修人员的关联关系 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + int deleteRepairRelationalByIds(String ids); + + /** + * 删除设备类型与派单员、维修人员的关联关系信息 + * + * @param id 设备类型与派单员、维修人员的关联关系ID + * @return 结果 + */ + int deleteRepairRelationalById(Long id); + +} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairRoomService.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairRoomService.java deleted file mode 100644 index e573105..0000000 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairRoomService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ics.admin.service; - -import com.ics.admin.domain.RepairRoom; -import com.baomidou.mybatisplus.extension.service.IService; -import java.util.List; - -/** - * 报修房间Service接口 - * - * @author ics - * @date 2024-08-06 - */ -public interface IRepairRoomService extends IService { - /** - * 查询报修房间 - * - * @param id 报修房间ID - * @return 报修房间 - */ - RepairRoom selectRepairRoomById(Long id); - - /** - * 查询报修房间列表 - * - * @param repairRoom 报修房间 - * @return 报修房间集合 - */ - List selectRepairRoomList(RepairRoom repairRoom); - - /** - * 新增报修房间 - * - * @param repairRoom 报修房间 - * @return 结果 - */ - int insertRepairRoom(RepairRoom repairRoom); - - /** - * 修改报修房间 - * - * @param repairRoom 报修房间 - * @return 结果 - */ - int updateRepairRoom(RepairRoom repairRoom); - - /** - * 批量删除报修房间 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - int deleteRepairRoomByIds(String ids); - - /** - * 删除报修房间信息 - * - * @param id 报修房间ID - * @return 结果 - */ - int deleteRepairRoomById(Long id); -} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairService.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairService.java index cc657b6..8a727f4 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairService.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairService.java @@ -14,64 +14,51 @@ import java.util.List; */ public interface IRepairService extends IService { /** - * 查询工单管理 - * - * @param id 工单管理ID - * @return 工单管理 + * 查询工单 + * + * @param id 工单ID + * @return 工单 */ Repair selectRepairById(Long id); /** - * 查询工单管理列表 - * - * @param repair 工单管理 - * @return 工单管理集合 + * 查询工单列表 + * + * @param repair 工单 + * @return 工单集合 */ List selectRepairList(Repair repair); /** - * 新增工单管理 - * - * @param repair 工单管理 + * 新增工单 + * + * @param repair 工单 * @return 结果 */ int insertRepair(Repair repair); /** - * 修改工单管理 - * - * @param repair 工单管理 + * 修改工单 + * + * @param repair 工单 * @return 结果 */ int updateRepair(Repair repair); /** - * 批量删除工单管理 - * + * 批量删除工单 + * * @param ids 需要删除的数据ID * @return 结果 */ int deleteRepairByIds(String ids); /** - * 删除工单管理信息 - * - * @param id 工单管理ID + * 删除工单信息 + * + * @param id 工单ID * @return 结果 */ int deleteRepairById(Long id); - - /** - * 查询我的工单管理列表 - * - * @param repair 创建用户 - * @return 工单管理集合 - */ - List selectMyRepairList(Repair repair); - - List selectWorkerIdByTypeId(String typeId); - - List selectDispatcher(); - } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairStaffTypeService.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairStaffTypeService.java deleted file mode 100644 index 9f6d59d..0000000 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairStaffTypeService.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.ics.admin.service; - -import com.ics.admin.domain.RepairStaffType; -import com.baomidou.mybatisplus.extension.service.IService; -import java.util.List; - -/** - * RepairStaffTypeService接口 - * - * @author chen - * @date 2024-07-30 - */ -public interface IRepairStaffTypeService extends IService { - /** - * 查询RepairStaffType - * - * @param id RepairStaffTypeID - * @return RepairStaffType - */ - RepairStaffType selectRepairStaffTypeById(Long id); - - /** - * 查询RepairStaffType列表 - * - * @param repairStaffType RepairStaffType - * @return RepairStaffType集合 - */ - List selectRepairStaffTypeList(RepairStaffType repairStaffType); - - /** - * 新增RepairStaffType - * - * @param repairStaffType RepairStaffType - * @return 结果 - */ - int insertRepairStaffType(RepairStaffType repairStaffType); - - /** - * 修改RepairStaffType - * - * @param repairStaffType RepairStaffType - * @return 结果 - */ - int updateRepairStaffType(RepairStaffType repairStaffType); - - /** - * 批量删除RepairStaffType - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - int deleteRepairStaffTypeByIds(String ids); - - /** - * 删除RepairStaffType信息 - * - * @param id RepairStaffTypeID - * @return 结果 - */ - int deleteRepairStaffTypeById(Long id); - - Long selectRepairTypeByUserId(Integer userId); - - RepairStaffType selectStaffIdByTypeId(Long id); - -} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairWorkerTypeService.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairWorkerTypeService.java deleted file mode 100644 index 4ac3c3f..0000000 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairWorkerTypeService.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.ics.admin.service; - -import com.ics.admin.domain.RepairWorkerType; -import com.baomidou.mybatisplus.extension.service.IService; -import com.ics.common.core.domain.IcsCustomerStaff; - -import java.util.List; - -/** - * 维修人分类关联Service接口 - * - * @author chen - * @date 2024-07-31 - */ -public interface IRepairWorkerTypeService extends IService { - /** - * 查询维修人分类关联 - * - * @param id 维修人分类关联ID - * @return 维修人分类关联 - */ - RepairWorkerType selectRepairWorkerTypeById(Long id); - - /** - * 查询维修人分类关联列表 - * - * @param repairWorkerType 维修人分类关联 - * @return 维修人分类关联集合 - */ - List selectRepairWorkerTypeList(RepairWorkerType repairWorkerType); - - /** - * 新增维修人分类关联 - * - * @param repairWorkerType 维修人分类关联 - * @return 结果 - */ - int insertRepairWorkerType(RepairWorkerType repairWorkerType); - - /** - * 修改维修人分类关联 - * - * @param repairWorkerType 维修人分类关联 - * @return 结果 - */ - int updateRepairWorkerType(RepairWorkerType repairWorkerType); - - /** - * 批量删除维修人分类关联 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - int deleteRepairWorkerTypeByIds(String ids); - - /** - * 删除维修人分类关联信息 - * - * @param id 维修人分类关联ID - * @return 结果 - */ - int deleteRepairWorkerTypeById(Long id); - - List selectRepairWorkerTypeListByTypeId(Long type); - -} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairAddressFloorServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairAddressFloorServiceImpl.java new file mode 100644 index 0000000..31e7e00 --- /dev/null +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairAddressFloorServiceImpl.java @@ -0,0 +1,92 @@ +package com.ics.admin.service.impl; + +import java.util.List; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ics.admin.mapper.RepairAddressFloorMapper; +import com.ics.admin.domain.RepairAddressFloor; +import com.ics.admin.service.IRepairAddressFloorService; + +/** + * 地点楼层Service业务层处理 + * + * @author ics + * @date 2024-08-06 + */ +@Service +public class RepairAddressFloorServiceImpl extends ServiceImpl implements IRepairAddressFloorService { + @Autowired + private RepairAddressFloorMapper repairAddressFloorMapper; + + /** + * 查询地点楼层 + * + * @param id 地点楼层ID + * @return 地点楼层 + */ + @Override + public RepairAddressFloor selectRepairAddressFloorById(Long id) { + return repairAddressFloorMapper.selectById(id); + } + + /** + * 查询地点楼层列表 + * + * @param repairAddressFloor 地点楼层 + * @return 地点楼层 + */ + @Override + public List selectRepairAddressFloorList(RepairAddressFloor repairAddressFloor) { + QueryWrapper queryWrapper = new QueryWrapper(); + return repairAddressFloorMapper.selectList(queryWrapper); + } + + /** + * 新增地点楼层 + * + * @param repairAddressFloor 地点楼层 + * @return 结果 + */ + @Override + public int insertRepairAddressFloor(RepairAddressFloor repairAddressFloor) { + return repairAddressFloorMapper.insert(repairAddressFloor); + } + + /** + * 修改地点楼层 + * + * @param repairAddressFloor 地点楼层 + * @return 结果 + */ + @Override + public int updateRepairAddressFloor(RepairAddressFloor repairAddressFloor) { + return repairAddressFloorMapper.updateById(repairAddressFloor); + } + + /** + * 删除地点楼层对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteRepairAddressFloorByIds(String ids) { + String[] idsArray = StrUtil.split(ids,","); + return repairAddressFloorMapper.deleteBatchIds(CollUtil.toList(idsArray)); + } + + /** + * 删除地点楼层信息 + * + * @param id 地点楼层ID + * @return 结果 + */ + @Override + public int deleteRepairAddressFloorById(Long id) { + return repairAddressFloorMapper.deleteRepairAddressFloorById(id); + } +} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairAddressServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairAddressServiceImpl.java index 5365097..29942f8 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairAddressServiceImpl.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairAddressServiceImpl.java @@ -24,7 +24,7 @@ public class RepairAddressServiceImpl extends ServiceImpl implements IRepairAttachService { + + @Autowired + private RepairAttachMapper repairAttachMapper; + + /** + * 查询附件 + * + * @param id 附件ID + * @return 附件 + */ + @Override + public RepairAttach selectRepairAttachById(Long id) { + return repairAttachMapper.selectById(id); + } + + /** + * 查询附件列表 + * + * @param repairAttach 附件 + * @return 附件 + */ + @Override + public List selectRepairAttachList(RepairAttach repairAttach) { + QueryWrapper queryWrapper = new QueryWrapper(); + return repairAttachMapper.selectList(queryWrapper); + } + + /** + * 新增附件 + * + * @param repairAttach 附件 + * @return 结果 + */ + @Override + public int insertRepairAttach(RepairAttach repairAttach) { + return repairAttachMapper.insert(repairAttach); + } + + /** + * 修改附件 + * + * @param repairAttach 附件 + * @return 结果 + */ + @Override + public int updateRepairAttach(RepairAttach repairAttach) { + return repairAttachMapper.updateById(repairAttach); + } + + /** + * 删除附件对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteRepairAttachByIds(String ids) { + String[] idsArray = StrUtil.split(ids,","); + return repairAttachMapper.deleteBatchIds(CollUtil.toList(idsArray)); + } + + /** + * 删除附件信息 + * + * @param id 附件ID + * @return 结果 + */ + @Override + public int deleteRepairAttachById(Long id) { + return repairAttachMapper.deleteRepairAttachById(id); + } + +} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairDeviceServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairDeviceServiceImpl.java index aa74ebe..e0b0963 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairDeviceServiceImpl.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairDeviceServiceImpl.java @@ -12,7 +12,7 @@ import com.ics.admin.domain.RepairDevice; import com.ics.admin.service.IRepairDeviceService; /** - * 保修设备类型Service业务层处理 + * 保修设备Service业务层处理 * * @author ics * @date 2024-07-30 @@ -23,10 +23,10 @@ public class RepairDeviceServiceImpl extends ServiceImpl selectRepairDeviceList(RepairDevice repairDevice) { QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq(repairDevice.getTypeId() != null,"type_id",repairDevice.getTypeId()); return repairDeviceMapper.selectList(queryWrapper); } /** - * 新增保修设备类型 - * - * @param repairDevice 保修设备类型 + * 新增报修设备 + * + * @param repairDevice 报修设备 * @return 结果 */ @Override @@ -58,9 +57,9 @@ public class RepairDeviceServiceImpl extends ServiceImpl implements IRepairDeviceTypeService { + @Autowired + private RepairDeviceTypeMapper repairDeviceTypeMapper; + + /** + * 查询设备类型 + * + * @param id 设备类型ID + * @return 设备类型 + */ + @Override + public RepairDeviceType selectRepairDeviceTypeById(Long id) { + return repairDeviceTypeMapper.selectById(id); + } + + /** + * 查询设备类型列表 + * + * @param repairDeviceType 设备类型 + * @return 设备类型 + */ + @Override + public List selectRepairDeviceTypeList(RepairDeviceType repairDeviceType) { + QueryWrapper queryWrapper = new QueryWrapper(); + return repairDeviceTypeMapper.selectList(queryWrapper); + } + + /** + * 新增设备类型 + * + * @param repairDeviceType 设备类型 + * @return 结果 + */ + @Override + public int insertRepairDeviceType(RepairDeviceType repairDeviceType) { + return repairDeviceTypeMapper.insert(repairDeviceType); + } + + /** + * 修改设备类型 + * + * @param repairDeviceType 设备类型 + * @return 结果 + */ + @Override + public int updateRepairDeviceType(RepairDeviceType repairDeviceType) { + return repairDeviceTypeMapper.updateById(repairDeviceType); + } + + /** + * 删除设备类型对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteRepairDeviceTypeByIds(String ids) { + String[] idsArray = StrUtil.split(ids,","); + return repairDeviceTypeMapper.deleteBatchIds(CollUtil.toList(idsArray)); + } + + /** + * 删除设备类型信息 + * + * @param id 设备类型ID + * @return 结果 + */ + @Override + public int deleteRepairDeviceTypeById(Long id) { + return repairDeviceTypeMapper.deleteRepairDeviceTypeById(id); + } + +} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairFailureTypeServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairFailureTypeServiceImpl.java index 6b0f2d4..7df6cb3 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairFailureTypeServiceImpl.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairFailureTypeServiceImpl.java @@ -76,7 +76,7 @@ public class RepairFailureTypeServiceImpl extends ServiceImpl selectRepairLogList(RepairLog repairLog) { - return repairLogMapper.selectRepairLogList(repairLog); + QueryWrapper queryWrapper = new QueryWrapper(); + return repairLogMapper.selectList(queryWrapper); } /** - * 新增报修记录 - * - * @param repairLog 报修记录 + * 新增流程日志 + * + * @param repairLog 流程日志 * @return 结果 */ @Override @@ -56,9 +58,9 @@ public class RepairLogServiceImpl extends ServiceImpl implements IRepairRecordService { - @Autowired - private RepairRecordMapper repairRecordMapper; - - /** - * 查询保修评价 - * - * @param id 保修评价ID - * @return 保修评价 - */ - @Override - public RepairRecord selectRepairRecordById(Long id) { - return repairRecordMapper.selectById(id); - } - - /** - * 查询保修评价列表 - * - * @param repairRecord 保修评价 - * @return 保修评价 - */ - @Override - public List selectRepairRecordList(RepairRecord repairRecord) { - QueryWrapper queryWrapper = new QueryWrapper(); - return repairRecordMapper.selectList(queryWrapper); - } - - /** - * 新增保修评价 - * - * @param repairRecord 保修评价 - * @return 结果 - */ - @Override - public int insertRepairRecord(RepairRecord repairRecord) { - return repairRecordMapper.insert(repairRecord); - } - - /** - * 修改保修评价 - * - * @param repairRecord 保修评价 - * @return 结果 - */ - @Override - public int updateRepairRecord(RepairRecord repairRecord) { - return repairRecordMapper.updateById(repairRecord); - } - - /** - * 删除保修评价对象 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - @Override - public int deleteRepairRecordByIds(String ids) { - String[] idsArray = StrUtil.split(ids,","); - return repairRecordMapper.deleteBatchIds(CollUtil.toList(idsArray)); - } - - /** - * 删除保修评价信息 - * - * @param id 保修评价ID - * @return 结果 - */ - @Override - public int deleteRepairRecordById(Long id) { - return repairRecordMapper.deleteRepairRecordById(id); - } - - @Override - public RepairRecord selectByRepairId(Long id) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - - wrapper.eq(RepairRecord::getRepairId,id); - return repairRecordMapper.selectOne(wrapper); - } -} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairRelationalServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairRelationalServiceImpl.java new file mode 100644 index 0000000..b18b8a3 --- /dev/null +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairRelationalServiceImpl.java @@ -0,0 +1,92 @@ +package com.ics.admin.service.impl; + +import java.util.List; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ics.admin.mapper.RepairRelationalMapper; +import com.ics.admin.domain.RepairRelational; +import com.ics.admin.service.IRepairRelationalService; + +/** + * RepairStaffTypeService业务层处理 + * + * @author chen + * @date 2024-07-30 + */ +@Service +public class RepairRelationalServiceImpl extends ServiceImpl implements IRepairRelationalService { + @Autowired + private RepairRelationalMapper repairRelationalMapper; + + /** + * 查询设备类型与派单员、维修人员的关联关系 + * + * @param id 设备类型与派单员、维修人员的关联关系ID + * @return 设备类型与派单员、维修人员的关联关系 + */ + @Override + public RepairRelational selectRepairRelationalById(Long id) { + return repairRelationalMapper.selectById(id); + } + + /** + * 查询设备类型与派单员、维修人员的关联关系列表 + * + * @param repairRelational 设备类型与派单员、维修人员的关联关系 + * @return 设备类型与派单员、维修人员的关联关系 + */ + @Override + public List selectRepairRelationalList(RepairRelational repairRelational) { + QueryWrapper queryWrapper = new QueryWrapper(); + return repairRelationalMapper.selectList(queryWrapper); + } + + /** + * 新增设备类型与派单员、维修人员的关联关系 + * + * @param repairRelational 设备类型与派单员、维修人员的关联关系 + * @return 结果 + */ + @Override + public int insertRepairRelational(RepairRelational repairRelational) { + return repairRelationalMapper.insert(repairRelational); + } + + /** + * 修改设备类型与派单员、维修人员的关联关系 + * + * @param repairRelational 设备类型与派单员、维修人员的关联关系 + * @return 结果 + */ + @Override + public int updateRepairRelational(RepairRelational repairRelational) { + return repairRelationalMapper.updateById(repairRelational); + } + + /** + * 删除设备类型与派单员、维修人员的关联关系对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteRepairRelationalByIds(String ids) { + String[] idsArray = StrUtil.split(ids,","); + return repairRelationalMapper.deleteBatchIds(CollUtil.toList(idsArray)); + } + + /** + * 删除设备类型与派单员、维修人员的关联关系信息 + * + * @param id 设备类型与派单员、维修人员的关联关系ID + * @return 结果 + */ + @Override + public int deleteRepairRelationalById(Long id) { + return repairRelationalMapper.deleteRepairRelationalById(id); + } +} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairRoomServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairRoomServiceImpl.java deleted file mode 100644 index eaa83a1..0000000 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairRoomServiceImpl.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.ics.admin.service.impl; - -import java.util.List; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ics.admin.mapper.RepairRoomMapper; -import com.ics.admin.domain.RepairRoom; -import com.ics.admin.service.IRepairRoomService; - -/** - * 报修房间Service业务层处理 - * - * @author ics - * @date 2024-08-06 - */ -@Service -public class RepairRoomServiceImpl extends ServiceImpl implements IRepairRoomService { - @Autowired - private RepairRoomMapper repairRoomMapper; - - /** - * 查询报修房间 - * - * @param id 报修房间ID - * @return 报修房间 - */ - @Override - public RepairRoom selectRepairRoomById(Long id) { - return repairRoomMapper.selectById(id); - } - - /** - * 查询报修房间列表 - * - * @param repairRoom 报修房间 - * @return 报修房间 - */ - @Override - public List selectRepairRoomList(RepairRoom repairRoom) { - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq(repairRoom.getAddressId() != null,"address_id",repairRoom.getAddressId()); - - return repairRoomMapper.selectList(queryWrapper); - } - - /** - * 新增报修房间 - * - * @param repairRoom 报修房间 - * @return 结果 - */ - @Override - public int insertRepairRoom(RepairRoom repairRoom) { - return repairRoomMapper.insert(repairRoom); - } - - /** - * 修改报修房间 - * - * @param repairRoom 报修房间 - * @return 结果 - */ - @Override - public int updateRepairRoom(RepairRoom repairRoom) { - return repairRoomMapper.updateById(repairRoom); - } - - /** - * 删除报修房间对象 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - @Override - public int deleteRepairRoomByIds(String ids) { - String[] idsArray = StrUtil.split(ids,","); - return repairRoomMapper.deleteBatchIds(CollUtil.toList(idsArray)); - } - - /** - * 删除报修房间信息 - * - * @param id 报修房间ID - * @return 结果 - */ - @Override - public int deleteRepairRoomById(Long id) { - return repairRoomMapper.deleteRepairRoomById(id); - } -} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairServiceImpl.java index d1afc5d..c315f48 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairServiceImpl.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairServiceImpl.java @@ -3,16 +3,17 @@ package com.ics.admin.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ics.admin.domain.Repair; import com.ics.admin.domain.RepairLog; -import com.ics.admin.domain.RepairWorkerType; +import com.ics.admin.domain.RepairAttach; import com.ics.admin.mapper.IcsCustomerStaffMapper; import com.ics.admin.mapper.RepairMapper; -import com.ics.admin.mapper.RepairWorkerTypeMapper; +import com.ics.admin.mapper.RepairAttachMapper; import com.ics.admin.service.IRepairLogService; import com.ics.admin.service.IRepairService; -import com.ics.admin.service.IRepairWorkerTypeService; +import com.ics.admin.service.IRepairAttachService; import com.ics.common.core.domain.IcsCustomerStaff; import com.ics.common.utils.DateUtils; import com.ics.system.domain.Sn; @@ -36,97 +37,53 @@ public class RepairServiceImpl extends ServiceImpl impleme @Autowired private RepairMapper repairMapper; - @Autowired - private ISnService snService; - - @Autowired - private IRepairLogService repairLogService; - - @Autowired - private ICurrentUserService currentUserService; - - @Autowired - private IRepairWorkerTypeService repairWorkerTypeService; - - @Autowired - private RepairWorkerTypeMapper repairWorkerTypeMapper; - - @Autowired - private IcsCustomerStaffMapper customerStaffMapper; - /** - * 查询工单管理 + * 查询工单 * - * @param id 工单管理ID - * @return 工单管理 + * @param id 工单ID + * @return 工单 */ @Override public Repair selectRepairById(Long id) { - return repairMapper.selectRepairById(id); + return repairMapper.selectById(id); } /** - * 查询工单管理列表 + * 查询工单列表 * - * @param repair 工单管理 - * @return 工单管理 + * @param repair 工单 + * @return 工单 */ @Override public List selectRepairList(Repair repair) { - return repairMapper.selectRepairList(repair); + QueryWrapper queryWrapper = new QueryWrapper(); + return repairMapper.selectList(queryWrapper); } /** - * 新增工单管理 + * 新增工单 * - * @param repair 工单管理 + * @param repair 工单 * @return 结果 */ @Override - @Transactional(rollbackFor = Exception.class) public int insertRepair(Repair repair) { - repair.setSn(snService.generate(Sn.Type.REPAIR)); - repair.setCreateTime(DateUtils.getNowDate()); - repair.setRepairTime(DateUtils.getNowDate()); - int result = repairMapper.insert(repair); - // 增加报修日志 - RepairLog repairLog = new RepairLog(); - repairLog.setType(repair.getStatus()); - repairLog.setDetail(String.format("工单号：%s,已收到报修", repair.getSn())); - repairLog.setRepairId(repair.getId()); - repairLog.setCreateBy(repair.getCreateBy()); - repairLog.setCreateTime(DateUtils.getNowDate()); - repairLog.setUpdateBy(repair.getCreateBy()); - repairLog.setUpdateTime(DateUtils.getNowDate()); - repairLog.setParkId(repair.getParkId()); - repairLog.setTenantId(repair.getTenantId()); - repairLogService.insertRepairLog(repairLog); - return result; + return repairMapper.insert(repair); } /** - * 修改工单管理 + * 修改工单 * - * @param repair 工单管理 + * @param repair 工单 * @return 结果 */ @Override public int updateRepair(Repair repair) { - // 增加报修日志 - RepairLog repairLog = new RepairLog(); - repairLog.setType(repair.getStatus()); - repairLog.setDetail(repair.getStatus().getName()); - repairLog.setRepairId(repair.getId()); - repairLog.setCreateBy(repair.getUpdateBy()); - repairLog.setCreateTime(DateUtils.getNowDate()); - repairLog.setUpdateBy(repair.getUpdateBy()); - repairLog.setUpdateTime(DateUtils.getNowDate()); - repairLogService.insertRepairLog(repairLog); return repairMapper.updateById(repair); } /** - * 删除工单管理对象 + * 删除工单对象 * * @param ids 需要删除的数据ID * @return 结果 @@ -138,49 +95,14 @@ public class RepairServiceImpl extends ServiceImpl impleme } /** - * 删除工单管理信息 + * 删除工单信息 * - * @param id 工单管理ID + * @param id 工单ID * @return 结果 */ @Override public int deleteRepairById(Long id) { - return repairMapper.deleteById(id); - } - - - /** - * 查询工单管理列表 - * - * @param repair 工单管理 - * @return 工单管理 - */ - @Override - public List selectMyRepairList(Repair repair) { - return repairMapper.selectMyRepairList(repair); - } - - @Override - public List selectWorkerIdByTypeId(String typeId) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(RepairWorkerType::getTypeId, typeId); - //获取用户ids - List collect = repairWorkerTypeMapper.selectList(wrapper).stream().map(RepairWorkerType::getWorkerId).collect(Collectors.toList()); - LambdaQueryWrapper userWrapper = new LambdaQueryWrapper<>(); - - userWrapper.in(IcsCustomerStaff::getId, collect); - return customerStaffMapper.selectList(userWrapper); - - - } - - @Override - public List selectDispatcher() { - LambdaQueryWrapper userWrapper = new LambdaQueryWrapper<>(); - - userWrapper.eq(IcsCustomerStaff::getDataType, "0"); - return customerStaffMapper.selectList(userWrapper); - + return repairMapper.deleteRepairById(id); } } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairStaffTypeServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairStaffTypeServiceImpl.java deleted file mode 100644 index 5c33bb4..0000000 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairStaffTypeServiceImpl.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.ics.admin.service.impl; - -import java.util.List; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ics.admin.mapper.RepairStaffTypeMapper; -import com.ics.admin.domain.RepairStaffType; -import com.ics.admin.service.IRepairStaffTypeService; - -/** - * RepairStaffTypeService业务层处理 - * - * @author chen - * @date 2024-07-30 - */ -@Service -public class RepairStaffTypeServiceImpl extends ServiceImpl implements IRepairStaffTypeService { - @Autowired - private RepairStaffTypeMapper repairStaffTypeMapper; - - /** - * 查询RepairStaffType - * - * @param id RepairStaffTypeID - * @return RepairStaffType - */ - @Override - public RepairStaffType selectRepairStaffTypeById(Long id) { - return repairStaffTypeMapper.selectById(id); - } - - /** - * 查询RepairStaffType列表 - * - * @param repairStaffType RepairStaffType - * @return RepairStaffType - */ - @Override - public List selectRepairStaffTypeList(RepairStaffType repairStaffType) { - QueryWrapper queryWrapper = new QueryWrapper(); - return repairStaffTypeMapper.selectList(queryWrapper); - } - - /** - * 新增RepairStaffType - * - * @param repairStaffType RepairStaffType - * @return 结果 - */ - @Override - public int insertRepairStaffType(RepairStaffType repairStaffType) { - return repairStaffTypeMapper.insert(repairStaffType); - } - - /** - * 修改RepairStaffType - * - * @param repairStaffType RepairStaffType - * @return 结果 - */ - @Override - public int updateRepairStaffType(RepairStaffType repairStaffType) { - return repairStaffTypeMapper.updateById(repairStaffType); - } - - /** - * 删除RepairStaffType对象 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - @Override - public int deleteRepairStaffTypeByIds(String ids) { - String[] idsArray = StrUtil.split(ids,","); - return repairStaffTypeMapper.deleteBatchIds(CollUtil.toList(idsArray)); - } - - /** - * 删除RepairStaffType信息 - * - * @param id RepairStaffTypeID - * @return 结果 - */ - @Override - public int deleteRepairStaffTypeById(Long id) { - return repairStaffTypeMapper.deleteRepairStaffTypeById(id); - } - - @Override - public Long selectRepairTypeByUserId(Integer userId) { - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("staff_id",userId); - RepairStaffType repairStaffType = baseMapper.selectOne(wrapper); - if (repairStaffType != null) { - return repairStaffType.getTypeId(); - } - return null; - - } - - @Override - public RepairStaffType selectStaffIdByTypeId(Long id) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("type_id",id); - RepairStaffType repairStaffType = baseMapper.selectOne(wrapper); - return repairStaffType; - } -} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairTypeServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairTypeServiceImpl.java deleted file mode 100644 index 7c215d5..0000000 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairTypeServiceImpl.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.ics.admin.service.impl; - -import java.util.List; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ics.admin.mapper.RepairTypeMapper; -import com.ics.admin.domain.RepairType; -import com.ics.admin.service.IRepairTypeService; - -/** - * 设备类型Service业务层处理 - * - * @author ics - * @date 2024-07-30 - */ -@Service -public class RepairTypeServiceImpl extends ServiceImpl implements IRepairTypeService { - @Autowired - private RepairTypeMapper repairTypeMapper; - - /** - * 查询设备类型 - * - * @param id 设备类型ID - * @return 设备类型 - */ - @Override - public RepairType selectRepairTypeById(Long id) { - return repairTypeMapper.selectById(id); - } - - /** - * 查询设备类型列表 - * - * @param repairType 设备类型 - * @return 设备类型 - */ - @Override - public List selectRepairTypeList(RepairType repairType) { - QueryWrapper queryWrapper = new QueryWrapper(); - return repairTypeMapper.selectList(queryWrapper); - } - - /** - * 新增设备类型 - * - * @param repairType 设备类型 - * @return 结果 - */ - @Override - public int insertRepairType(RepairType repairType) { - return repairTypeMapper.insert(repairType); - } - - /** - * 修改设备类型 - * - * @param repairType 设备类型 - * @return 结果 - */ - @Override - public int updateRepairType(RepairType repairType) { - return repairTypeMapper.updateById(repairType); - } - - /** - * 删除设备类型对象 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - @Override - public int deleteRepairTypeByIds(String ids) { - String[] idsArray = StrUtil.split(ids,","); - return repairTypeMapper.deleteBatchIds(CollUtil.toList(idsArray)); - } - - /** - * 删除设备类型信息 - * - * @param id 设备类型ID - * @return 结果 - */ - @Override - public int deleteRepairTypeById(Long id) { - return repairTypeMapper.deleteRepairTypeById(id); - } - - -} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairWorkerTypeServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairWorkerTypeServiceImpl.java deleted file mode 100644 index 4cf7a86..0000000 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairWorkerTypeServiceImpl.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.ics.admin.service.impl; - -import java.util.List; -import java.util.stream.Collectors; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ics.admin.mapper.IcsCustomerStaffMapper; -import com.ics.common.core.domain.IcsCustomerStaff; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ics.admin.mapper.RepairWorkerTypeMapper; -import com.ics.admin.domain.RepairWorkerType; -import com.ics.admin.service.IRepairWorkerTypeService; - -/** - * 维修人分类关联Service业务层处理 - * - * @author chen - * @date 2024-07-31 - */ -@Service -public class RepairWorkerTypeServiceImpl extends ServiceImpl implements IRepairWorkerTypeService { - @Autowired - private RepairWorkerTypeMapper repairWorkerTypeMapper; - - @Autowired - private IcsCustomerStaffMapper icsCustomerStaffMapper; - - /** - * 查询维修人分类关联 - * - * @param id 维修人分类关联ID - * @return 维修人分类关联 - */ - @Override - public RepairWorkerType selectRepairWorkerTypeById(Long id) { - return repairWorkerTypeMapper.selectById(id); - } - - /** - * 查询维修人分类关联列表 - * - * @param repairWorkerType 维修人分类关联 - * @return 维修人分类关联 - */ - @Override - public List selectRepairWorkerTypeList(RepairWorkerType repairWorkerType) { - QueryWrapper queryWrapper = new QueryWrapper(); - return repairWorkerTypeMapper.selectList(queryWrapper); - } - - /** - * 新增维修人分类关联 - * - * @param repairWorkerType 维修人分类关联 - * @return 结果 - */ - @Override - public int insertRepairWorkerType(RepairWorkerType repairWorkerType) { - return repairWorkerTypeMapper.insert(repairWorkerType); - } - - /** - * 修改维修人分类关联 - * - * @param repairWorkerType 维修人分类关联 - * @return 结果 - */ - @Override - public int updateRepairWorkerType(RepairWorkerType repairWorkerType) { - return repairWorkerTypeMapper.updateById(repairWorkerType); - } - - /** - * 删除维修人分类关联对象 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - @Override - public int deleteRepairWorkerTypeByIds(String ids) { - String[] idsArray = StrUtil.split(ids,","); - return repairWorkerTypeMapper.deleteBatchIds(CollUtil.toList(idsArray)); - } - - /** - * 删除维修人分类关联信息 - * - * @param id 维修人分类关联ID - * @return 结果 - */ - @Override - public int deleteRepairWorkerTypeById(Long id) { - return repairWorkerTypeMapper.deleteRepairWorkerTypeById(id); - } - - @Override - public List selectRepairWorkerTypeListByTypeId(Long type) { - - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(RepairWorkerType::getTypeId,type); - List repairWorkerTypes = repairWorkerTypeMapper.selectList(wrapper); - //获取用户ids - if (CollUtil.isNotEmpty(repairWorkerTypes)){ - List collect = repairWorkerTypes.stream().map(RepairWorkerType::getWorkerId).collect(Collectors.toList()); - - LambdaQueryWrapper userWrapper = new LambdaQueryWrapper<>(); - return icsCustomerStaffMapper.selectList(userWrapper.in(IcsCustomerStaff::getId, collect)); - } - return null; - } - - -} diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairRoomMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairAddressFloorMapper.xml similarity index 69% rename from shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairRoomMapper.xml rename to shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairAddressFloorMapper.xml index 444e7a4..d60132d 100644 --- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairRoomMapper.xml +++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairAddressFloorMapper.xml @@ -2,11 +2,13 @@ - - - + + + + + @@ -15,29 +17,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - SELECT id, name, remark, delete_flag, create_by, create_time, update_by, update_time, tenant_id, park_id, address_id FROM ics_repair_room + + SELECT id, address_id, name, admin_Id, remark, delete_flag, create_by, create_time, update_by, update_time, tenant_id, park_id FROM ics_repair_address_floor - + + AND name LIKE CONCAT('%', #{name}, '%') - - + WHERE id = #{id} - - - INSERT INTO ics_repair_room + + + INSERT INTO ics_repair_address_floor + address_id, name, + admin_Id, remark, delete_flag, create_by, @@ -46,10 +49,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, tenant_id, park_id, - address_id, - + + #{addressId}, #{name}, + #{adminId}, #{remark}, #{deleteFlag}, #{createBy}, @@ -58,14 +62,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateTime}, #{tenantId}, #{parkId}, - #{addressId}, - + - - UPDATE ics_repair_room + + UPDATE ics_repair_address_floor + address_id = #{addressId}, name = #{name}, + admin_Id = #{adminId}, remark = #{remark}, delete_flag = #{deleteFlag}, create_by = #{createBy}, @@ -74,20 +79,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time = #{updateTime}, tenant_id = #{tenantId}, park_id = #{parkId}, - address_id = #{addressId}, WHERE id = #{id} - - DELETE FROM ics_repair_room WHERE id = #{id} + + DELETE FROM ics_repair_address_floor WHERE id = #{id} - - DELETE FROM ics_repair_room where id in + + DELETE FROM ics_repair_address_floor where id in #{id} - + \ No newline at end of file diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairAddressMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairAddressMapper.xml index 188f1fa..24e6321 100644 --- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairAddressMapper.xml +++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairAddressMapper.xml @@ -2,8 +2,8 @@ - - + + @@ -23,16 +23,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + INSERT INTO ics_repair_address @@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, tenant_id, park_id, - + #{name}, #{remark}, @@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateTime}, #{tenantId}, #{parkId}, - + @@ -85,5 +85,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} - + \ No newline at end of file diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairAttachMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairAttachMapper.xml new file mode 100644 index 0000000..c24579d --- /dev/null +++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairAttachMapper.xml @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + SELECT id, repair_id, node_id, original_filename, filename, url, filesize, ext1, ext2, ext3, delete_flag, create_by, create_time, update_by, update_time, tenant_id, park_id FROM ics_repair_attach + + + + + + + + INSERT INTO ics_repair_attach + + repair_id, + node_id, + original_filename, + filename, + url, + filesize, + ext1, + ext2, + ext3, + delete_flag, + create_by, + create_time, + update_by, + update_time, + tenant_id, + park_id, + + + #{repairId}, + #{nodeId}, + #{originalFilename}, + #{filename}, + #{url}, + #{filesize}, + #{ext1}, + #{ext2}, + #{ext3}, + #{deleteFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{tenantId}, + #{parkId}, + + + + + UPDATE ics_repair_attach + + repair_id = #{repairId}, + node_id = #{nodeId}, + original_filename = #{originalFilename}, + filename = #{filename}, + url = #{url}, + filesize = #{filesize}, + ext1 = #{ext1}, + ext2 = #{ext2}, + ext3 = #{ext3}, + delete_flag = #{deleteFlag}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + tenant_id = #{tenantId}, + park_id = #{parkId}, + + WHERE id = #{id} + + + + DELETE FROM ics_repair_attach WHERE id = #{id} + + + + DELETE FROM ics_repair_attach where id in + + #{id} + + + + \ No newline at end of file diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairDeviceMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairDeviceMapper.xml index 376cc95..9644749 100644 --- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairDeviceMapper.xml +++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairDeviceMapper.xml @@ -2,15 +2,14 @@ - - + + + - - @@ -19,35 +18,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - SELECT id, name, brand, specification, pic_url, file_url, remark,type_id, delete_flag, create_by, create_time, update_by, update_time, tenant_id, park_id FROM ics_repair_device + SELECT id, type_id, name, brand, specification, remark, delete_flag, create_by, create_time, update_by, update_time, tenant_id, park_id FROM ics_repair_device - + - + INSERT INTO ics_repair_device + type_id, name, brand, specification, - pic_url, - file_url, remark, - type_id, delete_flag, create_by, create_time, @@ -55,14 +51,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, tenant_id, park_id, - + + #{typeId}, #{name}, #{brand}, #{specification}, - #{picUrl}, - #{typeId}, - #{fileUrl}, #{remark}, #{deleteFlag}, #{createBy}, @@ -71,19 +65,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateTime}, #{tenantId}, #{parkId}, - + UPDATE ics_repair_device + type_id = #{typeId}, name = #{name}, brand = #{brand}, specification = #{specification}, - pic_url = #{picUrl}, - file_url = #{fileUrl}, remark = #{remark}, - type_id = #{typeId}, delete_flag = #{deleteFlag}, create_by = #{createBy}, create_time = #{createTime}, @@ -105,5 +97,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} - - \ No newline at end of file + + diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairTypeMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairDeviceTypeMapper.xml similarity index 75% rename from shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairTypeMapper.xml rename to shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairDeviceTypeMapper.xml index 748836b..1fadc75 100644 --- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairTypeMapper.xml +++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairDeviceTypeMapper.xml @@ -2,9 +2,9 @@ - - - + + + @@ -17,26 +17,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - SELECT id, name, remark, delete_flag, create_by, create_time, update_by, update_time, tenant_id, park_id FROM ics_repair_type + + SELECT id, name, remark, delete_flag, create_by, create_time, update_by, update_time, tenant_id, park_id FROM ics_repair_device_type - + + AND name LIKE CONCAT('%', #{name}, '%') - - + WHERE id = #{id} - - - INSERT INTO ics_repair_type + + + INSERT INTO ics_repair_device_type - id, name, remark, delete_flag, @@ -46,9 +45,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, tenant_id, park_id, - + - #{id}, #{name}, #{remark}, #{deleteFlag}, @@ -58,11 +56,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateTime}, #{tenantId}, #{parkId}, - + - - UPDATE ics_repair_type + + UPDATE ics_repair_device_type name = #{name}, remark = #{remark}, @@ -77,15 +75,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE id = #{id} - - DELETE FROM ics_repair_type WHERE id = #{id} + + DELETE FROM ics_repair_device_type WHERE id = #{id} - - DELETE FROM ics_repair_type where id in + + DELETE FROM ics_repair_device_type where id in #{id} - + \ No newline at end of file diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairFailureTypeMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairFailureTypeMapper.xml index 2ac2508..fe40f91 100644 --- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairFailureTypeMapper.xml +++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairFailureTypeMapper.xml @@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -18,25 +19,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT id, name, remark, delete_flag, create_by, create_time, update_by, update_time, tenant_id, park_id FROM ics_repair_failure_type + SELECT id, name, kind, remark, delete_flag, create_by, create_time, update_by, update_time, tenant_id, park_id FROM ics_repair_failure_type INSERT INTO ics_repair_failure_type name, + kind, remark, delete_flag, create_by, @@ -48,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{name}, + #{kind}, #{remark}, #{deleteFlag}, #{createBy}, @@ -63,10 +67,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" UPDATE ics_repair_failure_type name = #{name}, + kind = #{kind}, remark = #{remark}, - delete_flag = #{deleteFlag}, - create_by = #{createBy}, - create_time = #{createTime}, + + + update_by = #{updateBy}, update_time = #{updateTime}, tenant_id = #{tenantId}, @@ -76,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - DELETE FROM ics_repair_failure_type WHERE id = #{id} + DELETE FROM ics_repair_failure_type where id = #{id} diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairLogMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairLogMapper.xml index b7de728..f9812c1 100644 --- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairLogMapper.xml +++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairLogMapper.xml @@ -5,40 +5,146 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - SELECT id, - type, - detail, - repair_id, - version, - delete_flag, - create_by, - create_time, - update_by, - update_time, - tenant_id - FROM ics_repair_log + SELECT id, pid, repair_id, node_form, node_to, send_userid, send_username, rec_userid, rec_username, read, readtime, status, closetime, content, remark, ext1, ext2, ext3, delete_flag, create_by, create_time, update_by, update_time, park_id, tenant_id FROM ics_repair_log + + + + INSERT INTO ics_repair_log + + pid, + repair_id, + node_form, + node_to, + send_userid, + send_username, + rec_userid, + rec_username, + read, + readtime, + status, + closetime, + content, + remark, + ext1, + ext2, + ext3, + delete_flag, + create_by, + create_time, + update_by, + update_time, + park_id, + tenant_id, + + + #{pid}, + #{repairId}, + #{nodeForm}, + #{nodeTo}, + #{sendUserid}, + #{sendUsername}, + #{recUserid}, + #{recUsername}, + #{read}, + #{readtime}, + #{status}, + #{closetime}, + #{content}, + #{remark}, + #{ext1}, + #{ext2}, + #{ext3}, + #{deleteFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{parkId}, + #{tenantId}, + + + + + UPDATE ics_repair_log + + pid = #{pid}, + repair_id = #{repairId}, + node_form = #{nodeForm}, + node_to = #{nodeTo}, + send_userid = #{sendUserid}, + send_username = #{sendUsername}, + rec_userid = #{recUserid}, + rec_username = #{recUsername}, + read = #{read}, + readtime = #{readtime}, + status = #{status}, + closetime = #{closetime}, + content = #{content}, + remark = #{remark}, + ext1 = #{ext1}, + ext2 = #{ext2}, + ext3 = #{ext3}, + delete_flag = #{deleteFlag}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + park_id = #{parkId}, + tenant_id = #{tenantId}, + + WHERE id = #{id} + + + + DELETE FROM ics_repair_log WHERE id = #{id} + + + + DELETE FROM ics_repair_log where id in + + #{id} + + \ No newline at end of file diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairMapper.xml index 22bcaeb..17ee46d 100644 --- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairMapper.xml +++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairMapper.xml @@ -5,131 +5,229 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - SELECT r.id, - r.sn, - r.name, - r.phone, - r.area, - r.status, - r.content, - r.failure_date, - r.repair_name, - r.user_id, - r.repair_level, - r.repair_voice, - r.address_id, - r.room_id, - r.worker_explain, - r.worker_proof, - r.dispatcher_id, - r.type_id, - r.repair_device, - r.failure_type_id, - r.repair_time, - r.repair_images, - r.repair_fee, - r.repair_score, - r.repair_materiel, - r.begin_date, - r.end_date, - r.remark, - r.worker_score, - r.worker_id, - r.customer_id, - r.create_by, - r.create_time, - r.update_by, - r.update_time, - r.tenant_id, - r.park_id - FROM ics_repair AS r + SELECT id, sn, repair_name, repair_level, repair_time, type_id, type_name, device_id, device_name, name, phone, address_id, address, floor_id, floor, room, content, per_userid, predate, cause, solution, failure_type_id, failure_type_name, resolve, repair_user_id, end_date, eval_service, feedback, eval_time, eval_user_id, timeout, warn, status, log_id, remark, ext1, ext2, ext3, delete_flag, create_by, create_time, update_by, update_time, tenant_id, park_id FROM ics_repair - - AND r.sn LIKE CONCAT('%', #{sn}, '%') - AND r.status =#{status.ordinal} - AND r.delete_flag = 0 + AND repair_name LIKE CONCAT('%', #{repairName}, '%') + AND type_name LIKE CONCAT('%', #{typeName}, '%') + AND device_name LIKE CONCAT('%', #{deviceName}, '%') + AND name LIKE CONCAT('%', #{name}, '%') + AND failure_type_name LIKE CONCAT('%', #{failureTypeName}, '%') + + INSERT INTO ics_repair + + sn, + repair_name, + repair_level, + repair_time, + type_id, + type_name, + device_id, + device_name, + name, + phone, + address_id, + address, + floor_id, + floor, + room, + content, + per_userid, + predate, + cause, + solution, + failure_type_id, + failure_type_name, + resolve, + repair_user_id, + end_date, + eval_service, + feedback, + eval_time, + eval_user_id, + timeout, + warn, + status, + log_id, + remark, + ext1, + ext2, + ext3, + delete_flag, + create_by, + create_time, + update_by, + update_time, + tenant_id, + park_id, + + + #{sn}, + #{repairName}, + #{repairLevel}, + #{repairTime}, + #{typeId}, + #{typeName}, + #{deviceId}, + #{deviceName}, + #{name}, + #{phone}, + #{addressId}, + #{address}, + #{floorId}, + #{floor}, + #{room}, + #{content}, + #{perUserid}, + #{predate}, + #{cause}, + #{solution}, + #{failureTypeId}, + #{failureTypeName}, + #{resolve}, + #{repairUserId}, + #{endDate}, + #{evalService}, + #{feedback}, + #{evalTime}, + #{evalUserId}, + #{timeout}, + #{warn}, + #{status}, + #{logId}, + #{remark}, + #{ext1}, + #{ext2}, + #{ext3}, + #{deleteFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{tenantId}, + #{parkId}, + + - + + UPDATE ics_repair + + sn = #{sn}, + repair_name = #{repairName}, + repair_level = #{repairLevel}, + repair_time = #{repairTime}, + type_id = #{typeId}, + type_name = #{typeName}, + device_id = #{deviceId}, + device_name = #{deviceName}, + name = #{name}, + phone = #{phone}, + address_id = #{addressId}, + address = #{address}, + floor_id = #{floorId}, + floor = #{floor}, + room = #{room}, + content = #{content}, + per_userid = #{perUserid}, + predate = #{predate}, + cause = #{cause}, + solution = #{solution}, + failure_type_id = #{failureTypeId}, + failure_type_name = #{failureTypeName}, + resolve = #{resolve}, + repair_user_id = #{repairUserId}, + end_date = #{endDate}, + eval_service = #{evalService}, + feedback = #{feedback}, + eval_time = #{evalTime}, + eval_user_id = #{evalUserId}, + timeout = #{timeout}, + warn = #{warn}, + status = #{status}, + log_id = #{logId}, + remark = #{remark}, + ext1 = #{ext1}, + ext2 = #{ext2}, + ext3 = #{ext3}, + delete_flag = #{deleteFlag}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + tenant_id = #{tenantId}, + park_id = #{parkId}, + + WHERE id = #{id} + + + + DELETE FROM ics_repair WHERE id = #{id} + + + + DELETE FROM ics_repair where id in + + #{id} + + \ No newline at end of file diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairRecordMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairRecordMapper.xml deleted file mode 100644 index 25c1420..0000000 --- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairRecordMapper.xml +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - SELECT id, speed, serve, effect, remark, img, delete_flag, create_by, create_time, update_by, update_time, tenant_id, park_id, repair_id, worker_id, user_id FROM ics_repair_record - - - - - - - - INSERT INTO ics_repair_record - - id, - speed, - serve, - effect, - remark, - img, - delete_flag, - create_by, - create_time, - update_by, - update_time, - tenant_id, - park_id, - repair_id, - worker_id, - user_id, - - - #{id}, - #{speed}, - #{serve}, - #{effect}, - #{remark}, - #{img}, - #{deleteFlag}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{tenantId}, - #{parkId}, - #{repairId}, - #{workerId}, - #{userId}, - - - - - UPDATE ics_repair_record - - speed = #{speed}, - serve = #{serve}, - effect = #{effect}, - remark = #{remark}, - img = #{img}, - delete_flag = #{deleteFlag}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - tenant_id = #{tenantId}, - park_id = #{parkId}, - repair_id = #{repairId}, - worker_id = #{workerId}, - user_id = #{userId}, - - WHERE id = #{id} - - - - DELETE FROM ics_repair_record WHERE id = #{id} - - - - DELETE FROM ics_repair_record where id in - - #{id} - - - - \ No newline at end of file diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairWorkerTypeMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairRelationalMapper.xml similarity index 57% rename from shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairWorkerTypeMapper.xml rename to shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairRelationalMapper.xml index 59f2a2e..39e64e8 100644 --- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairWorkerTypeMapper.xml +++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairRelationalMapper.xml @@ -2,12 +2,14 @@ - - - + + + - + + + @@ -17,27 +19,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - SELECT id, worker_id, type_id, delete_flag, create_by, create_time, update_by, update_time, tenant_id, park_id FROM ics_repair_worker_type + + SELECT id, type_id, kind, groupName, user_id, delete_flag, create_by, create_time, update_by, update_time, tenant_id, park_id FROM ics_repair_relational - + + + AND groupName LIKE CONCAT('%', #{groupname}, '%') - - + WHERE id = #{id} - - - INSERT INTO ics_repair_worker_type + + + INSERT INTO ics_repair_relational - id, - worker_id, type_id, + kind, + groupName, + user_id, delete_flag, create_by, create_time, @@ -45,11 +49,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, tenant_id, park_id, - + - #{id}, - #{workerId}, #{typeId}, + #{kind}, + #{groupname}, + #{userId}, #{deleteFlag}, #{createBy}, #{createTime}, @@ -57,14 +62,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateTime}, #{tenantId}, #{parkId}, - + - - UPDATE ics_repair_worker_type + + UPDATE ics_repair_relational - worker_id = #{workerId}, type_id = #{typeId}, + kind = #{kind}, + groupName = #{groupname}, + user_id = #{userId}, delete_flag = #{deleteFlag}, create_by = #{createBy}, create_time = #{createTime}, @@ -76,15 +83,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE id = #{id} - - DELETE FROM ics_repair_worker_type WHERE id = #{id} + + DELETE FROM ics_repair_relational WHERE id = #{id} - - DELETE FROM ics_repair_worker_type where id in + + DELETE FROM ics_repair_relational where id in #{id} - + \ No newline at end of file diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairStaffTypeMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairStaffTypeMapper.xml deleted file mode 100644 index 71e8fb7..0000000 --- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairStaffTypeMapper.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - SELECT id, staff_id, type_id, delete_flag, create_by, create_time, update_by, update_time, tenant_id, park_id FROM ics_repair_staff_type - - - - - - - > - INSERT INTO ics_repair_staff_type - - id, - staff_id, - type_id, - delete_flag, - create_by, - create_time, - update_by, - update_time, - tenant_id, - park_id, - - - #{id}, - #{staffId}, - #{typeId}, - #{deleteFlag}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{tenantId}, - #{parkId}, - - - - - UPDATE ics_repair_staff_type - - staff_id = #{staffId}, - type_id = #{typeId}, - delete_flag = #{deleteFlag}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - tenant_id = #{tenantId}, - park_id = #{parkId}, - - WHERE id = #{id} - - - - DELETE FROM ics_repair_staff_type WHERE id = #{id} - - - - DELETE FROM ics_repair_staff_type where id in - - #{id} - - - - \ No newline at end of file diff --git a/shoot-hand/ics-web/src/main/java/com/ics/controller/mobile/member/RepairAPIController.java b/shoot-hand/ics-web/src/main/java/com/ics/controller/mobile/member/RepairAPIController.java index 8e90eb1..5502a83 100644 --- a/shoot-hand/ics-web/src/main/java/com/ics/controller/mobile/member/RepairAPIController.java +++ b/shoot-hand/ics-web/src/main/java/com/ics/controller/mobile/member/RepairAPIController.java @@ -1,37 +1,17 @@ package com.ics.controller.mobile.member; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.collect.Maps; import com.ics.admin.domain.*; -import com.ics.admin.domain.meeting.StaffCustomer; import com.ics.admin.service.*; -import com.ics.admin.vo.ParkVO; -import com.ics.admin.vo.RepairVO; -import com.ics.common.annotation.LoginUser; import com.ics.common.core.controller.BaseController; -import com.ics.common.core.domain.IcsCustomerStaff; import com.ics.common.core.domain.R; -import com.ics.common.core.page.PageDomain; -import com.ics.common.core.page.TableSupport; -import com.ics.common.utils.DateUtils; -import com.ics.common.utils.StringUtils; -import com.ics.common.utils.ValidatorUtils; -import com.ics.common.utils.bean.BeanUtils; -import com.ics.service.IRepairLogService; import com.ics.service.IRepairService; -import com.ics.system.domain.User; -import com.ics.system.domain.vo.UserVO; -import org.apache.commons.compress.utils.Lists; -import org.checkerframework.checker.units.qual.A; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.wf.jwtp.annotation.Ignore; import org.wf.jwtp.annotation.RequiresPermissions; -import java.util.HashMap; -import java.util.List; import java.util.Map; /** @@ -53,22 +33,19 @@ public class RepairAPIController extends BaseController { private IRepairDeviceService repairDeviceService; @Autowired - private IRepairRecordService repairRecordService; + private IRepairRelationalService staffTypeService; @Autowired - private IRepairStaffTypeService staffTypeService; + private IRepairDeviceTypeService repairTypeService; @Autowired - private IRepairTypeService repairTypeService; - - @Autowired - private IRepairWorkerTypeService workerTypeService; + private IRepairAttachService workerTypeService; @Autowired private IRepairAddressService repairAddressService; @Autowired - private IRepairRoomService repairRoomService; + private IRepairAddressFloorService repairRoomService; @Autowired private IIcsCustomerStaffService customerStaffService; @@ -85,55 +62,55 @@ public class RepairAPIController extends BaseController { * 查询工单管理 */ // @RequiresPermissions("member:center:view") - @Ignore - @GetMapping("get/{id}") - public R get(@PathVariable("id") Long id) { - Repair repair = repairService.selectRepairById(id); - if (repair != null) { - repair.setStatusValue(repair.getStatus().getValue()); - - //设备名称 - RepairDevice repairDevice = repairDeviceService.selectRepairDeviceById(Long.valueOf(repair.getRepairDevice())); - if (repairDevice != null) { - repair.setRepairDeviceName(repairDevice.getName()); - } - //维修人 - Long workerId = repair.getWorkerId(); - IcsCustomerStaff icsCustomerStaff = icsCustomerStaffService.selectIcsCustomerStaffById(workerId); - if (icsCustomerStaff != null) { - repair.setWorkerName(icsCustomerStaff.getName()); - } - } - return R.data(repair); - } +// @Ignore +// @GetMapping("get/{id}") +// public R get(@PathVariable("id") Long id) { +// Repair repair = repairService.selectRepairById(id); +// if (repair != null) { +// repair.setStatusValue(repair.getStatus().getValue()); +// +// //设备名称 +// RepairDevice repairDevice = repairDeviceService.selectRepairDeviceById(Long.valueOf(repair.getRepairDevice())); +// if (repairDevice != null) { +// repair.setRepairDeviceName(repairDevice.getName()); +// } +// //维修人 +// Long workerId = repair.getWorkerId(); +// IcsCustomerStaff icsCustomerStaff = icsCustomerStaffService.selectIcsCustomerStaffById(workerId); +// if (icsCustomerStaff != null) { +// repair.setWorkerName(icsCustomerStaff.getName()); +// } +// } +// return R.data(repair); +// } /** * 查询工单管理列表 */ - @RequiresPermissions("member:center:view") - @GetMapping("list") - public R list(Repair.Status status, Long parkId) { - long currentUserId = getCurrentUserId(); - IcsCustomerStaff staff = icsCustomerStaffService.selectIcsCustomerStaffById(currentUserId); - Repair repair = new Repair(); - repair.setStatus(status); - repair.setCreateBy(staff.getUsername()); - repair.setParkId(1L); - startPage(); - List repairList = repairService.selectMyRepairList(repair); - List> repairVOList = Lists.newArrayList(); - repairList.stream().forEach(item ->{ - Map map = Maps.newHashMap(); - map.put("id", item.getId()); - map.put("sn", item.getSn()); - map.put("repairTime", item.getRepairTime()); - map.put("area", item.getArea()); - map.put("content", item.getContent()); - map.put("status",item.getStatus()); - repairVOList.add(map); - }); - return result(repairVOList); - } +// @RequiresPermissions("member:center:view") +// @GetMapping("list") +// public R list(Repair.Status status, Long parkId) { +// long currentUserId = getCurrentUserId(); +// IcsCustomerStaff staff = icsCustomerStaffService.selectIcsCustomerStaffById(currentUserId); +// Repair repair = new Repair(); +// repair.setStatus(status); +// repair.setCreateBy(staff.getUsername()); +// repair.setParkId(1L); +// startPage(); +// List repairList = repairService.selectMyRepairList(repair); +// List> repairVOList = Lists.newArrayList(); +// repairList.stream().forEach(item ->{ +// Map map = Maps.newHashMap(); +// map.put("id", item.getId()); +// map.put("sn", item.getSn()); +// map.put("repairTime", item.getRepairTime()); +// map.put("area", item.getArea()); +// map.put("content", item.getContent()); +// map.put("status",item.getStatus()); +// repairVOList.add(map); +// }); +// return result(repairVOList); +// } /** @@ -158,26 +135,26 @@ public class RepairAPIController extends BaseController { * 新增保存工单管理 */ // @RequiresPermissions("member:center:view") - @Ignore - @PostMapping("save") - public R addSave(@RequestBody Repair repair) { - - //获取用户id - ValidatorUtils.validateEntity(repair); - repair.setStatus(Repair.Status.PENDING_ASSIGN); - return toAjax(repairService.insertRepair(repair)); - } +// @Ignore +// @PostMapping("save") +// public R addSave(@RequestBody Repair repair) { +// +// //获取用户id +// ValidatorUtils.validateEntity(repair); +// repair.setStatus(Repair.Status.PENDING_ASSIGN); +// return toAjax(repairService.insertRepair(repair)); +// } /** * 获取设备分类列表 - * @param repairType + * @param * @return */ - @Ignore - @GetMapping("deviceTypeList") - public R deviceTypeList(RepairType repairType) { - return result(repairTypeService.selectRepairTypeList(repairType)); - } +// @Ignore +// @GetMapping("deviceTypeList") +// public R deviceTypeList(RepairDeviceType repairType) { +// return result(repairTypeService.selectRepairTypeList(repairType)); +// } @Ignore @GetMapping("deviceList") @@ -193,8 +170,9 @@ public class RepairAPIController extends BaseController { @Ignore @GetMapping("selectRoomList") - public R selectRoomList(RepairRoom repairRoom) { - return result(repairRoomService.selectRepairRoomList(repairRoom)); + public R selectRoomList(RepairAddressFloor repairRoom) { + //return result(repairRoomService.selectRepairRoomList(repairRoom)); + return null; } @@ -204,255 +182,255 @@ public class RepairAPIController extends BaseController { * 用户评价工单 */ // @RequiresPermissions("member:center:view") - @Ignore - @PostMapping("review") - public R review(@RequestBody RepairRecord repairRecord) { - Repair pRepair = repairService.selectRepairById(repairRecord.getId()); - if (repairRecord == null || !Repair.Status.COMPLETED.equals(pRepair.getStatus())) { - return R.error("报修为空或状态已完成"); - } - pRepair.setStatus(Repair.Status.SCORE); - //修改工单状态 - int i = repairService.updateRepair(pRepair); - //新增评价 - repairRecord.setCreateTime(DateUtils.getNowDate()); - repairRecord.setDeleteFlag(0); - int count = repairRecordService.insertRepairRecord(repairRecord); - - return toAjax(i); - } +// @Ignore +// @PostMapping("review") +// public R review(@RequestBody RepairEval repairRecord) { +// Repair pRepair = repairService.selectRepairById(repairRecord.getId()); +// if (repairRecord == null || !Repair.Status.COMPLETED.equals(pRepair.getStatus())) { +// return R.error("报修为空或状态已完成"); +// } +// pRepair.setStatus(Repair.Status.SCORE); +// //修改工单状态 +// int i = repairService.updateRepair(pRepair); +// //新增评价 +// repairRecord.setCreateTime(DateUtils.getNowDate()); +// repairRecord.setDeleteFlag(0); +// int count = repairRecordService.insertRepairRecord(repairRecord); +// +// return toAjax(i); +// } /** * 用户取消工单 */ - @RequiresPermissions("member:center:view") - @GetMapping("cancel") - public R cancel(Long repairId) { - Repair repair = repairService.selectRepairById(repairId); - if (repair == null || !Repair.Status.PENDING_PROCESS.equals(repair.getStatus())) { - return R.error("报修为空或状态不是待处理"); - } - repair.setStatus(Repair.Status.CANCELED); - repair.setUpdateBy(getLoginName()); - return toAjax(repairService.updateRepair(repair)); - } +// @RequiresPermissions("member:center:view") +// @GetMapping("cancel") +// public R cancel(Long repairId) { +// Repair repair = repairService.selectRepairById(repairId); +// if (repair == null || !Repair.Status.PENDING_PROCESS.equals(repair.getStatus())) { +// return R.error("报修为空或状态不是待处理"); +// } +// repair.setStatus(Repair.Status.CANCELED); +// repair.setUpdateBy(getLoginName()); +// return toAjax(repairService.updateRepair(repair)); +// } /** * 根据用户id或者保修记录 */ - @Ignore - @GetMapping("/listByUserId") - public R listByUserId(Long userId,Integer status) { - List repair = repairService.selectByUserId(userId,status); - for (Repair repair1 : repair) { - RepairDevice repairDevice = repairDeviceService.selectRepairDeviceById(Long.valueOf(repair1.getRepairDevice())); - if (repairDevice != null) { - repair1.setRepairDeviceName(repairDevice.getName()); - } - } - return R.data(repair); - } +// @Ignore +// @GetMapping("/listByUserId") +// public R listByUserId(Long userId,Integer status) { +// List repair = repairService.selectByUserId(userId,status); +// for (Repair repair1 : repair) { +// RepairDevice repairDevice = repairDeviceService.selectRepairDeviceById(Long.valueOf(repair1.getRepairDevice())); +// if (repairDevice != null) { +// repair1.setRepairDeviceName(repairDevice.getName()); +// } +// } +// return R.data(repair); +// } /*-------------------------以下为派单员接口------------------------*/ /** * 派单中心列表 */ - @Ignore - @PostMapping("/dispatcherList") - public R dispatcherList(@RequestBody Repair repair) { - Integer userId = repair.getUserId(); - Integer statusValue = repair.getStatusValue(); - - //根据用户id查询绑定的设备分类 - Long type = staffTypeService.selectRepairTypeByUserId(userId); - //根据设备分类和状态查询对应的数据 - PageDomain pageDomain = TableSupport.buildPageRequest(); - - Integer pageNum = pageDomain.getPageNum(); - Integer pageSize = pageDomain.getPageSize(); - IPage repairList = repairService.selectRepairListByType(type,statusValue,pageNum,pageSize); - for (Repair repair1 : repairList.getRecords()) { - repair1.setStatusValue(repair1.getStatus().getValue()); - repair1.setStatusName(repair1.getStatus().getName()); - //设备类型 - if (repair1.getTypeId() != null) { - RepairType repairType = repairTypeService.selectRepairTypeById(Long.valueOf(repair1.getTypeId())); - repair1.setTypeName(repairType.getName()); - } - //设备名称 - if (repair1.getRepairDevice() != null){ - RepairDevice repairDevice = deviceService.selectRepairDeviceById(Long.valueOf(repair1.getRepairDevice())); - repair1.setRepairDeviceName(repairDevice.getName()); - } - //地点 - if (repair1.getAddressId() !=null){ - RepairAddress repairAddress = repairAddressService.selectRepairAddressById(repair1.getAddressId()); - repair1.setAddressName(repairAddress.getName()); - } - //楼层 - if (repair1.getRoomId() !=null){ - RepairRoom repairRoom = repairRoomService.selectRepairRoomById(repair1.getRoomId()); - repair1.setRoomName(repairRoom.getName()); - } - //故障 - if (repair1.getFailureTypeId() != null){ - - RepairFailureType repairFailureType = repairFailureTypeService.selectRepairFailureTypeById(repair1.getFailureTypeId()); - repair1.setFailureTypeName(repairFailureType.getName()); - } - if (repair1.getUserId() != null){ - IcsCustomerStaff staff = customerStaffService.selectIcsCustomerStaffById(Long.valueOf(repair1.getUserId())); - repair1.setUserName(staff.getUsername()); - } - - if (repair1.getWorkerId() != null){ - IcsCustomerStaff worker = customerStaffService.selectIcsCustomerStaffById(repair1.getWorkerId()); - repair1.setWorkerName(worker.getUsername()); - } - } - - return R.ok().put("data",repairList); - } +// @Ignore +// @PostMapping("/dispatcherList") +// public R dispatcherList(@RequestBody Repair repair) { +// Integer userId = repair.getUserId(); +// Integer statusValue = repair.getStatusValue(); +// +// //根据用户id查询绑定的设备分类 +// Long type = staffTypeService.selectRepairTypeByUserId(userId); +// //根据设备分类和状态查询对应的数据 +// PageDomain pageDomain = TableSupport.buildPageRequest(); +// +// Integer pageNum = pageDomain.getPageNum(); +// Integer pageSize = pageDomain.getPageSize(); +// IPage repairList = repairService.selectRepairListByType(type,statusValue,pageNum,pageSize); +// for (Repair repair1 : repairList.getRecords()) { +// repair1.setStatusValue(repair1.getStatus().getValue()); +// repair1.setStatusName(repair1.getStatus().getName()); +// //设备类型 +// if (repair1.getTypeId() != null) { +// RepairDeviceType repairType = repairTypeService.selectRepairTypeById(Long.valueOf(repair1.getTypeId())); +// repair1.setTypeName(repairType.getName()); +// } +// //设备名称 +// if (repair1.getRepairDevice() != null){ +// RepairDevice repairDevice = deviceService.selectRepairDeviceById(Long.valueOf(repair1.getRepairDevice())); +// repair1.setRepairDeviceName(repairDevice.getName()); +// } +// //地点 +// if (repair1.getAddressId() !=null){ +// RepairAddress repairAddress = repairAddressService.selectRepairAddressById(repair1.getAddressId()); +// repair1.setAddressName(repairAddress.getName()); +// } +// //楼层 +// if (repair1.getRoomId() !=null){ +// RepairAddressFloor repairRoom = repairRoomService.selectRepairRoomById(repair1.getRoomId()); +// repair1.setRoomName(repairRoom.getName()); +// } +// //故障 +// if (repair1.getFailureTypeId() != null){ +// +// RepairFailureType repairFailureType = repairFailureTypeService.selectRepairFailureTypeById(repair1.getFailureTypeId()); +// repair1.setFailureTypeName(repairFailureType.getName()); +// } +// if (repair1.getUserId() != null){ +// IcsCustomerStaff staff = customerStaffService.selectIcsCustomerStaffById(Long.valueOf(repair1.getUserId())); +// repair1.setUserName(staff.getUsername()); +// } +// +// if (repair1.getWorkerId() != null){ +// IcsCustomerStaff worker = customerStaffService.selectIcsCustomerStaffById(repair1.getWorkerId()); +// repair1.setWorkerName(worker.getUsername()); +// } +// } +// +// return R.ok().put("data",repairList); +// } //无效申请 取消派单 - @Ignore - @PostMapping("dispatcherCancel") - public R dispatcherCancel(Long repairId) { - Repair repair = repairService.selectRepairById(repairId); - if (repair == null || !Repair.Status.PENDING_ASSIGN.equals(repair.getStatus())) { - return R.error("报修为空或状态不是待分配"); - } - repair.setStatus(Repair.Status.CANCELED); - return toAjax(repairService.updateRepair(repair)); - } - - //提交反馈 - @Ignore - @PostMapping("dispatcherSubmitFeedback") - public R dispatcherSubmitFeedback(Long repairId) { - Repair repair = repairService.selectRepairById(repairId); - if (repair == null || !Repair.Status.PENDING_ASSIGN.equals(repair.getStatus())) { - return R.error("报修为空或状态不是待分配"); - } - repair.setStatus(Repair.Status.SUBMIT_FEEDBACK); - return toAjax(repairService.updateRepair(repair)); - } - - //选择维修人员 - @Ignore - @GetMapping("selectDispatcherChooseWorker") - public R dispatcherChooseWorker(@RequestBody Map map) { - Integer userId = (Integer) map.get("userId"); - - //根据用户id查询绑定的设备分类 - Long type = staffTypeService.selectRepairTypeByUserId(userId); - //根据设备分类查询对应的维修人员列表 - List customerStaffs = workerTypeService.selectRepairWorkerTypeListByTypeId(type); - - return R.data(customerStaffs); - } - - - //提交派单人员 - @Ignore - @GetMapping("dispatcherPendingProcess") - public R dispatcherPendingProcess(@RequestBody Repair repair) { - Repair repair1 = repairService.selectRepairById(repair.getId()); - if (repair1 == null || !Repair.Status.PENDING_ASSIGN.equals(repair.getStatus())) { - return R.error("报修为空或状态不是待分配"); - } - repair1.setStatus(Repair.Status.PENDING_PROCESS); - repair1.setWorkerId(repair.getWorkerId()); - repair1.setBeginDate(DateUtils.getNowDate()); - return toAjax(repairService.updateRepair(repair1)); - } - - /*-------------------------以下为维修人员接口------------------------*/ - - /** - * 维修人员工单管理 - * @param userId - * @param status - * @return - */ - @Ignore - @GetMapping("/listByWorkerId") - public R listByWorkerId(Long userId,Integer status) { - - - //待完成 状态为 1 - Integer beCompleted = repairService.listByWorkerIdByCount(userId,1); - - //进行中 状态为4 - Integer ongoing = repairService.listByWorkerIdByCount(userId,4); - - //已完成 - Integer done2 = repairService.listByWorkerIdByCount(userId,5); - Integer done1 = repairService.listByWorkerIdByCount(userId,6); - - Map map = new HashMap<>(); - map.put("beCompleted",beCompleted); - map.put("ongoing",ongoing); - map.put("done",done1+done2); - - - // 待完成 1 进行中 2 已完成 3 - List repair = repairService.listByWorkerId(userId,status); - for (Repair repair1 : repair) { - RepairDevice repairDevice = repairDeviceService.selectRepairDeviceById(Long.valueOf(repair1.getRepairDevice())); - if (repairDevice != null) { - repair1.setRepairDeviceName(repairDevice.getName()); - } - } - map.put("repair",repair); - return R.data(map); - } - - /** - * 维修人员工单详情 - */ - - @Ignore - @GetMapping("/detailByWorkerId") - public R detailByWorkerId(Long repairId) { - Repair repair = repairService.selectRepairById(repairId); - if (repair == null) { - return R.error("报修为空"); - } - Integer repairDevice = repair.getRepairDevice(); - if (repairDevice != null) { - RepairDevice repairDevice1 = repairDeviceService.selectRepairDeviceById(Long.valueOf(repairDevice)); - repair.setRepairDeviceName(repairDevice1.getName()); - } - //派单员id 查找对应名称 - IcsCustomerStaff icsCustomerStaff = icsCustomerStaffService.selectIcsCustomerStaffById(Long.valueOf(repair.getDispatcherId())); - if (icsCustomerStaff != null) { - repair.setDispatcherName(icsCustomerStaff.getName()); - } - //报修人id 查找对应名称 - IcsCustomerStaff staff = icsCustomerStaffService.selectIcsCustomerStaffById(Long.valueOf(repair.getUserId())); - if (staff != null) { - repair.setUserName(icsCustomerStaff.getName()); - } - return R.data(repair); - } - - /** - * 维修人员确认接单 - */ - @Ignore - @PostMapping("/confirmOrder") - public R confirmOrder(Long repairId) { - Repair repair = repairService.selectRepairById(repairId); - repair.setStatus(Repair.Status.PROCESSING); - repair.setBeginDate(DateUtils.getNowDate()); - repairService.updateRepair(repair); - return R.ok(); - } +// @Ignore +// @PostMapping("dispatcherCancel") +// public R dispatcherCancel(Long repairId) { +// Repair repair = repairService.selectRepairById(repairId); +// if (repair == null || !Repair.Status.PENDING_ASSIGN.equals(repair.getStatus())) { +// return R.error("报修为空或状态不是待分配"); +// } +// repair.setStatus(Repair.Status.CANCELED); +// return toAjax(repairService.updateRepair(repair)); +// } +// +// //提交反馈 +// @Ignore +// @PostMapping("dispatcherSubmitFeedback") +// public R dispatcherSubmitFeedback(Long repairId) { +// Repair repair = repairService.selectRepairById(repairId); +// if (repair == null || !Repair.Status.PENDING_ASSIGN.equals(repair.getStatus())) { +// return R.error("报修为空或状态不是待分配"); +// } +// repair.setStatus(Repair.Status.SUBMIT_FEEDBACK); +// return toAjax(repairService.updateRepair(repair)); +// } +// +// //选择维修人员 +// @Ignore +// @GetMapping("selectDispatcherChooseWorker") +// public R dispatcherChooseWorker(@RequestBody Map map) { +// Integer userId = (Integer) map.get("userId"); +// +// //根据用户id查询绑定的设备分类 +// Long type = staffTypeService.selectRepairTypeByUserId(userId); +// //根据设备分类查询对应的维修人员列表 +// List customerStaffs = workerTypeService.selectRepairWorkerTypeListByTypeId(type); +// +// return R.data(customerStaffs); +// } +// +// +// //提交派单人员 +// @Ignore +// @GetMapping("dispatcherPendingProcess") +// public R dispatcherPendingProcess(@RequestBody Repair repair) { +// Repair repair1 = repairService.selectRepairById(repair.getId()); +// if (repair1 == null || !Repair.Status.PENDING_ASSIGN.equals(repair.getStatus())) { +// return R.error("报修为空或状态不是待分配"); +// } +// repair1.setStatus(Repair.Status.PENDING_PROCESS); +// repair1.setWorkerId(repair.getWorkerId()); +// repair1.setBeginDate(DateUtils.getNowDate()); +// return toAjax(repairService.updateRepair(repair1)); +// } +// +// /*-------------------------以下为维修人员接口------------------------*/ +// +// /** +// * 维修人员工单管理 +// * @param userId +// * @param status +// * @return +// */ +// @Ignore +// @GetMapping("/listByWorkerId") +// public R listByWorkerId(Long userId,Integer status) { +// +// +// //待完成 状态为 1 +// Integer beCompleted = repairService.listByWorkerIdByCount(userId,1); +// +// //进行中 状态为4 +// Integer ongoing = repairService.listByWorkerIdByCount(userId,4); +// +// //已完成 +// Integer done2 = repairService.listByWorkerIdByCount(userId,5); +// Integer done1 = repairService.listByWorkerIdByCount(userId,6); +// +// Map map = new HashMap<>(); +// map.put("beCompleted",beCompleted); +// map.put("ongoing",ongoing); +// map.put("done",done1+done2); +// +// +// // 待完成 1 进行中 2 已完成 3 +// List repair = repairService.listByWorkerId(userId,status); +// for (Repair repair1 : repair) { +// RepairDevice repairDevice = repairDeviceService.selectRepairDeviceById(Long.valueOf(repair1.getRepairDevice())); +// if (repairDevice != null) { +// repair1.setRepairDeviceName(repairDevice.getName()); +// } +// } +// map.put("repair",repair); +// return R.data(map); +// } +// +// /** +// * 维修人员工单详情 +// */ +// +// @Ignore +// @GetMapping("/detailByWorkerId") +// public R detailByWorkerId(Long repairId) { +// Repair repair = repairService.selectRepairById(repairId); +// if (repair == null) { +// return R.error("报修为空"); +// } +// Integer repairDevice = repair.getRepairDevice(); +// if (repairDevice != null) { +// RepairDevice repairDevice1 = repairDeviceService.selectRepairDeviceById(Long.valueOf(repairDevice)); +// repair.setRepairDeviceName(repairDevice1.getName()); +// } +// //派单员id 查找对应名称 +// IcsCustomerStaff icsCustomerStaff = icsCustomerStaffService.selectIcsCustomerStaffById(Long.valueOf(repair.getDispatcherId())); +// if (icsCustomerStaff != null) { +// repair.setDispatcherName(icsCustomerStaff.getName()); +// } +// //报修人id 查找对应名称 +// IcsCustomerStaff staff = icsCustomerStaffService.selectIcsCustomerStaffById(Long.valueOf(repair.getUserId())); +// if (staff != null) { +// repair.setUserName(icsCustomerStaff.getName()); +// } +// return R.data(repair); +// } +// +// /** +// * 维修人员确认接单 +// */ +// @Ignore +// @PostMapping("/confirmOrder") +// public R confirmOrder(Long repairId) { +// Repair repair = repairService.selectRepairById(repairId); +// repair.setStatus(Repair.Status.PROCESSING); +// repair.setBeginDate(DateUtils.getNowDate()); +// repairService.updateRepair(repair); +// return R.ok(); +// } diff --git a/shoot-hand/ics-web/src/main/java/com/ics/service/impl/RepairServiceImpl.java b/shoot-hand/ics-web/src/main/java/com/ics/service/impl/RepairServiceImpl.java index af9c49f..39f4327 100644 --- a/shoot-hand/ics-web/src/main/java/com/ics/service/impl/RepairServiceImpl.java +++ b/shoot-hand/ics-web/src/main/java/com/ics/service/impl/RepairServiceImpl.java @@ -61,23 +61,24 @@ public class RepairServiceImpl extends ServiceImpl impleme @Override @Transactional(rollbackFor = Exception.class) public int insertRepair(Repair repair) { - repair.setSn(snService.generate(Sn.Type.REPAIR)); - repair.setCreateTime(DateUtils.getNowDate()); - repair.setRepairTime(DateUtils.getNowDate()); - int result = repairMapper.insert(repair); - // 增加报修日志 - RepairLog repairLog = new RepairLog(); - repairLog.setType(repair.getStatus()); - repairLog.setDetail(String.format("工单号：%s,已收到报修", repair.getSn())); - repairLog.setRepairId(repair.getId()); - repairLog.setCreateBy(repair.getCreateBy()); - repairLog.setCreateTime(DateUtils.getNowDate()); - repairLog.setUpdateBy(repair.getCreateBy()); - repairLog.setUpdateTime(DateUtils.getNowDate()); - repairLog.setParkId(repair.getParkId()); - repairLog.setTenantId(repair.getTenantId()); - repairLogService.insertRepairLog(repairLog); - return result; +// repair.setSn(snService.generate(Sn.Type.REPAIR)); +// repair.setCreateTime(DateUtils.getNowDate()); +// repair.setRepairTime(DateUtils.getNowDate()); +// int result = repairMapper.insert(repair); +// // 增加报修日志 +// RepairLog repairLog = new RepairLog(); +// repairLog.setType(repair.getStatus()); +// repairLog.setDetail(String.format("工单号：%s,已收到报修", repair.getSn())); +// repairLog.setRepairId(repair.getId()); +// repairLog.setCreateBy(repair.getCreateBy()); +// repairLog.setCreateTime(DateUtils.getNowDate()); +// repairLog.setUpdateBy(repair.getCreateBy()); +// repairLog.setUpdateTime(DateUtils.getNowDate()); +// repairLog.setParkId(repair.getParkId()); +// repairLog.setTenantId(repair.getTenantId()); +// repairLogService.insertRepairLog(repairLog); +// return result; + return 0; } /** @@ -89,16 +90,17 @@ public class RepairServiceImpl extends ServiceImpl impleme @Override public int updateRepair(Repair repair) { // 增加报修日志 - RepairLog repairLog = new RepairLog(); - repairLog.setType(repair.getStatus()); - repairLog.setDetail(repair.getStatus().getName()); - repairLog.setRepairId(repair.getId()); - repairLog.setCreateBy(repair.getUpdateBy()); - repairLog.setCreateTime(DateUtils.getNowDate()); - repairLog.setUpdateBy(repair.getUpdateBy()); - repairLog.setUpdateTime(DateUtils.getNowDate()); - repairLogService.insertRepairLog(repairLog); - return repairMapper.updateById(repair); +// RepairLog repairLog = new RepairLog(); +// repairLog.setType(repair.getStatus()); +// repairLog.setDetail(repair.getStatus().getName()); +// repairLog.setRepairId(repair.getId()); +// repairLog.setCreateBy(repair.getUpdateBy()); +// repairLog.setCreateTime(DateUtils.getNowDate()); +// repairLog.setUpdateBy(repair.getUpdateBy()); +// repairLog.setUpdateTime(DateUtils.getNowDate()); +// repairLogService.insertRepairLog(repairLog); +// return repairMapper.updateById(repair); + return 0; } @@ -111,19 +113,22 @@ public class RepairServiceImpl extends ServiceImpl impleme */ @Override public List selectMyRepairList(Repair repair) { - return repairMapper.selectMyRepairList(repair); + //return repairMapper.selectMyRepairList(repair); + return null; } @Override public List selectByUserId(Long userId,Integer status) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(Repair::getUserId, userId); - wrapper.orderByAsc(Repair::getRepairTime); - if (status != null && status != 0) { - wrapper.eq(Repair::getStatus, status); - } +// LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); +// wrapper.eq(Repair::getUserId, userId); +// wrapper.orderByAsc(Repair::getRepairTime); +// if (status != null && status != 0) { +// wrapper.eq(Repair::getStatus, status); +// } +// +// return repairMapper.selectList(wrapper); - return repairMapper.selectList(wrapper); + return null; } @Override @@ -146,31 +151,34 @@ public class RepairServiceImpl extends ServiceImpl impleme @Override public List listByWorkerId(Long userId, Integer status) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(Repair::getWorkerId, userId); - wrapper.orderByAsc(Repair::getRepairTime); - if ( status == 1) { - wrapper.eq(Repair::getStatus, 1); - }else if (status == 1){ - wrapper.eq(Repair::getStatus, 4); - }else if (status == 2){ - wrapper.eq(Repair::getStatus,5 ).or().eq(Repair::getStatus, 6); - } - - return repairMapper.selectList(wrapper); +// LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); +// wrapper.eq(Repair::getWorkerId, userId); +// wrapper.orderByAsc(Repair::getRepairTime); +// if ( status == 1) { +// wrapper.eq(Repair::getStatus, 1); +// }else if (status == 1){ +// wrapper.eq(Repair::getStatus, 4); +// }else if (status == 2){ +// wrapper.eq(Repair::getStatus,5 ).or().eq(Repair::getStatus, 6); +// } +// +// return repairMapper.selectList(wrapper); + return null; } @Override public Integer listByWorkerIdByCount(Long userId, Integer status) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(Repair::getWorkerId, userId); - wrapper.orderByAsc(Repair::getRepairTime); - if (status != null && status != 0) { - wrapper.eq(Repair::getStatus, status); - } +// LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); +// wrapper.eq(Repair::getWorkerId, userId); +// wrapper.orderByAsc(Repair::getRepairTime); +// if (status != null && status != 0) { +// wrapper.eq(Repair::getStatus, status); +// } +// +// return repairMapper.selectCount(wrapper); - return repairMapper.selectCount(wrapper); + return 0; } diff --git a/shoot-hand/ics-web/src/main/resources/application-dev.yml b/shoot-hand/ics-web/src/main/resources/application-dev.yml index eee8c03..c491e86 100644 --- a/shoot-hand/ics-web/src/main/resources/application-dev.yml +++ b/shoot-hand/ics-web/src/main/resources/application-dev.yml @@ -20,7 +20,7 @@ spring: # url: jdbc:mysql://192.168.0.50:3306/dbd-meeting?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # username: root # password: boyuekeji2023 - url: jdbc:mysql://222.184.49.22:3306/dbd-meeting?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://222.184.49.22:3306/shoot-hand?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: boyue1!Z # 从库数据源 @@ -137,7 +137,7 @@ mybatis-plus: weixin: appid: wx5582a07c1fbbcf06 # appid mch-serial-no: 5899B7D34B161F9E24EFFCD50E95245521CA40AB # 证书序列号 - private-key-path: F:/cert/dbd/apiclient_key.pem # 证书路径 + private-key-path: E:/apiclient_key.pem # 证书路径 mch-id: 1665472343 # 商户号 key: CHANGYANGKONGGUhenanjianandianzi # APIv3密钥 domain: https://api.mch.weixin.qq.com # 微信服务器地址 diff --git a/shoot-hand/ics-web/src/main/resources/application.yml b/shoot-hand/ics-web/src/main/resources/application.yml index 68c0260..a58fb9b 100644 --- a/shoot-hand/ics-web/src/main/resources/application.yml +++ b/shoot-hand/ics-web/src/main/resources/application.yml @@ -27,7 +27,7 @@ spring: main: allow-bean-definition-overriding: true profiles: - active: prod + active: dev jackson: date-format: yyyy-MM-dd HH:mm:ss time-zone: GMT+8 diff --git a/shoot-hand/pom.xml b/shoot-hand/pom.xml index 25df1bb..4935c1f 100644 --- a/shoot-hand/pom.xml +++ b/shoot-hand/pom.xml @@ -16,7 +16,7 @@ 1.0.0-SNAPSHOT UTF-8 UTF-8 - 11 + 8 2.4.0 1.2.3 1.19