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

增加是否已办的参数

This commit is contained in:
黎润豪 2026-02-26 16:52:17 +08:00
parent 90f66680fb
commit 5a8f73a012
3 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/chinaweal/aiccs/aiccs/revoke/controller/TsbizrevlistController.java
View File

@ -42,6 +42,7 @@ import com.chinaweal.aiccs.aiccs.system.entity.TRBaseCode;
import com.chinaweal.aiccs.aiccs.system.service.TRBaseCodeService;
import com.chinaweal.aiccs.common.base.controller.BaseController;
import com.chinaweal.aiccs.common.constant.BaseDataConstant;
import com.chinaweal.aiccs.common.constant.CommonConstants;
import com.chinaweal.aiccs.common.constant.Constant;
import com.chinaweal.aiccs.common.constant.IndustryConstant;
import com.chinaweal.aiccs.common.util.ConstantsUtil;
@ -1777,8 +1778,13 @@ public class TsbizrevlistController extends BaseController {
// 只查询开业状态的市场主体
wrapper.eq(EBaseinfo::getRegstate, "1");
if (StringUtils.equals(queryDto.getIsDeal(), CommonConstants.TRUE_1)) {
wrapper.exists("SELECT 1 FROM revokelist r WHERE r.PRIPID = e_baseinfo.PRIPID");
} else if (StringUtils.equals(queryDto.getIsDeal(), CommonConstants.FALSE_0)) {
wrapper.notExists("SELECT 1 FROM revokelist r WHERE r.PRIPID = e_baseinfo.PRIPID");
}
// 排除已吊销的市场主体（通过子查询排除）
wrapper.notExists("SELECT 1 FROM revokelist r WHERE r.PRIPID = e_baseinfo.PRIPID AND r.STATE = '1'");
wrapper.exists(String.format("SELECT 1 FROM PENALTY_ENT_INFO p WHERE p.PRIPID = e_baseinfo.PRIPID" +
" AND p.FLG_DELETED != '1' and p.CASEID = '%s'", queryDto.getCaseid()));
@ -1856,6 +1862,15 @@ public class TsbizrevlistController extends BaseController {
wrapper.like(PenaltyCaseInfo::getPenaltyorg, queryDTO.getPenaltyorg());
}
// 是否已办
if (StringUtils.equals(queryDTO.getIsDeal(), CommonConstants.TRUE_1)) {
wrapper.exists("select 1 from PENALTY_ENT_INFO pei where pei.CASEID = PENALTY_CASE_INFO.CASEID and pei.FLG_DELETED != '1' " +
" and exists(select 1 from REVOKELIST e where e.PRIPID = pei.PRIPID)");
} else if (StringUtils.equals(queryDTO.getIsDeal(), CommonConstants.FALSE_0)) {
wrapper.notExists("select 1 from PENALTY_ENT_INFO pei where pei.CASEID = PENALTY_CASE_INFO.CASEID and pei.FLG_DELETED != '1' " +
" and exists(select 1 from REVOKELIST e where e.PRIPID = pei.PRIPID)");
}
// 处罚决定日期范围
if (queryDTO.getPenaltydateStart() != null) {
wrapper.ge(PenaltyCaseInfo::getPenaltydate, queryDTO.getPenaltydateStart());

6
src/main/java/com/chinaweal/aiccs/aiccs/revoke/entity/dto/UnrevokedEntQueryDto.java
View File

@ -55,4 +55,10 @@ public class UnrevokedEntQueryDto implements Serializable {
*/
@ApiModelProperty(value = "案件id", required = true)
private String caseid;
/**
* 是否已办（0否1是）
*/
@ApiModelProperty("是否已办（0否1是）")
private String isDeal;
}

6
src/main/java/com/chinaweal/aiccs/aiccs/security/dto/PenaltyCaseInfoQueryDTO.java
View File

@ -69,4 +69,10 @@ public class PenaltyCaseInfoQueryDTO implements Serializable {
@JsonFormat(pattern = DateUtils.DATE_DEFAULT_FORMAT, timezone = "GMT+8")
@ApiModelProperty("处罚决定日期-结束")
private LocalDate penaltydateEnd;
/**
* 是否已办（0否1是）
*/
@ApiModelProperty("是否已办（0否1是）")
private String isDeal;
}