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

Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair

Browse Source 
# Conflicts:
#	dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
This commit is contained in:
Vinjor 2024-11-05 10:54:57 +08:00
commit 6148f263af
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dl-module-repair/src/main/java/cn/iocoder/yudao/common/RecordTypeEnum.java
View File

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

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

@ -961,10 +961,20 @@ 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 ="指派施工";
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);
}
} }
/** /**

4
dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlRepairTicketsReqVO.java
View File

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