Compare commits

..

No commits in common. "1016fc5d084905fc7b0b0f0e7da83440ddda3bf3" and "52d9317cc496faab546c02590bfccc26cfd4f709" have entirely different histories.

2 changed files with 50 additions and 104 deletions

View File

@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaweal.aiccs.aiccs.abnormal.entity.EBaseinfo; import com.chinaweal.aiccs.aiccs.abnormal.entity.EBaseinfo;
import com.chinaweal.aiccs.aiccs.abnormal.entity.TSAbnList; import com.chinaweal.aiccs.aiccs.abnormal.entity.TSAbnList;
import com.chinaweal.aiccs.aiccs.abnormal.entity.TSWrit; import com.chinaweal.aiccs.aiccs.abnormal.entity.TSWrit;
import com.chinaweal.aiccs.aiccs.abnormal.entity.excel.AbnListExcel;
import com.chinaweal.aiccs.aiccs.abnormal.service.EBaseinfoService; import com.chinaweal.aiccs.aiccs.abnormal.service.EBaseinfoService;
import com.chinaweal.aiccs.aiccs.abnormal.service.TSAbnListService; import com.chinaweal.aiccs.aiccs.abnormal.service.TSAbnListService;
import com.chinaweal.aiccs.aiccs.abnormal.service.TSWritService; import com.chinaweal.aiccs.aiccs.abnormal.service.TSWritService;
@ -25,7 +26,6 @@ import com.chinaweal.aiccs.aiccs.seriousillegal.entity.TSBizSerIllegal;
import com.chinaweal.aiccs.aiccs.seriousillegal.entity.TSBizSerIllegalReas; import com.chinaweal.aiccs.aiccs.seriousillegal.entity.TSBizSerIllegalReas;
import com.chinaweal.aiccs.aiccs.seriousillegal.entity.TSForIllOperatingList; import com.chinaweal.aiccs.aiccs.seriousillegal.entity.TSForIllOperatingList;
import com.chinaweal.aiccs.aiccs.seriousillegal.entity.TSSerIllegalList; import com.chinaweal.aiccs.aiccs.seriousillegal.entity.TSSerIllegalList;
import com.chinaweal.aiccs.aiccs.seriousillegal.entity.dto.IllegalListByPripIdParam;
import com.chinaweal.aiccs.aiccs.seriousillegal.entity.dto.TSBizSerIllegalVO; import com.chinaweal.aiccs.aiccs.seriousillegal.entity.dto.TSBizSerIllegalVO;
import com.chinaweal.aiccs.aiccs.seriousillegal.excelDto.IllegalExcelDto; import com.chinaweal.aiccs.aiccs.seriousillegal.excelDto.IllegalExcelDto;
import com.chinaweal.aiccs.aiccs.seriousillegal.service.TSBizSerIllegalService; import com.chinaweal.aiccs.aiccs.seriousillegal.service.TSBizSerIllegalService;
@ -37,7 +37,6 @@ import com.chinaweal.aiccs.common.base.controller.BaseController;
import com.chinaweal.aiccs.common.constant.Constant; import com.chinaweal.aiccs.common.constant.Constant;
import com.chinaweal.aiccs.common.util.*; import com.chinaweal.aiccs.common.util.*;
import com.chinaweal.aicorg.model.AICUser; import com.chinaweal.aicorg.model.AICUser;
import com.chinaweal.youfool.framework.springboot.base.query.BaseQuery;
import com.chinaweal.youfool.framework.springboot.mybatis.plus.function.CustomWrapperPackingFunction; import com.chinaweal.youfool.framework.springboot.mybatis.plus.function.CustomWrapperPackingFunction;
import com.chinaweal.youfool.framework.springboot.mybatis.plus.page.PageRequestDto; import com.chinaweal.youfool.framework.springboot.mybatis.plus.page.PageRequestDto;
import com.chinaweal.youfool.framework.springboot.rest.RestResult; import com.chinaweal.youfool.framework.springboot.rest.RestResult;
@ -242,8 +241,7 @@ public class SerIllegalListController extends BaseController {
} }
if(StringUtils.isNotBlank(searchName)){ if(StringUtils.isNotBlank(searchName)){
wrapper.like(TSSerIllegalList::getEntname,searchName); wrapper.like(TSSerIllegalList::getEntname,searchName);
} }if(StringUtils.isNotBlank(abntime)){
if (StringUtils.isNotBlank(abntime)) {
wrapper.eq(TSSerIllegalList::getAbntime,abntime); wrapper.eq(TSSerIllegalList::getAbntime,abntime);
} }
if(StringUtils.isNotBlank(serillrea)){ if(StringUtils.isNotBlank(serillrea)){
@ -574,7 +572,6 @@ public class SerIllegalListController extends BaseController {
/** /**
* 获取统一严重违法失信企业待办列表分页 * 获取统一严重违法失信企业待办列表分页
*
* @param request 请求 * @param request 请求
* @param pageRequestDto 分页参数与 * @param pageRequestDto 分页参数与
* @return 获取结果 * @return 获取结果
@ -597,7 +594,6 @@ public class SerIllegalListController extends BaseController {
/** /**
* 获取严重违法失信企业个人待办总量 * 获取严重违法失信企业个人待办总量
*
* @param request 请求 * @param request 请求
* @return 获取结果 * @return 获取结果
* @author lroyia * @author lroyia
@ -614,7 +610,6 @@ public class SerIllegalListController extends BaseController {
/** /**
* 通过主体pripid获取主体相关严重违法失信企业名录信息 * 通过主体pripid获取主体相关严重违法失信企业名录信息
*
* @param pripid 主体pripid * @param pripid 主体pripid
* @return 查询结果 * @return 查询结果
* @author lroyia * @author lroyia
@ -746,7 +741,6 @@ public class SerIllegalListController extends BaseController {
/** /**
* 综合查询 - 严重违法失信名录导出 * 综合查询 - 严重违法失信名录导出
*
* @param pageRequestDto * @param pageRequestDto
* @param response * @param response
* @return * @return
@ -835,19 +829,4 @@ public class SerIllegalListController extends BaseController {
if (excelWriter != null) excelWriter.finish(); if (excelWriter != null) excelWriter.finish();
} }
} }
/**
* 查询市场主体的列严记录分页
*
* @param pageQuery 分页参数
* @return 分页结果
*/
@ApiOperation("查询市场主体的列严记录分页")
@PostMapping("getIllegalListByPripId")
public RestResult<IPage<TSSerIllegalList>> getIllegalListByPripId(@RequestBody @ApiParam(value = "分页参数", required = true) BaseQuery<IllegalListByPripIdParam> pageQuery) {
IllegalListByPripIdParam param = pageQuery.getEntity(IllegalListByPripIdParam.class);
return RestResult.ok(tsSerIllegalListService.lambdaQuery().eq(TSSerIllegalList::getPripid, param.getPripid())
.eq(StringUtils.isNotBlank(param.getOperationStatus()), TSSerIllegalList::getOperationStatus, param.getOperationStatus())
.page(new Page<>(pageQuery.getCurrent(), pageQuery.getSize())));
}
} }

View File

@ -1,33 +0,0 @@
package com.chinaweal.aiccs.aiccs.seriousillegal.entity.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
/**
* 市场主体列严记录分页查询参数
* @author lroyia
* @since 2026/1/29 16:48
**/
@Data
@Accessors(chain = true)
@ApiModel("市场主体列严记录分页查询参数")
public class IllegalListByPripIdParam implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 市场主体主键
*/
@ApiModelProperty(value = "市场主体主键", required = true)
private String pripid;
/**
* 记录状态
*/
@ApiModelProperty("记录状态")
private String operationStatus;
}