dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
xuyuncong 2025-11-18 17:17:15 +08:00
parent 618c7868b3
commit 359d12dcd7
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTitemController.java
View File

@ -201,11 +201,11 @@ public class DlRepairTitemController {
} }
/** /**
* 根据工单ID统计班组完成进度 * @description : 根据工单ID统计班组完成进度
* * @author xyc
* @author AI * @date 17:15 2025/11/18
* @date 2025/11/18 * @param [ticketId]
* @param ticketId 工单ID * @return cn.iocoder.yudao.framework.common.pojo.CommonResult<?>
**/ **/
@GetMapping("/teamProgress") @GetMapping("/teamProgress")
@Operation(summary = "根据工单ID统计班组完成进度") @Operation(summary = "根据工单ID统计班组完成进度")
@ -214,12 +214,11 @@ public class DlRepairTitemController {
} }
/** /**
* 根据班组查询班组下工时项目的完成情况 * @description : 根据班组查询班组下工时项目的完成情况
* * @author xyc
* @author AI * @date 17:15 2025/11/18
* @date 2025/11/18 * @param [ticketId, workType]
* @param ticketId 工单ID * @return cn.iocoder.yudao.framework.common.pojo.CommonResult<?>
* @param workType 班组编码（工种类型）
**/ **/
@GetMapping("/teamProjectStatus") @GetMapping("/teamProjectStatus")
@Operation(summary = "根据班组查询班组下工时项目的完成情况") @Operation(summary = "根据班组查询班组下工时项目的完成情况")

4
dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
View File

@ -1314,7 +1314,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
RepairRecords record = finishedRecordMap.get(item.getId()); RepairRecords record = finishedRecordMap.get(item.getId());
if (record != null) { if (record != null) {
vo.setFinished(true); vo.setFinished(true);
vo.setFinishTime(record.getCreateTime()); vo.setFinishTime(DateUtil.date(record.getCreateTime()));
vo.setFinisherId(record.getDealUserId()); vo.setFinisherId(record.getDealUserId());
vo.setFinisherName(record.getDealUserName()); vo.setFinisherName(record.getDealUserName());
} else { } else {
@ -1375,7 +1375,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
String repairItemId = record.getRepairItemId(); String repairItemId = record.getRepairItemId();
RepairRecords exist = finishedRecordMap.get(repairItemId); RepairRecords exist = finishedRecordMap.get(repairItemId);
if (exist == null || (record.getCreateTime() != null && exist.getCreateTime() != null if (exist == null || (record.getCreateTime() != null && exist.getCreateTime() != null
&& record.getCreateTime().after(exist.getCreateTime()))) { && DateUtil.date(record.getCreateTime()).after(DateUtil.date(exist.getCreateTime())))) {
finishedRecordMap.put(repairItemId, record); finishedRecordMap.put(repairItemId, record);
} }
}); });