bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交审核

This commit is contained in:
sxu 2024-11-25 11:02:08 +08:00
parent f4d05cba0d
commit 5b024bc735
8 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java
View File

@ -95,7 +95,7 @@ public class RepairController extends BaseController {
*/ */
@ApiOperation(value = "获取维修单详情") @ApiOperation(value = "获取维修单详情")
@GetMapping("/getRepairDocumentInfo") @GetMapping("/getRepairDocumentInfo")
public AjaxResult getRepairDocumentInfo(@NotBlank(message = "TaskId参数不能为空") String taskId) { public AjaxResult getRepairDocumentInfo(@NotBlank(message = "TaskId参数不能为空") Long taskId) {
return service.getRepairDocumentInfo(taskId); return service.getRepairDocumentInfo(taskId);
} }

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTask.java
View File

@ -17,7 +17,7 @@ public class RepairTask {
* 任务id * 任务id
*/ */
@ApiModelProperty(value = "任务id") @ApiModelProperty(value = "任务id")
private String taskId; private Long taskId;
@ApiModelProperty(value = "任务状态") @ApiModelProperty(value = "任务状态")
private Integer taskStatus; private Integer taskStatus;

4
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java
View File

@ -23,7 +23,7 @@ public class RepairTaskDetails extends BaseEntity {
* 任务ID * 任务ID
*/ */
@ApiModelProperty(value = "任务ID") @ApiModelProperty(value = "任务ID")
private String taskId; private Long taskId;
/** /**
* 机具ID * 机具ID
*/ */
@ -98,7 +98,7 @@ public class RepairTaskDetails extends BaseEntity {
@ApiModelProperty(value = "关键字") @ApiModelProperty(value = "关键字")
private String keyword; private String keyword;
public RepairTaskDetails(String taskId) { public RepairTaskDetails(Long taskId) {
this.taskId = taskId; this.taskId = taskId;
} }

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairAuditDetailsMapper.java
View File

@ -79,6 +79,8 @@ public interface RepairAuditDetailsMapper {
*/ */
int deleteRepairAuditDetailsById(Long id); int deleteRepairAuditDetailsById(Long id);
int deleteRepairAuditDetailsByTaskId(Long taskId);
/** /**
* 批量删除修试审核详细 * 批量删除修试审核详细
* *

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/RepairService.java
View File

@ -43,7 +43,7 @@ public interface RepairService {
/** /**
* 查询维修单 * 查询维修单
*/ */
AjaxResult getRepairDocumentInfo(@NotBlank(message = "TaskId参数不能为空") String taskId); AjaxResult getRepairDocumentInfo(@NotBlank(message = "TaskId参数不能为空") Long taskId);
/** /**
* 提交维修记录 * 提交维修记录

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java
View File

@ -285,7 +285,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
Long backId = repairAuditDetailsMapper.getBackId(inputDetails.getRepairId()); Long backId = repairAuditDetailsMapper.getBackId(inputDetails.getRepairId());
/* 添加驳回后维修详细表数据*/ /* 添加驳回后维修详细表数据*/
RepairTaskDetails repairTaskDetails = new RepairTaskDetails(); RepairTaskDetails repairTaskDetails = new RepairTaskDetails();
repairTaskDetails.setTaskId(String.valueOf(inputTaskId)); repairTaskDetails.setTaskId(inputTaskId);
repairTaskDetails.setMaId(String.valueOf(inputDetails.getMaId())); repairTaskDetails.setMaId(String.valueOf(inputDetails.getMaId()));
repairTaskDetails.setTypeId(String.valueOf(inputDetails.getTypeId())); repairTaskDetails.setTypeId(String.valueOf(inputDetails.getTypeId()));
Integer repairNum = inputDetails.getRepairNum(); Integer repairNum = inputDetails.getRepairNum();

15
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java
View File

@ -154,14 +154,10 @@ public class RepairServiceImpl implements RepairService {
* @param taskId 任务id * @param taskId 任务id
*/ */
@Override @Override
public AjaxResult getRepairDocumentInfo(@NotBlank(message = "TaskId参数不能为空") String taskId) { public AjaxResult getRepairDocumentInfo(@NotBlank(message = "TaskId参数不能为空") Long taskId) {
if (!NumberUtil.isNumber(taskId)) {
return AjaxResult.error("TaskId参数非数字类型,参数类型错误");
}
try { try {
long thisTaskId = Long.parseLong(taskId);
// 查询维修任务信息 // 查询维修任务信息
RepairTask repairTaskInfo = repairMapper.getRepairTaskInfoByTaskId(thisTaskId); RepairTask repairTaskInfo = repairMapper.getRepairTaskInfoByTaskId(taskId);
if (Objects.isNull(repairTaskInfo)) { if (Objects.isNull(repairTaskInfo)) {
return AjaxResult.error("未查询到维修任务信息"); return AjaxResult.error("未查询到维修任务信息");
} }
@ -181,14 +177,14 @@ public class RepairServiceImpl implements RepairService {
repairDeviceSummaryList.removeIf(Objects::isNull); repairDeviceSummaryList.removeIf(Objects::isNull);
repairDeviceSummaryList.forEach(repairDevice -> { repairDeviceSummaryList.forEach(repairDevice -> {
List<BmFileInfo> fileInfos = bmFileInfoMapper.selectBmFileInfoList(new BmFileInfo() List<BmFileInfo> fileInfos = bmFileInfoMapper.selectBmFileInfoList(new BmFileInfo()
.setTaskId(OptionalLong.of(thisTaskId).orElse(0L)) .setTaskId(OptionalLong.of(taskId).orElse(0L))
.setModelId(Optional.ofNullable(repairDevice.getIds()[0]).orElse(0L)) .setModelId(Optional.ofNullable(repairDevice.getIds()[0]).orElse(0L))
.setTaskType(TmTaskTypeEnum.TM_TASK_REPAIR.getTaskTypeId()) .setTaskType(TmTaskTypeEnum.TM_TASK_REPAIR.getTaskTypeId())
); );
repairDevice.setFileList(fileInfos); repairDevice.setFileList(fileInfos);
}); });
List<RepairPart> repairPartList = repairAuditDetailsMapper.getPartDetailsByTaskId(new RepairAuditDetails().setTaskId(thisTaskId)); List<RepairPart> repairPartList = repairAuditDetailsMapper.getPartDetailsByTaskId(new RepairAuditDetails().setTaskId(taskId));
repairPartList = mergePartsNum(repairPartList); repairPartList = mergePartsNum(repairPartList);
RepairTicketVo result = new RepairTicketVo() RepairTicketVo result = new RepairTicketVo()
.setRepairTaskInfo(repairTaskInfo) .setRepairTaskInfo(repairTaskInfo)
@ -384,7 +380,7 @@ public class RepairServiceImpl implements RepairService {
for (RepairTaskDetails bean : list) { for (RepairTaskDetails bean : list) {
int repairedNum = bean.getRepairNum() - bean.getRepairedNum() - bean.getScrapNum(); int repairedNum = bean.getRepairNum() - bean.getRepairedNum() - bean.getScrapNum();
RepairApplyRecord repairRecord = new RepairApplyRecord(); RepairApplyRecord repairRecord = new RepairApplyRecord();
repairRecord.setTaskId(Long.valueOf(bean.getTaskId())); repairRecord.setTaskId(bean.getTaskId());
repairRecord.setMaId(Long.valueOf(bean.getMaId())); repairRecord.setMaId(Long.valueOf(bean.getMaId()));
repairRecord.setTypeId(Long.valueOf(bean.getTypeId())); repairRecord.setTypeId(Long.valueOf(bean.getTypeId()));
repairRecord.setRepairNum(repairedNum); repairRecord.setRepairNum(repairedNum);
@ -810,6 +806,7 @@ public class RepairServiceImpl implements RepairService {
repairMapper.addTask(task); repairMapper.addTask(task);
// 循环插入【修饰审核明细表】 // 循环插入【修饰审核明细表】
repairAuditDetailsMapper.deleteRepairAuditDetailsByTaskId(task.getTaskId());
for (RepairTaskDetails details : detailsList) { for (RepairTaskDetails details : detailsList) {
details.setCreateBy(String.valueOf(loginUser.getUserid())); details.setCreateBy(String.valueOf(loginUser.getUserid()));
details.setTaskId(task.getTaskId()); details.setTaskId(task.getTaskId());

4
bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml
View File

@ -261,6 +261,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
delete from repair_audit_details where id = #{id} delete from repair_audit_details where id = #{id}
</delete> </delete>
<delete id="deleteRepairAuditDetailsByTaskId" parameterType="Long">
delete from repair_audit_details where task_id = #{taskId}
</delete>
<delete id="deleteRepairAuditDetailsByIds" parameterType="String"> <delete id="deleteRepairAuditDetailsByIds" parameterType="String">
delete from repair_audit_details where id in delete from repair_audit_details where id in
<foreach item="id" collection="array" open="(" separator="," close=")"> <foreach item="id" collection="array" open="(" separator="," close=")">