src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java
@@ -6,7 +6,7 @@ import com.ruoyi.device.service.DeviceDefectRecordService; import com.ruoyi.framework.web.domain.AjaxResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -16,12 +16,12 @@ public class DeviceDefectRecordController { @Autowired private DeviceDefectRecordService deviceDefectRecordService; @ApiModelProperty("设备缺陷记录列表") @ApiOperation("设备缺陷记录列表") @GetMapping("/page") public AjaxResult page(Page page , DeviceDefectRecordDto deviceDefectRecordDto) { return AjaxResult.success(deviceDefectRecordService.listPage(page,deviceDefectRecordDto)); } @ApiModelProperty("设备id查询设备缺陷记录列表") @ApiOperation("设备id查询设备缺陷记录列表") @GetMapping("/find/{deviceLedgerId}") public AjaxResult find(@PathVariable Long deviceLedgerId) { DeviceDefectRecordDto deviceDefectRecordDto = new DeviceDefectRecordDto(); @@ -30,17 +30,17 @@ } @PostMapping("/add") @ApiModelProperty("添加设备缺陷记录") @ApiOperation("添加设备缺陷记录") public AjaxResult add(@RequestBody DeviceDefectRecord deviceDefectRecord) { return AjaxResult.success(deviceDefectRecordService.add(deviceDefectRecord)); } @PostMapping("/update") @ApiModelProperty("修改设备缺陷记录") @ApiOperation("修改设备缺陷记录") public AjaxResult update(@RequestBody DeviceDefectRecord deviceDefectRecord) { return AjaxResult.success(deviceDefectRecordService.updateByDDR(deviceDefectRecord)); } @DeleteMapping("/delete") @ApiModelProperty("删除设备缺陷记录") @ApiOperation("删除设备缺陷记录") public AjaxResult delete(@PathVariable Long id) { return AjaxResult.success(deviceDefectRecordService.removeById(id)); } src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java
@@ -12,7 +12,6 @@ import com.ruoyi.framework.aspectj.lang.annotation.Anonymous; import com.ruoyi.framework.web.domain.AjaxResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -39,33 +38,33 @@ @ApiModelProperty("设备台账列表") @ApiOperation("设备台账列表") @GetMapping("/page") public AjaxResult page(Page page , DeviceLedgerDto deviceLedger) { return AjaxResult.success(deviceLedgerService.queryPage(page,deviceLedger)); } @PostMapping() @ApiModelProperty("添加设备台账") @ApiOperation("添加设备台账") public AjaxResult add(@RequestBody DeviceLedger deviceLedger) { return deviceLedgerService.saveDeviceLedger(deviceLedger); } @ApiModelProperty("根据id查询设备台账") @ApiOperation("根据id查询设备台账") @GetMapping("/{id}") public AjaxResult detail(@PathVariable Long id) { return AjaxResult.success(deviceLedgerService.getById(id)); } @PutMapping () @ApiModelProperty("修改设备台账") @ApiOperation("修改设备台账") public AjaxResult update(@RequestBody DeviceLedger deviceLedger) { return deviceLedgerService.updateDeviceLedger(deviceLedger); } @DeleteMapping("/{ids}") @ApiModelProperty("删除设备台账") @ApiOperation("删除设备台账") public AjaxResult delete(@PathVariable("ids") ArrayList<Long> ids) { boolean b = deviceLedgerService.removeBatchByIds(ids); if (!b) { @@ -75,13 +74,13 @@ } @PostMapping("export") @ApiModelProperty("导出设备台账") @ApiOperation("导出设备台账") public void export(HttpServletResponse response, Long[] ids) { deviceLedgerService.export(response, ids); } @PostMapping("import") @ApiModelProperty("导入设备台账") @ApiOperation("导入设备台账") public AjaxResult importData(MultipartFile file) throws IOException { Boolean b = deviceLedgerService.importData(file); if (b) { @@ -92,7 +91,7 @@ @GetMapping("getDeviceLedger") @ApiModelProperty("获取设备台账") @ApiOperation("获取设备台账") public AjaxResult getDeviceLedger( ) { return AjaxResult.success(deviceLedgerService.list(new QueryWrapper<DeviceLedger>().lambda() .select(DeviceLedger::getId, DeviceLedger::getDeviceName,DeviceLedger::getDeviceModel))); src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
@@ -9,7 +9,7 @@ import com.ruoyi.device.service.IDeviceMaintenanceService; import com.ruoyi.framework.web.domain.AjaxResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -28,14 +28,14 @@ @Autowired private IDeviceLedgerService deviceLedgerService; @ApiModelProperty("设备保养列表") @ApiOperation("设备保养列表") @GetMapping("/page") public AjaxResult page(Page page , DeviceMaintenanceDto deviceMaintenanceDto) { return AjaxResult.success(deviceMaintenanceService.queryPage(page,deviceMaintenanceDto)); } @PostMapping() @ApiModelProperty("添加设备保养") @ApiOperation("添加设备保养") public AjaxResult add(@RequestBody DeviceMaintenance deviceMaintenance) { DeviceLedger byId = deviceLedgerService.getById(deviceMaintenance.getDeviceLedgerId()); deviceMaintenance.setDeviceName(byId.getDeviceName()); @@ -43,14 +43,14 @@ return deviceMaintenanceService.saveDeviceRepair(deviceMaintenance); } @ApiModelProperty("根据id查询设备保养") @ApiOperation("根据id查询设备保养") @GetMapping("/{id}") public AjaxResult detail(@PathVariable Long id) { return AjaxResult.success(deviceMaintenanceService.detailById(id)); } @PutMapping () @ApiModelProperty("修改设备保养") @ApiOperation("修改设备保养") public AjaxResult update(@RequestBody DeviceMaintenance deviceMaintenance) { DeviceLedger byId = deviceLedgerService.getById(deviceMaintenance.getDeviceLedgerId()); deviceMaintenance.setDeviceName(byId.getDeviceName()); @@ -59,14 +59,14 @@ } @PostMapping ("maintenance") @ApiModelProperty("修改设备保养") @ApiOperation("修改设备保养") public AjaxResult maintenance(@RequestBody DeviceMaintenance deviceMaintenance) { return deviceMaintenanceService.updateDeviceDeviceMaintenance(deviceMaintenance); } @DeleteMapping("/{ids}") @ApiModelProperty("删除设备保养") @ApiOperation("删除设备保养") public AjaxResult delete(@PathVariable("ids") Long[] ids) { boolean b = deviceMaintenanceService.removeBatchByIds(Arrays.asList(ids)); if (!b) { @@ -76,7 +76,7 @@ } @PostMapping("export") @ApiModelProperty("导出设备保养") @ApiOperation("导出设备保养") public void export(HttpServletResponse response, Long[] ids) { deviceMaintenanceService.export(response, ids); } src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
@@ -8,7 +8,7 @@ import com.ruoyi.device.service.IDeviceRepairService; import com.ruoyi.framework.web.domain.AjaxResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -26,19 +26,19 @@ @Autowired private IDeviceLedgerService deviceLedgerService; @ApiModelProperty("设备报修列表") @ApiOperation("设备报修列表") @GetMapping("/page") public AjaxResult page(Page page , DeviceRepairDto deviceRepairDto) { return AjaxResult.success(deviceRepairService.queryPage(page,deviceRepairDto)); } @PostMapping() @ApiModelProperty("添加设备报修") @ApiOperation("添加设备报修") public AjaxResult add( @RequestBody DeviceRepair deviceRepair) { return deviceRepairService.saveDeviceRepair(deviceRepair); } @ApiModelProperty("根据id查询设备报修") @ApiOperation("根据id查询设备报修") @GetMapping("/{id}") public AjaxResult detail(@PathVariable Long id) { DeviceRepairDto byId = deviceRepairService.detailById(id); @@ -46,19 +46,19 @@ } @PutMapping () @ApiModelProperty("修改设备报修") @ApiOperation("修改设备报修") public AjaxResult update( @RequestBody DeviceRepair deviceRepair) { return deviceRepairService.updateDeviceRepair(deviceRepair); } @PostMapping ("repair") @ApiModelProperty("设备维修") @ApiOperation("设备维修") public AjaxResult repair( @RequestBody DeviceRepair deviceRepair) { return deviceRepairService.updateDeviceRepair(deviceRepair); } @DeleteMapping("/{ids}") @ApiModelProperty("删除设备报修") @ApiOperation("删除设备报修") public AjaxResult delete(@PathVariable("ids") Long[] ids) { boolean b = deviceRepairService.removeBatchByIds(Arrays.asList(ids)); if (!b) { @@ -68,7 +68,7 @@ } @PostMapping("export") @ApiModelProperty("导出设备报修") @ApiOperation("导出设备报修") public void export(HttpServletResponse response, Long[] ids) { deviceRepairService.export(response, ids); } src/main/java/com/ruoyi/staff/service/impl/AnalyticsServiceImpl.java
@@ -16,7 +16,9 @@ import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @AllArgsConstructor @Service @@ -29,16 +31,32 @@ @Override public List<StaffLeaveDto> staffLeaveReasonAnalytics() { List<StaffLeaveDto> result = staffLeaveMapper.staffLeaveReasonAnalytics(); result.forEach(dto -> { List<StaffLeaveDto> dbResult = staffLeaveMapper.staffLeaveReasonAnalytics(); // 创建一个Map用于存储所有枚举原因的数量，默认值为0 Map<String, Integer> reasonCountMap = new HashMap<>(); for (StaffLeaveReason reasonEnum : StaffLeaveReason.values()) { reasonCountMap.put(reasonEnum.getCode(), 0); } // 将数据库查询结果合并到Map中 for (StaffLeaveDto dto : dbResult) { String reasonCode = dto.getReason(); StaffLeaveReason reasonEnum = StaffLeaveReason.getByCode(reasonCode); if (reasonEnum != null) { dto.setReasonText(reasonEnum.getInfo()); } else { dto.setReasonText("未知原因"); if (reasonCountMap.containsKey(reasonCode)) { reasonCountMap.put(reasonCode, dto.getCount()); } }); } // 将Map转换为List<StaffLeaveDto> List<StaffLeaveDto> result = new ArrayList<>(); for (StaffLeaveReason reasonEnum : StaffLeaveReason.values()) { StaffLeaveDto dto = new StaffLeaveDto(); dto.setReason(reasonEnum.getCode()); dto.setCount(reasonCountMap.get(reasonEnum.getCode())); dto.setReasonText(reasonEnum.getInfo()); result.add(dto); } return result; }
@@ -54,9 +54,10 @@ // 新增离职记录 StaffLeave staffLeave = new StaffLeave(); staffLeave.setStaffOnJobId(staffLeaveDto.getStaffOnJobId()); staffLeave.setReason(staffLeaveDto.getReason()); String reason = staffLeaveDto.getReason(); if (!StaffLeaveReasonOther.getCode().equals(reason)){ staffLeave.setRemark(""); if (StaffLeaveReasonOther.getCode().equals(reason)){ staffLeave.setRemark(staffLeaveDto.getRemark()); } staffLeaveMapper.insert(staffLeave);
