smartor.git - Gitblit

			@@ -7,6 +7,7 @@
			import com.ruoyi.common.core.domain.entity.SysUser;
			import com.ruoyi.common.core.domain.model.LoginUser;
			import com.ruoyi.common.core.page.TableDataInfo;
			import com.ruoyi.common.core.redis.RedisCache;
			import com.ruoyi.common.enums.BusinessType;
			import com.ruoyi.common.utils.DtoConversionUtils;
			import com.ruoyi.common.utils.PageUtils;
			@@ -18,6 +19,7 @@
			import io.swagger.annotations.ApiOperation;
			import lombok.extern.slf4j.Slf4j;
			import org.apache.commons.collections4.CollectionUtils;
			import org.apache.commons.lang3.ObjectUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.web.bind.annotation.*;

			@@ -58,7 +60,8 @@
			for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
			ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
			serviceSubtaskRecord.setSubtaskId(serviceSubtask.getId());
			serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
			if (ObjectUtils.isNotEmpty((serviceSubtask.getTaskid())))
			serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
			serviceSubtask.setServiceSubtaskRecordList(serviceSubtaskRecordService.selectServiceSubtaskRecordList(serviceSubtaskRecord));
			}
			Map<String, Object> map = serviceSubtaskService.patItemCount(serviceSubtaskVO);
			@@ -146,6 +149,7 @@
			LoginUser loginUser = getLoginUser();
			SysUser user = loginUser.getUser();
			ivrTaskVO.setCreateBy(user.getNickName());
			ivrTaskVO.setUpdateBy(user.getNickName());
			ivrTaskVO.setOrgid(user.getOrgid());
			return success(serviceSubtaskService.insertOrUpdateTask(ivrTaskVO));
			}
			@@ -153,6 +157,7 @@
			@ApiOperation("修改子任务")
			@PostMapping("/update")
			public AjaxResult update(@RequestBody ServiceSubtask serviceSubtask) {
			serviceSubtask.setUpdateBy(getLoginUser().getUser().getNickName());
			return toAjax(serviceSubtaskService.updateServiceSubtask(serviceSubtask));
			}

			@@ -160,7 +165,7 @@
			@PostMapping("/addSubTask")
			public AjaxResult addSubTask(@RequestBody ServiceSubtask serviceSubtask) {
			SysUser user = getLoginUser().getUser();
			serviceSubtask.setOrgid(user.getOrgid());
			if (ObjectUtils.isNotEmpty(user)) serviceSubtask.setOrgid(user.getOrgid());
			return toAjax(serviceSubtaskService.insertServiceSubtask(serviceSubtask));
			}