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

强制注销功能优化

This commit is contained in:
zhouxy 2026-01-30 21:46:38 +08:00
parent b0b14c0652
commit fd1ef69313
6 changed files with 102 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/chinaweal/aiccs/aiccs/abnormal/entity/EBaseinfo.java
View File

@ -589,4 +589,8 @@ public class EBaseinfo extends Model<EBaseinfo> {
return this.pripid;
}
@ApiModelProperty(value = "企业类型，企业：company 个体户：individual 农专：farmer")
@TableField(exist = false)
private String enterType;
}

6
src/main/java/com/chinaweal/aiccs/aiccs/force/controller/XrForceDeregisterSpeController.java
View File

@ -127,7 +127,11 @@ public class XrForceDeregisterSpeController extends BaseController {
xrForceDeregisterSpeVo.setLeRep(eBaseinfo.getName());
xrForceDeregisterSpeVo.setOpState(eBaseinfo.getRegstate());
//判断当前用户所在单位是否是登记机关
boolean userIsRegOrg = StringUtils.equals(user.getRegionID(), xrForceDeregisterSpe.getRegOrg() + "000");
String regionID = user.getRegionID();
if(regionID.length() == 6){
regionID = regionID + "000"; //取9位去查
}
boolean userIsRegOrg = StringUtils.equals(regionID, xrForceDeregisterSpe.getRegOrg());
xrForceDeregisterSpeVo.setUserIsRegOrg(userIsRegOrg);
speVoList.add(xrForceDeregisterSpeVo);
}

7
src/main/java/com/chinaweal/aiccs/aiccs/force/entity/XrForceDeregisterSpe.java
View File

@ -233,4 +233,11 @@ public class XrForceDeregisterSpe extends SuperEntity implements Serializable {
@TableField("accept_org")
private String acceptOrg;
/**
* 公告期至剩余天数
*/
@ApiModelProperty(value = "公告期至剩余天数")
@TableField(exist = false)
private Integer noticeToRemain;
}

19
src/main/java/com/chinaweal/aiccs/aiccs/force/entity/querydto/ForceDeregisterSpeQueryDto.java
View File

