diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lossAssessment/service/impl/LossAssessmentServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lossAssessment/service/impl/LossAssessmentServiceImpl.java index cf72bdd2..5154730d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lossAssessment/service/impl/LossAssessmentServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lossAssessment/service/impl/LossAssessmentServiceImpl.java @@ -265,7 +265,7 @@ public class LossAssessmentServiceImpl implements LossAssessmentService { //2、修改任务状态 mapper.updateSingleTaskStatus(task, loginUser.getUserid(), RepairTaskStatusEnum.TASK_LOSS_ASSESSMENT_COMPLETE.getStatus()); //将数据status状态都置为1 - mapper.updateStatus(task.getTaskId()); +// mapper.updateStatus(task.getTaskId()); //3、重新生成维修数据 for (RepairTaskDetails repairTaskDetails : detailsList){ repairTaskDetails.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getNickName()); @@ -388,7 +388,7 @@ public class LossAssessmentServiceImpl implements LossAssessmentService { task.setTaskId(bean.getTaskId()); mapper.updateSingleTaskStatus(task, loginUser.getUserid(), RepairTaskStatusEnum.TASK_LOSS_ASSESSMENT_COMPLETE.getStatus()); //将数据status状态都置为1 - mapper.updateStatus(task.getTaskId()); +// mapper.updateStatus(task.getTaskId()); //3、重新生成维修数据 for (RepairTaskDetails repairTaskDetails : detailsList){ repairTaskDetails.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getNickName()); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTask.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTask.java index bfbca895..02a794ca 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTask.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTask.java @@ -191,7 +191,7 @@ public class RepairTask { private String firstId; /** - * 数据状态 3-修饰后入库驳回 + * 数据状态 0-未定损,1-已定损 3-修饰后入库驳回 */ private String dataStatus; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceVO.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceVO.java index e6110300..0fa013cc 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceVO.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceVO.java @@ -130,6 +130,11 @@ public class RepairDeviceVO { @ApiModelProperty(value = "一级类型id") private Long firstId; + /** + * 数据状态 0-未定损,1-已定损 3-修饰后入库驳回 + */ + private String dataStatus; + // 手动覆盖 getter 方法,确保 List 始终被初始化 public List getCodeInRepairPartList() { if (this.codeInRepairPartList == null) {this.codeInRepairPartList = new ArrayList<>();} diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lossAssessment/LossAssessmentMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lossAssessment/LossAssessmentMapper.xml index b335e358..c2d73dcd 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lossAssessment/LossAssessmentMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lossAssessment/LossAssessmentMapper.xml @@ -164,6 +164,7 @@ repair_apply_details set repairer = #{repairer}, + status = 1, remark = #{remark}, diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml index f334ca71..2adf8ff3 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml @@ -271,7 +271,8 @@ bai.CODE AS backCode, GROUP_CONCAT(DISTINCT mt2.type_name) as type, rd.level as level, - GROUP_CONCAT(DISTINCT mt4.type_id) as firstId + GROUP_CONCAT(DISTINCT mt4.type_id) as firstId, + rd.status as dataStatus FROM repair_apply_details rd LEFT JOIN ma_type mt on rd.type_id = mt.type_id @@ -387,6 +388,7 @@