From dd96d9bab7a4409a3cbfb9bf73d4acddb08f9862 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Tue, 28 Mar 2023 16:45:33 +0800 Subject: [PATCH] =?UTF-8?q?feature=201.=E9=82=AE=E7=AE=B1=E9=87=87?= =?UTF-8?q?=E9=9B=86=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/mailGather/EmailMaintainController.java | 8 ++++---- .../controller/mailGather/MailGatherLogController.java | 4 ++-- .../service/mailGather/impl/EmailMaintainServiceImpl.java | 3 ++- .../service/mailGather/impl/MailGatherLogServiceImpl.java | 1 + .../resources/mapper/mailGather/EmailMaintainMapper.xml | 4 ++-- .../resources/mapper/mailGather/MailGatherLogMapper.xml | 1 - 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java index 4e186038..7d3821e6 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java +++ b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java @@ -19,7 +19,7 @@ import java.util.Map; * @since 2023-03-23 08:39:46 */ @RestController -@RequestMapping("emailMaintain") +@RequestMapping("/emailMaintain") public class EmailMaintainController extends AbstractController { /** * 服务对象 @@ -33,10 +33,10 @@ public class EmailMaintainController extends AbstractController { * @param pramsMap 筛选条件 * @return 查询结果 */ - @GetMapping("/queryByPage") + @PostMapping("/queryByPage") public ResponseEntity queryByPage(@RequestBody Map pramsMap) { // 入参统一在入口处理 - pramsMap.put("dbName", getUserInfo().getDbName()); +// pramsMap.put("dbName", getUserInfo().getDbName()); // List gfshList = new ArrayList<>(); // if (!"99".equals(pramsMap.get("gfsh")) && pramsMap.get("gfsh") != null && !"".equals(pramsMap.get("gfsh"))) { // gfshList.add(pramsMap.get("gfsh").toString()); @@ -81,7 +81,7 @@ public class EmailMaintainController extends AbstractController { * @return 编辑结果 */ @PostMapping("/edit") - public ResponseEntity edit(EmailMaintainVo emailMaintain) { + public ResponseEntity edit(@RequestBody EmailMaintainVo emailMaintain) { boolean b = emailMaintainService.update(emailMaintain); if(b){ return ResponseEntity.ok(R.ok()); diff --git a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/MailGatherLogController.java b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/MailGatherLogController.java index a4711fea..64f66412 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/MailGatherLogController.java +++ b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/MailGatherLogController.java @@ -19,7 +19,7 @@ import java.util.Map; * @since 2023-03-23 08:42:35 */ @RestController -@RequestMapping("mailGatherLog") +@RequestMapping("/mailGatherLog") public class MailGatherLogController extends AbstractController { /** * 服务对象 @@ -36,7 +36,7 @@ public class MailGatherLogController extends AbstractController { @PostMapping("/queryByPage") public ResponseEntity queryByPage(@RequestBody Map pramsMap) { - pramsMap.put("dbName", getUserInfo().getDbName()); +// pramsMap.put("dbName", getUserInfo().getDbName()); if (pramsMap.get("username") == null || "".equals(pramsMap.get("username"))) { return ResponseEntity.ok(R.error("收件人姓名不能为空！")); } diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java index cae86c03..db1d2556 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java @@ -53,6 +53,7 @@ public class EmailMaintainServiceImpl implements EmailMaintainService { PageHelper.startPage(curr, size); List emailMaintainVos = emailMaintainDao.queryAllByLimit(pramsMap); PageInfo pageInfo = new PageInfo<>(emailMaintainVos); + returnList.add(pageInfo); // 设置记录总数 json.put("total", pageInfo.getTotal()); json.put("datalist", returnList); @@ -76,7 +77,7 @@ public class EmailMaintainServiceImpl implements EmailMaintainService { emailMaintain.setId(IdUtil.nanoId()); } if(StringUtils.isEmpty(emailMaintain.getDelStatus())){ - emailMaintain.setId("0"); + emailMaintain.setDelStatus("0"); } emailMaintain.setCreateTime(new Date()); emailMaintain.setModifyTime(new Date()); diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/MailGatherLogServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/MailGatherLogServiceImpl.java index b04f8088..607569f9 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/MailGatherLogServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/MailGatherLogServiceImpl.java @@ -50,6 +50,7 @@ public class MailGatherLogServiceImpl implements MailGatherLogService { PageHelper.startPage(curr, size); List emailMaintainVos = mailGatherLogDao.queryAllByLimit(pramsMap); PageInfo pageInfo = new PageInfo<>(emailMaintainVos); + returnList.add(pageInfo); // 设置记录总数 json.put("total", pageInfo.getTotal()); json.put("datalist", returnList); diff --git a/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml b/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml index fe570e0e..628add7f 100644 --- a/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml +++ b/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml @@ -83,8 +83,8 @@ - insert into email_maintain(dept_id, company_code, dept_name, username, user_id, email_address, email_password, create_time, del_status, modify_time) - values (#{deptId}, #{companyCode}, #{deptName}, #{username}, #{userId}, #{emailAddress}, #{emailPassword}, #{createTime}, #{delStatus}, #{modifyTime}) + insert into email_maintain(id, dept_id, company_code, dept_name, username, user_id, email_address, email_password, create_time, del_status, modify_time) + values (#{id}, #{deptId}, #{companyCode}, #{deptName}, #{username}, #{userId}, #{emailAddress}, #{emailPassword}, #{createTime}, #{delStatus}, #{modifyTime}) diff --git a/dxhy-core/src/main/resources/mapper/mailGather/MailGatherLogMapper.xml b/dxhy-core/src/main/resources/mapper/mailGather/MailGatherLogMapper.xml index 5e76cb61..734cbac5 100644 --- a/dxhy-core/src/main/resources/mapper/mailGather/MailGatherLogMapper.xml +++ b/dxhy-core/src/main/resources/mapper/mailGather/MailGatherLogMapper.xml @@ -66,7 +66,6 @@ and create_time = #{createTime} - limit #{pageable.offset}, #{pageable.pageSize}