From c4b22272f4cb970662f49afbb28c9e03e66fc908 Mon Sep 17 00:00:00 2001 From: lroyia Date: Tue, 21 Apr 2026 14:53:50 +0800 Subject: [PATCH] =?UTF-8?q?SQL=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TBizRemPunishmentController.java | 5 +-- .../mapper/TbIlcPunInfoQueryMapper.java | 2 +- .../service/TbIlcPunInfoQueryService.java | 2 +- .../impl/TbIlcPunInfoQueryServiceImpl.java | 3 +- .../crgs/punish/TbIlcPunInfoQueryMapper.xml | 38 +++++++++---------- 5 files changed, 24 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/controller/TBizRemPunishmentController.java b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/controller/TBizRemPunishmentController.java index 986281f..79cc084 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/controller/TBizRemPunishmentController.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/controller/TBizRemPunishmentController.java @@ -8,7 +8,6 @@ import com.chinaweal.aiccs.aiccs.abnormal.entity.TSAttachment; import com.chinaweal.aiccs.aiccs.abnormal.service.TSAttachmentService; import com.chinaweal.aiccs.aiccs.business.entity.TSTaskList; import com.chinaweal.aiccs.aiccs.business.service.TSTaskListService; -import com.chinaweal.aiccs.aiccs.punishment.entity.PunishmentUnionDto; import com.chinaweal.aiccs.aiccs.punishment.entity.TBizRemPunishment; import com.chinaweal.aiccs.aiccs.punishment.service.ITBizRemPunishmentService; import com.chinaweal.aiccs.aiccs.writs.entity.Tswrittemplate; @@ -124,14 +123,14 @@ public class TBizRemPunishmentController extends BaseController { @ApiOperation(value = "6.查询行政处罚记录", position = 6) @PostMapping("/punishmentList") - public RestResult> punishmentList(@RequestBody PageRequestDto pageRequestDto) { + public RestResult> punishmentList(@RequestBody PageRequestDto pageRequestDto) { AICUser curUser = SSOUtil.getUser(); String region = curUser.getRegionID(); // 自治区的账号可以发起所有的行政处罚，主要是针对药监局的行政处罚 if (!StringUtils.equals("150000", region)) { pageRequestDto.getParamMap().put("region", region); } - IPage iPage = tbIlcPunInfoQueryService.searchUnionByPage( + IPage iPage = tbIlcPunInfoQueryService.searchUnionByPage( new Page<>(pageRequestDto.getCurPage(), pageRequestDto.getPageSize()), pageRequestDto.getParamMap()); return RestResult.ok(iPage); diff --git a/src/main/java/com/chinaweal/aiccs/crgs/punish/mapper/TbIlcPunInfoQueryMapper.java b/src/main/java/com/chinaweal/aiccs/crgs/punish/mapper/TbIlcPunInfoQueryMapper.java index 4954361..4cf2b1a 100644 --- a/src/main/java/com/chinaweal/aiccs/crgs/punish/mapper/TbIlcPunInfoQueryMapper.java +++ b/src/main/java/com/chinaweal/aiccs/crgs/punish/mapper/TbIlcPunInfoQueryMapper.java @@ -22,5 +22,5 @@ public interface TbIlcPunInfoQueryMapper extends BaseMapper { TbIlcPunInfoQuery findById(@Param("id") String id); - IPage searchUnionByPage(Page page, @Param("params") Map params); + IPage searchUnionByPage(Page page, @Param("params") Map params); } diff --git a/src/main/java/com/chinaweal/aiccs/crgs/punish/service/TbIlcPunInfoQueryService.java b/src/main/java/com/chinaweal/aiccs/crgs/punish/service/TbIlcPunInfoQueryService.java index 5da74dd..4fdf8d4 100644 --- a/src/main/java/com/chinaweal/aiccs/crgs/punish/service/TbIlcPunInfoQueryService.java +++ b/src/main/java/com/chinaweal/aiccs/crgs/punish/service/TbIlcPunInfoQueryService.java @@ -21,5 +21,5 @@ public interface TbIlcPunInfoQueryService extends BaseService TbIlcPunInfoQuery findById(String id); - IPage searchUnionByPage(Page page, Map params); + IPage searchUnionByPage(Page page, Map params); } diff --git a/src/main/java/com/chinaweal/aiccs/crgs/punish/service/impl/TbIlcPunInfoQueryServiceImpl.java b/src/main/java/com/chinaweal/aiccs/crgs/punish/service/impl/TbIlcPunInfoQueryServiceImpl.java index d88c6ff..94d745c 100644 --- a/src/main/java/com/chinaweal/aiccs/crgs/punish/service/impl/TbIlcPunInfoQueryServiceImpl.java +++ b/src/main/java/com/chinaweal/aiccs/crgs/punish/service/impl/TbIlcPunInfoQueryServiceImpl.java @@ -2,7 +2,6 @@ package com.chinaweal.aiccs.crgs.punish.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.chinaweal.aiccs.aiccs.punishment.entity.PunishmentUnionDto; import com.chinaweal.aiccs.crgs.punish.entity.TbIlcPunInfoQuery; import com.chinaweal.aiccs.crgs.punish.mapper.TbIlcPunInfoQueryMapper; import com.chinaweal.aiccs.crgs.punish.service.TbIlcPunInfoQueryService; @@ -37,7 +36,7 @@ public class TbIlcPunInfoQueryServiceImpl extends BaseServiceImpl searchUnionByPage(Page page, Map params) { + public IPage searchUnionByPage(Page page, Map params) { return tbIlcPunInfoQueryMapper.searchUnionByPage(page, params); } } diff --git a/src/main/resources/mybatis/mapper/crgs/punish/TbIlcPunInfoQueryMapper.xml b/src/main/resources/mybatis/mapper/crgs/punish/TbIlcPunInfoQueryMapper.xml index 67a5313..7a76022 100644 --- a/src/main/resources/mybatis/mapper/crgs/punish/TbIlcPunInfoQueryMapper.xml +++ b/src/main/resources/mybatis/mapper/crgs/punish/TbIlcPunInfoQueryMapper.xml @@ -99,20 +99,20 @@ - ( SELECT - CASEID AS caseId, - ENTNAME AS entName, + CASEID AS id, + REGNO AS zch, UNISCID AS uniscid, - REGNO AS regNo, - PENDECNO AS penDecNo, - PENAUTH_CN AS penAuthCn, - PENDECISSDATE AS penDecIssDate, - PENCONTENT AS penContent, + ENTNAME AS dsrmc, + PENDECNO AS sbookcode, + ILLEGACTTYPE AS sgisttypename, + PENAUTH_CN AS cfdjjg, + PENDECISSDATE AS cfjdsj, + PENCONTENT AS spuncontent, PENAM AS penam, - ILLEGACTTYPE AS illegActType, - '外省' AS dataSource + '外省' AS sflag FROM QG_CASE_PUB_NBASEINFO WHERE ACTYPE = '1' @@ -132,17 +132,17 @@ UNION ALL ( SELECT - CASEID AS caseId, - ENTNAME AS entName, + CASEID AS id, + REGNO AS zch, UNISCID AS uniscid, - REGNO AS regNo, - PENDECNO AS penDecNo, - PENAUTH_CN AS penAuthCn, - PENDECISSDATE AS penDecIssDate, - PENCONTENT AS penContent, + ENTNAME AS dsrmc, + PENDECNO AS sbookcode, + ILLEGACTTYPE AS sgisttypename, + PENAUTH_CN AS cfdjjg, + PENDECISSDATE AS cfjdsj, + PENCONTENT AS spuncontent, PENAM AS penam, - ILLEGACTTYPE AS illegActType, - '本省' AS dataSource + '本省' AS sflag FROM case_pub_nbaseinfo WHERE ACTYPE = '1'