注释格式修改

postdischarge-manage/src/main/java/com/xinelu/manage/controller/servicewaycontent/ServiceWayContentController.java

@@ -37,10 +37,6 @@ public class ServiceWayContentController extends BaseController {
 
     /**
      * 查询服务方式列表
-     *
-     * @param serviceWayName
-     * @param id
-     * @return
      */
     @ApiOperation("查询服务方式列表")
     @GetMapping("/serviceWayList")
@@ -51,9 +47,6 @@ public class ServiceWayContentController extends BaseController {
 
     /**
      * 根据服务方式id获取服务方式
-     *
-     * @param id
-     * @return
      */
     @ApiOperation("根据服务方式id获取服务方式")
     @GetMapping(value = "/serviceWay/{id}")
@@ -63,9 +56,6 @@ public class ServiceWayContentController extends BaseController {
 
     /**
      * 新增服务方式
-     *
-     * @param serviceWayContent
-     * @return
      */
     @ApiOperation("新增服务方式")
     @PostMapping("/addServiceWay")
@@ -75,9 +65,6 @@ public class ServiceWayContentController extends BaseController {
 
     /**
      * 修改服务方式
-     *
-     * @param serviceWayContent
-     * @return
      */
     @ApiOperation("修改服务方式")
     @PutMapping("/editServiceWay")
@@ -87,9 +74,6 @@ public class ServiceWayContentController extends BaseController {
 
     /**
      * 根据id删除服务方式
-     *
-     * @param id
-     * @return
      */
     @ApiOperation("根据id删除服务方式")
     @DeleteMapping("/removeServiceWay/{id}")

postdischarge-manage/src/main/java/com/xinelu/manage/controller/textmessage/TextMessageController.java

@@ -50,7 +50,7 @@ public class TextMessageController extends BaseController {
         List<TextMessageTaskVO> list = textMessageService.selectTextMessageList(textMessageDTO);
         //处理上面查询的list集合
         int num = list.size();
-        list = list.stream().skip((pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+        list = list.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
         TableDataInfo rspData = new TableDataInfo();
         rspData.setCode(HttpStatus.SUCCESS);
         rspData.setRows(list);

postdischarge-manage/src/main/java/com/xinelu/manage/controller/wechattemplate/WechatTemplateController.java

@@ -49,7 +49,7 @@ public class WechatTemplateController extends BaseController {
         List<WechatTemplateTaskVO> list = wechatTemplateService.selectWechatTemplateList(wechatTemplateDto);
         //处理上面查询的list集合
         int num = list.size();
-        list = list.stream().skip((pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+        list = list.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
         TableDataInfo rspData = new TableDataInfo();
         rspData.setCode(HttpStatus.SUCCESS);
         rspData.setRows(list);

postdischarge-manage/src/main/java/com/xinelu/manage/dto/labelfieldcontent/LabelFieldContentAddDTO.java

@@ -3,6 +3,7 @@ package com.xinelu.manage.dto.labelfieldcontent;
 import com.xinelu.common.custominterface.Insert;
 import com.xinelu.common.custominterface.Update;
 import com.xinelu.manage.domain.labelfieldcontent.LabelFieldContent;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@ import java.util.List;
  * @date : 2024/3/11 17:09
  */
 @Data
+@ApiModel(value ="标签字段内容AddDTO")
 public class LabelFieldContentAddDTO {
 
     /**

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldcontent/LabelFieldContentMapper.java

@@ -62,20 +62,11 @@ public interface LabelFieldContentMapper {
 
     /**
      * 检查数据库中同一个fieldId下内容名称的重复性
-     *
-     * @param fieldId
-     * @param contentName
-     * @return
      */
     int existCountByFieldIdAndContentName(@Param("fieldId") Long fieldId, @Param("contentName") String contentName);
 
     /**
      * 检查除去当前记录外有没有重复内容名称
-     *
-     * @param id
-     * @param fieldId
-     * @param contentName
-     * @return
      */
     int existCountByContentNameExcludingId(@Param("id") Long id, @Param("fieldId") Long fieldId, @Param("contentName") String contentName);
 }

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldinfo/LabelFieldInfoMapper.java

@@ -62,20 +62,11 @@ public interface LabelFieldInfoMapper {
 
     /**
      * 检查同类型下有没有重复字段名称
-     *
-     * @param fieldType
-     * @param fieldNames
-     * @return
      */
     int countDuplicateFieldNamesByType(@Param("fieldType") String fieldType, @Param("fieldNames") List<String> fieldNames);
 
     /**
      * 检查除当前记录外有没有同名的字段信息名称
-     *
-     * @param id
-     * @param fieldType
-     * @param fieldName
-     * @return
      */
     int countByFieldNameExcludingId(@Param("id") Long id, @Param("fieldType") String fieldType, @Param("fieldName") String fieldName);
 }

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/operationInfo/OperationInfoMapper.java

@@ -62,20 +62,11 @@ public interface OperationInfoMapper {
 
     /**
      * 检查所属科室下手术名称是否重复
-     *
-     * @param departmentId
-     * @param operationName
-     * @return
      */
     int countByDepartmentIdAndOperationName(@Param("departmentId") Long departmentId, @Param("operationName") String operationName);
 
     /**
      * 检查除当前记录之外是否存在同名的手术名称
-     *
-     * @param id
-     * @param departmentId
-     * @param operationName
-     * @return
      */
     int countByOperationNameExcludingId(@Param("id") Long id, @Param("departmentId") Long departmentId, @Param("operationName") String operationName);
 }

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/servicepackage/ServicePackageMapper.java

@@ -65,53 +65,31 @@ public interface ServicePackageMapper {
 
     /**
      * 根据服务包id查询服务包详情信息
-     *
-     * @param id
-     * @return
      */
     ServicePackageDetailVO selectServicePackagesById(Long id);
 
     /**
      * 查询服务包列表
-     *
-     * @param servicePackage
-     * @return
      */
     List<ServicePackageVO> selectServicePackageLists(ServicePackage servicePackage);
 
     /**
      * 根据服务包id查询服务包内容
-     *
-     * @param id
-     * @return
      */
-    List<ServicePackageContentVO> selectServicePackageVOListById(Long id);
+    List<ServicePackageContentVO> selectServicePackageVoListById(Long id);
 
     /**
      * 判断所属科室下服务包名称是否存在
-     *
-     * @param departmentId
-     * @param packageName
-     * @return
      */
     int existNameCount(@Param("departmentId") Long departmentId, @Param("packageName") String packageName);
 
     /**
      * 修改服务包发布状态
-     *
-     * @param id
-     * @param whetherRelease
-     * @return
      */
     int editReleaseStatus(@Param("id") Long id, @Param("whetherRelease") Integer whetherRelease);
 
     /**
      * 检查除当前记录之外是否存在同名的服务包名称
-     *
-     * @param id
-     * @param departmentId
-     * @param packageName
-     * @return
      */
     int countByPackageNameExcludingId(@Param("id") Long id, @Param("departmentId") Long departmentId, @Param("packageName") String packageName);
 }

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/servicepackagecontent/ServicePackageContentMapper.java

@@ -63,43 +63,26 @@ public interface ServicePackageContentMapper {
 
     /**
      * 根据服务包id删除服务包内容
-     *
-     * @param ids
-     * @return
      */
     int deleteServicePackageContentByPackageIds(Long[] ids);
 
     /**
      * 根据服务包id和服务方式名称查询服务方式是否存在
-     *
-     * @param id
-     * @param serviceWayName
-     * @return
      */
     Long countByPackageIdAndServiceWayName(@Param("id") Long id, @Param("serviceWayName") String serviceWayName);
 
     /**
      * 根据服务方式id和服务内容查询服务内容是否存在
-     *
-     * @param serviceWayId
-     * @param serviceContent
-     * @return
      */
     Long countByServiceWayIdAndServiceContent(@Param("serviceWayId") Long serviceWayId, @Param("serviceContent") String serviceContent);
 
     /**
      * 根据服务内容id和服务频次查询服务频次是否存在
-     *
-     * @param serviceContentId
-     * @param vo
-     * @return
      */
     int countByServiceContentIdAndServiceFrequency(@Param("serviceContentId") Long serviceContentId, @Param("vo") ServicePackageContentVO vo);
 
     /**
      * 根据服务包id删除服务包内容
-     * @param id
-     * @return
      */
     int deleteServicePackageContentByPackageId(Long id);
 }

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/servicewaycontent/ServiceWayContentMapper.java

@@ -69,130 +69,77 @@ public interface ServiceWayContentMapper {
 
     /**
      * 查询服务方式列表
-     *
-     * @param serviceWayName
-     * @param id
-     * @return
      */
     List<ServiceWayContentAndNumVO> selectListNum(@Param("serviceWayName") String serviceWayName, @Param("id") Long id);
 
     /**
      * 查询服务方式内容列表
-     *
-     * @param serviceWayContentDTO
-     * @return
      */
     List<ServiceWayContentVO> selectServiceWayContentListV1(ServiceWayContentDTO serviceWayContentDTO);
 
     /**
      * 根据服务频次id查询服务内容和服务频次
-     *
-     * @param id
-     * @return
      */
     ServiceWayContentAndFrequencyVO selectServiceWayContentDetailByFrequencyId(Long id);
 
     /**
      * 查询服务方式是否存在
-     *
-     * @param serviceWayName
-     * @return
      */
     int countByServiceName(String serviceWayName);
 
     /**
      * 根据id删除服务方式
-     *
-     * @param id
-     * @return
      */
     int deleteServiceWayById(Long id);
 
     /**
      * 通过id查询服务方式
-     *
-     * @param id
-     * @return
      */
     String selectServiceWayById(Long id);
 
-    /**
-     * @param serviceWayContentAddDTO
-     * @param id
-     * @return
-     */
-    int countByDTOAndContentId(@Param("DTO") ServiceWayContentAddDTO serviceWayContentAddDTO, @Param("id") Long id);
 
     /**
      * 修改服务方式
-     *
-     * @param serviceWayContent
-     * @return
      */
     int updateServiceWay(ServiceWayContent serviceWayContent);
 
     /**
      * 判断同一服务内容下服务频次是否存在
-     *
-     * @param serviceWayContentEditDTO
-     * @return
      */
     int countByEditDTO(ServiceWayContentEditDTO serviceWayContentEditDTO);
 
     /**
      * 根据服务频次id删除服务内容
-     *
-     * @param id
-     * @return
      */
     int deleteByFrequencyId(Long id);
 
     /**
      * 判断服务内容在服务内容表中是否存在
-     *
-     * @param serviceWayId
-     * @param serviceContent
-     * @return
      */
     ServiceWayContentVO countByWayIdAndContent(@Param("serviceWayId") Long serviceWayId, @Param("serviceContent") String serviceContent);
 
     /**
      * 判断服务频次在服务频次表中是否存在
-     *
-     * @param serviceFrequencyDTO
-     * @return
      */
     int countByServiceFrequencyDTO(ServiceFrequencyDTO serviceFrequencyDTO);
 
     /**
      * 判断当前服务方式下服务内容是否重复
-     *
-     * @param serviceContent
-     * @param serviceWayId
-     * @return
      */
     int selectServiceContentByName(@Param("serviceContent") String serviceContent, @Param("serviceWayId") Long serviceWayId);
 
     /**
      * 检查TEXT类型的serviceFrequencyText是否重复
-     *
-     * @param serviceWayContentEditDTO
-     * @return
      */
     boolean isServiceFrequencyTextDuplicate(@Param("serviceWayContentEditDTO") ServiceWayContentEditDTO serviceWayContentEditDTO);
 
     /**
      * 检查DIGIT类型的serviceFrequencyStart和serviceFrequencyEnd是否重复
-     *
-     * @param serviceWayContentEditDTO
-     * @return
      */
     boolean isServiceFrequencyDigitDuplicate(@Param("serviceWayContentEditDTO") ServiceWayContentEditDTO serviceWayContentEditDTO);
 
     /**
      * 更新服务频次
-     * @param currentFrequency
-     * @return
      */
     int updateServiceFrequency(ServiceWayContent currentFrequency);
 }

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/textmessage/TextMessageMapper.java

@@ -66,58 +66,36 @@ public interface TextMessageMapper {
 
     /**
      * 根据id查询短信模板信息
-     *
-     * @param id
-     * @return
      */
     TextMessageVO selectTextMessageInfoById(Long id);
 
     /**
      * 检查短信模板信息是否存在
-     *
-     * @param textMessageTaskDTO
-     * @return
      */
     int countByTextMessageTaskDTO(TextMessageTaskDTO textMessageTaskDTO);
 
     /**
      * 批量插入短信模板适用任务类型
-     *
-     * @param tasks
-     * @return
      */
     int insertTextMessageSuitTasks(List<TextMessageSuitTask> tasks);
 
     /**
      * 批量删除短信模板适用任务类型
-     *
-     * @param ids
-     * @return
      */
     int deleteTextMessageSuitTasks(Long[] ids);
 
     /**
      * 修改短信模板适用任务类型
-     *
-     * @param task
-     * @return
      */
     int updateTextMessageSuitTask(@Param("task") TextMessageSuitTask task);
 
     /**
      * 根据id删除之前的适用任务类型
-     *
-     * @param id
      */
     void deleteTextMessageSuitTask(Long id);
 
     /**
      * 检查除当前记录之外是否存在同名的短信模板名称
-     *
-     * @param id
-     * @param departmentId
-     * @param textMessageName
-     * @return
      */
     int countByTextMessageNameExcludingId(@Param("id") Long id, @Param("departmentId") Long departmentId, @Param("textMessageName") String textMessageName);
 }

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/wechattemplate/WechatTemplateMapper.java

@@ -66,66 +66,41 @@ public interface WechatTemplateMapper {
 
     /**
      * 查询微信模板信息Dto列表
-     *
-     * @param wechatTemplateDto
-     * @return
      */
     List<WechatTemplateVO> selectWechatTemplateDtoList(WechatTemplateDTO wechatTemplateDto);
 
     /**
      * 根据id查询微信模板Dto
-     *
-     * @param id
-     * @return
      */
     WechatTemplateVO selectWechatTemplateDtoById(@Param("id") Long id);
 
     /**
      * 新增微信模板适用任务类型
-     *
-     * @param tasks
-     * @return
      */
     int insertWechatTemplateSuitTask(List<WechatTemplateSuitTask> tasks);
 
     /**
      * 修改微信模板适用任务类型
-     *
-     * @param tasks
-     * @return
      */
     int updateWechatTemplateSuitTask(List<WechatTemplateSuitTask> tasks);
 
     /**
      * 批量删除微信模板使用任务类型
-     *
-     * @param ids
-     * @return
      */
     int deleteWechatTemplateSuitTaskByIds(Long[] ids);
 
     /**
      * 检查微信模板名称是否存在
-     *
-     * @param wechatTemplateTaskDTO
-     * @return
      */
     int countByWechatTemplateTaskDTO(WechatTemplateTaskDTO wechatTemplateTaskDTO);
 
     /**
      * 根据id删除之前存储的适用模板任务类型
-     *
-     * @param id
      */
     void deleteWechatTemplateSuitTaskById(Long id);
 
     /**
      * 检查除当前记录之外是否存在同名的微信模板名称
-     *
-     * @param id
-     * @param departmentId
-     * @param wechatTemplateName
-     * @return
      */
     int countByWechatTemplateNameExcludingId(@Param("id") Long id, @Param("departmentId") Long departmentId, @Param("wechatTemplateName") String wechatTemplateName);
 }

postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/ILabelFieldContentService.java

@@ -62,8 +62,6 @@ public interface ILabelFieldContentService {
 
     /**
      * 批量新增标签字段内容信息
-     * @param labelFieldContentAddDTO
-     * @return
      */
     int insertLabelFieldContents(LabelFieldContentAddDTO labelFieldContentAddDTO);
 }

postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java

@@ -110,9 +110,6 @@ public class LabelFieldContentServiceImpl implements ILabelFieldContentService {
 
     /**
      * 批量新增标签字段内容信息
-     *
-     * @param labelFieldContentAddDTO
-     * @return
      */
     @Override
     public int insertLabelFieldContents(LabelFieldContentAddDTO labelFieldContentAddDTO) {

postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/ILabelFieldInfoService.java

@@ -62,8 +62,6 @@ public interface ILabelFieldInfoService {
 
     /**
      * 批量新增标签字段信息
-     * @param labelFieldInfoAddDTO
-     * @return
      */
     int insertLabelFieldInfoList(LabelFieldInfoAddDTO labelFieldInfoAddDTO);
 

postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java

@@ -115,9 +115,6 @@ public class LabelFieldInfoServiceImpl implements ILabelFieldInfoService {
 
     /**
      * 批量新增标签字段信息
-     *
-     * @param labelFieldInfoAddDTO
-     * @return
      */
     @Transactional(rollbackFor = Exception.class)
     @Override

postdischarge-manage/src/main/java/com/xinelu/manage/service/scriptInfo/IScriptInfoService.java

@@ -63,10 +63,6 @@ public interface IScriptInfoService {
 
     /**
      * 话术图片上传
-     *
-     * @param multipartFile
-     * @return
-     * @throws Exception
      */
     AjaxResult uploadScriptInfo(MultipartFile multipartFile) throws Exception;
 }

postdischarge-manage/src/main/java/com/xinelu/manage/service/scriptInfo/impl/ScriptInfoServiceImpl.java

@@ -120,9 +120,6 @@ public class ScriptInfoServiceImpl implements IScriptInfoService {
 
     /**
      * 话术图片上传
-     *
-     * @param multipartFile
-     * @return
      */
     @Override
     public AjaxResult uploadScriptInfo(MultipartFile multipartFile) throws Exception {

postdischarge-manage/src/main/java/com/xinelu/manage/service/servicepackage/IServicePackageService.java

@@ -62,10 +62,6 @@ public interface IServicePackageService {
 
     /**
      * 修改服务包发布状态
-     *
-     * @param id
-     * @param whetherRelease
-     * @return
      */
     int editReleaseStatus(Long id, Integer whetherRelease);
 }

postdischarge-manage/src/main/java/com/xinelu/manage/service/servicepackage/impl/ServicePackageServiceImpl.java

@@ -22,7 +22,6 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 服务包基础信息Service业务层处理
@@ -56,7 +55,7 @@ public class ServicePackageServiceImpl implements IServicePackageService {
         ServicePackageDetailVO servicePackageDetailVO = servicePackageMapper.selectServicePackagesById(id);
         servicePackageDetailVO.setPackageTermAndUnit(servicePackageDetailVO.getPackageTerm() + servicePackageDetailVO.getPackageTermUnit());
         // 根据服务包id查询服务包内容
-        List<ServicePackageContentVO> voList = servicePackageMapper.selectServicePackageVOListById(id);
+        List<ServicePackageContentVO> voList = servicePackageMapper.selectServicePackageVoListById(id);
         servicePackageDetailVO.setVoList(voList);
         return servicePackageDetailVO;
     }
@@ -71,11 +70,11 @@ public class ServicePackageServiceImpl implements IServicePackageService {
     public TableDataInfo selectServicePackageList(ServicePackage servicePackage) {
         pageServiceUtil.startPage();
         List<ServicePackageVO> voList = servicePackageMapper.selectServicePackageLists(servicePackage);
-        voList.stream().peek(vo -> {
+        voList.forEach(vo -> {
             // 拼接服务包期限+服务包单位
             String packageTermAndUnit = vo.getPackageTerm() + vo.getPackageTermUnit();
             vo.setPackageTermAndUnit(packageTermAndUnit);
-        }).collect(Collectors.toList());
+        });
         return pageServiceUtil.getDataTable(voList);
     }
 
@@ -241,10 +240,6 @@ public class ServicePackageServiceImpl implements IServicePackageService {
 
     /**
      * 修改服务包发布状态
-     *
-     * @param id
-     * @param whetherRelease
-     * @return
      */
     @Override
     public int editReleaseStatus(Long id, Integer whetherRelease) {

postdischarge-manage/src/main/java/com/xinelu/manage/service/servicewaycontent/IServiceWayContentService.java

@@ -67,50 +67,31 @@ public interface IServiceWayContentService {
 
     /**
      * 查询服务方式列表
-     *
-     * @param serviceWayName
-     * @param id
-     * @return
      */
     List<ServiceWayContentAndNumVO> selectListNum(String serviceWayName, Long id);
 
     /**
      * 新增服务方式
-     *
-     * @param serviceWayContent
-     * @return
      */
     int insertServiceWay(ServiceWayContent serviceWayContent);
 
     /**
      * 修改服务方式
-     *
-     * @param serviceWayContent
-     * @return
      */
     int editServiceWay(ServiceWayContent serviceWayContent);
 
     /**
      * 根据id删除服务方式
-     *
-     * @param id
-     * @return
      */
     int deleteServiceWayById(Long id);
 
     /**
      * 根据id查询服务方式
-     *
-     * @param id
-     * @return
      */
     String selectServiceWayById(Long id);
 
     /**
      * 根据服务频次id删除服务内容
-     *
-     * @param id
-     * @return
      */
     int deleteByFrequencyId(Long id);
 }

postdischarge-manage/src/main/java/com/xinelu/manage/service/servicewaycontent/impl/ServiceWayContentServiceImpl.java

@@ -3,7 +3,6 @@ package com.xinelu.manage.service.servicewaycontent.impl;
 import com.xinelu.common.constant.Constants;
 import com.xinelu.common.enums.ServiceWayContentServiceType;
 import com.xinelu.common.exception.ServiceException;
-import com.xinelu.common.utils.DateUtils;
 import com.xinelu.common.utils.SecurityUtils;
 import com.xinelu.common.utils.bean.BeanUtils;
 import com.xinelu.common.utils.codes.GenerateSystemCodeUtil;
@@ -23,7 +22,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
-import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
@@ -56,7 +54,7 @@ public class ServiceWayContentServiceImpl implements IServiceWayContentService {
      * 查询服务方式内容列表
      *
      * @param serviceWayContentDTO 服务方式内容
-     * @return
+     * @return 服务方式内容集合
      */
     @Override
     public List<ServiceWayContentVO> selectServiceWayContentList(ServiceWayContentDTO serviceWayContentDTO) {
@@ -228,10 +226,6 @@ public class ServiceWayContentServiceImpl implements IServiceWayContentService {
 
     /**
      * 查询服务方式列表
-     *
-     * @param serviceWayName
-     * @param id
-     * @return
      */
     @Override
     public List<ServiceWayContentAndNumVO> selectListNum(String serviceWayName, Long id) {
@@ -240,9 +234,6 @@ public class ServiceWayContentServiceImpl implements IServiceWayContentService {
 
     /**
      * 新增服务方式
-     *
-     * @param serviceWayContent
-     * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -263,9 +254,6 @@ public class ServiceWayContentServiceImpl implements IServiceWayContentService {
 
     /**
      * 修改服务方式
-     *
-     * @param serviceWayContent
-     * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -284,9 +272,6 @@ public class ServiceWayContentServiceImpl implements IServiceWayContentService {
 
     /**
      * 根据id删除服务方式
-     *
-     * @param id
-     * @return
      */
     @Override
     public int deleteServiceWayById(Long id) {
@@ -303,6 +288,9 @@ public class ServiceWayContentServiceImpl implements IServiceWayContentService {
         return serviceWayContentMapper.deleteServiceWayById(id);
     }
 
+    /**
+     * 根据服务方式id获取服务方式
+     */
     @Override
     public String selectServiceWayById(Long id) {
         return serviceWayContentMapper.selectServiceWayById(id);
@@ -310,9 +298,6 @@ public class ServiceWayContentServiceImpl implements IServiceWayContentService {
 
     /**
      * 根据服务频次id删除服务内容
-     *
-     * @param id
-     * @return
      */
     @Override
     public int deleteByFrequencyId(Long id) {

postdischarge-manage/src/main/java/com/xinelu/manage/service/wechattemplate/IWechatTemplateService.java

@@ -66,9 +66,6 @@ public interface IWechatTemplateService {
 
     /**
      * 根据id查询微信模板Dto
-     *
-     * @param id
-     * @return
      */
     WechatTemplateTaskVO selectWechatTemplateDtoById(Long id);
 }

postdischarge-manage/src/main/java/com/xinelu/manage/service/wechattemplate/impl/WechatTemplateServiceImpl.java

@@ -37,9 +37,6 @@ public class WechatTemplateServiceImpl implements IWechatTemplateService {
     @Resource
     private SysDictDataMapper sysDictDataMapper;
 
-    @Resource
-    private PageServiceUtil pageServiceUtil;
-
     /**
      * 查询微信模板信息
      *
@@ -222,9 +219,6 @@ public class WechatTemplateServiceImpl implements IWechatTemplateService {
 
     /**
      * 根据id查询微信模板Dto
-     *
-     * @param id
-     * @return
      */
     @Override
     public WechatTemplateTaskVO selectWechatTemplateDtoById(Long id) {

postdischarge-manage/src/main/resources/mapper/manage/servicepackage/ServicePackageMapper.xml

@@ -211,7 +211,7 @@
         </where>
         order by create_time DESC
     </select>
-    <select id="selectServicePackageVOListById"
+    <select id="selectServicePackageVoListById"
             resultType="com.xinelu.manage.vo.servicepackagecontent.ServicePackageContentVO">
         select spc1.id,
                spc1.service_way_name,

postdischarge-manage/src/main/resources/mapper/manage/servicewaycontent/ServiceWayContentMapper.xml

@@ -223,35 +223,6 @@
             </if>
         </where>
     </select>
-    <select id="countByDTOAndContentId" resultType="java.lang.Integer">
-        select count(*)
-        from service_way_content swc1
-        left join
-        service_way_content swc2 on swc1.id = swc2.service_way_id
-        left join service_way_content swc3 on swc2.id = swc3.service_content_id
-        <where>
-            swc1.service_type = 'SERVICE_WRY'
-            and swc2.service_type = 'SERVICE_CONTENT'
-            and swc3.service_type = 'SERVICE_FREQUENCY'
-            and swc1.id = #{DTO.id} and swc2.id = #{id}
-            <if test="serviceFrequencyType != null  and serviceFrequencyType != ''">
-                and service_frequency_type =
-                #{serviceFrequencyType}
-            </if>
-            <if test="serviceFrequencyText != null  and serviceFrequencyText != ''">
-                and service_frequency_text =
-                #{serviceFrequencyText}
-            </if>
-            <if test="serviceFrequencyStart != null ">
-                and service_frequency_start =
-                #{serviceFrequencyStart}
-            </if>
-            <if test="serviceFrequencyEnd != null ">
-                and service_frequency_end =
-                #{serviceFrequencyEnd}
-            </if>
-        </where>
-    </select>
     <select id="countByEditDTO" resultType="java.lang.Integer"
             parameterType="com.xinelu.manage.dto.servicewaycontent.ServiceWayContentEditDTO">
         select count(*)