From fb2c010927cfa0de544c7134993feb87a6388923 Mon Sep 17 00:00:00 2001 From: youxilong Date: Thu, 7 Mar 2024 14:58:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9F=AD=E4=BF=A1=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E6=98=BE=E7=A4=BA=E6=9D=A1=E6=95=B0=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ServicePackageController.java | 21 +++----------- .../textmessage/TextMessageController.java | 5 ++-- .../WechatTemplateController.java | 5 ++-- .../TextMessageSuitTask.java | 2 +- .../mapper/textmessage/TextMessageMapper.java | 8 ----- .../IServicePackageService.java | 3 +- .../impl/ServicePackageServiceImpl.java | 11 +++++-- .../textmessage/ITextMessageService.java | 1 + .../impl/TextMessageServiceImpl.java | 3 +- .../IWechatTemplateService.java | 1 + .../impl/WechatTemplateServiceImpl.java | 3 ++ .../manage/textmessage/TextMessageMapper.xml | 29 ++++++------------- 12 files changed, 37 insertions(+), 55 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/servicepackage/ServicePackageController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/servicepackage/ServicePackageController.java index 94dae338..75276816 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/servicepackage/ServicePackageController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/servicepackage/ServicePackageController.java @@ -1,12 +1,9 @@ package com.xinelu.manage.controller.servicepackage; import com.xinelu.common.annotation.Log; -import com.xinelu.common.constant.HttpStatus; import com.xinelu.common.core.controller.BaseController; import com.xinelu.common.core.domain.AjaxResult; -import com.xinelu.common.core.page.PageDomain; import com.xinelu.common.core.page.TableDataInfo; -import com.xinelu.common.core.page.TableSupport; import com.xinelu.common.enums.BusinessType; import com.xinelu.common.utils.poi.ExcelUtil; import com.xinelu.manage.domain.servicepackage.ServicePackage; @@ -21,7 +18,6 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.util.List; -import java.util.stream.Collectors; /** * 服务包基础信息Controller @@ -43,17 +39,7 @@ public class ServicePackageController extends BaseController { @PreAuthorize("@ss.hasPermi('manage:servicepackage:list')") @GetMapping("/list") public TableDataInfo list(ServicePackage servicePackage) { - PageDomain pageDomain = TableSupport.buildPageRequest(); - Integer pageNum = pageDomain.getPageNum(); - Integer pageSize = pageDomain.getPageSize(); - List list = servicePackageService.selectServicePackageList(servicePackage); - int num = list.size(); - list = list.stream().skip((pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); - TableDataInfo rspData = new TableDataInfo(); - rspData.setCode(HttpStatus.SUCCESS); - rspData.setRows(list); - rspData.setTotal(num); - return rspData; + return servicePackageService.selectServicePackageList(servicePackage); } /** @@ -64,9 +50,10 @@ public class ServicePackageController extends BaseController { @Log(title = "服务包基础信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, ServicePackage servicePackage) { - List list = servicePackageService.selectServicePackageList(servicePackage); + TableDataInfo tableDataInfo = servicePackageService.selectServicePackageList(servicePackage); ExcelUtil util = new ExcelUtil(ServicePackageVO.class); - util.exportExcel(response, list, "服务包基础信息数据"); + List voList = (List) tableDataInfo.getRows(); + util.exportExcel(response, voList, "服务包基础信息数据"); } /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/textmessage/TextMessageController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/textmessage/TextMessageController.java index 11acef7c..80ebf3af 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/textmessage/TextMessageController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/textmessage/TextMessageController.java @@ -48,6 +48,7 @@ public class TextMessageController extends BaseController { Integer pageNum = pageDomain.getPageNum(); Integer pageSize = pageDomain.getPageSize(); List list = textMessageService.selectTextMessageList(textMessageDTO); + //处理上面查询的list集合 int num = list.size(); list = list.stream().skip((pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); TableDataInfo rspData = new TableDataInfo(); @@ -65,9 +66,9 @@ public class TextMessageController extends BaseController { @Log(title = "短信模板信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, TextMessageDTO textMessageDTO) { - List list = textMessageService.selectTextMessageList(textMessageDTO); + List voList = textMessageService.selectTextMessageList(textMessageDTO); ExcelUtil util = new ExcelUtil(TextMessageTaskVO.class); - util.exportExcel(response, list, "短信模板信息数据"); + util.exportExcel(response, voList, "短信模板信息数据"); } /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/wechattemplate/WechatTemplateController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/wechattemplate/WechatTemplateController.java index 362a3ab1..33825bf1 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/wechattemplate/WechatTemplateController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/wechattemplate/WechatTemplateController.java @@ -47,6 +47,7 @@ public class WechatTemplateController extends BaseController { Integer pageNum = pageDomain.getPageNum(); Integer pageSize = pageDomain.getPageSize(); List list = wechatTemplateService.selectWechatTemplateList(wechatTemplateDto); + //处理上面查询的list集合 int num = list.size(); list = list.stream().skip((pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); TableDataInfo rspData = new TableDataInfo(); @@ -64,9 +65,9 @@ public class WechatTemplateController extends BaseController { @Log(title = "微信模板信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, WechatTemplateDTO wechatTemplateDto) { - List list = wechatTemplateService.selectWechatTemplateList(wechatTemplateDto); + List voList = wechatTemplateService.selectWechatTemplateList(wechatTemplateDto); ExcelUtil util = new ExcelUtil(WechatTemplateTaskVO.class); - util.exportExcel(response, list, "微信模板信息数据"); + util.exportExcel(response, voList, "微信模板信息数据"); } /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/textmessagesuittask/TextMessageSuitTask.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/textmessagesuittask/TextMessageSuitTask.java index f9255367..2dde882f 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/textmessagesuittask/TextMessageSuitTask.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/textmessagesuittask/TextMessageSuitTask.java @@ -31,7 +31,7 @@ public class TextMessageSuitTask extends BaseEntity { * 短信模板id */ @ApiModelProperty(value = "短信模板id") - private Long textMessageId; + private Long messageId; /** * 适用任务类型字典Id diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/textmessage/TextMessageMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/textmessage/TextMessageMapper.java index 19071069..16e4b65a 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/textmessage/TextMessageMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/textmessage/TextMessageMapper.java @@ -88,14 +88,6 @@ public interface TextMessageMapper { */ int insertTextMessageSuitTasks(List tasks); - /** - * 批量修改短信模板适用任务类型 - * - * @param tasks - * @return - */ - int updateTextMessageSuitTasks(List tasks); - /** * 批量删除短信模板适用任务类型 * diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicepackage/IServicePackageService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicepackage/IServicePackageService.java index fdb2e36e..cbf1814c 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicepackage/IServicePackageService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicepackage/IServicePackageService.java @@ -1,5 +1,6 @@ package com.xinelu.manage.service.servicepackage; +import com.xinelu.common.core.page.TableDataInfo; import com.xinelu.manage.domain.servicepackage.ServicePackage; import com.xinelu.manage.dto.servicepackage.ServicePackageAddDTO; import com.xinelu.manage.vo.servicepackage.ServicePackageDetailVO; @@ -28,7 +29,7 @@ public interface IServicePackageService { * @param servicePackage 服务包基础信息 * @return 服务包基础信息集合 */ - public List selectServicePackageList(ServicePackage servicePackage); + public TableDataInfo selectServicePackageList(ServicePackage servicePackage); /** * 新增服务包基础信息 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicepackage/impl/ServicePackageServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicepackage/impl/ServicePackageServiceImpl.java index 124d5656..cbae264b 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicepackage/impl/ServicePackageServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicepackage/impl/ServicePackageServiceImpl.java @@ -1,7 +1,9 @@ package com.xinelu.manage.service.servicepackage.impl; +import com.xinelu.common.core.page.TableDataInfo; import com.xinelu.common.exception.ServiceException; import com.xinelu.common.utils.DateUtils; +import com.xinelu.common.utils.PageServiceUtil; import com.xinelu.common.utils.SecurityUtils; import com.xinelu.common.utils.bean.BeanUtils; import com.xinelu.manage.domain.servicepackage.ServicePackage; @@ -35,6 +37,9 @@ public class ServicePackageServiceImpl implements IServicePackageService { @Resource private ServicePackageContentMapper servicePackageContentMapper; + @Resource + private PageServiceUtil pageServiceUtil; + /** * 查询服务包基础信息 * @@ -59,14 +64,16 @@ public class ServicePackageServiceImpl implements IServicePackageService { * @return 服务包基础信息 */ @Override - public List selectServicePackageList(ServicePackage servicePackage) { + public TableDataInfo selectServicePackageList(ServicePackage servicePackage) { + pageServiceUtil.startPage(); List voList = servicePackageMapper.selectServicePackageLists(servicePackage); - return voList.stream().map(vo -> { + voList.stream().map(vo -> { // 拼接服务包期限+服务包单位 String packageTermAndUnit = vo.getPackageTerm() + vo.getPackageTermUnit(); vo.setPackageTermAndUnit(packageTermAndUnit); return vo; }).collect(Collectors.toList()); + return pageServiceUtil.getDataTable(voList); } /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/textmessage/ITextMessageService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/textmessage/ITextMessageService.java index 2cf3ed5c..d7a89ead 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/textmessage/ITextMessageService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/textmessage/ITextMessageService.java @@ -1,5 +1,6 @@ package com.xinelu.manage.service.textmessage; +import com.xinelu.common.core.page.TableDataInfo; import com.xinelu.manage.dto.textmessage.TextMessageDTO; import com.xinelu.manage.dto.textmessage.TextMessageTaskDTO; import com.xinelu.manage.vo.textmessage.TextMessageTaskVO; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/textmessage/impl/TextMessageServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/textmessage/impl/TextMessageServiceImpl.java index 3b1a45ef..401f4b1c 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/textmessage/impl/TextMessageServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/textmessage/impl/TextMessageServiceImpl.java @@ -3,7 +3,6 @@ package com.xinelu.manage.service.textmessage.impl; import com.xinelu.common.core.domain.entity.SysDictData; import com.xinelu.common.exception.ServiceException; import com.xinelu.common.utils.DateUtils; -import com.xinelu.common.utils.PageServiceUtil; import com.xinelu.common.utils.SecurityUtils; import com.xinelu.common.utils.bean.BeanUtils; import com.xinelu.manage.domain.textmessage.TextMessage; @@ -143,7 +142,7 @@ public class TextMessageServiceImpl implements ITextMessageService { private TextMessageSuitTask createTextMessageSuitTask(Long suitTaskTypeId, Long textMessageId, String createdBy, Date createdAt) { SysDictData sysDictData = sysDictDataMapper.selectDictDataById(suitTaskTypeId); TextMessageSuitTask task = new TextMessageSuitTask(); - task.setTextMessageId(textMessageId); + task.setMessageId(textMessageId); task.setSuitTaskTypeId(suitTaskTypeId); task.setSuitTaskTypeName(sysDictData.getDictLabel()); task.setCreateBy(createdBy); diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/wechattemplate/IWechatTemplateService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/wechattemplate/IWechatTemplateService.java index 593c52b7..801c6871 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/wechattemplate/IWechatTemplateService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/wechattemplate/IWechatTemplateService.java @@ -1,5 +1,6 @@ package com.xinelu.manage.service.wechattemplate; +import com.xinelu.common.core.page.TableDataInfo; import com.xinelu.manage.domain.wechattemplate.WechatTemplate; import com.xinelu.manage.dto.wechattemplate.WechatTemplateDTO; import com.xinelu.manage.dto.wechattemplate.WechatTemplateTaskDTO; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/wechattemplate/impl/WechatTemplateServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/wechattemplate/impl/WechatTemplateServiceImpl.java index c84f5774..ab9708fa 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/wechattemplate/impl/WechatTemplateServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/wechattemplate/impl/WechatTemplateServiceImpl.java @@ -38,6 +38,9 @@ public class WechatTemplateServiceImpl implements IWechatTemplateService { @Resource private SysDictDataMapper sysDictDataMapper; + @Resource + private PageServiceUtil pageServiceUtil; + /** * 查询微信模板信息 * diff --git a/postdischarge-manage/src/main/resources/mapper/manage/textmessage/TextMessageMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/textmessage/TextMessageMapper.xml index 31eb6878..fc87f1c1 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/textmessage/TextMessageMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/textmessage/TextMessageMapper.xml @@ -38,7 +38,7 @@ - + @@ -85,12 +85,12 @@ tm.text_message_sort, tm.text_message_remark, tmst.id AS taskId, - tmst.text_message_id, + tmst.message_id, tmst.suit_task_type_id, tmst.suit_task_type_name from text_message tm left join text_message_suit_task tmst on - tm.id = tmst.text_message_id + tm.id = tmst.message_id where tm.id = #{id} @@ -109,12 +109,12 @@ tm.text_message_sort, tm.text_message_remark, tmst.id AS taskId, - tmst.text_message_id, + tmst.message_id, tmst.suit_task_type_id, tmst.suit_task_type_name from text_message tm left join text_message_suit_task tmst on - tm.id = tmst.text_message_id + tm.id = tmst.message_id AND tm.department_id = @@ -228,10 +228,10 @@ INSERT INTO text_message_suit_task - (text_message_id, suit_task_type_id, suit_task_type_name, create_by, create_time) + (message_id, suit_task_type_id, suit_task_type_name, create_by, create_time) VALUES - (#{task.textMessageId}, #{task.suitTaskTypeId}, #{task.suitTaskTypeName}, #{task.createBy}, + (#{task.messageId}, #{task.suitTaskTypeId}, #{task.suitTaskTypeName}, #{task.createBy}, #{task.createTime}) @@ -288,17 +288,6 @@ where id = #{id} - - - UPDATE text_message_suit_task - SET suit_task_type_name = #{task.suitTaskTypeName}, - suit_task_type_id = #{task.suitTaskTypeId}, - update_by = #{task.updateBy}, - update_time = #{task.updateTime} - WHERE text_message_id = #{task.textMessageId} - - update text_message_suit_task @@ -333,7 +322,7 @@ delete from text_message_suit_task - where text_message_id in + where message_id in #{id} @@ -341,6 +330,6 @@ delete from text_message_suit_task - where text_message_id = #{id} + where message_id = #{id} \ No newline at end of file