From 5f83dbf4942e7f2e67963ae4ece013c22f091b72 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期五, 25 八月 2023 09:18:26 +0800
Subject: [PATCH] 优化物品

---
 service-community/src/main/java/com/java110/community/cmd/ownerRepair/RepairDispatchCmd.java |   23 +++++------------------
 1 files changed, 5 insertions(+), 18 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 ecaeb28..5f21a53 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
@@ -93,6 +93,7 @@
         if (!reqJson.containsKey("userId")) {
             reqJson.put("userId", context.getReqHeaders().get("user-id"));
         }
+
     }
 
     @Override
@@ -163,7 +164,8 @@
         RepairUserDto repairUserDto = new RepairUserDto();
         repairUserDto.setRepairId(reqJson.getString("repairId"));
         repairUserDto.setCommunityId(reqJson.getString("communityId"));
-        repairUserDto.setState(RepairUserDto.STATE_DOING);
+        //todo 杩欓噷鑰冭檻甯﹁瘎浠�
+        repairUserDto.setStates(new String[]{RepairUserDto.STATE_DOING,RepairUserDto.STATE_EVALUATE});
         repairUserDto.setStaffId(reqJson.getString("userId"));
         List<RepairUserDto> repairUserDtos = repairUserInnerServiceSMOImpl.queryRepairUsers(repairUserDto);
         if (repairUserDtos != null && repairUserDtos.size() != 1) {
@@ -171,26 +173,11 @@
             context.setResponseEntity(responseEntity);
             return;
         }
-//        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"));
-//        repairUserInnerServiceSMOImpl.updateRepairUser(repairUserPo);
-        //澶勭悊浜轰俊鎭�
-//        repairUserPo = new RepairUserPo();
-//        repairUserPo.setRuId("-1");
-//        repairUserPo.setState(RepairUserDto.STATE_DOING);
-//        repairUserPo.setRepairId(reqJson.getString("repairId"));
-//        repairUserPo.setStaffId(reqJson.getString("staffId"));
-//        repairUserPo.setStaffName(reqJson.getString("staffName"));
         RepairUserDto repair = new RepairUserDto();
         repair.setRepairId(reqJson.getString("repairId"));
         repair.setStaffId(reqJson.getString("staffId"));
         repair.setCommunityId(reqJson.getString("communityId"));
-//        repair.setRuId(repairUserDtos.get(0).getPreRuId());
-        repair.setStates(new String[]{RepairUserDto.STATE_TRANSFER, RepairUserDto.STATE_CLOSE, RepairUserDto.STATE_STOP});
+        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())
@@ -209,7 +196,7 @@
                 }
                 return;
             } else {
-                ResponseEntity<String> responseEntity = ResultVo.createResponseEntity(ResultVo.CODE_BUSINESS_VERIFICATION, "闈炲父鎶辨瓑褰撳墠涓嶈兘閫�鍗曪紒");
+                ResponseEntity<String> responseEntity = ResultVo.createResponseEntity(ResultVo.CODE_BUSINESS_VERIFICATION, "闈炲父鎶辨瓑褰撳墠涓嶈兘閫�鍗曪紝鎶ヤ慨璁剧疆涓烘寚娲炬ā寮忎笉鍙繘琛岄��鍗曪紒");
                 context.setResponseEntity(responseEntity);
                 return;
             }

--
Gitblit v1.8.0