From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-community/src/main/java/com/java110/community/bmo/repairReturnVisit/impl/SaveRepairReturnVisitBMOImpl.java | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/bmo/repairReturnVisit/impl/SaveRepairReturnVisitBMOImpl.java b/service-community/src/main/java/com/java110/community/bmo/repairReturnVisit/impl/SaveRepairReturnVisitBMOImpl.java
index e094411..b72254f 100644
--- a/service-community/src/main/java/com/java110/community/bmo/repairReturnVisit/impl/SaveRepairReturnVisitBMOImpl.java
+++ b/service-community/src/main/java/com/java110/community/bmo/repairReturnVisit/impl/SaveRepairReturnVisitBMOImpl.java
@@ -20,6 +20,7 @@
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -62,21 +63,27 @@
RepairUserDto repairUserDto = new RepairUserDto();
repairUserDto.setRepairId(repairReturnVisitPo.getRepairId());
repairUserDto.setCommunityId(repairReturnVisitPo.getCommunityId());
- if (repairChannel.equals("Z")) { //濡傛灉鏄笟涓荤鎶ヤ慨锛屽氨鏌ヨ鏄惁鏈夊凡璇勪环鐘舵�佺殑
- repairUserDto.setState(RepairUserDto.STATE_FINISH);
- } else if (!StringUtil.isEmpty(maintenanceType) && maintenanceType.equals("1001")) { //濡傛灉涓嶆槸涓氫富绔姤淇紝涓旀槸鏈夊伩鐨勶紝灏辨煡璇㈠凡鏀粯鐘舵�佺殑
- repairUserDto.setState(RepairUserDto.STATE_FINISH_PAY_FEE);
- } else { //鍏朵粬鐨勬煡璇㈢粨鍗曠姸鎬佺殑
- repairUserDto.setState(RepairUserDto.STATE_CLOSE);
- }
+// if (repairChannel.equals("Z")) { //濡傛灉鏄笟涓荤鎶ヤ慨锛屽氨鏌ヨ鏄惁鏈夊凡璇勪环鐘舵�佺殑
+// repairUserDto.setState(RepairUserDto.STATE_FINISH);
+// } else if (!StringUtil.isEmpty(maintenanceType) && maintenanceType.equals("1001")) { //濡傛灉涓嶆槸涓氫富绔姤淇紝涓旀槸鏈夊伩鐨勶紝灏辨煡璇㈠凡鏀粯鐘舵�佺殑
+// repairUserDto.setState(RepairUserDto.STATE_FINISH_PAY_FEE);
+// } else { //鍏朵粬鐨勬煡璇㈢粨鍗曠姸鎬佺殑
+// repairUserDto.setState(RepairUserDto.STATE_CLOSE);
+// }
+
+ repairUserDto.setStates(new String[]{RepairUserDto.STATE_FINISH, RepairUserDto.STATE_FINISH_PAY_FEE, RepairUserDto.STATE_CLOSE});
//鏌ヨ鎶ヤ慨娲惧崟鐘舵��
List<RepairUserDto> repairUserDtos = repairUserInnerServiceSMOImpl.queryRepairUsers(repairUserDto);
- Assert.listOnlyOne(repairUserDtos, "淇℃伅閿欒");
+
+ if (repairUserDtos == null || repairUserDtos.size() < 1) {
+ throw new IllegalArgumentException("鏈煡璇㈠埌 鎺ュ崟 寰呮敮浠� 鎴栬�� 璇勪环瀹屾垚鐨勫伐鍗曪紝涓嶈兘鍥炶");
+ }
+ repairUserDto = repairUserDtos.get(repairUserDtos.size() - 1);
RepairUserPo repairUserPo = new RepairUserPo();
repairUserPo.setRuId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_ruId));
repairUserPo.setEndTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- Date endTime = repairUserDtos.get(0).getEndTime();
+ Date endTime = repairUserDto.getEndTime();
repairUserPo.setStartTime(format.format(endTime));
repairUserPo.setState(RepairUserDto.STATE_FINISH_VISIT);
repairUserPo.setContext(repairReturnVisitPo.getContext());
@@ -85,9 +92,9 @@
repairUserPo.setRepairId(repairReturnVisitPo.getRepairId());
repairUserPo.setStaffId(repairReturnVisitPo.getVisitPersonId());
repairUserPo.setStaffName(repairReturnVisitPo.getVisitPersonName());
- repairUserPo.setPreStaffId(repairUserDtos.get(0).getStaffId());
- repairUserPo.setPreStaffName(repairUserDtos.get(0).getStaffName());
- repairUserPo.setPreRuId(repairUserDtos.get(0).getRuId());
+ repairUserPo.setPreStaffId(repairUserDto.getStaffId());
+ repairUserPo.setPreStaffName(repairUserDto.getStaffName());
+ repairUserPo.setPreRuId(repairUserDto.getRuId());
repairUserPo.setRepairEvent("auditUser");
repairUserPo.setbId("-1");
repairUserInnerServiceSMOImpl.saveRepairUser(repairUserPo);
--
Gitblit v1.8.0