From 4f3b666cd625381e4acb07d8ae4d68ae9554b1b8 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 06 十一月 2023 18:12:49 +0800
Subject: [PATCH] Merge branch 'xinghong-dev' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-community/src/main/java/com/java110/community/cmd/ownerRepair/RepairDispatchCmd.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/ownerRepair/RepairDispatchCmd.java b/service-community/src/main/java/com/java110/community/cmd/ownerRepair/RepairDispatchCmd.java
index 5f21a53..b1b9d47 100644
--- a/service-community/src/main/java/com/java110/community/cmd/ownerRepair/RepairDispatchCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/ownerRepair/RepairDispatchCmd.java
@@ -74,7 +74,6 @@
@Autowired
private IRepairUserV1InnerServiceSMO repairUserV1InnerServiceSMOImpl;
-
//鍩�
public static final String DOMAIN_COMMON = "DOMAIN.COMMON";
@@ -102,13 +101,13 @@
// RepairUserPo repairUserPo = BeanConvertUtil.covertBean(reqJson, RepairUserPo.class);
String action = reqJson.getString("action");
switch (action) {
- case ACTION_DISPATCH:
+ case ACTION_DISPATCH: //娲惧崟
dispacthRepair(context, reqJson);
break;
- case ACTION_TRANSFER:
+ case ACTION_TRANSFER: //杞崟
transferRepair(context, reqJson);
break;
- case ACTION_BACK:
+ case ACTION_BACK: //閫�鍗�
backRepair(context, reqJson);
break;
}
@@ -180,8 +179,8 @@
repair.setStates(new String[]{RepairUserDto.STATE_TRANSFER, RepairUserDto.STATE_CLOSE, RepairUserDto.STATE_STOP,RepairUserDto.STATE_EVALUATE});
List<RepairUserDto> repairUsers = repairUserInnerServiceSMOImpl.queryRepairUsers(repair);
if (repairUsers == null || repairUsers.size() < 1) { //鎸囨淳鐨勪笉鑳介��鍗�
- if (RepairDto.REPAIR_WAY_GRABBING.equals(repairDtos.get(0).getRepairWay())
- || RepairDto.REPAIR_WAY_TRAINING.equals(repairDtos.get(0).getRepairWay())) {
+ if (RepairDto.REPAIR_WAY_GRABBING.equals(repairDtos.get(0).getRepairWay())
+ || RepairDto.REPAIR_WAY_TRAINING.equals(repairDtos.get(0).getRepairWay())) { //鎶㈠崟銆佽疆璁�
modifyBusinessRepairDispatch(reqJson, RepairDto.STATE_WAIT);//缁翠慨鍗曞彉鎴愭湭娲惧崟
//鎶婅嚜宸辨敼鎴愰��鍗�
RepairUserPo repairUser = new RepairUserPo();
@@ -268,7 +267,7 @@
context.setResponseEntity(responseEntity);
return;
}
- //鎻掑叆娲惧崟鑰呯殑淇℃伅
+ //鏇存敼杞崟鑰呯殑淇℃伅
RepairUserPo repairUserPo = new RepairUserPo();
repairUserPo.setRuId(repairUserDtos.get(0).getRuId());
repairUserPo.setEndTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
@@ -278,7 +277,8 @@
flag = repairUserV1InnerServiceSMOImpl.updateRepairUserNew(repairUserPo);
if (flag < 1) {
throw new CmdException("淇敼鐢ㄦ埛澶辫触");
- } //澶勭悊浜轰俊鎭�
+ }
+ //澶勭悊浜轰俊鎭�
repairUserPo = new RepairUserPo();
repairUserPo.setRuId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_ruId));
repairUserPo.setState(RepairUserDto.STATE_DOING);
@@ -315,7 +315,7 @@
String staffId = reqJson.getString("staffId");
RepairDto repair = new RepairDto();
repair.setStaffId(staffId);
- repair.setState("10001"); //澶勭悊涓�
+ repair.setState("1100"); //鎺ュ崟鐘舵��
int i = repairInnerServiceSMOImpl.queryStaffRepairsCount(repair);
//鍙栧嚭寮�鍏虫槧灏勭殑鍊�(缁翠慨甯堝倕鏈鐞嗘渶澶у崟鏁�)
String repairNumber = MappingCache.getValue(MappingConstant.REPAIR_DOMAIN, REPAIR_NUMBER);
@@ -335,7 +335,7 @@
RepairDto repairDto = new RepairDto();
repairDto.setRepairId(repairId);
List<RepairDto> repairDtos = repairInnerServiceSMOImpl.queryRepairs(repairDto);
- if (repairDtos == null || repairDtos.size() < 1) {
+ if (repairDtos == null || repairDtos.size() != 1) {
ResponseEntity<String> responseEntity = ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "鏁版嵁閿欒锛�");
context.setResponseEntity(responseEntity);
} else {
@@ -346,7 +346,7 @@
String userName = reqJson.getString("userName");
String ruId = GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_ruId);
- // 鑷繁鐨勫崟瀛愮姸鎬佷慨鏀逛负杞崟
+ // 鑷繁鐨勫崟瀛愮姸鎬佷慨鏀逛负娲惧崟
RepairUserPo repairUserPo = new RepairUserPo();
repairUserPo.setRuId(ruId);
repairUserPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
@@ -431,7 +431,6 @@
JSONObject businessOwnerRepair = new JSONObject();
businessOwnerRepair.putAll(BeanConvertUtil.beanCovertMap(repairDtos.get(0)));
businessOwnerRepair.put("state", state);
- //璁＄畻 搴旀敹閲戦
RepairPoolPo repairPoolPo = BeanConvertUtil.covertBean(businessOwnerRepair, RepairPoolPo.class);
int flag = repairPoolV1InnerServiceSMOImpl.updateRepairPoolNew(repairPoolPo);
if (flag < 1) {
--
Gitblit v1.8.0