diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/controller/RpeiExeInfoController.java b/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/controller/RpeiExeInfoController.java index 9da55cc..a37c1b3 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/controller/RpeiExeInfoController.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/controller/RpeiExeInfoController.java @@ -96,11 +96,11 @@ public class RpeiExeInfoController extends BaseController { queryWrapper.eq(RpeiExeInfo::getRegAuth, user.getRegionID().substring(0, 6)) .eq(RpeiExeInfo::getExeState, "1"); //只查执行期间的 if (StringUtils.isNotEmpty(entity.getSearchUscc())) { - queryWrapper.eq(RpeiExeInfo::getUniscId, entity.getSearchUscc()) - .or().eq(RpeiExeInfo::getRegNo, entity.getSearchUscc()); + queryWrapper.eq(RpeiExeInfo::getUniscid, entity.getSearchUscc()) + .or().eq(RpeiExeInfo::getRegno, entity.getSearchUscc()); } if (StringUtils.isNotEmpty(entity.getEntName())) { - queryWrapper.like(RpeiExeInfo::getEntName, entity.getEntName()); + queryWrapper.like(RpeiExeInfo::getEntname, entity.getEntName()); } Page page = new Page<>(query.getCurrent(), query.getSize()); IPage data = rpeiExeInfoService.page(page, queryWrapper); @@ -122,7 +122,7 @@ public class RpeiExeInfoController extends BaseController { //判断该企业还有没有没走完的流程 List taskList = rpeiExeInfoTaskService.list(new LambdaQueryWrapper() - .eq(RpeiExeInfoTask::getPripId, rpeiExeInfo.getPripId()) + .eq(RpeiExeInfoTask::getPripId, rpeiExeInfo.getPripid()) .in(RpeiExeInfoTask::getStatus, "0", "1", "2"));//还没走完的流程 if (!taskList.isEmpty()) { return RestResult.error(ResultCode.BUSINESS_LOGIC_ERROR, "该企业还有未完成的流程"); @@ -131,7 +131,7 @@ public class RpeiExeInfoController extends BaseController { //若是要新增执行流程,需要判断该企业的重整计划或者和解协议是否在执行 if ("add".equals(operType)) { List infoList = rpeiExeInfoService.list(new LambdaQueryWrapper() - .eq(RpeiExeInfo::getPripId, rpeiExeInfo.getPripId()) + .eq(RpeiExeInfo::getPripid, rpeiExeInfo.getPripid()) .eq(RpeiExeInfo::getExeState, "1"));//执行状态是1代表还在执行中 if (!infoList.isEmpty()) { return RestResult.error(ResultCode.BUSINESS_LOGIC_ERROR, "该企业的重整计划或者和解协议尚在执行中"); diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/entity/RpeiExeInfo.java b/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/entity/RpeiExeInfo.java index 275eab8..d4bc869 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/entity/RpeiExeInfo.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/entity/RpeiExeInfo.java @@ -41,28 +41,28 @@ public class RpeiExeInfo extends SuperEntity implements Serializable { */ @ApiModelProperty(value = "企业(机构)名称") @TableField("ENTNAME") - private String entName; + private String entname; /** * 主体身份代码 */ @ApiModelProperty(value = "主体身份代码") @TableField("PRIPID") - private String pripId; + private String pripid; /** * 统一社会信用代码 */ @ApiModelProperty(value = "统一社会信用代码") @TableField("UNISCID") - private String uniscId; + private String uniscid; /** * 注册号 */ @ApiModelProperty(value = "注册号") @TableField("REGNO") - private String regNo; + private String regno; /** * 登记机关 diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/service/impl/RpeiExeInfoTaskServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/service/impl/RpeiExeInfoTaskServiceImpl.java index c28b993..6f869c4 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/service/impl/RpeiExeInfoTaskServiceImpl.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/service/impl/RpeiExeInfoTaskServiceImpl.java @@ -91,7 +91,7 @@ public class RpeiExeInfoTaskServiceImpl extends ServiceImpl selectEntList(TSSerIllegalList serIllegalListModel) { @@ -171,7 +176,12 @@ public class TSSerIllegalListServiceImpl extends BaseServiceImpl serCodeMap = baseCodeService.getBaseCodeMapFormCache("CD73"); + TRBaseCode reasonCode = serCodeMap.get(tsSerIllegalList.getSerillrea()); + tsSerIllegalList.setSerillreaString(reasonCode.getName()); + records.add(tsSerIllegalList); }); xrSeriousIllegalListIPage.setRecords(records); diff --git a/src/main/resources/mybatis/mapper/aiccs/seriousillegal/TSSerIllegalListMapper.xml b/src/main/resources/mybatis/mapper/aiccs/seriousillegal/TSSerIllegalListMapper.xml index 1c0971b..bd06302 100644 --- a/src/main/resources/mybatis/mapper/aiccs/seriousillegal/TSSerIllegalListMapper.xml +++ b/src/main/resources/mybatis/mapper/aiccs/seriousillegal/TSSerIllegalListMapper.xml @@ -532,14 +532,14 @@ b.ENTTYPE not in ('9500','9910','9100','9200') and exists (select 1 from tsserillegallist s where s.PRIPID = b.PRIPID and s.OPERATIONSTATUS = '0' and s.REMDATE is null) - - and b.ENTNAME = #{entity.entName,jdbcType=VARCHAR} + + and b.ENTNAME = #{entity.entname,jdbcType=VARCHAR} and (b.UNISCID = #{entity.searchUscc} or b.REGNO = #{entity.searchUscc}) - - and (b.UNISCID = #{entity.uniscId} or b.REGNO = #{entity.uniscId}) + + and (b.UNISCID = #{entity.uniscid} or b.REGNO = #{entity.uniscid}) and b.REGORG = #{entity.regorg}