nm-project
/
aiccs-api
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.107.61.133:3000/nm-project/aiccs-api

This commit is contained in:
黎润豪 2026-02-26 09:41:39 +08:00
parent 7d74f49d05 b6df0092db
commit 86864192de
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/chinaweal/aiccs/aiccs/force/controller/XrForceDeregisterSpeController.java
View File

@ -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<List<XrForceDeregisterSpeVo>> listByBizSeqNo(@RequestParam @ApiParam("id") String bizSeqNo,String forceType, HttpServletRequest request) {
public RestResult<IPage<XrForceDeregisterSpeVo>> listByBizSeqNo(@RequestParam @ApiParam("id") String bizSeqNo,String forceType, Integer current, Integer size, HttpServletRequest request) {
AICUser user = getLoginUser(request);
LambdaQueryWrapper<XrForceDeregisterSpe> 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<XrForceDeregisterSpe> speList = iXrForceDeregisterSpeService.list(queryWrapper);
Page<XrForceDeregisterSpe> page = new Page<>(current, size);
IPage<XrForceDeregisterSpe> pageSpe = iXrForceDeregisterSpeService.page(page, queryWrapper);
List<XrForceDeregisterSpe> speList = pageSpe.getRecords();
IPage<XrForceDeregisterSpeVo> pageSpeVo = new Page<>(page.getCurrent(), page.getSize(), pageSpe.getTotal());
List<XrForceDeregisterSpeVo> 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)

4
src/main/java/com/chinaweal/aiccs/aiccs/force/service/impl/XrForceDeregisterSpeServiceImpl.java
View File

@ -601,10 +601,10 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl<XrForceDeregist
iXrForceDeregisterResService.saveOrUpdate(xrForceDeregisterRes);
iXrForceNoticeService.saveOrUpdate(xrForceNotice);
Map<String, Object> 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()));