ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -401,6 +401,7 @@ ivrTaskVO.setCreateBy(user.getNickName()); ivrTaskVO.setUpdateBy(user.getNickName()); ivrTaskVO.setOrgid(user.getOrgid()); ivrTaskVO.setCampusid(user.getCampusid()); return success(serviceSubtaskService.insertOrUpdateTask(ivrTaskVO)); } @@ -426,6 +427,7 @@ public AjaxResult addSubTask(@RequestBody ServiceSubtask serviceSubtask) { SysUser user = getLoginUser().getUser(); if (ObjectUtils.isNotEmpty(user)) serviceSubtask.setOrgid(user.getOrgid()); if (ObjectUtils.isNotEmpty(user)) serviceSubtask.setCampusid(user.getCampusid()); return toAjax(serviceSubtaskService.insertServiceSubtask(serviceSubtask)); } @@ -435,6 +437,7 @@ public AjaxResult addSubTaskAgain(@RequestBody ServiceSubtask serviceSubtask) { SysUser user = getLoginUser().getUser(); if (ObjectUtils.isNotEmpty(user)) serviceSubtask.setOrgid(user.getOrgid()); if (ObjectUtils.isNotEmpty(user)) serviceSubtask.setCampusid(user.getCampusid()); return success(serviceSubtaskService.addSubTaskAgain(serviceSubtask)); }
@@ -150,10 +150,11 @@ @Log(title = "语音任务", businessType = BusinessType.INSERT) @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid") @PostMapping("/add") public AjaxResult add(@RequestBody ServiceTask ServiceTask) { public AjaxResult add(@RequestBody ServiceTask serviceTask) { SysUser user = getLoginUser().getUser(); ServiceTask.setOrgid(user.getOrgid()); return toAjax(serviceTaskService.insertServiceTask(ServiceTask)); serviceTask.setOrgid(user.getOrgid()); serviceTask.setCampusid(user.getCampusid()); return toAjax(serviceTaskService.insertServiceTask(serviceTask)); } /** ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskSingleController.java
@@ -37,6 +37,8 @@ LoginUser loginUser = getLoginUser(); SysUser user = loginUser.getUser(); svyTaskVO.setCreateBy(user.getNickName()); svyTaskVO.setOrgid(user.getOrgid()); svyTaskVO.setCampusid(svyTaskVO.getCampusid()); ServiceTaskVO serviceTaskVO = DtoConversionUtils.sourceToTarget(svyTaskVO, ServiceTaskVO.class); return toAjax(svyTaskSingleService.insertOrUpdateSvyTask(serviceTaskVO)); } ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -864,7 +864,7 @@ } } } else if (active.equals("hzszlyy")) {//市一医院 String content = sendMagParam.getContent().replace("【新华医院】", ""); String content = sendMagParam.getContent().replace("【市一医院】", ""); String result = smsUtils.sendSms(xhsmsPath, xhsmsAccount, xhsmsPwd, sendMagParam.getPhone(), content); //这里需要根据result返回的值去判断，是否成功，然后将值赋值给isSuccess if (StringUtils.isNotEmpty(result) && result.contains("处理成功")) { smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
@@ -357,6 +357,12 @@ private String orgid; /** * 院区ID */ @ApiModelProperty(value = "院区ID") private String campusid; /** * 文本变量参数 */ @Excel(name = "文本变量参数") smartor/src/main/java/com/smartor/domain/ServiceTask.java
@@ -256,6 +256,12 @@ private String orgid; /** * 院区ID */ @ApiModelProperty(value = "院区ID") private String campusid; /** * 父ID */ @Excel(name = " 父ID ") smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -36,6 +36,7 @@ <result property="isupload" column="isupload"/> <result property="uploadTime" column="upload_time"/> <result property="orgid" column="orgid"/> <result property="campusid" column="campusid"/> <result property="pid" column="pid"/> <result property="guid" column="guid"/> <result property="taskGuid" column="task_guid"/> @@ -812,6 +813,7 @@ <if test="isupload != null">isupload,</if> <if test="uploadTime != null">upload_time,</if> <if test="orgid != null">orgid,</if> <if test="campusid != null">campusid,</if> <if test="pid != null">pid,</if> <if test="guid != null">guid,</if> <if test="textParam != null">text_param,</if> @@ -904,6 +906,7 @@ <if test="isupload != null">#{isupload},</if> <if test="uploadTime != null">#{uploadTime},</if> <if test="orgid != null">#{orgid},</if> <if test="campusid != null">#{campusid},</if> <if test="pid != null">#{pid},</if> <if test="guid != null">#{guid},</if> <if test="textParam != null">#{textParam},</if> @@ -1001,6 +1004,7 @@ <if test="isupload != null">isupload = #{isupload},</if> <if test="uploadTime != null">upload_time = #{uploadTime},</if> <if test="orgid != null">orgid = #{orgid},</if> <if test="campusid != null">campusid = #{campusid},</if> <if test="pid != null">pid = #{pid},</if> <if test="guid != null">guid = #{guid},</if> <if test="textParam != null">text_param = #{textParam},</if> @@ -1099,6 +1103,7 @@ <if test="isupload != null">isupload = #{isupload},</if> <if test="uploadTime != null">upload_time = #{uploadTime},</if> <if test="orgid != null">orgid = #{orgid},</if> <if test="campusid != null">campusid = #{campusid},</if> <if test="pid != null">pid = #{pid},</if> <if test="guid != null">guid = #{guid},</if> <if test="textParam != null">text_param = #{textParam},</if> @@ -1201,6 +1206,7 @@ <if test="isupload != null">isupload = #{isupload},</if> <if test="uploadTime != null">upload_time = #{uploadTime},</if> <if test="orgid != null">orgid = #{orgid},</if> <if test="campusid != null">campusid = #{campusid},</if> <if test="pid != null">pid = #{pid},</if> <if test="guid != null">guid = #{guid},</if> <if test="visitCount != null">visit_count = #{visitCount},</if> @@ -1300,6 +1306,7 @@ <if test="isupload != null">isupload = #{isupload},</if> <if test="uploadTime != null">upload_time = #{uploadTime},</if> <if test="orgid != null">orgid = #{orgid},</if> <if test="campusid != null">campusid = #{campusid},</if> <if test="pid != null">pid = #{pid},</if> <if test="guid != null">guid = #{guid},</if> <if test="textParam != null">text_param = #{textParam},</if> smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
@@ -30,6 +30,7 @@ <result property="isupload" column="isupload"/> <result property="uploadTime" column="upload_time"/> <result property="orgid" column="orgid"/> <result property="campusid" column="campusid"/> <result property="pid" column="pid"/> <result property="guid" column="guid"/> <result property="preachform" column="preachform"/> @@ -161,6 +162,7 @@ <if test="isupload != null ">and isupload = #{isupload}</if> <if test="uploadTime != null ">and upload_time = #{uploadTime}</if> <if test="orgid != null and orgid != ''">and orgid = #{orgid}</if> <if test="campusid != null and campusid != ''">and campusid = #{campusid}</if> <if test="compensateDate != null and compensateDate != ''">and compensate_date = #{compensateDate}</if> <if test="hospType != null and hospType != ''">and hosp_type = #{hospType}</if> <if test="libtemplateid != null ">and libtemplateid = #{libtemplateid}</if> @@ -367,6 +369,7 @@ <if test="isupload != null">isupload,</if> <if test="uploadTime != null">upload_time,</if> <if test="orgid != null">orgid,</if> <if test="campusid != null">campusid,</if> <if test="pid != null">pid,</if> <if test="guid != null">guid,</if> <if test="preachform != null">preachform,</if> @@ -420,6 +423,7 @@ <if test="isupload != null">#{isupload},</if> <if test="uploadTime != null">#{uploadTime},</if> <if test="orgid != null">#{orgid},</if> <if test="campusid != null">#{campusid},</if> <if test="nexttaskflag != null">#{nexttaskflag},</if> <if test="nexttaskid != null">#{nexttaskid},</if> <if test="nexttaskname != null">#{nexttaskname},</if> @@ -480,6 +484,7 @@ <if test="isupload != null">isupload = #{isupload},</if> <if test="uploadTime != null">upload_time = #{uploadTime},</if> <if test="orgid != null">orgid = #{orgid},</if> <if test="campusid != null">campusid = #{campusid},</if> <if test="nexttaskflag != null">nexttaskflag = #{nexttaskflag},</if> <if test="nexttaskid != null">nexttaskid = #{nexttaskid},</if> <if test="nexttaskname != null">nexttaskname = #{nexttaskname},</if>
