diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/entity/EBaseinfo.java b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/entity/EBaseinfo.java index fb4f008..7614690 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/entity/EBaseinfo.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/entity/EBaseinfo.java @@ -589,4 +589,8 @@ public class EBaseinfo extends Model { return this.pripid; } + @ApiModelProperty(value = "企业类型，企业：company 个体户：individual 农专：farmer") + @TableField(exist = false) + private String enterType; + } diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/business/controller/TaskController.java b/src/main/java/com/chinaweal/aiccs/aiccs/business/controller/TaskController.java index 3e823a6..ea27208 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/business/controller/TaskController.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/business/controller/TaskController.java @@ -226,6 +226,7 @@ public class TaskController extends BaseController { } } // 处理业务类型、业务状态查询参数 + AICUser aicUser = getLoginUser(request); if(customParamMap != null && customParamMap.get("bustype") != null && customParamMap.get("busstatus") != null && customParamMap.get("bustypeAndCurrentNode") != null){ Object bustypeAndStatus1 = customParamMap.get("bustypeAndStatus"); if (bustypeAndStatus1 instanceof List) { @@ -246,7 +247,6 @@ public class TaskController extends BaseController { // 信用修复 if (customParamMap != null && customParamMap.get("type") != null && "repair".equals(customParamMap.get("type"))) { //处理年报申请过来的信用修复待办 - AICUser aicUser = getLoginUser(request); //倒计时工作日开关 boolean isGzrNum = customParamMap.containsKey("gzrNumSwitch") && (boolean)customParamMap.get("gzrNumSwitch"); if (isGzrNum) { @@ -286,6 +286,9 @@ public class TaskController extends BaseController { } // 获取待办分页 + if (customParamMap != null && !customParamMap.containsKey("areaCode")) { //判断如果没有加区域的值，就给用户所在区局 + customParamMap.put("areaCode", aicUser.getRegionID()); + } IPage page = taskListService.searchUnionTaskPage(new Page<>(pageRequestDto.getCurPage(), pageRequestDto.getPageSize()), taskListParam, customParamMap); List taskListUnionDtoList = page.getRecords(); for(TaskListUnionDto taskListUnionDto : taskListUnionDtoList){ diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/force/controller/XrForceDeregisterSpeController.java b/src/main/java/com/chinaweal/aiccs/aiccs/force/controller/XrForceDeregisterSpeController.java index f774f6e..654b693 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/force/controller/XrForceDeregisterSpeController.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/force/controller/XrForceDeregisterSpeController.java @@ -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); } diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/force/entity/XrForceDeregisterSpe.java b/src/main/java/com/chinaweal/aiccs/aiccs/force/entity/XrForceDeregisterSpe.java index fdc2b57..6e79f27 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/force/entity/XrForceDeregisterSpe.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/force/entity/XrForceDeregisterSpe.java @@ -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; + } diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/force/entity/querydto/ForceDeregisterSpeQueryDto.java b/src/main/java/com/chinaweal/aiccs/aiccs/force/entity/querydto/ForceDeregisterSpeQueryDto.java index f0d34c9..747f4c1 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/force/entity/querydto/ForceDeregisterSpeQueryDto.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/force/entity/querydto/ForceDeregisterSpeQueryDto.java @@ -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; + } diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/force/service/impl/XrForceDeregisterSpeServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/force/service/impl/XrForceDeregisterSpeServiceImpl.java index 341fc6f..d99f034 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/force/service/impl/XrForceDeregisterSpeServiceImpl.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/force/service/impl/XrForceDeregisterSpeServiceImpl.java @@ -114,53 +114,74 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl eBaseinfoIPage = new Page<>(); Integer level = 99; - OrgUnits orgUnits = aicorgService.getOne(new LambdaQueryWrapper<>(OrgUnits.class).eq(OrgUnits::getOrgUnitId, - user.getRegionID())); - if (orgUnits != null) { + String regionID = user.getRegionID(); + OrgUnits orgUnits = aicorgService.getOne(new LambdaQueryWrapper<>(OrgUnits.class) + .eq(OrgUnits::getOrgUnitId, regionID)); + if(orgUnits != null) { level = orgUnits.getOrgLevel(); } List 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 page = new Page<>(query.getCurrent(), query.getSize()); + LambdaQueryWrapper 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 page = new Page<>(query.getCurrent(), query.getSize()); - LambdaQueryWrapper 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 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 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; @@ -742,7 +763,10 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl forceDeregisterPageByRegOrg(BaseQuery 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 xrForceDeregisterSpeIPage; Page page = new Page<>(query.getCurrent(), query.getSize()); @@ -750,6 +774,9 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl savePermit(@RequestBody @Valid AnModifyPermit anModifyPermit, BindingResult bindingResult) { + public RestResult savePermit(@RequestBody @Valid AnModifyPermit anModifyPermit, BindingResult bindingResult, HttpServletRequest request) { AssertUtils.isBndingValidit(bindingResult); + anModifyPermit.setCreateId(getLoginUser(request).getPrimaryKey()); + anModifyPermit.setUpdateId(getLoginUser(request).getPrimaryKey()); + anModifyPermit.setCreateTime(LocalDateTime.now()); + anModifyPermit.setUpdateTime(LocalDateTime.now()); anModifyPermitService.save(anModifyPermit); return RestResult.ok(anModifyPermit); } @@ -61,8 +67,10 @@ public class AnModifyPermitController extends BaseController { @ApiOperation(value = "3.修改信息 ", position = 3) @PostMapping("/update") - public RestResult updatePermit(@RequestBody @Valid AnModifyPermit anModifyPermit, BindingResult bindingResult) { + public RestResult updatePermit(@RequestBody @Valid AnModifyPermit anModifyPermit, BindingResult bindingResult, HttpServletRequest request) { AssertUtils.isBndingValidit(bindingResult); + anModifyPermit.setUpdateId(getLoginUser(request).getPrimaryKey()); + anModifyPermit.setUpdateTime(LocalDateTime.now()); anModifyPermitService.updateById(anModifyPermit); return RestResult.ok(); } diff --git a/src/main/java/com/chinaweal/aiccs/aiceps/annual/entity/AnModifyPermit.java b/src/main/java/com/chinaweal/aiccs/aiceps/annual/entity/AnModifyPermit.java index d1f3ebb..6e3b716 100644 --- a/src/main/java/com/chinaweal/aiccs/aiceps/annual/entity/AnModifyPermit.java +++ b/src/main/java/com/chinaweal/aiccs/aiceps/annual/entity/AnModifyPermit.java @@ -22,7 +22,7 @@ import java.time.LocalDateTime; @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @ApiModel("年报修改许可") -@TableName("AN_MODIFY_PERMIT") +@TableName("AICCS.AN_MODIFY_PERMIT") public class AnModifyPermit implements Serializable { private final static long serialVersionUID = 1L; @@ -74,4 +74,33 @@ public class AnModifyPermit implements Serializable { @ApiModelProperty("同步标志") @TableField("ISYNC") private String isync; + + /** + * 更新时间 + */ + @ApiModelProperty("更新时间") + @TableField("UPDATE_TIME") + private LocalDateTime updateTime; + + /** + * 修改用户id + */ + @ApiModelProperty("修改用户id") + @TableField("UPDATEID") + private String updateId; + + /** + * 添加时间 + */ + @ApiModelProperty("添加时间") + @TableField("CREATE_TIME") + private LocalDateTime createTime; + + /** + * 添加用户id + */ + @ApiModelProperty("添加用户id") + @TableField("CREATEID") + private String createId; + } diff --git a/src/main/resources/mybatis/mapper/aiccs/force/XrForceDeregisterSpeMapper.xml b/src/main/resources/mybatis/mapper/aiccs/force/XrForceDeregisterSpeMapper.xml index ff2eb2a..befc983 100644 --- a/src/main/resources/mybatis/mapper/aiccs/force/XrForceDeregisterSpeMapper.xml +++ b/src/main/resources/mybatis/mapper/aiccs/force/XrForceDeregisterSpeMapper.xml @@ -165,7 +165,11 @@ and biz.status != '5' + + and timestampdiff(DAY, curdate(), biz.notice_to) <= 10 + + order by notice_to