ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -844,6 +844,31 @@ return ajax; } @ApiOperation("获取随访分类统计明细详情超链接") @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid") @PostMapping("/getSfStatisticsCountDetailsHyperLink") public AjaxResult getSfStatisticsCountDetailsHyperLink(@RequestBody ServiceSubtaskCountReq serviceSubtaskCountReq) { LoginUser loginUser = getLoginUser(); String orgid = loginUser.getUser().getOrgid(); String configKey = serviceSubtaskCountReq.getConfigKey(); if (StringUtils.isNotEmpty(configKey)) { String configValue = configService.selectConfigByKey(configKey, orgid); serviceSubtaskCountReq.setConfigValue(configValue); if (StringUtils.isEmpty(configValue)) { String logInfo = "getSfStatisticsCount-参数 " + configKey + " 未配置, 请配置好后重试"; log.error(logInfo); return error(logInfo); } } String followUpCountStyle = configService.selectConfigByKey("followUpCountStyle", orgid); if (ObjectUtils.isNotEmpty(followUpCountStyle)) { serviceSubtaskCountReq.setFollowUpCountStyle(followUpCountStyle); } else { serviceSubtaskCountReq.setFollowUpCountStyle("1"); } return success(serviceSubtaskService.getSfStatisticsHyperlink(serviceSubtaskCountReq)); } /** * 发送短信模板 */ ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml
@@ -12,7 +12,7 @@ <!-- 配置默认的执行器.SIMPLE就是普通执行器;REUSE执行器会重用预处理语句(prepared statements);BATCH执行器将重用语句并执行批量更新 --> <setting name="defaultExecutorType" value="SIMPLE"/> <!-- 指定 MyBatis 所用日志的具体实现(是否打印SQL) --> <setting name="logImpl" value="STDOUT_LOGGING"/> <!-- <setting name="logImpl" value="STDOUT_LOGGING"/>--> <!-- 使用驼峰命名法转换字段 --> <!-- <setting name="mapUnderscoreToCamelCase" value="true"/> --> </settings> smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -410,7 +410,6 @@ <if test="managementDoctorCode != null ">and management_doctor_code = #{managementDoctorCode}</if> <if test="submit != null ">and submit = #{submit}</if> <if test="upid != null ">and upid = #{upid}</if> <if test="visitCount != null ">and visit_count = #{visitCount}</if> <if test="patfrom != null ">and patfrom = #{patfrom}</if> <if test="serviceType != null ">and service_type = #{serviceType}</if> <if test="patid != null ">and patid = #{patid}</if> @@ -2067,10 +2066,15 @@ <if test="type != null"> and type = #{type} </if> <if test="visitCount != null and visitCount == 1"> <!-- 首个再次随访:精确查 visit_count = 2,与统计口径一致 --> <if test="hyperLinkInfoType == 'againFollowUpPushCountInfo'"> AND visit_count = 2 </if> <!-- 其他类型保持原语义:1 首次,>1 再次 --> <if test="hyperLinkInfoType != 'againFollowUpPushCountInfo' and visitCount != null and visitCount == 1"> AND visit_count = 1 </if> <if test="visitCount != null and visitCount > 1"> <if test="hyperLinkInfoType != 'againFollowUpPushCountInfo' and visitCount != null and visitCount > 1"> AND visit_count > 1 </if> <if test="groupKey != null and groupKey != '' and groupKeyList != null and groupKeyList.size>0">