ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 企标计划接口不做申请类型筛选

Browse Source
This commit is contained in:
mzaxd
2023-10-13 15:38:19 +08:00
parent 37583e5a37
commit b0e4264dee
3 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java
+2 -3
View File
@@ -149,8 +149,7 @@ public class ProcessESInitChangeController {
public Result<?> getESPList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, public Result<?> getESPList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
ESPlanQueryDTO esPlanQueryDTO, ESPlanQueryDTO esPlanQueryDTO,
@RequestParam("projectType") String projectType, @RequestParam("projectType") String projectType) {
@RequestParam(name="revisionType", required = false) String revisionType) { return Result.OK(espService.getESPList(pageNo, pageSize, esPlanQueryDTO, projectType));
return Result.OK(espService.getESPList(pageNo, pageSize, esPlanQueryDTO, projectType, revisionType));
} }
} }
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardPlanService.java
+1 -2
View File
@@ -53,8 +53,7 @@ public interface EnterpriseStandardPlanService extends IService<EnterpriseStanda
* @param pageSize * @param pageSize
* @param esPlanQueryDTO * @param esPlanQueryDTO
* @param projectType * @param projectType
* @param revisionType
* @return * @return
*/ */
IPage<EnterpriseStandardPlanVo> getESPList(Integer pageNo, Integer pageSize, ESPlanQueryDTO esPlanQueryDTO, String projectType, String revisionType); IPage<EnterpriseStandardPlanVo> getESPList(Integer pageNo, Integer pageSize, ESPlanQueryDTO esPlanQueryDTO, String projectType);
} }
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardPlanServiceImpl.java
+7 -11
View File
@@ -76,24 +76,20 @@ public class EnterpriseStandardPlanServiceImpl extends ServiceImpl<EnterpriseSta
@Override @Override
public IPage<EnterpriseStandardPlanVo> getESPList(Integer pageNo, Integer pageSize, ESPlanQueryDTO esPlanQueryDTO, String projectType, String revisionType) { public IPage<EnterpriseStandardPlanVo> getESPList(Integer pageNo, Integer pageSize, ESPlanQueryDTO esPlanQueryDTO, String projectType) {
List<String> projectStatusList = new ArrayList<>();
// 构建查询参数 // 构建查询参数
if (!ESPProjectType.MERGE.getValue().equals(projectType)) { if (ESPProjectType.MERGE.getValue().equals(projectType)) {
// 合并 未开始 修订+修订 制定+制定
projectStatusList.add(ESPProjectStatus.NOT_STARTED.getValue());
esPlanQueryDTO.setProjectStatusList(projectStatusList);
} else {
// 完成时间变更 未开始/进行中 // 完成时间变更 未开始/进行中
// 工作中止 未开始/进行中 // 工作中止 未开始/进行中
// 责任部门变更 未开始/进行中 // 责任部门变更 未开始/进行中
List<String> projectStatusList = new ArrayList<>();
projectStatusList.add(ESPProjectStatus.NOT_STARTED.getValue()); projectStatusList.add(ESPProjectStatus.NOT_STARTED.getValue());
projectStatusList.add(ESPProjectStatus.IN_PROGRESS.getValue()); projectStatusList.add(ESPProjectStatus.IN_PROGRESS.getValue());
esPlanQueryDTO.setProjectStatusList(projectStatusList); esPlanQueryDTO.setProjectStatusList(projectStatusList);
} else {
// 合并 未开始 修订+修订 制定+制定
esPlanQueryDTO.setProjectStatus(ESPProjectStatus.NOT_STARTED.getValue());
if (ESPRevisionType.ENACT.getValue().equals(revisionType)) {
esPlanQueryDTO.setRevisionType(ESPRevisionType.ENACT.getValue());
} else {
esPlanQueryDTO.setRevisionType(ESPRevisionType.MODIFY.getValue());
}
} }
IPage<EnterpriseStandardPlanVo> page = new Page<>(pageNo, pageSize); IPage<EnterpriseStandardPlanVo> page = new Page<>(pageNo, pageSize);
esPlanMapper.page(page, esPlanQueryDTO); esPlanMapper.page(page, esPlanQueryDTO);