From 4dbf61c9189796ec46d39ac4b839cfc064e70411 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 12 八月 2021 16:11:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/listener/ownerRepair/RepairDispatchListener.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/listener/ownerRepair/RepairDispatchListener.java b/service-api/src/main/java/com/java110/api/listener/ownerRepair/RepairDispatchListener.java
index 02b6a8f..72cb44d 100755
--- a/service-api/src/main/java/com/java110/api/listener/ownerRepair/RepairDispatchListener.java
+++ b/service-api/src/main/java/com/java110/api/listener/ownerRepair/RepairDispatchListener.java
@@ -156,14 +156,13 @@
repairUserDto.setStaffId(userId);
List<RepairUserDto> repairUserDtos = repairUserInnerServiceSMOImpl.queryRepairUsers(repairUserDto);
Assert.listOnlyOne(repairUserDtos, "褰撳墠鐢ㄦ埛娌℃湁闇�瑕佸鐞嗚鍗�");
- //鎶婅嚜宸辨敼鎴愰��鍗�
+ String ruId = repairUserDtos.get(0).getRuId();
RepairUserPo repairUserPo = new RepairUserPo();
repairUserPo.setRuId(repairUserDtos.get(0).getRuId());
repairUserPo.setEndTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
repairUserPo.setState(RepairUserDto.STATE_BACK);
repairUserPo.setContext(reqJson.getString("context"));
repairUserPo.setCommunityId(reqJson.getString("communityId"));
- super.update(context, repairUserPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_REPAIR_USER);
//澶勭悊浜轰俊鎭�
repairUserPo = new RepairUserPo();
repairUserPo.setRuId("-1");
@@ -185,12 +184,31 @@
|| RepairDto.REPAIR_WAY_TRAINING.equals(repairDtos.get(0).getRepairWay())
) {
ownerRepairBMOImpl.modifyBusinessRepairDispatch(reqJson, context, RepairDto.STATE_WAIT);
+ //鎶婅嚜宸辨敼鎴愰��鍗�
+ RepairUserPo repairUser = new RepairUserPo();
+ repairUser.setRuId(ruId);
+ repairUser.setEndTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ repairUser.setState(RepairUserDto.STATE_BACK);
+ repairUser.setContext(reqJson.getString("context"));
+ repairUser.setCommunityId(reqJson.getString("communityId"));
+ super.update(context, repairUser, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_REPAIR_USER);
return;
} else {
- throw new IllegalArgumentException("闈炲父鎶辨瓑褰撳墠涓嶈兘閫�鍗�");
+ ResponseEntity<String> responseEntity = ResultVo.createResponseEntity(ResultVo.CODE_BUSINESS_VERIFICATION, "闈炲父鎶辨瓑褰撳墠涓嶈兘閫�鍗曪紒");
+ context.setResponseEntity(responseEntity);
+ return;
}
}
+ //鎶婅嚜宸辨敼鎴愰��鍗�
+ RepairUserPo repairUser = new RepairUserPo();
+ repairUser.setRuId(ruId);
+ repairUser.setEndTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ repairUser.setState(RepairUserDto.STATE_BACK);
+ repairUser.setContext(reqJson.getString("context"));
+ repairUser.setCommunityId(reqJson.getString("communityId"));
+ super.update(context, repairUser, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_REPAIR_USER);
+
repairUserPo.setPreStaffId(repairUserDtos.get(0).getPreStaffId());
repairUserPo.setPreStaffName(repairUserDtos.get(0).getPreStaffName());
repairUserPo.setPreRuId(repairUserDtos.get(0).getPreRuId());
--
Gitblit v1.8.0