@ -10,6 +10,8 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
/**
@ -78,4 +80,21 @@ public class ForceDeregisterSpeQueryDto extends BaseParamDto implements Serializ
@ApiModelProperty("拟强制注销结果（国标C13044）")
private String forceRes;
@ApiModelProperty("企业类型，企业：company 个体户：individual 农专：farmer")
private String enterType;
@ApiModelProperty("行业门类")
private String industryphy;
@ApiModelProperty("吊销时间自")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime revStartDate;
@ApiModelProperty("吊销时间至")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime revEndDate;
@ApiModelProperty("是否查即将届满，0否，1是")
private String soon;
}

99
src/main/java/com/chinaweal/aiccs/aiccs/force/service/impl/XrForceDeregisterSpeServiceImpl.java
View File

@ -116,53 +116,74 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl<XrForceDeregist
ForceDeregisterSpeQueryDto entity = query.getEntity(ForceDeregisterSpeQueryDto.class);
IPage<EBaseinfo> eBaseinfoIPage = new Page<>();
Integer level = 99;
OrgUnits orgUnits = aicorgService.getOne(new LambdaQueryWrapper<>(OrgUnits.class).eq(OrgUnits::getOrgUnitId,
user.getRegionID()));
String regionID = user.getRegionID();
OrgUnits orgUnits = aicorgService.getOne(new LambdaQueryWrapper<>(OrgUnits.class)
.eq(OrgUnits::getOrgUnitId, regionID));
if(orgUnits != null) {
level = orgUnits.getOrgLevel();
}
List<String> regOrgList = Lists.newArrayList();
if(level <= 3){ //市级只能查询本市的，省局的也只能查省局的
regOrgList.add(StringUtils.substring(user.getRegionID(), 0, 4) + "00");
} else if(level == 4){ //区县可查区县和本市
regOrgList.add(StringUtils.substring(user.getRegionID(), 0, 6));
regOrgList.add(StringUtils.substring(user.getRegionID(), 0, 4) + "00");
} else if(level >= 5){ //所级可查区县
regOrgList.add(StringUtils.substring(user.getRegionID(), 0, 6));
// if(level <= 3){ //市级只能查询本市的，省局的也只能查省局的
// regOrgList.add(StringUtils.substring(user.getRegionID(), 0, 4) + "00");
// } else if(level == 4){ //区县可查区县和本市
// regOrgList.add(StringUtils.substring(user.getRegionID(), 0, 6));
// regOrgList.add(StringUtils.substring(user.getRegionID(), 0, 4) + "00");
// } else if(level >= 5){ //所级可查区县
// regOrgList.add(StringUtils.substring(user.getRegionID(), 0, 6));
// }
//现在限制只查当前单位
if(regionID.length() == 6){
regionID = regionID + "000"; //取9位去查
}
regOrgList.add(regionID);
String entName = entity.getEntName();
String searchUscc = entity.getSearchUscc();
Page<EBaseinfo> page = new Page<>(query.getCurrent(), query.getSize());
LambdaQueryWrapper<EBaseinfo> wrapper = new LambdaQueryWrapper<>();
//输入了条件才会查询
if(StringUtils.isNotBlank(entName)
|| StringUtils.isNotBlank(searchUscc)){
//已注销的主体不能发起业务
wrapper.in(EBaseinfo::getRegorg, regOrgList).notIn(EBaseinfo::getRegstate,"4");
if (StringUtils.equals(entity.getEnterType(), "farmer")) {
wrapper.in(EBaseinfo::getEnttype,"9100", "9200");
} else if (StringUtils.equals(entity.getEnterType(), "individual")) {
wrapper.in(EBaseinfo::getEnttype,"9910","9500");
} else {
wrapper.notIn(EBaseinfo::getEnttype,"9910","9500","9100", "9200");
}
if(StringUtils.isNotBlank(entName)){
wrapper.like(EBaseinfo::getEntname, entName);
}
if(StringUtils.isNotBlank(searchUscc)){
wrapper.and(w -> w.eq(EBaseinfo::getUniscid, searchUscc).or().eq(EBaseinfo::getRegno, searchUscc));
}
if(StringUtils.isNotBlank(entity.getIndustryphy())){
wrapper.eq(EBaseinfo::getIndustryphy, entity.getIndustryphy());
}
//当选择了吊销日期自和吊销日期至的条件
if(entity.getRevStartDate()!=null && entity.getRevEndDate()!=null){
//先排查是吊销状态的
wrapper.eq(EBaseinfo::getRegstate, "2");
//再加上时间，因为revdate为空，所以用apprdate
wrapper.and(w -> w.ge(EBaseinfo::getApprdate, entity.getRevStartDate())
.le(EBaseinfo::getApprdate, entity.getRevEndDate()));
}
Page<EBaseinfo> page = new Page<>(query.getCurrent(), query.getSize());
LambdaQueryWrapper<EBaseinfo> wrapper = new LambdaQueryWrapper<>();
//已注销的主体不能发起业务
wrapper.in(EBaseinfo::getRegorg, regOrgList).in(EBaseinfo::getRegstate,"2");
if(StringUtils.isNotBlank(entName)){
wrapper.like(EBaseinfo::getEntname, entName);
}
if(StringUtils.isNotBlank(searchUscc)){
wrapper.and(w -> w.eq(EBaseinfo::getUniscid, searchUscc).or().eq(EBaseinfo::getRegno, searchUscc));
eBaseinfoIPage = iEBaseinfoService.page(page, wrapper);
// 处理 EnterType 赋值逻辑
for (EBaseinfo eBaseinfo : eBaseinfoIPage.getRecords()) {
String entType = eBaseinfo.getEnttype();
if (StringUtils.equalsAny(entType,"9910","9500")) {
eBaseinfo.setEnterType("individual");
} else if (StringUtils.equalsAny(entType,"9100","9200")) {
eBaseinfo.setEnterType("farmer");
} else {
eBaseinfo.setEnterType("company");
}
eBaseinfoIPage = iEBaseinfoService.page(page, wrapper);
for (EBaseinfo record : eBaseinfoIPage.getRecords()) {
// QueryWrapper<TOrgUnits> queryWrapper = new QueryWrapper<>();
//查属地机关中文
// String supervisedeptid = record.getSupervisedeptid();
// if(StringUtils.isNotEmpty(supervisedeptid)){
// queryWrapper.lambda().eq(TOrgUnits::getOrgNumber, supervisedeptid.length() == 6 ? supervisedeptid + "000" : supervisedeptid)
// .eq(TOrgUnits::getDeleted, '0');
// List<TOrgUnits> list = tOrgUnitsService.list(queryWrapper);
// if (list.size() > 0) {
// TOrgUnits tOrgunits = list.get(0);
// record.setLocaladmCn(tOrgunits.getOrgUnitName());
// }
// }
if (StringUtils.equals(eBaseinfo.getRegstate(),"2")){
eBaseinfo.setRevDate(eBaseinfo.getApprdate().toString());
}
}
return eBaseinfoIPage;
@ -741,7 +762,10 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl<XrForceDeregist
@Override
public IPage<XrForceDeregisterSpe> forceDeregisterPageByRegOrg(BaseQuery<ForceDeregisterSpeQueryDto> query, AICUser user) {
ForceDeregisterSpeQueryDto entity = query.getEntity(ForceDeregisterSpeQueryDto.class);
String userRegOrg = StringUtils.substring(user.getRegionID(), 0, 6);
String userRegOrg = user.getRegionID();
if(userRegOrg.length() == 6){
userRegOrg = userRegOrg + "000"; //取9位去查
}
IPage<XrForceDeregisterSpe> xrForceDeregisterSpeIPage;
Page<XrForceDeregisterSpe> page = new Page<>(query.getCurrent(), query.getSize());
@ -749,6 +773,9 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl<XrForceDeregist
entity.setForceRes("1"); //只查正在拟强制注销公告中的数据
entity.setForceType("1"); //只查正在拟强制注销公告
entity.setStatus("3"); //查审批通过的
if(StringUtils.equals("0", entity.getSoon())){
entity.setSoon(null);
}
xrForceDeregisterSpeIPage = baseMapper.xrForceDeregisterPageByRegOrg(page, entity);
return xrForceDeregisterSpeIPage;
}

4
src/main/resources/mybatis/mapper/aiccs/force/XrForceDeregisterSpeMapper.xml
View File

@ -165,7 +165,11 @@
<if test="param.status == null or param.status == ''">
and biz.status != '5'
</if>
<if test="param.soon != null and param.soon != ''">
and timestampdiff(DAY, curdate(), biz.notice_to) &lt;= 10
</if>
</where>
order by notice_to
</select>
</mapper>