smartor.git - Gitblit

			@@ -197,7 +197,7 @@
			String[] split = key.split("-");
			//先判断，是不是当前提交人的，不是当前提交人的，跳过
			try {
			if (ObjectUtils.isNotEmpty(split[0]) && ObjectUtils.isNotEmpty(split[1]) && !Long.valueOf(split[0]).equals(pid) && !Long.valueOf(split[1]).equals(tid) && !Long.valueOf(split[2]).equals(subid)) {
			if (ObjectUtils.isNotEmpty(split[0]) && ObjectUtils.isNotEmpty(split[1]) && !Long.valueOf(split[0]).equals(pid) && !Long.valueOf(split[1]).equals(tid) && !Objects.isNull(split[2]) && !Long.valueOf(split[2]).equals(subid)) {
			continue;
			}
			} catch (Exception e) {
			@@ -238,7 +238,7 @@

			if (svyTaskTemplateScriptVO.getSort() != null && svyTaskTemplateScriptVO.getSort().equals(nextScriptno)) {
			// log.error("svyTaskTemplateScriptVO的值为：{}", svyTaskTemplateScriptVO);
			Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, Long.valueOf(split[1]), Long.valueOf(split[0]), Long.valueOf(split[2]));
			Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, Long.valueOf(split[1]), Long.valueOf(split[0]), Objects.isNull(split[2]) ? null : Long.valueOf(split[2]));
			log.error("nextScriptNo的信息为：{}", map.get("nextScriptNo"));
			if (!Objects.isNull(map.get("nextScriptNo")))
			nextScriptno = Long.valueOf(map.get("nextScriptNo"));
			@@ -281,7 +281,7 @@
			ivrTaskTemplateScriptVO.setIvrTaskScriptTargetoptionList(ivrTaskTemplateTargetoptions);

			if (ivrTaskTemplateScriptVO.getSort() != null && Long.valueOf(ivrTaskTemplateScriptVO.getSort()).equals(nextScriptno)) {
			Map<String, String> map = setSFInfo(ivrTaskTemplateScriptVO, Long.valueOf(split[1]), Long.valueOf(split[0]), Long.valueOf(split[2]));
			Map<String, String> map = setSFInfo(ivrTaskTemplateScriptVO, Long.valueOf(split[1]), Long.valueOf(split[0]), Objects.isNull(split[2]) ? null : Long.valueOf(split[2]));
			log.error("----nextScriptNo2的信息为：{}", map.get("nextScriptNo"));
			if (!Objects.isNull(map.get("nextScriptNo")))
			nextScriptno = Long.valueOf(map.get("nextScriptNo"));
			@@ -354,7 +354,7 @@
			for (SvyTaskTemplateScriptVO svyTaskTemplateScriptVO : cacheList) {
			if (svyTaskTemplateScriptVO.getSort() == 1L) {
			//说明是第一题
			List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = cacheList.get(0).getSvyTaskTemplateTargetoptions();
			List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = svyTaskTemplateScriptVO.getSvyTaskTemplateTargetoptions();
			svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions);
			Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, tid, pid, subid);
			if (map == null) continue;
			@@ -399,7 +399,7 @@
			for (IvrTaskTemplateScriptVO ivrTaskTemplateScriptVO : cacheList) {
			if (ivrTaskTemplateScriptVO.getSort() != null && ivrTaskTemplateScriptVO.getSort() == 1L) {
			//说明是第一题
			List<IvrTaskTemplateTargetoption> ivrTaskTemplateTargetoptions = cacheList.get(0).getIvrTaskScriptTargetoptionList();
			List<IvrTaskTemplateTargetoption> ivrTaskTemplateTargetoptions = ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList();
			ivrTaskTemplateScriptVO.setIvrTaskScriptTargetoptionList(ivrTaskTemplateTargetoptions);
			//它俩都是ivr_task_templatescript_id,所以这里需要设置一下
			ivrTaskTemplateScriptVO.setId(ivrTaskTemplateScriptVO.getScriptID());
			@@ -457,7 +457,9 @@

			//将当前发送状态改成9完成
			ServiceSubtaskPreachform serviceSubtaskPreachform = new ServiceSubtaskPreachform();
			serviceSubtaskPreachform.setPreachform(serviceSubtaskList.get(0).getCurrentPreachform());
			if (CollectionUtils.isNotEmpty(serviceSubtaskList)) {
			serviceSubtaskPreachform.setPreachform(serviceSubtaskList.get(0).getCurrentPreachform());
			}
			serviceSubtaskPreachform.setSubid(serviceSubtask.getId());
			serviceSubtaskPreachform.setTaskid(serviceSubtask.getTaskid());
			List<ServiceSubtaskPreachform> serviceSubtaskPreachforms = serviceSubtaskPreachformMapper.selectServiceSubtaskPreachformList(serviceSubtaskPreachform);
			@@ -732,19 +734,20 @@

			@Override
			public Map<String, Object> selectPatQuestionResult(ServiceSubTaskQueryReq serviceSubTaskQueryReq) {
			log.error("selectPatQuesTionResult的入参为：{}", serviceSubTaskQueryReq);
			log.info("selectPatQuesTionResult的入参为：{}", serviceSubTaskQueryReq);
			Map<String, Object> map = new HashMap<>();

			//获取本次的问答结果
			Map<String, Object> scriptInfoByCondition = serviceTaskService.getScriptInfoByCondition(serviceSubTaskQueryReq.getTaskid(), serviceSubTaskQueryReq.getPatid(), serviceSubTaskQueryReq.getIsFinish(), serviceSubTaskQueryReq.getPatfrom());
			Map<String, Object> scriptInfoByCondition = serviceTaskService.getScriptInfoByCondition(serviceSubTaskQueryReq.getTaskid(), serviceSubTaskQueryReq.getPatid(), serviceSubTaskQueryReq.getIsFinish(), serviceSubTaskQueryReq.getPatfrom(), serviceSubTaskQueryReq.getSubId());
			map = getMap(scriptInfoByCondition, serviceSubTaskQueryReq.getSubId(), serviceSubTaskQueryReq.getPatid());

			//获取上次的问答结果
			ServiceSubtask serviceSubtask = serviceSubtaskMapper.selectServiceSubtaskById(serviceSubTaskQueryReq.getSubId());
			map.put("upScriptResult", null);
			map.put("templateName", serviceSubtask.getTemplatename());
			map.put("upTaskName", null);
			if (ObjectUtils.isNotEmpty(serviceSubtask) && serviceSubtask.getUpid() != null) {
			Map<String, Object> scriptInfoByCondition2 = serviceTaskService.getScriptInfoByCondition(serviceSubTaskQueryReq.getTaskid(), serviceSubTaskQueryReq.getPatid(), serviceSubTaskQueryReq.getIsFinish(), serviceSubTaskQueryReq.getPatfrom());
			Map<String, Object> scriptInfoByCondition2 = serviceTaskService.getScriptInfoByCondition(serviceSubTaskQueryReq.getTaskid(), serviceSubTaskQueryReq.getPatid(), serviceSubTaskQueryReq.getIsFinish(), serviceSubTaskQueryReq.getPatfrom(),serviceSubTaskQueryReq.getSubId());
			Map<String, Object> map1 = getMap(scriptInfoByCondition2, Long.valueOf(serviceSubtask.getUpid()), serviceSubTaskQueryReq.getPatid());
			if (!map1.isEmpty()) {
			map.put("upScriptResult", map1.get("scriptResult"));
			@@ -759,10 +762,8 @@
			private Map<String, Object> getMap(Map<String, Object> scriptInfoByCondition, Long subid, Long patid) {
			Map<String, Object> map = new HashMap<>();
			if (ObjectUtils.isNotEmpty(scriptInfoByCondition) && ObjectUtils.isNotEmpty(scriptInfoByCondition.get("script"))) {
			// log.error("-----------scriptInfoByCondition的值为：{}", scriptInfoByCondition);
			if (scriptInfoByCondition.get("type").equals("1")) {
			List<IvrTaskTemplateScriptVO> ivrTaskTemplateScriptVOS = (List<IvrTaskTemplateScriptVO>) scriptInfoByCondition.get("script");
			// List<IvrLibaTemplateScriptVO> ivrLibaTemplateScriptVOList = DtoConversionUtils.sourceToTarget(ivrTaskTemplateScriptVOS, IvrLibaTemplateScriptVO.class);
			for (IvrTaskTemplateScriptVO ivrTaskTemplateScriptVO : ivrTaskTemplateScriptVOS) {
			Map<String, String> scriptResult = getScriptResult(subid, patid, ivrTaskTemplateScriptVO.getId());
			if (ObjectUtils.isNotEmpty(scriptResult)) {
			@@ -900,7 +901,7 @@
			}

			//判断一下当前的问题是不是满意度问题，并且dutyDeptCode是否有值，并且选项是不是异常选项，如果全符合，则往满意度问题异常表新增
			if (StringUtils.isNotEmpty(svyTaskTemplateScriptVO.getDutyDeptCode()) && 1 == stt.getIsabnormal()) {
			if (StringUtils.isNotEmpty(svyTaskTemplateScriptVO.getDutyDeptCode()) && stt != null && 1 == stt.getIsabnormal()) {
			isabnormalFlag = 1L;
			ServiceSubtaskDetailTrace subtaskDetailTrace = new ServiceSubtaskDetailTrace();
			subtaskDetailTrace.setDetailId(serviceSubtaskDetail.getId());
			@@ -1091,7 +1092,7 @@
			ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity();
			serviceSubtaskVO.setTaskid(taskid);
			serviceSubtaskVO.setPatid(patid);
			serviceSubtaskVO.setPatid(subid);
			serviceSubtaskVO.setSubId(subid);
			List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);

			String score = "0";