From 85dc2129502894029b655c68aeaa430ae2e490c0 Mon Sep 17 00:00:00 2001 From: luyan Date: Wed, 30 Aug 2023 17:24:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=95=E8=AF=89?= =?UTF-8?q?=E5=BB=BA=E8=AE=AE=E5=A4=84=E7=90=86bug=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcComplaintsReplyServiceImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcComplaintsReplyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcComplaintsReplyServiceImpl.java index 78885c467a..12cbbd133f 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcComplaintsReplyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcComplaintsReplyServiceImpl.java @@ -8,12 +8,15 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.dao.IcComplaintsReplyDao; import com.epmet.dto.IcComplaintsReplyDTO; +import com.epmet.dto.result.LoginUserDetailsResultDTO; import com.epmet.entity.IcComplaintsReplyEntity; +import com.epmet.remote.EpmetUserRemoteService; import com.epmet.service.IcComplaintsReplyService; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -27,6 +30,9 @@ import java.util.Map; @Service public class IcComplaintsReplyServiceImpl extends BaseServiceImpl implements IcComplaintsReplyService { + @Resource + private EpmetUserRemoteService remoteService; + @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -62,6 +68,8 @@ public class IcComplaintsReplyServiceImpl extends BaseServiceImpl Date: Thu, 31 Aug 2023 15:54:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8A=95=E8=AF=89=E5=BB=BA=E8=AE=AE?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcComplaintsController.java | 2 +- .../IcComplaintsReplyController.java | 20 +++++++----- .../impl/IcComplaintsReplyServiceImpl.java | 31 ++++++++++++++++--- .../service/impl/IcComplaintsServiceImpl.java | 18 ++++++++--- 4 files changed, 55 insertions(+), 16 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcComplaintsController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcComplaintsController.java index a909f6916f..ffc72747af 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcComplaintsController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcComplaintsController.java @@ -35,7 +35,7 @@ public class IcComplaintsController { private IcComplaintsService icComplaintsService; @RequestMapping("page") - public Result> page(@RequestParam Map params) { + public Result> page(@RequestBody Map params) { PageData page = icComplaintsService.page(params); return new Result>().ok(page); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcComplaintsReplyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcComplaintsReplyController.java index ea445f8aa6..84620fd5f6 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcComplaintsReplyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcComplaintsReplyController.java @@ -13,6 +13,7 @@ import com.epmet.service.IcComplaintsReplyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Map; @@ -30,20 +31,26 @@ public class IcComplaintsReplyController { private IcComplaintsReplyService icComplaintsReplyService; @RequestMapping("page") - public Result> page(@RequestParam Map params){ + public Result> page(@RequestParam Map params) { PageData page = icComplaintsReplyService.page(params); return new Result>().ok(page); } - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) - public Result get(@PathVariable("id") String id){ + @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET}) + public Result get(@PathVariable("id") String id) { IcComplaintsReplyDTO data = icComplaintsReplyService.get(id); return new Result().ok(data); } + @RequestMapping("list") + public Result> list(@RequestParam Map params) { + List data = icComplaintsReplyService.list(params); + return new Result>().ok(data); + } + @NoRepeatSubmit @PostMapping("save") - public Result save(@RequestBody IcComplaintsReplyDTO dto){ + public Result save(@RequestBody IcComplaintsReplyDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); icComplaintsReplyService.save(dto); @@ -52,7 +59,7 @@ public class IcComplaintsReplyController { @NoRepeatSubmit @PostMapping("update") - public Result update(@RequestBody IcComplaintsReplyDTO dto){ + public Result update(@RequestBody IcComplaintsReplyDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); icComplaintsReplyService.update(dto); @@ -60,7 +67,7 @@ public class IcComplaintsReplyController { } @PostMapping("delete") - public Result delete(@RequestBody String[] ids){ + public Result delete(@RequestBody String[] ids) { //效验数据 AssertUtils.isArrayEmpty(ids, "id"); icComplaintsReplyService.delete(ids); @@ -68,5 +75,4 @@ public class IcComplaintsReplyController { } - } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcComplaintsReplyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcComplaintsReplyServiceImpl.java index 12cbbd133f..fdf0c88cb5 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcComplaintsReplyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcComplaintsReplyServiceImpl.java @@ -7,12 +7,15 @@ import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.dao.IcComplaintsReplyDao; +import com.epmet.dto.IcComplaintsDTO; import com.epmet.dto.IcComplaintsReplyDTO; import com.epmet.dto.result.LoginUserDetailsResultDTO; import com.epmet.entity.IcComplaintsReplyEntity; import com.epmet.remote.EpmetUserRemoteService; import com.epmet.service.IcComplaintsReplyService; +import com.epmet.service.IcComplaintsService; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -33,6 +36,9 @@ public class IcComplaintsReplyServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -49,12 +55,12 @@ public class IcComplaintsReplyServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); + String complantsId = (String) params.get("complantsId"); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - + wrapper.eq(StringUtils.isNotBlank(complantsId), "COMPLANTS_ID", complantsId); return wrapper; } @@ -71,6 +77,8 @@ public class IcComplaintsReplyServiceImpl extends BaseServiceImpl data = getPageData(page, IcComplaintsDTO.class); + if (!CollectionUtils.isEmpty(data.getList())) { + page.getRecords().forEach(entity -> { + data.getList().forEach(dto -> { + if (dto.getId().equals(entity.getId())) { + dto.setCreatedTime(DateUtil.formatDate(entity.getCreatedTime())); + } + }); + }); + } + return data; } @Override @@ -82,7 +92,7 @@ public class IcComplaintsServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); wrapper.like(StringUtils.isNotEmpty(userName), "USER_NAME", userName); - wrapper.eq(StringUtils.isNotEmpty(state), FieldConstant.STATE_HUMP, state); + wrapper.eq(StringUtils.isNotEmpty(state), FieldConstant.STATE, state); wrapper.eq(StringUtils.isNotEmpty(type), "TYPE", type); wrapper.like(StringUtils.isNotEmpty(content), "CONTENT", content); wrapper.between(StringUtils.isNotEmpty(startTime), "CREATED_TIME", startTime, endTime); @@ -151,14 +161,14 @@ public class IcComplaintsServiceImpl extends BaseServiceImpl