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 2492e6b..d5af09f 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,19 +1,20 @@ package com.ics.admin.controller; -import com.ics.admin.domain.Repair; -import com.ics.admin.domain.RepairLog; -import com.ics.admin.service.IRepairLogService; -import com.ics.admin.service.IRepairService; +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; @@ -34,6 +35,21 @@ public class RepairController extends BaseController { @Autowired private IRepairLogService repairLogService; + @Autowired + private IIcsCustomerStaffService customerStaffService; + + @Autowired + private IRepairTypeService repairTypeService; + + @Autowired + private IRepairDeviceService deviceService; + + @Autowired + private IRepairFailureTypeService repairFailureTypeService; + + @Autowired + private IRepairRecordService repairRecordService; + /** * 查询工单管理 */ @@ -46,14 +62,39 @@ public class RepairController extends BaseController { BeanUtils.copyBeanProp(repairVO, repair); repairVO.setStatus(repair.getStatus().getValue()); repairVO.setStatusName(repair.getStatus().getName()); + //设备类型 + RepairType repairType = repairTypeService.selectRepairTypeById(Long.valueOf(repair.getTypeId())); + repairVO.setTypeName(repairType.getName()); + //设备名称 + RepairDevice repairDevice = deviceService.selectRepairDeviceById(Long.valueOf(repair.getRepairDevice())); + repairVO.setRepairDeviceName(repairDevice.getName()); + //故障 + RepairFailureType repairFailureType = repairFailureTypeService.selectRepairFailureTypeById(repair.getFailureTypeId()); + repairVO.setFailureTypeName(repairFailureType.getName()); + IcsCustomerStaff staff = customerStaffService.selectIcsCustomerStaffById(Long.valueOf(repair.getUserId())); + repairVO.setUserName(staff.getUsername()); - ParkVO parkVO = new ParkVO(); - BeanUtils.copyBeanProp(parkVO, repair.getPark()); - repairVO.setParkVO(parkVO); + IcsCustomerStaff worker = customerStaffService.selectIcsCustomerStaffById(repair.getWorkerId()); + repairVO.setWorkerName(worker.getUsername()); - UserVO userVO = new UserVO(); - BeanUtils.copyBeanProp(userVO, repair.getUser()); - repairVO.setUserVO(userVO); + RepairRecord repairRecord = repairRecordService.selectByRepairId(id); + if (null != repairRecord){ + repairVO.setSpeed(repairRecord.getSpeed()); + repairVO.setServe(repairRecord.getServe()); + repairVO.setEffect(repairRecord.getEffect()); + } + + +// repairVO.setStatus(repair.getStatus().getValue()); +// repairVO.setStatusName(repair.getStatus().getName()); +// +// ParkVO parkVO = new ParkVO(); +// BeanUtils.copyBeanProp(parkVO, repair.getPark()); +// repairVO.setParkVO(parkVO); +// +// UserVO userVO = new UserVO(); +// BeanUtils.copyBeanProp(userVO, repair.getUser()); +// repairVO.setUserVO(userVO); RepairLog repairLog = new RepairLog(); repairLog.setRepairId(id); @@ -80,11 +121,12 @@ public class RepairController extends BaseController { @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); - return toAjax(repairService.updateRepair(repair)); +// if (repair == null || !Repair.Status.PENDING_ASSIGN.equals(pRepair.getStatus())) { +// return R.error("报修为空或状态不是待分配"); +// } +// repair.setStatus(Repair.Status.PENDING_PROCESS); + repair.setStatus(Repair.Status.PENDING_ASSIGN); + return toAjax(repairService.insertRepair(repair)); } /** @@ -110,4 +152,13 @@ public class RepairController extends BaseController { return toAjax(repairService.deleteRepairByIds(ids)); } + + + @Ignore + @GetMapping("selectWorkerIdByTypeId") + public R selectWorkerIdByTypeId(String typeId) { + List customerStaffs = repairService.selectWorkerIdByTypeId(typeId); + return R.data(customerStaffs); + } + } 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 e10ce69..fc06c8c 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 @@ -35,6 +35,9 @@ public class Repair extends BaseEntity { private Integer typeId; + @TableField(exist = false) + private String typeName; + private Integer repairDevice; @TableField(exist = false) private String repairDeviceName; @@ -145,6 +148,12 @@ public class Repair extends BaseEntity { */ private String content; + /** + * failure_date 故障时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date failureDate; + /** * 报修时间 */ @@ -154,8 +163,7 @@ public class Repair extends BaseEntity { /** * 报修图片 */ - @TableField(typeHandler = BannerImageHandler.class) - private List repairImages = new ArrayList<>(); + private String repairImages; /** * 维修费 diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IIcsCustomerStaffService.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IIcsCustomerStaffService.java index c9ea29c..61f06eb 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IIcsCustomerStaffService.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IIcsCustomerStaffService.java @@ -90,5 +90,6 @@ public interface IIcsCustomerStaffService extends IService { IcsCustomerStaff selectUserByMobile(String phone); + // IcsCustomerStaff selectUserByMobileAndParkId(String phoneNumber, String parkId); } 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 index 3183f68..05faaf0 100644 --- 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 @@ -1,5 +1,6 @@ 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; @@ -58,4 +59,6 @@ public interface IRepairRecordService extends IService { * @return 结果 */ int deleteRepairRecordById(Long id); + + RepairRecord selectByRepairId(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 6a79548..b0aa50b 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 @@ -2,6 +2,7 @@ package com.ics.admin.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ics.admin.domain.Repair; +import com.ics.common.core.domain.IcsCustomerStaff; import java.util.List; @@ -68,4 +69,7 @@ public interface IRepairService extends IService { * @return 工单管理集合 */ List selectMyRepairList(Repair repair); + + List selectWorkerIdByTypeId(String typeId); + } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/IcsCustomerStaffServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/IcsCustomerStaffServiceImpl.java index 2db7037..1d67ce1 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/IcsCustomerStaffServiceImpl.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/IcsCustomerStaffServiceImpl.java @@ -301,6 +301,7 @@ public class IcsCustomerStaffServiceImpl extends ServiceImpl ids = new ArrayList<>(); diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairRecordServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairRecordServiceImpl.java index 6493098..ca7f08c 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairRecordServiceImpl.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairRecordServiceImpl.java @@ -3,8 +3,10 @@ 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.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ics.admin.domain.Repair; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ics.admin.mapper.RepairRecordMapper; @@ -89,4 +91,12 @@ public class RepairRecordServiceImpl extends ServiceImpl 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/RepairServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairServiceImpl.java index c6cec93..0d6955e 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 @@ -2,12 +2,18 @@ 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.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.mapper.IcsCustomerStaffMapper; import com.ics.admin.mapper.RepairMapper; +import com.ics.admin.mapper.RepairWorkerTypeMapper; import com.ics.admin.service.IRepairLogService; import com.ics.admin.service.IRepairService; +import com.ics.admin.service.IRepairWorkerTypeService; +import com.ics.common.core.domain.IcsCustomerStaff; import com.ics.common.utils.DateUtils; import com.ics.system.domain.Sn; import com.ics.system.service.ICurrentUserService; @@ -17,6 +23,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.stream.Collectors; /** * 工单管理Service业务层处理 @@ -38,6 +45,15 @@ public class RepairServiceImpl extends ServiceImpl impleme @Autowired private ICurrentUserService currentUserService; + @Autowired + private IRepairWorkerTypeService repairWorkerTypeService; + + @Autowired + private RepairWorkerTypeMapper repairWorkerTypeMapper; + + @Autowired + private IcsCustomerStaffMapper customerStaffMapper; + /** * 查询工单管理 * @@ -143,4 +159,18 @@ public class RepairServiceImpl extends ServiceImpl impleme 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); + + + } + } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/RepairVO.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/RepairVO.java index 5b85d8e..2bffd23 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/RepairVO.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/RepairVO.java @@ -40,6 +40,10 @@ public class RepairVO { */ private String name; + private String repairName; + + private String repairLevel; + /** * 联系电话 */ @@ -167,7 +171,24 @@ public class RepairVO { /** * 报修图片 */ - @TableField(typeHandler = BannerImageHandler.class) - private List repairImages = new ArrayList<>(); + private String repairImages; + + + private String typeName; + + private String repairDeviceName; + + private String failureTypeName; + + private String userName; + + private String workerName; + + //评分 + private Integer speed; + + private Integer serve; + + private Integer effect; } 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 7f14bfc..e47e9ae 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 @@ -14,6 +14,7 @@ + @@ -21,8 +22,7 @@ - + @@ -71,6 +71,7 @@ r.area, r.status, r.content, + r.failure_date, r.repair_name, r.user_id, r.repair_level, diff --git a/shoot-hand/ics-common/ics-common-core/src/main/java/com/ics/common/utils/file/MimeTypeUtils.java b/shoot-hand/ics-common/ics-common-core/src/main/java/com/ics/common/utils/file/MimeTypeUtils.java index 21cb644..ba63827 100644 --- a/shoot-hand/ics-common/ics-common-core/src/main/java/com/ics/common/utils/file/MimeTypeUtils.java +++ b/shoot-hand/ics-common/ics-common-core/src/main/java/com/ics/common/utils/file/MimeTypeUtils.java @@ -28,7 +28,7 @@ public class MimeTypeUtils { // word excel powerpoint "doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt", // 压缩文件 - "rar", "zip", "gz", "bz2", + "rar", "zip", "gz", "bz2","mp4", // pdf "pdf"};