SQL字段调整

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<IPage<PunishmentUnionDto>> punishmentList(@RequestBody PageRequestDto pageRequestDto) {
+    public RestResult<IPage<TbIlcPunInfoQuery>> punishmentList(@RequestBody PageRequestDto pageRequestDto) {
         AICUser curUser = SSOUtil.getUser();
         String region = curUser.getRegionID();
         // 自治区的账号可以发起所有的行政处罚，主要是针对药监局的行政处罚
         if (!StringUtils.equals("150000", region)) {
             pageRequestDto.getParamMap().put("region", region);
         }
-        IPage<PunishmentUnionDto> iPage = tbIlcPunInfoQueryService.searchUnionByPage(
+        IPage<TbIlcPunInfoQuery> iPage = tbIlcPunInfoQueryService.searchUnionByPage(
                 new Page<>(pageRequestDto.getCurPage(), pageRequestDto.getPageSize()),
                 pageRequestDto.getParamMap());
         return RestResult.ok(iPage);

src/main/java/com/chinaweal/aiccs/crgs/punish/mapper/TbIlcPunInfoQueryMapper.java

@@ -22,5 +22,5 @@ public interface TbIlcPunInfoQueryMapper extends BaseMapper<TbIlcPunInfoQuery> {
 
     TbIlcPunInfoQuery findById(@Param("id") String id);
 
-    IPage<com.chinaweal.aiccs.aiccs.punishment.entity.PunishmentUnionDto> searchUnionByPage(Page<?> page, @Param("params") Map<String, Object> params);
+    IPage<TbIlcPunInfoQuery> searchUnionByPage(Page<?> page, @Param("params") Map<String, Object> params);
 }

src/main/java/com/chinaweal/aiccs/crgs/punish/service/TbIlcPunInfoQueryService.java

@@ -21,5 +21,5 @@ public interface TbIlcPunInfoQueryService extends BaseService<TbIlcPunInfoQuery>
 
     TbIlcPunInfoQuery findById(String id);
 
-    IPage<com.chinaweal.aiccs.aiccs.punishment.entity.PunishmentUnionDto> searchUnionByPage(Page<?> page, Map<String, Object> params);
+    IPage<TbIlcPunInfoQuery> searchUnionByPage(Page<?> page, Map<String, Object> params);
 }

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<TbIlcPunInfoQu
     }
 
     @Override
-    public IPage<PunishmentUnionDto> searchUnionByPage(Page<?> page, Map<String, Object> params) {
+    public IPage<TbIlcPunInfoQuery> searchUnionByPage(Page<?> page, Map<String, Object> params) {
         return tbIlcPunInfoQueryMapper.searchUnionByPage(page, params);
     }
 }

src/main/resources/mybatis/mapper/crgs/punish/TbIlcPunInfoQueryMapper.xml

@@ -99,20 +99,20 @@
     </select>
 
     <!-- 行政处罚记录UNION查询（本省+外省） -->
-    <select id="searchUnionByPage" resultType="com.chinaweal.aiccs.aiccs.punishment.entity.PunishmentUnionDto">
+    <select id="searchUnionByPage" resultType="com.chinaweal.aiccs.crgs.punish.entity.TbIlcPunInfoQuery">
         (
             SELECT
-                CASEID AS caseId,
+                CASEID AS id,
-                ENTNAME AS entName,
+                REGNO AS zch,
                 UNISCID AS uniscid,
-                REGNO AS regNo,
+                ENTNAME AS dsrmc,
-                PENDECNO AS penDecNo,
+                PENDECNO AS sbookcode,
-                PENAUTH_CN AS penAuthCn,
+                ILLEGACTTYPE AS sgisttypename,
-                PENDECISSDATE AS penDecIssDate,
+                PENAUTH_CN AS cfdjjg,
-                PENCONTENT AS penContent,
+                PENDECISSDATE AS cfjdsj,
+                PENCONTENT AS spuncontent,
                 PENAM AS penam,
-                ILLEGACTTYPE AS illegActType,
+                '外省' AS sflag
-                '外省' AS dataSource
             FROM QG_CASE_PUB_NBASEINFO
             WHERE ACTYPE = '1'
             <if test="params.uniscid != null and params.uniscid != ''">
@@ -132,17 +132,17 @@
         UNION ALL
         (
             SELECT
-                CASEID AS caseId,
+                CASEID AS id,
-                ENTNAME AS entName,
+                REGNO AS zch,
                 UNISCID AS uniscid,
-                REGNO AS regNo,
+                ENTNAME AS dsrmc,
-                PENDECNO AS penDecNo,
+                PENDECNO AS sbookcode,
-                PENAUTH_CN  AS penAuthCn,
+                ILLEGACTTYPE AS sgisttypename,
-                PENDECISSDATE  AS penDecIssDate,
+                PENAUTH_CN AS cfdjjg,
-                PENCONTENT AS penContent,
+                PENDECISSDATE AS cfjdsj,
+                PENCONTENT AS spuncontent,
                 PENAM AS penam,
-                ILLEGACTTYPE  AS illegActType,
+                '本省' AS sflag
-                '本省' AS dataSource
             FROM case_pub_nbaseinfo
             WHERE ACTYPE = '1'
             <if test="params.region != null and params.region != '' and params.region != '市'.toString()">