陈昶聿
2 天以前 14c05113b72698a331259ce7c34c7ae8dd69ffd7
【市一】问题统计接口调整
已修改3个文件
14 ■■■■■ 文件已修改
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateScriptController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateScriptController.java
@@ -109,7 +109,7 @@
     * 问题统计
     */
    @ApiOperation("问题统计")
    @AddOrgId
    @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
    @PostMapping(value = "/countPatByScript")
    public AjaxResult countPatByScript(@RequestBody ServiceSubtaskCountReq serviceSubtaskCountReq) {
        return success(svyLibTemplateScriptService.countPatByScript(serviceSubtaskCountReq));
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -3068,6 +3068,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();
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -1452,12 +1452,15 @@
        <if test="configValue != null and configValue != ''">
            AND ssd.categoryid IN (${configValue})
        </if>
        <!-- 适用单条查询 -->
        <if test="scriptids != null">
            AND ssd.scriptid in (${scriptids})
        </if>
        group by ssd.scriptid) b
        ON a.id = b.scriptid
        <!-- 适用单条查询 -->
        <if test="scriptids != null">
            AND a.scriptid in
            (SELECT lib_script.scriptid FROM
            svy_lib_template_script lib_script
            WHERE lib_script.scriptid in (${scriptids}))
        </if>
    </select>
    <select id="getSfStatisticsScriptItemDetails" parameterType="com.smartor.domain.ServiceSubtaskCountReq"