From 5e249b7eb65847af81c48f20c2ef7062b1291736 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 24 Jun 2024 18:13:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A7=E4=BB=B6=E8=B0=83=E6=95=B4=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AsOldpartreturnConfirmDto.java | 2 ++ .../AsOldpartreturnApplyMapper.java | 5 --- .../AsOldpartreturnApplyMapper.xml | 4 --- .../AsOldpartreturnApplyService.java | 31 ++++++++++++++++--- .../AsOldpartreturnConfirmMapper.java | 7 ----- .../AsOldpartreturnConfirmMapper.xml | 7 ----- .../AsOldpartreturnConfirmRest.java | 8 ----- .../AsOldpartreturnConfirmService.java | 16 ---------- 8 files changed, 29 insertions(+), 51 deletions(-) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnconfirm/AsOldpartreturnConfirmDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnconfirm/AsOldpartreturnConfirmDto.java index c5f71d1847..91bde34dd4 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnconfirm/AsOldpartreturnConfirmDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnconfirm/AsOldpartreturnConfirmDto.java @@ -54,6 +54,8 @@ public class AsOldpartreturnConfirmDto implements Dto { private String sid; // sid + @ApiModelProperty("备注") + private String remarks; @ApiModelProperty("主表sid") private String mainSid; // 主表sid @ApiModelProperty("返件数量确认(0一致,1不一致)") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.java index b6824f0f4c..e50e7a5b34 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.java @@ -55,11 +55,6 @@ import java.util.Map; public interface AsOldpartreturnApplyMapper extends BaseMapper { IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from as_oldpartreturn_apply") - List selectListVo(); int updateFlowFiled(Map map); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.xml index 9004d5a44c..b52b7286d2 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.xml @@ -25,10 +25,6 @@ LEFT JOIN anrui_portal.sys_organization AS s ON aoa.deptSid = s.sid ${ew.sqlSegment} - - UPDATE as_oldpartreturn_apply diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java index dbc4bacc0a..8ab3b090fc 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java @@ -199,6 +199,17 @@ public class AsOldpartreturnApplyService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); + for (AsOldpartreturnApplyVo record : pagging.getRecords()) { + List urlPahts = new ArrayList<>(); + AsOldpartreturnApply asOldpartreturnApply = fetchBySid(record.getSid()); + String filePath = asOldpartreturnApply.getFilePath(); + String[] filePaths = filePath.split(","); + for (String path : filePaths) { + String url = fileUploadComponent.getUrlPrefix() + path; + urlPahts.add(url); + } + record.setFilePaths(urlPahts); + } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } @@ -612,16 +623,16 @@ public class AsOldpartreturnApplyService extends MybatisBaseService= date_format('" + createStartTime + "','%Y-%m-%d')"). apply(StringUtils.isNotEmpty(createEndTime), "date_format (aoa.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" ); + qw.groupBy("aoa.sid"); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); + for (AsOldpartreturnApplyVo record : pagging.getRecords()) { + List urlPahts = new ArrayList<>(); + AsOldpartreturnApply asOldpartreturnApply = fetchBySid(record.getSid()); + String filePath = asOldpartreturnApply.getFilePath(); + String[] filePaths = filePath.split(","); + for (String path : filePaths) { + String url = fileUploadComponent.getUrlPrefix() + path; + urlPahts.add(url); + } + record.setFilePaths(urlPahts); + } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmMapper.java index c811aeab5e..a2bc25d3b2 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmMapper.java @@ -54,13 +54,6 @@ import java.util.List; @Mapper public interface AsOldpartreturnConfirmMapper extends BaseMapper { - //@Update("update as_oldpartreturn_confirm set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - @Select("select * from as_oldpartreturn_confirm") List selectListVo(); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmMapper.xml index 6a7732ed52..c86faccd98 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmMapper.xml @@ -3,11 +3,4 @@ - - - \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmRest.java index 00ce2f24e8..186f7004a9 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmRest.java @@ -59,14 +59,6 @@ public class AsOldpartreturnConfirmRest { @Autowired private AsOldpartreturnConfirmService asOldpartreturnConfirmService; - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = asOldpartreturnConfirmService.listPageVo(pq); - return rb.success().setData(pv); - } - @ApiOperation("新增或修改") @PostMapping("/save") public ResultBean save(@RequestBody AsOldpartreturnConfirmDto dto){ diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmService.java index bd22353505..fb59b8bb6a 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmService.java @@ -73,22 +73,6 @@ public class AsOldpartreturnConfirmService extends MybatisBaseService createQueryWrapper(AsOldpartreturnConfirmQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - AsOldpartreturnConfirmQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } public void saveOrUpdateDto(AsOldpartreturnConfirmDto dto){ String dtoSid = dto.getSid();