@@ -30,7 +30,7 @@ public class ProjectDeclareChoiceAction implements Action<ProjectStatusEnum, Pro | |||||
if (StateMachineUtils.isCityProject(project) && StateMachineUtils.judgeDeclareAmount(project)){ | if (StateMachineUtils.isCityProject(project) && StateMachineUtils.judgeDeclareAmount(project)){ | ||||
project.setStatus(ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS_SUCCESS.getCode()); | project.setStatus(ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS_SUCCESS.getCode()); | ||||
}else { | }else { | ||||
project.setStatus(ProjectStatusEnum.PRE_APPLYING.getCode()); | |||||
project.setStatus(ProjectStatusEnum.PENDING_PREQUALIFICATION.getCode()); | |||||
} | } | ||||
} | } | ||||
} | } | ||||
@@ -97,7 +97,7 @@ public class ProjectDeclareStateMachineBuilder { | |||||
.source(ProjectStatusEnum.PENDING_PREQUALIFICATION_CHOICE) | .source(ProjectStatusEnum.PENDING_PREQUALIFICATION_CHOICE) | ||||
.first(ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS,projectDeclareGuardFactory.new PendingPreQualificationChoiceGuard(),projectDeclareAction.new ProjectDeclareChoiceAction()) | .first(ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS,projectDeclareGuardFactory.new PendingPreQualificationChoiceGuard(),projectDeclareAction.new ProjectDeclareChoiceAction()) | ||||
.last(ProjectStatusEnum.PRE_APPLYING,projectDeclareAction.new ProjectDeclareChoiceAction()).and() | .last(ProjectStatusEnum.PRE_APPLYING,projectDeclareAction.new ProjectDeclareChoiceAction()).and() | ||||
// 省级部门联审通过,从省级部门联审中到升级部门联审成功 | |||||
// 省级部门联审通过,从省级部门联审中到省级部门联审成功 | |||||
.withExternal() | .withExternal() | ||||
.source(ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS) | .source(ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS) | ||||
.target(ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS_SUCCESS) | .target(ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS_SUCCESS) | ||||
@@ -117,16 +117,7 @@ public class ProjectDeclareStateMachineBuilder { | |||||
.source(ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS) | .source(ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS) | ||||
.target(ProjectStatusEnum.PENDING_PREQUALIFICATION) | .target(ProjectStatusEnum.PENDING_PREQUALIFICATION) | ||||
.event(ProjectStatusChangeEvent.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS_WITHDRAW).and() | .event(ProjectStatusChangeEvent.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS_WITHDRAW).and() | ||||
// 省级部门联审不通过重新申报,从省级部门联审不通过到待预审选择 | |||||
.withExternal() | |||||
.source(ProjectStatusEnum.PRE_APPLYING) | |||||
.target(ProjectStatusEnum.PENDING_PREQUALIFICATION_CHOICE) | |||||
.event(ProjectStatusChangeEvent.PRE_APPLYING_WITHDRAW).and() | |||||
// 省级部门联审不通过重新申报,从待预审选择->省级部门联审成功,待预审,完成其中一种状态 | |||||
.withChoice() | |||||
.source(ProjectStatusEnum.PRE_APPLYING) | |||||
.first(ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS_SUCCESS,projectDeclareGuardFactory.new PendingPreQualificationChoiceGuard(),new ProjectDeclareChoiceAction()) | |||||
.last(ProjectStatusEnum.PENDING_PREQUALIFICATION,projectDeclareAction.new ProjectDeclareChoiceAction()).and() | |||||
// 预审通过,从预审中到部门联审中 | // 预审通过,从预审中到部门联审中 | ||||
.withExternal() | .withExternal() | ||||
.source(ProjectStatusEnum.PRE_APPLYING) | .source(ProjectStatusEnum.PRE_APPLYING) | ||||
@@ -124,7 +124,7 @@ public enum ProjectStatusChangeEvent { | |||||
*/ | */ | ||||
JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS_WITHDRAW(null, null, ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS.getCode()), | JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS_WITHDRAW(null, null, ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS.getCode()), | ||||
/** | /** | ||||
* 预审中时被撤回(项目状态进入:待预审选择,,有判断条件:市级项目且申报金额大于1000万项目状态变为:省级部门联审中;否则项目状态变为:预审中) | |||||
* 预审中时被撤回(项目状态进入:待预审选择,,有判断条件:市级项目且申报金额大于1000万项目状态变为:省级部门联审通过;否则项目状态变为:待预审) | |||||
*/ | */ | ||||
PRE_APPLYING_WITHDRAW(null, null, ProjectStatusEnum.PRE_APPLYING.getCode()), | PRE_APPLYING_WITHDRAW(null, null, ProjectStatusEnum.PRE_APPLYING.getCode()), | ||||
/** | /** | ||||
@@ -205,7 +205,10 @@ public class ExcelDownUtil { | |||||
List<List<String>> rowList = Lists.newArrayList(); | List<List<String>> rowList = Lists.newArrayList(); | ||||
for (ExportOptionEnum column : columnList) { | for (ExportOptionEnum column : columnList) { | ||||
List<String> columnValues = Lists.newArrayList(); | List<String> columnValues = Lists.newArrayList(); | ||||
columnValues.add(column.getDesc()); | |||||
String desc = column.getDesc(); | |||||
if (Objects.nonNull(desc)){ | |||||
columnValues.add(desc); | |||||
} | |||||
projects.forEach(project -> { | projects.forEach(project -> { | ||||
String s = JSON.toJSONString(project); | String s = JSON.toJSONString(project); | ||||
JSONObject jsonObject = JSON.parseObject(s); | JSONObject jsonObject = JSON.parseObject(s); | ||||
@@ -45,8 +45,8 @@ public class DingOrganizationController { | |||||
@PostMapping("/get-child-list") | @PostMapping("/get-child-list") | ||||
@ApiOperation("获取组织架构的树状结构(单位筛选列表)") | @ApiOperation("获取组织架构的树状结构(单位筛选列表)") | ||||
public List<OrganizationTreeVO> getChildOrganizationList(@RequestParam(value = "parentCode", required = false) String parentCode) { | |||||
return organizationManage.getChildOrganizationList(parentCode); | |||||
public List<OrganizationTreeVO> getChildOrganizationList(@RequestParam(value = "parentCode", required = false) String parentCode,@RequestParam(value = "orgName", required = false) String orgName) { | |||||
return organizationManage.getChildOrganizationList(parentCode,orgName); | |||||
} | } | ||||
@ApiOperation("组织树状列表筛选(前端定制化接口不可复用)") | @ApiOperation("组织树状列表筛选(前端定制化接口不可复用)") | ||||
@@ -92,17 +92,20 @@ public class OrganizationManage { | |||||
return pageVo; | return pageVo; | ||||
} | } | ||||
public List<OrganizationTreeVO> getChildOrganizationList(String parentCode) { | |||||
public List<OrganizationTreeVO> getChildOrganizationList(String parentCode, String orgName) { | |||||
List<String> parentCodeList = new ArrayList<>(); | List<String> parentCodeList = new ArrayList<>(); | ||||
List<DingOrganization> dingOrganizationList = new ArrayList<>(); | List<DingOrganization> dingOrganizationList = new ArrayList<>(); | ||||
if (StrUtils.isBlank(parentCode)) { | if (StrUtils.isBlank(parentCode)) { | ||||
parentCodeList = dingOrganizationProperties.getDeptVisibleScopes(); | parentCodeList = dingOrganizationProperties.getDeptVisibleScopes(); | ||||
dingOrganizationList = iDingOrganizationService.list(Wrappers.lambdaQuery(DingOrganization.class) | dingOrganizationList = iDingOrganizationService.list(Wrappers.lambdaQuery(DingOrganization.class) | ||||
.like(StringUtils.isNotBlank(orgName), DingOrganization::getOrganizationName, orgName) | |||||
.in(DingOrganization::getOrganizationCode, parentCodeList)); | .in(DingOrganization::getOrganizationCode, parentCodeList)); | ||||
} else { | } else { | ||||
parentCodeList = CollectionUtil.toList(parentCode); | parentCodeList = CollectionUtil.toList(parentCode); | ||||
dingOrganizationList = iDingOrganizationService | dingOrganizationList = iDingOrganizationService | ||||
.list(Wrappers.lambdaQuery(DingOrganization.class).in(DingOrganization::getParentCode, parentCodeList)); | |||||
.list(Wrappers.lambdaQuery(DingOrganization.class) | |||||
.like(StringUtils.isNotBlank(orgName), DingOrganization::getOrganizationName, orgName) | |||||
.in(DingOrganization::getParentCode, parentCodeList)); | |||||
} | } | ||||
if (CollectionUtils.isEmpty(dingOrganizationList)) { | if (CollectionUtils.isEmpty(dingOrganizationList)) { | ||||
@@ -232,7 +235,7 @@ public class OrganizationManage { | |||||
public void treeVOList(Boolean needMember, List<KeyTreeVO> basicOrgKeyTreeVOList) { | public void treeVOList(Boolean needMember, List<KeyTreeVO> basicOrgKeyTreeVOList) { | ||||
for (KeyTreeVO basicOrgKeyTreeVO : basicOrgKeyTreeVOList) { | for (KeyTreeVO basicOrgKeyTreeVO : basicOrgKeyTreeVOList) { | ||||
String parentCode = basicOrgKeyTreeVO.getKey(); | String parentCode = basicOrgKeyTreeVO.getKey(); | ||||
List<OrganizationTreeVO> childOrganizationList = getChildOrganizationList(parentCode); | |||||
List<OrganizationTreeVO> childOrganizationList = getChildOrganizationList(parentCode, null); | |||||
List<KeyTreeVO> orgKeyTreeVOList = childOrganizationList.stream().map(r -> { | List<KeyTreeVO> orgKeyTreeVOList = childOrganizationList.stream().map(r -> { | ||||
KeyTreeVO keyTreeVO = new KeyTreeVO(); | KeyTreeVO keyTreeVO = new KeyTreeVO(); | ||||