@@ -65,8 +65,9 @@ public class TagManage { | |||||
*/ | */ | ||||
public PageVo<TagVO> list(String areaCode, TagPageReq req) { | public PageVo<TagVO> list(String areaCode, TagPageReq req) { | ||||
RegionDTO regionDto = regionCacheHelper.getByCodeAndLevel(areaCode, RegionConst.RL_COUNTY); | RegionDTO regionDto = regionCacheHelper.getByCodeAndLevel(areaCode, RegionConst.RL_COUNTY); | ||||
String regionCode = Objects.nonNull(regionDto) ? regionDto.getRegionCode() : null; | |||||
LambdaQueryWrapper<Tag> query = Wrappers.lambdaQuery(Tag.class) | LambdaQueryWrapper<Tag> query = Wrappers.lambdaQuery(Tag.class) | ||||
.eq(Objects.nonNull(regionDto),Tag::getAreaCode, regionDto.getRegionCode()) | |||||
.eq(Objects.nonNull(regionCode),Tag::getAreaCode, regionCode) | |||||
.like(StringUtils.isNotBlank(req.getName()),Tag::getName,req.getName()) | .like(StringUtils.isNotBlank(req.getName()),Tag::getName,req.getName()) | ||||
.orderByDesc(Tag::getUpdateOn); | .orderByDesc(Tag::getUpdateOn); | ||||
checkAuth(query,LoginUserUtil.loginUserDetail()); | checkAuth(query,LoginUserUtil.loginUserDetail()); | ||||
@@ -129,6 +129,7 @@ public class JoinReviewProvincialBureauServiceImpl implements IJoinReviewProvinc | |||||
JSONObject jsonBaby = new JSONObject(); | JSONObject jsonBaby = new JSONObject(); | ||||
jsonBaby.put("projectId",projectId); | jsonBaby.put("projectId",projectId); | ||||
log.info("请求体 :{}",jsonBaby); | |||||
//发送post请求 | //发送post请求 | ||||
RequestEntity<JSONObject> requestEntity = RequestEntity | RequestEntity<JSONObject> requestEntity = RequestEntity | ||||
.post(url) | .post(url) | ||||
@@ -65,6 +65,7 @@ public class CheckProvincialReviewResultTask { | |||||
.eq(Project::getStatus, ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS.getCode()) | .eq(Project::getStatus, ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS.getCode()) | ||||
.ge(Project::getDeclareAmount, ProjectDeclareConst.Number.DECLARE_AMOUNT_JUDGEMENT) | .ge(Project::getDeclareAmount, ProjectDeclareConst.Number.DECLARE_AMOUNT_JUDGEMENT) | ||||
.eq(Project::getAreaCode, RegionConst.RC_LS) | .eq(Project::getAreaCode, RegionConst.RC_LS) | ||||
.eq(Project::getNewest,Boolean.TRUE) | |||||
.orderByAsc(Project::getCreateOn)); | .orderByAsc(Project::getCreateOn)); | ||||
log.info("需要去查询省级联审结果的项目 size:{}",projectList.size()); | log.info("需要去查询省级联审结果的项目 size:{}",projectList.size()); | ||||