修改手机号登录

lidongdong

2022-10-08 61d428d6bdbce2e6a6d4507170dc21c644148b10

 flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java

@@ -99,10 +99,6 @@
            return ResultData.error("导办人员id不能为空");
        }

        if(StringUtils.isEmpty(order.getGuideUserPhone()))
        {
            return ResultData.error("导办人员电话不能为空");
        }

        //已分配
        order.setState("2");
@@ -154,19 +150,21 @@
        {
            return ResultData.error("该工单已办结!");
        }

        if(!StringUtils.equals(order.getState(),"2"))
        {
            return ResultData.error("该工单非是待办状态！");
        if(StringUtils.equals(entity.getState(),"2")){//如果用户选择未解决则状态改为待办
            order.setState("2");
            entity.setState("8");
        }
        //待评价
        order.setState("4");
        else if(StringUtils.equals(entity.getState(),"4")){
            //待评价
            order.setState("4");
            entity.setState("9");
        }
        //新增已办结记录
        entity.setCreateTime(LocalDateTime.now());
        entity.setUpdateTime(LocalDateTime.now());
        entity.setState("4");
        entity.setFromDepartmentalId(sysUser.getDepartmentId());
        entity.setFromUserId(sysUser.getUserId()+"");
        entity.setGuideId(order.getId().toString());
        iGuideEvolveService.insertConfig(entity);
        return toAjax(iGuideRepairOrderService.updateConfig(order));
    }
@@ -227,37 +225,48 @@
    @Authorization
    public ResultData evaluate(@RequestBody GuideRepairOrder entity, @CurrentUser SysUser sysUser)
    {
        if(entity==null)
//        if(entity==null)
//        {
//            return ResultData.error("参数不能为空");
//        }
//
//        if(entity.getId()<=0)
//        {
//            return ResultData.error("工单id不能为空");
//        }
//
//        if(!StringUtils.equals(entity.getState(),"4"))
//        {
//            return ResultData.error("该工单不能评价！");
//        }
//
//        if(StringUtils.isEmpty(entity.getEvaluateState()))
//        {
//            return ResultData.error("满意程度不能为空！");
//        }


        if(sysUser==null)
        {
            return ResultData.error("参数不能为空");
            return ResultData.error("sysUser为空！");
        }

        if(entity.getId()<=0)
        {
            return ResultData.error("工单id不能为空");
        }

        if(!StringUtils.equals(entity.getState(),"4"))
        {
            return ResultData.error("该工单不能评价！");
        }

        if(StringUtils.isEmpty(entity.getEvaluateState()))
        {
            return ResultData.error("满意程度不能为空！");
        }

        //已办结
        entity.setState("3");
        //新增已办结记录
        GuideEvolveEntity guideEvolveEntity=new GuideEvolveEntity();
        guideEvolveEntity.setCreateTime(LocalDateTime.now());
        guideEvolveEntity.setUpdateTime(LocalDateTime.now());
        guideEvolveEntity.setState("3");
        guideEvolveEntity.setFromDepartmentalId(sysUser.getDepartmentId());
        guideEvolveEntity.setFromUserId(sysUser.getUserId()+"");
        iGuideEvolveService.insertConfig(guideEvolveEntity);
//        entity.setState("3");
//        //新增已办结记录
//        GuideEvolveEntity guideEvolveEntity=new GuideEvolveEntity();
//        guideEvolveEntity.setCreateTime(LocalDateTime.now());
//        guideEvolveEntity.setUpdateTime(LocalDateTime.now());
//        guideEvolveEntity.setState("3");
//        guideEvolveEntity.setFromDepartmentalId(sysUser.getDepartmentId());
//        guideEvolveEntity.setFromUserId(sysUser.getUserId()+"");
//        iGuideEvolveService.insertConfig(guideEvolveEntity);

        return toAjax(iGuideRepairOrderService.updateConfig(entity));
//        return toAjax(iGuideRepairOrderService.updateConfig(entity));
        return ResultData.success(sysUser.getUserId()+"");
    }

    /**