smartor.git - Gitblit

			@@ -564,7 +564,7 @@
			}
			String configKey = serviceSubtaskCountReq.getConfigKey();
			if (StringUtils.isNotEmpty(configKey)) {
			String configValue = configService.selectConfigByKey(configKey);
			String configValue = configService.selectConfigByKey(configKey,serviceSubtaskCountReq.getOrgid());
			serviceSubtaskCountReq.setConfigValue(configValue);
			if (StringUtils.isEmpty(configValue)) {
			String logInfo = "getSfStatisticsCount-参数 " + configKey + " 未配置, 请配置好后重试";
			@@ -590,7 +590,7 @@
			//复诊统计
			String configKey = serviceSubtaskCountReq.getConfigKey();
			if (StringUtils.isNotEmpty(configKey)) {
			String configValue = configService.selectConfigByKey(configKey);
			String configValue = configService.selectConfigByKey(configKey,serviceSubtaskCountReq.getOrgid());
			if (StringUtils.isEmpty(configValue)) {
			String logInfo = "getSfStatisticsCountDetails-参数 " + configKey + " 未配置, 请配置好后重试";
			log.error(logInfo);

			@@ -29,7 +29,7 @@
			private List<IvrTaskTemplateScriptVO> ivrTaskTemplateScriptVOList;

			@ApiModelProperty(value = "问题回答明细(问卷)")
			List<SvyTaskTemplateScriptVO> svyTaskTemplateScriptVOS;
			private List<SvyTaskTemplateScriptVO> svyTaskTemplateScriptVOS;

			@ApiModelProperty(value = "试卷类型:1 随访 2 问卷")
			private Integer type;

			@@ -3069,7 +3069,7 @@
			* @return
			*/
			@Override
			@Cacheable(value = "getSfStatisticsScript", key = "T(org.springframework.util.DigestUtils).md5DigestAsHex(#serviceSubtaskCountReq.toString().getBytes())", unless = "#result == null or #result.isEmpty()")
			// @Cacheable(value = "getSfStatisticsScript", key = "T(org.springframework.util.DigestUtils).md5DigestAsHex(#serviceSubtaskCountReq.toString().getBytes())", unless = "#result == null or #result.isEmpty()")
			public List<ServiceSubtaskStatistic> getSfStatisticsScript(ServiceSubtaskCountReq serviceSubtaskCountReq) {
			log.error("getSfStatisticsScript的入参为：{}", serviceSubtaskCountReq);
			List<ServiceSubtaskStatistic> serviceSubtaskStatistics = new ArrayList<>();
			@@ -3132,12 +3132,12 @@
			BigDecimal finishedSum = new BigDecimal(0);
			//完成比例
			Double finishedPercentage = null;
			if(ObjectUtils.isNotEmpty(serviceSubtaskStatistic.getJoyAllCount())){
			finishedSum = new BigDecimal(serviceSubtaskStatistic.getJoyAllCount());
			if(ObjectUtils.isNotEmpty(serviceSubtaskStatistic.getJoyCount())){
			finishedSum = new BigDecimal(serviceSubtaskStatistic.getJoyCount());
			}

			if(ObjectUtils.isNotEmpty(serviceSubtaskStatistic.getJoyCount())){
			sum = new BigDecimal(serviceSubtaskStatistic.getJoyCount());
			if(ObjectUtils.isNotEmpty(serviceSubtaskStatistic.getJoyAllCount())){
			sum = new BigDecimal(serviceSubtaskStatistic.getJoyAllCount());
			}
			if(sum.intValue() != 0){
			finishedPercentage = finishedSum.divide(sum, 2, RoundingMode.HALF_UP).doubleValue();

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	smartor/src/main/java/com/smartor/domain/ServiceSubTaskCacheReq.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史