Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-10-11 2e5ffea1fc7263fff8e3b6a87707233597c07c8f

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

@@ -43,7 +43,13 @@
    public ResultData addOrder(@RequestBody GuideRepairOrder guideRepairOrder,@CurrentUser SysUser sysUser) {
          guideRepairOrder.setSubmitUserId(sysUser.getUserId().toString());
          guideRepairOrder.setSubmitUserPhone(sysUser.getPhonenumber());
          return toAjax(iGuideRepairOrderService.addOrder(guideRepairOrder));
          int i = iGuideRepairOrderService.addOrder(guideRepairOrder);
          if (i>0){
              iGuideEvolveService.updateGuid();
             return ResultData.success();
          }
          else
            return  ResultData.error();
    }


@@ -244,6 +250,7 @@
        {
            return ResultData.error("满意程度不能为空！");
        }

        //已办结
        entity.setState("3");
        //新增已办结记录
@@ -253,9 +260,11 @@
        guideEvolveEntity.setState("3");
        guideEvolveEntity.setFromDepartmentalId(sysUser.getDepartmentId());
        guideEvolveEntity.setFromUserId(sysUser.getUserId()+"");
        iGuideEvolveService.insertConfig(guideEvolveEntity);

        return toAjax(iGuideRepairOrderService.updateConfig(entity));
        int i = iGuideRepairOrderService.updateConfig(entity);
        if (i>0)
            return toAjax( iGuideEvolveService.insertConfig(guideEvolveEntity));
        else
            return ResultData.error();
    }

    /**