陈昶聿
4 小时以前 fab5cfa770fcee202f9aa611e462e1de63663d74
【丽水】超链接影响查询
已修改5个文件
87 ■■■■■ 文件已修改
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java 46 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -613,6 +613,15 @@
        return success(serviceSubtaskService.getSfStatisticsJoydetails(serviceSubtaskCountReq));
    }
    /**
     * 获取随访统计比例
     */
    @ApiOperation("获取随访统计超链接")
    @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
    @PostMapping("/getSfStatisticsHyperlink")
    public AjaxResult getSfStatisticsHyperlink(@RequestBody ServiceSubtaskCountReq serviceSubtaskCountReq) {
        return success(serviceSubtaskService.getSfStatisticsHyperlink(serviceSubtaskCountReq));
    }
    /**
     * 延续护理统计
smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java
@@ -141,6 +141,24 @@
    private List<String> groupKeyList;
    /**
     * 发送状态 - 超链接统计
     */
    @ApiModelProperty(value = "发送状态 1 被领取(在任务中是新建,在服务中是被领取)  2 待发送  3 已发送  4 不执行  5 发送失败 6 已完成")
    private List<Long> sendstates;
    /**
     * 异常标识 - 超链接统计
     */
    @ApiModelProperty(value = "异常标识:0绿色;1红色;2黄色")
    private String excep;
    /**
     * 当前发送方式 - 超链接统计
     */
    @ApiModelProperty("当前发送方式")
    private String currentPreachform;
    /**
     * pageNum
     */
    @ApiModelProperty("pageNum")
smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java
@@ -151,6 +151,8 @@
    public List<ServiceSubtaskCount> getSfStatisticsJoydetails(ServiceSubtaskCountReq serviceSubtaskCountReq);
    public List<ServiceSubtask> getSfStatisticsHyperlink(ServiceSubtaskCountReq serviceSubtaskCountReq);
    public List<ServiceStatisticsResponse> getServiceStatistics(ServiceStatisticsRequest request);
    public List<ServiceSubtaskStatistic> getSfStatisticsScript(ServiceSubtaskCountReq serviceSubtaskCountReq);
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -3746,43 +3746,6 @@
                }
            }
        }
//        //记录无需随访详情
//        serviceSubtaskStatistic.setNonFollowUpInfo(nonFollowUpInfo);
//        //记录需随访详情
//        serviceSubtaskStatistic.setFollowUpNeededAllInfo(followUpNeededAllInfo);
//        //记录首次应随访详情
//        serviceSubtaskStatistic.setNeedFollowUpInfo(needFollowUpInfo);
//        //记录首次待随访详情
//        serviceSubtaskStatistic.setPendingFollowUpInfo(pendingFollowUpInfo);
//        //记录首次随访成功详情
//        serviceSubtaskStatistic.setFollowUpSuccessInfo(followUpSuccessInfo);
//        //记录首次随访失败详情
//        serviceSubtaskStatistic.setFollowUpFailInfo(followUpFailInfo);
//        //记录首次随访人工详情
//        serviceSubtaskStatistic.setManualInfo(manualInfo);
//        //记录首次随访语音详情
//        serviceSubtaskStatistic.setVoiceInfo(voiceInfo);
//        //记录首次随访短信详情
//        serviceSubtaskStatistic.setSmsInfo(smsInfo);
//        //记录首次随访微信详情
//        serviceSubtaskStatistic.setWechatInfo(wechatInfo);
//        //记录再次应随访详情
//        serviceSubtaskStatistic.setNeedFollowUpAgainInfo(needFollowUpAgainInfo);
//        //记录再次待随访详情
//        serviceSubtaskStatistic.setPendingFollowUpAgainInfo(pendingFollowUpAgainInfo);
//        //记录再次随访成功详情
//        serviceSubtaskStatistic.setFollowUpSuccessAgainInfo(followUpSuccessAgainInfo);
//        //记录再次随访失败详情
//        serviceSubtaskStatistic.setFollowUpFailAgainInfo(followUpFailAgainInfo);
//        //记录再次随访人工详情
//        serviceSubtaskStatistic.setManualAgainInfo(manualAgainInfo);
//        //记录再次随访语音详情
//        serviceSubtaskStatistic.setVoiceAgainInfo(voiceAgainInfo);
//        //记录再次随访短信详情
//        serviceSubtaskStatistic.setSmsAgainInfo(smsAgainInfo);
//        //记录再次随访微信详情
//        serviceSubtaskStatistic.setWechatAgainInfo(wechatAgainInfo);
        return serviceSubtaskStatistic;
    }
@@ -3945,6 +3908,13 @@
        return serviceSubtaskMapper.getSfStatisticsJoydetails(serviceSubtaskCountReq);
    }
    @Override
    public List<ServiceSubtask> getSfStatisticsHyperlink(ServiceSubtaskCountReq serviceSubtaskCountReq) {
        List<ServiceSubtask> subtasks = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq);
        return subtasks;
    }
    /**
     * 获取随访统计比例
     *
@@ -3952,7 +3922,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.info("getSfStatisticsScript的入参为:{}", serviceSubtaskCountReq);
        List<ServiceSubtaskStatistic> serviceSubtaskStatistics = new ArrayList<>();
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -1484,6 +1484,18 @@
                #{key}
            </foreach>
        </if>
        <if test="sendstates != null and sendstates.size() > 0">
            AND sendstate IN
            <foreach collection="sendstates" item="state" open="(" separator="," close=")">
                #{state}
            </foreach>
        </if>
        <if test="currentPreachform != null">
            AND current_preachform = #{currentPreachform}
        </if>
        <if test="excep != null and excep != ''">
            AND excep = #{excep}
        </if>
    </select>
    <select id="getSfStatisticsGroupKey" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
            resultType="String">