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 178d4f9..986281f 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 @@ -4,19 +4,19 @@ import cn.hutool.core.util.IdUtil; 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.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.fraudreg.dto.FraudInfoDto; +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; import com.chinaweal.aiccs.aiccs.writs.service.TswrittemplateService; import com.chinaweal.aiccs.common.base.controller.BaseController; import com.chinaweal.aiccs.common.constant.Constant; import com.chinaweal.aiccs.common.util.StringUtils; import com.chinaweal.aiccs.common.util.filestorage.FileStorageService; -import com.chinaweal.aiccs.common.util.valid.ValidGroup; import com.chinaweal.aiccs.config.CommonConfig; import com.chinaweal.aiccs.crgs.punish.entity.TbIlcPunInfoQuery; import com.chinaweal.aiccs.crgs.punish.service.TbIlcPunInfoQueryService; @@ -29,21 +29,16 @@ import com.chinaweal.youfool.framework.springboot.rest.ResultCode; import com.chinaweal.youfool.framework.springboot.util.AssertUtils; import com.chinaweal.youfool.framework.sso.util.SSOUtil; import com.github.xiaoymin.knife4j.annotations.ApiSort; -import com.chinaweal.aiccs.aiccs.punishment.entity.TBizRemPunishment; -import com.chinaweal.aiccs.aiccs.punishment.service.ITBizRemPunishmentService; -import com.github.xiaoymin.knife4j.annotations.DynamicParameter; -import com.github.xiaoymin.knife4j.annotations.DynamicResponseParameters; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; -import org.springframework.web.bind.annotation.RestController; -import io.swagger.annotations.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.validation.ConstraintViolation; import javax.validation.Valid; import java.io.File; import java.io.IOException; @@ -52,12 +47,8 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Paths; import java.time.LocalDate; -import java.time.format.DateTimeFormatter; import java.util.HashMap; import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.stream.Collectors; /** *

@@ -133,22 +124,16 @@ 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 (curUser.getOrgName().indexOf("区") != -1) { -// region=curUser.getOrgName().substring(curUser.getOrgName().indexOf("市") == -1? 0 : curUser.getOrgName().indexOf("市") + 1, curUser.getOrgName().indexOf("区")); -// } else { -// region="市"; -// } - - //自治区的账号可以发起所有的行政处罚，主要是针对药监局的行政处罚 - if(!StringUtils.equals("150000",region)){ - pageRequestDto.getParamMap().put("region",region); + // 自治区的账号可以发起所有的行政处罚，主要是针对药监局的行政处罚 + if (!StringUtils.equals("150000", region)) { + pageRequestDto.getParamMap().put("region", region); } - IPage iPage = tbIlcPunInfoQueryService.searchByPage(new Page<>(pageRequestDto.getCurPage(), pageRequestDto.getPageSize()), pageRequestDto.getParamMap()); + 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/aiccs/punishment/entity/PunishmentUnionDto.java b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/entity/PunishmentUnionDto.java new file mode 100644 index 0000000..c585287 --- /dev/null +++ b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/entity/PunishmentUnionDto.java @@ -0,0 +1,101 @@ +package com.chinaweal.aiccs.aiccs.punishment.entity; + +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.chinaweal.aiccs.common.util.DateUtils; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * 行政处罚统一查询DTO（本省+外省UNION） + * + * @author chinaweal + * @since 2026-04-02 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@ApiModel(value = "PunishmentUnionDto对象", description = "行政处罚统一查询DTO") +public class PunishmentUnionDto extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 案件ID + */ + @ApiModelProperty(value = "案件ID") + private String caseId; + + /** + * 企业名称 + */ + @ApiModelProperty(value = "企业名称") + private String entName; + + /** + * 统一社会信用代码 + */ + @ApiModelProperty(value = "统一社会信用代码") + private String uniscid; + + /** + * 注册号 + */ + @ApiModelProperty(value = "注册号") + private String regNo; + + /** + * 处罚决定书文号 + */ + @ApiModelProperty(value = "处罚决定书文号") + private String penDecNo; + + /** + * 处罚机关 + */ + @ApiModelProperty(value = "处罚机关") + private String penAuthCn; + + /** + * 处罚决定日期 + */ + @JsonFormat(pattern = DateUtils.DATETIME_DEFAULT_FORMAT, timezone = "GMT+8") + @ApiModelProperty(value = "处罚决定日期") + private LocalDateTime penDecIssDate; + + /** + * 处罚内容 + */ + @ApiModelProperty(value = "处罚内容") + private String penContent; + + /** + * 罚款金额 + */ + @ApiModelProperty(value = "罚款金额") + private BigDecimal penam; + + /** + * 违法类型 + */ + @ApiModelProperty(value = "违法类型") + private String illegActType; + + /** + * 数据来源标识（本省/外省） + */ + @ApiModelProperty(value = "数据来源标识") + private String dataSource; + + @Override + protected Serializable pkVal() { + return this.caseId; + } +} diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/entity/TBizRemPunishment.java b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/entity/TBizRemPunishment.java index 0879440..608a9c7 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/entity/TBizRemPunishment.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/entity/TBizRemPunishment.java @@ -151,4 +151,11 @@ public class TBizRemPunishment extends SuperEntity { @TableField(exist = false) String nextPerformerName; + /** + * 数据来源标识 本省/外省 + */ + @ApiModelProperty(value = "数据来源标识") + @TableField(exist = false) + private String sourceType; + } diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/mapper/QgCasePubNbaseinfoMapper.java b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/mapper/QgCasePubNbaseinfoMapper.java index 7b51c1d..40ac2ab 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/mapper/QgCasePubNbaseinfoMapper.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/mapper/QgCasePubNbaseinfoMapper.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Map; @@ -41,5 +42,5 @@ public interface QgCasePubNbaseinfoMapper extends BaseMapper * @param now 当前时间戳 * @return 更新行数 */ - int updateForRepair(@Param("caseid") String caseid, @Param("approvalDate") java.util.Date approvalDate, @Param("now") LocalDateTime now); + int updateForRepair(@Param("caseid") String caseid, @Param("approvalDate") LocalDate approvalDate, @Param("now") LocalDateTime now); } diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/IQgCasePubNbaseinfoService.java b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/IQgCasePubNbaseinfoService.java index fc39fec..f38457b 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/IQgCasePubNbaseinfoService.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/IQgCasePubNbaseinfoService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.chinaweal.aiccs.aiccs.punishment.entity.QgCasePubNbaseinfo; +import java.time.LocalDate; import java.util.Map; /** @@ -19,7 +20,8 @@ public interface IQgCasePubNbaseinfoService extends IService /** * 分页查询跨省行政处罚信息 - * @param page 分页参数 + * + * @param page 分页参数 * @param params 查询参数 * @return 分页结果 */ @@ -27,6 +29,7 @@ public interface IQgCasePubNbaseinfoService extends IService /** * 根据ID查询 + * * @param caseid 案件ID * @return 跨省行政处罚信息 */ @@ -34,9 +37,10 @@ public interface IQgCasePubNbaseinfoService extends IService /** * 更新修复状态 - * @param caseid 案件ID + * + * @param caseid 案件ID * @param approvalDate 审批日期 * @return 是否成功 */ - boolean updateForRepair(String caseid, java.util.Date approvalDate); + boolean updateForRepair(String caseid, LocalDate approvalDate); } diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/impl/IQgCasePubNbaseinfoServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/impl/IQgCasePubNbaseinfoServiceImpl.java index 75bf581..291bdfc 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/impl/IQgCasePubNbaseinfoServiceImpl.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/impl/IQgCasePubNbaseinfoServiceImpl.java @@ -8,6 +8,7 @@ import com.chinaweal.aiccs.aiccs.punishment.mapper.QgCasePubNbaseinfoMapper; import com.chinaweal.aiccs.aiccs.punishment.service.IQgCasePubNbaseinfoService; import org.springframework.stereotype.Service; +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Map; @@ -33,7 +34,7 @@ public class IQgCasePubNbaseinfoServiceImpl extends ServiceImpl 0; } diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/impl/TBizRemPunishmentServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/impl/TBizRemPunishmentServiceImpl.java index 0da9d6b..670a7ff 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/impl/TBizRemPunishmentServiceImpl.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/impl/TBizRemPunishmentServiceImpl.java @@ -73,6 +73,10 @@ public class TBizRemPunishmentServiceImpl extends BaseServiceImpl startTask(TBizRemPunishment tBizRemPunishment) { AICUser loginUser = SSOUtil.getUser(); Map resultMap = new HashMap<>(); + String entName = ""; + + // 先查本省表 TbIlcPunInfoQuery tbIlcPunInfoQuery = tbIlcPunInfoQueryService.findById(tBizRemPunishment.getPunishmentId()); - EBaseinfo eBaseInfo = eBaseInfoService.lambdaQuery().eq(EBaseinfo::getUniscid, tbIlcPunInfoQuery.getUniscid()).one(); + if (tbIlcPunInfoQuery != null) { + // 本省案件 + tBizRemPunishment.setSourceType("本省"); + EBaseinfo eBaseInfo = eBaseInfoService.lambdaQuery().eq(EBaseinfo::getUniscid, tbIlcPunInfoQuery.getUniscid()).one(); + tBizRemPunishment.setPripid(eBaseInfo.getPripid()); + entName = eBaseInfo.getEntname(); + } else { + // 查外省表 + com.chinaweal.aiccs.aiccs.punishment.entity.QgCasePubNbaseinfo qgCasePubNbaseinfo = + qgCasePubNbaseinfoService.findById(tBizRemPunishment.getPunishmentId()); + if (qgCasePubNbaseinfo != null) { + // 外省案件 + tBizRemPunishment.setSourceType("外省"); + tBizRemPunishment.setPripid(qgCasePubNbaseinfo.getPripid()); + entName = qgCasePubNbaseinfo.getEntname(); + } else { + throw new RuntimeException("未找到对应的行政处罚记录"); + } + } String bizSeq = IdUtil.simpleUUID(); tBizRemPunishment.setId(bizSeq); @@ -108,14 +133,13 @@ public class TBizRemPunishmentServiceImpl extends BaseServiceImpl { IPage searchByPage(Page page, @Param("params") Map params); TbIlcPunInfoQuery findById(@Param("id") String id); + + 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 6cc3362..5da74dd 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 @@ -20,4 +20,6 @@ public interface TbIlcPunInfoQueryService extends BaseService IPage searchByPage(Page page, Map params); TbIlcPunInfoQuery findById(String id); + + 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 dbf5e8c..d88c6ff 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,6 +2,7 @@ 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; @@ -34,4 +35,9 @@ public class TbIlcPunInfoQueryServiceImpl extends BaseServiceImpl 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 f1bac4f..310d4ee 100644 --- a/src/main/resources/mybatis/mapper/crgs/punish/TbIlcPunInfoQueryMapper.xml +++ b/src/main/resources/mybatis/mapper/crgs/punish/TbIlcPunInfoQueryMapper.xml @@ -98,4 +98,66 @@ select from case_pub_nbaseinfo where ACTYPE = '1' and CASEID = #{id} + + +