From 64fd3d3bf2e1ac189768eee1a86da6eea96c9874 Mon Sep 17 00:00:00 2001 From: zhouxy Date: Wed, 25 Feb 2026 15:46:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=BA=E5=88=B6?= =?UTF-8?q?=E6=B3=A8=E9=94=80=E5=AE=A1=E6=89=B9=E6=8A=A5=E9=94=99=E7=9A=84?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../force/service/impl/XrForceDeregisterSpeServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/force/service/impl/XrForceDeregisterSpeServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/force/service/impl/XrForceDeregisterSpeServiceImpl.java index 5ecb60f..ba4bdd0 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/force/service/impl/XrForceDeregisterSpeServiceImpl.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/force/service/impl/XrForceDeregisterSpeServiceImpl.java @@ -597,10 +597,10 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl data = new HashMap<>(); - String nameByCode = gzaiccodeService.getNameByCode(gzaiccodeService.getNameByCode(StringUtils.clearRegionZero(xrForceSpe.getRegOrg()))); + String nameByCode = gzaiccodeService.getNameByCode(xrForceSpe.getRegOrg()); data.put("areaName", StringUtils.trimToEmpty(nameByCode)); data.put("writNo", StringUtils.trimToEmpty(tsWritModel.getWritsno())); - data.put("writContent", StringUtils.trimToEmpty(replaceContent)); + data.put("htmlContent", StringUtils.trimToEmpty(replaceContent)); LocalDate now = LocalDate.now(); data.put("year", String.valueOf(now.getYear())); data.put("month", String.valueOf(now.getMonthValue() > 9 ? now.getMonthValue() : "0" + now.getMonthValue())); From b6df0092dba6b5efe1e7ec4efd4b89050f33eae2 Mon Sep 17 00:00:00 2001 From: fangjf <2905107328@qq.com> Date: Wed, 25 Feb 2026 17:00:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8B=9F=E5=BC=BA?= =?UTF-8?q?=E5=88=B6=E6=B3=A8=E9=94=80=E4=B8=9A=E5=8A=A1=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/XrForceDeregisterSpeController.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/force/controller/XrForceDeregisterSpeController.java b/src/main/java/com/chinaweal/aiccs/aiccs/force/controller/XrForceDeregisterSpeController.java index 48056bc..51019c2 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/force/controller/XrForceDeregisterSpeController.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/force/controller/XrForceDeregisterSpeController.java @@ -2,6 +2,7 @@ package com.chinaweal.aiccs.aiccs.force.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaweal.aiccs.aiccs.abnormal.entity.EBaseinfo; import com.chinaweal.aiccs.aiccs.abnormal.service.EBaseinfoService; import com.chinaweal.aiccs.aiccs.business.entity.vo.XrTaskListVo; @@ -107,7 +108,7 @@ public class XrForceDeregisterSpeController extends BaseController { @ApiOperation(value = "4.业务号批量查询拟强制注销业务", position = 4) @GetMapping("/listByBizSeqNo") - public RestResult> listByBizSeqNo(@RequestParam @ApiParam("id") String bizSeqNo,String forceType, HttpServletRequest request) { + public RestResult> listByBizSeqNo(@RequestParam @ApiParam("id") String bizSeqNo,String forceType, Integer current, Integer size, HttpServletRequest request) { AICUser user = getLoginUser(request); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(XrForceDeregisterSpe::getBizSeqNo, bizSeqNo); @@ -115,7 +116,10 @@ public class XrForceDeregisterSpeController extends BaseController { if(StringUtils.isNotBlank(forceType)){ queryWrapper.eq(XrForceDeregisterSpe::getForceType, forceType); } - List speList = iXrForceDeregisterSpeService.list(queryWrapper); + Page page = new Page<>(current, size); + IPage pageSpe = iXrForceDeregisterSpeService.page(page, queryWrapper); + List speList = pageSpe.getRecords(); + IPage pageSpeVo = new Page<>(page.getCurrent(), page.getSize(), pageSpe.getTotal()); List speVoList = new ArrayList<>(); if (!speList.isEmpty()) { @@ -136,7 +140,7 @@ public class XrForceDeregisterSpeController extends BaseController { speVoList.add(xrForceDeregisterSpeVo); } } - return RestResult.ok(speVoList); + return RestResult.ok(pageSpeVo.setRecords(speVoList)); } @ApiOperation(value = "5.获取拟强制注销公告内容", position = 5)