From 904c793e1c8af98086b108cc2277d2f74763fddc Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 16 七月 2025 14:31:05 +0800
Subject: [PATCH] 二保流程代码
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java | 22 ++++++++++++----------
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamSecondMaintenanceRequest.java | 7 ++-----
2 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamSecondMaintenanceRequest.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamSecondMaintenanceRequest.java
index de66e47..26ed73e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamSecondMaintenanceRequest.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamSecondMaintenanceRequest.java
@@ -137,11 +137,8 @@
@ApiModelProperty(value = "澶囨敞")
private String remark;
- /**鍒楄〃 缁翠慨宸ユ槑缁�*/
+ /**鍒楄〃 鏄庣粏*/
@ApiModelProperty(value = "鍒楄〃 缁翠慨宸ユ槑缁�")
- private List<EamSecondMaintenanceOrderDetail> repairmanDetailList;;
+ private List<EamSecondMaintenanceOrderDetail> tableDetailList;;
- /**鍒楄〃 鎿嶄綔宸ユ槑缁�*/
- @ApiModelProperty(value = "鍒楄〃 缁翠慨宸ユ槑缁�")
- private List<EamSecondMaintenanceOrderDetail> operatorDetailList;;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java
index 26c65af..b8cd1ce 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java
@@ -379,7 +379,7 @@
values.put("comment", "浜屼繚鎿嶄綔宸ユ墽琛岀粨鏉�");
request.setComment("浜屼繚鎿嶄綔宸ユ墽琛岀粨鏉�");
//澶勭悊瀵瑰簲璇︽儏
- if (CollectionUtils.isNotEmpty(request.getOperatorDetailList())){
+ if (CollectionUtils.isNotEmpty(request.getTableDetailList())){
//鍒犻櫎鍘熸湁鏁版嵁
List<EamSecondMaintenanceOrderDetail> addList = new ArrayList<>();
//鍏堝垹闄ゅ師鏈�
@@ -387,7 +387,7 @@
queryWrapper.eq(EamSecondMaintenanceOrderDetail::getOrderId, entity.getId());
queryWrapper.eq(EamSecondMaintenanceOrderDetail::getItemCategory,EamMaintenanceStandardDetailCategory.OPERATOR_MAINTENANCE.name());
secondMaintenanceOrderDetailService.remove(queryWrapper);
- request.getOperatorDetailList().forEach(tableDetail -> {
+ request.getTableDetailList().forEach(tableDetail -> {
EamSecondMaintenanceOrderDetail eamMaintenanceStandardDetail=new EamSecondMaintenanceOrderDetail();
BeanUtils.copyProperties(tableDetail, eamMaintenanceStandardDetail);
eamMaintenanceStandardDetail.setOrderId(entity.getId());
@@ -401,7 +401,7 @@
values.put("comment", "浜屼繚缁翠慨宸ユ墽琛岀粨鏉�");
request.setComment("浜屼繚缁翠慨宸ユ墽琛岀粨鏉�");
//澶勭悊瀵瑰簲璇︽儏
- if (CollectionUtils.isNotEmpty(request.getRepairmanDetailList())){
+ if (CollectionUtils.isNotEmpty(request.getTableDetailList())){
//鍒犻櫎鍘熸湁鏁版嵁
List<EamSecondMaintenanceOrderDetail> addList = new ArrayList<>();
//鍏堝垹闄ゅ師鏈�
@@ -409,7 +409,7 @@
queryWrapper.eq(EamSecondMaintenanceOrderDetail::getOrderId, entity.getId());
queryWrapper.eq(EamSecondMaintenanceOrderDetail::getItemCategory,EamMaintenanceStandardDetailCategory.REPAIRER_MAINTENANCE.name());
secondMaintenanceOrderDetailService.remove(queryWrapper);
- request.getRepairmanDetailList().forEach(tableDetail -> {
+ request.getTableDetailList().forEach(tableDetail -> {
EamSecondMaintenanceOrderDetail eamMaintenanceStandardDetail=new EamSecondMaintenanceOrderDetail();
BeanUtils.copyProperties(tableDetail, eamMaintenanceStandardDetail);
eamMaintenanceStandardDetail.setOrderId(entity.getId());
@@ -422,35 +422,37 @@
break;
case WAIT_ADMIN_CONFIRM:
//绠＄悊鍛樼‘璁�
- userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0003);
+ userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0006);
if (CollectionUtil.isEmpty(userSelectors)) {
throw new JeecgBootException("璁惧鏈瓨鍦ㄦ鏌ヤ汉锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
}else{
userApprovalList= userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
values.put("NextAssignee", userApprovalList);
values.put("dataId", entity.getId());
- values.put("organization",request.getComment());
- values.put("comment", request.getComment());
+ values.put("organization",request.getDealDescription());
+ values.put("comment", request.getDealDescription());
values.put("manageUserResult",request.getManageUserResult());
entity.setMaintenanceStatus(SecondMaintenanceStatusEnum.WAIT_INSPECTOR_CONFIRM.name());
entity.setManageUser(user.getUsername());
entity.setProblemDescription(request.getProblemDescription());
entity.setManageUserResult(request.getManageUserResult());
- entity.setDealDescription(request.getComment());
+ entity.setDealDescription(request.getDealDescription());
entity.setConfirmTime(new Date());
+ request.setComment(request.getDealDescription());
}
break;
case WAIT_INSPECTOR_CONFIRM:
//妫�鏌ヤ汉纭
values.put("dataId", entity.getId());
- values.put("organization",request.getComment());
- values.put("comment", request.getComment());
+ values.put("organization",request.getInspectConfirmComment());
+ values.put("comment", request.getInspectConfirmComment());
values.put("inspectorResult",request.getInspectorResult());
entity.setMaintenanceStatus(SecondMaintenanceStatusEnum.COMPLETE.name());
entity.setInspector(user.getUsername());
entity.setInspectorResult(request.getInspectorResult());
entity.setInspectConfirmComment(request.getInspectConfirmComment());
entity.setInspectConfirmTime(new Date());
+ request.setComment(request.getDealDescription());
break;
default:
throw new JeecgBootException("瀹℃壒澶辫触");
--
Gitblit v1.9.3