【市一】问题统计接口调整

陈昶聿

4 天以前 9fc52256df321e14a179811eda954491f5b71fea

 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java

@@ -72,6 +72,9 @@
    private IvrTaskVisitResultMapper serviceTaskVisitResultMapper;

    @Autowired
    private SvyTaskTemplateScriptMapper svyTaskTemplateScriptMapper;

    @Autowired
    private IServiceTaskdeptService serviceTaskdeptService;

    @Autowired
@@ -2701,10 +2704,18 @@
            //满意度
            List<ServiceSubtaskCount> joyCountTemp = joySubCount.stream().filter(r -> r.getSubTaskId().equals(serviceSubtask.getId())).collect(Collectors.toList());
            if (joyCountTemp != null && joyCountTemp.size() > 0) {
                if (ObjectUtils.isNotEmpty(joyCountTemp.get(0).getJoyCount()))
                    serviceSubtaskStatistic.setJoyCount(serviceSubtaskStatistic.getJoyCount() + joyCountTemp.get(0).getJoyCount());
                if (ObjectUtils.isNotEmpty(joyCountTemp.get(0).getJoyAllCount()))
                    serviceSubtaskStatistic.setJoyAllCount(serviceSubtaskStatistic.getJoyAllCount() + joyCountTemp.get(0).getJoyAllCount());
                Integer joyCount = joyCountTemp.get(0).getJoyCount();
                Integer joyAllCount = joyCountTemp.get(0).getJoyAllCount();
                if (ObjectUtils.isNotEmpty(joyCount)){
                    if(joyCount>0){
                        serviceSubtaskStatistic.setJoyCount(serviceSubtaskStatistic.getJoyCount() + joyCount);
                    }
                }
                if (ObjectUtils.isNotEmpty(joyAllCount)){
                    if(joyAllCount>0){
                        serviceSubtaskStatistic.setJoyAllCount(serviceSubtaskStatistic.getJoyAllCount() + joyAllCount);
                    }
                }
            }
            //无需随访人次
            if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 4) {
@@ -2949,7 +2960,7 @@
     * @return
     */
    @Override
    @Cacheable(value = "sfStatisticsJoy", key = "T(org.springframework.util.DigestUtils).md5DigestAsHex(#serviceSubtaskCountReq.toString().getBytes())", unless = "#result == null or #result.isEmpty()")
//    @Cacheable(value = "sfStatisticsJoy", 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<>();
@@ -3015,18 +3026,19 @@
                BigDecimal mydtblsum = new BigDecimal(0);
                //完成比例
                Double wcbl = null;
                if(ObjectUtils.isNotEmpty(serviceSubtaskStatistic.getJoyAllCount())){
                    mydtblsum = new BigDecimal(serviceSubtaskStatistic.getJoyAllCount());
                }

                //满意度填报量
                if(ObjectUtils.isNotEmpty(serviceSubtaskStatistic.getJoyCount())){
                    mydtmzlsum = new BigDecimal(serviceSubtaskStatistic.getJoyCount());
                    mydtblsum = new BigDecimal(serviceSubtaskStatistic.getJoyCount());
                }
                //满意度题目总量
                if(ObjectUtils.isNotEmpty(serviceSubtaskStatistic.getJoyAllCount())){
                    mydtmzlsum = new BigDecimal(serviceSubtaskStatistic.getJoyAllCount());
                }
                if(mydtmzlsum.intValue() != 0){
                    wcbl = mydtblsum.divide(mydtmzlsum, 2, RoundingMode.HALF_UP).doubleValue();
                }
                serviceSubtaskStatistic.setJoyAllCount(mydtmzlsum.intValue());
                serviceSubtaskStatistic.setJoyCount(mydtblsum.intValue());
                serviceSubtaskStatistic.setJoyAllCount(mydtmzlsum.intValue());
                serviceSubtaskStatistic.setJoyTotal(wcbl);
            }
        }
@@ -3039,6 +3051,43 @@
        Map<String, ServiceSubtaskScriptCount> result = new HashMap<>();
        List<ServiceSubtaskScriptCount> allCounts = new ArrayList<>();
        List<ServiceSubtaskScriptCount> allItemCounts = new ArrayList<>();

        List<ServiceSubtaskScriptCount> emptyCounts = svyTaskTemplateScriptMapper.getSvyTemplateScriptListForSubtaskCount(serviceSubtaskCountReq);
        if(ObjectUtils.isNotEmpty(emptyCounts)){
            Map<Long, List<ServiceSubtaskScriptCount>> emptyCountMap = emptyCounts.stream().collect(Collectors.groupingBy(ServiceSubtaskScriptCount::getScriptid));
            for (Map.Entry<Long, List<ServiceSubtaskScriptCount>> entry : emptyCountMap.entrySet()) {
                Long eScriptId = entry.getKey();
                if(ObjectUtils.isNotEmpty(eScriptId)){
                    ServiceSubtaskScriptCount eCount = new ServiceSubtaskScriptCount();
                    List<ServiceSubtaskScriptCount> emptyCountList = entry.getValue();
                    Map<String, ServiceSubtaskScriptCount> eMap = new HashMap<>();
                    if(ObjectUtils.isNotEmpty(emptyCountList)){
                        eCount.setScriptid(eScriptId);
                        eCount.setScriptType(emptyCountList.get(0).getScriptType());
                        eCount.setScriptContent(emptyCountList.get(0).getScriptContent());
                        eCount.setTemplateid(emptyCountList.get(0).getTemplateid());
                        eCount.setChosenQuantity(0);
                        eCount.setChosenPercentage("0.0");
                        eCount.setCompletedQuantity(0);
                        eCount.setCompletedPercentage("0.0");
                        eCount.setAllQuantity(0);
                        //填空空数据
                        for(ServiceSubtaskScriptCount empCount: emptyCountList){
                            empCount.setChosenQuantity(0);
                            empCount.setChosenPercentage("0.0");
                            empCount.setCompletedQuantity(0);
                            empCount.setCompletedPercentage("0.0");
                            empCount.setAllQuantity(0);
                            eMap.put(empCount.getOptionText(),eCount);
                        }
                    }
                    List<ServiceSubtaskScriptCount> empCountList = new ArrayList<>(eMap.values());
                    eCount.setDetails(empCountList);
                    result.put(eScriptId.toString(),eCount);
                }
            }
        }

        String type = serviceSubtaskCountReq.getType();
        if(ObjectUtils.isEmpty(type)){
            //查询语音统计明细
@@ -3068,6 +3117,7 @@
                    && count.getSubtaskType().equals("2")){
                SvyTaskTemplateScriptVO svyTaskTemplateScriptVO = new SvyTaskTemplateScriptVO();
                svyTaskTemplateScriptVO.setId(count.getScriptid());
                svyTaskTemplateScriptVO.setOrgid(serviceSubtaskCountReq.getOrgid());
                SvyTaskTemplateScriptVO svyTaskTemplateScriptResultVo = svyTaskTemplateScriptService.selectInfoByCondition(svyTaskTemplateScriptVO);
                if(ObjectUtils.isNotEmpty(svyTaskTemplateScriptResultVo)){
                    List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = svyTaskTemplateScriptResultVo.getSvyTaskTemplateTargetoptions();
@@ -3113,6 +3163,7 @@
                    }
                }
            });

            List<ServiceSubtaskScriptCount> itemCounts = new ArrayList<>(itemCountMap.values());
            count.setDetails(itemCounts);
            result.put(count.getScriptid().toString(),count);