优化物品

Your Name

2023-08-25 5f83dbf4942e7f2e67963ae4ece013c22f091b72

 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;
            }