Compare commits

...

3 Commits

Author SHA1 Message Date
xiaofajia
e87cafee78 修改重新派工逻辑 2024-11-05 10:44:40 +08:00
xiaofajia
56f84995cc Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair
# Conflicts:
#	dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
#	dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlRepairTicketsReqVO.java
2024-11-05 10:38:42 +08:00
xiaofajia
3f45d05344 修改重新派工逻辑 2024-11-05 10:37:01 +08:00
3 changed files with 20 additions and 3 deletions

View File

@ -74,7 +74,10 @@ public enum RecordTypeEnum {
ZFGG("zfgg", "作废工单"), ZFGG("zfgg", "作废工单"),
/** 删除工单 */ /** 删除工单 */
SCGG("scgg", "删除工单"); SCGG("scgg", "删除工单"),
/** 内返派工 */
NFPG("nfpg", "内返派工");
/** /**
* code * code

View File

@ -961,14 +961,25 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
throw exception0(500, "工单已开始"); throw exception0(500, "工单已开始");
} }
repairWorkerService.sentMessage(reqVO.getNowRepairId(), "您有新的工单要处理"); repairWorkerService.sentMessage(reqVO.getNowRepairId(), "您有新的工单要处理");
//最后记录操作日志--指派施工
//最后记录操作日志--指派施工--pull下来的逻辑
String code = RecordTypeEnum.ZPSG.getCode(); String code = RecordTypeEnum.ZPSG.getCode();
String remark ="指派施工"; String remark ="指派施工";
if(StringUtils.isNotEmpty(reqVO.getOperateCode())){ if(StringUtils.isNotEmpty(reqVO.getOperateCode())){
code = reqVO.getOperateCode(); code = reqVO.getOperateCode();
remark = "维修完成移交下一班组维修"; remark = "维修完成移交下一班组维修";
} }
repairRecordsService.saveRepairRecord(reqVO.getId(), null,code, remark, null);
// 获取当前操作人的身份----小李新加的逻辑
String userRole = getUserRole();
// 总检
if (userRole.equals(RepairRoleEnum.INSPECTION.getCode())){
repairRecordsService.saveRepairRecord(reqVO.getId(), null, RecordTypeEnum.NFPG.getCode(), reqVO.getRemark(), reqVO.getImage());
}else {
// 其他
//最后记录操作日志--指派施工
repairRecordsService.saveRepairRecord(reqVO.getId(), null, code, remark, null);
}
} }
/** /**

View File

@ -34,6 +34,9 @@ public class DlRepairTicketsReqVO extends DlRepairTickets {
/** 人员角色code */ /** 人员角色code */
private String roleCode; private String roleCode;
/** 图片路径 */
private String image;
/** 操作类型默认是指派施工 --zpsg */ /** 操作类型默认是指派施工 --zpsg */
private String operateCode; private String operateCode;
} }