ci: 更正swagger
This commit is contained in:
+2
-2
@@ -148,7 +148,7 @@ public class ProcessESInitChangeController {
|
||||
public Result<?> getESPList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
@RequestParam("projectType") String projectType,
|
||||
@RequestParam(name="espApplicationCategory", required = false) String espApplicationCategory) {
|
||||
return Result.OK(espService.getESPList(pageNo, pageSize, projectType, espApplicationCategory));
|
||||
@RequestParam(name="revisionType", required = false) String revisionType) {
|
||||
return Result.OK(espService.getESPList(pageNo, pageSize, projectType, revisionType));
|
||||
}
|
||||
}
|
||||
|
||||
+31
@@ -0,0 +1,31 @@
|
||||
package com.jero.modules.activiti.process.esInitChange.entity.enums;
|
||||
|
||||
/**
|
||||
* @author: Mzaxd
|
||||
* @Date: 2023/10/13 15:14
|
||||
*/
|
||||
public enum ESPRevisionType {
|
||||
|
||||
/** 立项 **/
|
||||
ENACT("制定", "1"),
|
||||
MODIFY("修订", "2"),
|
||||
;
|
||||
|
||||
private final String name;
|
||||
|
||||
private final String value;
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public String getValue() {
|
||||
return value;
|
||||
}
|
||||
|
||||
ESPRevisionType(String name, String value) {
|
||||
this.name = name;
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
}
|
||||
+2
-2
@@ -52,8 +52,8 @@ public interface EnterpriseStandardPlanService extends IService<EnterpriseStanda
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param projectType
|
||||
* @param espApplicationCategory
|
||||
* @param revisionType
|
||||
* @return
|
||||
*/
|
||||
IPage<EnterpriseStandardPlanVo> getESPList(Integer pageNo, Integer pageSize, String projectType, String espApplicationCategory);
|
||||
IPage<EnterpriseStandardPlanVo> getESPList(Integer pageNo, Integer pageSize, String projectType, String revisionType);
|
||||
}
|
||||
|
||||
+5
-4
@@ -9,6 +9,7 @@ import com.jero.common.system.api.ISysBaseAPI;
|
||||
import com.jero.common.system.vo.DictModel;
|
||||
import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPProjectStatus;
|
||||
import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPProjectType;
|
||||
import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPRevisionType;
|
||||
import com.jero.modules.laws.enterprise.entity.dto.ESPlanQueryDTO;
|
||||
import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardPlanVo;
|
||||
import com.jero.common.exception.JeroBootException;
|
||||
@@ -75,7 +76,7 @@ public class EnterpriseStandardPlanServiceImpl extends ServiceImpl<EnterpriseSta
|
||||
|
||||
|
||||
@Override
|
||||
public IPage<EnterpriseStandardPlanVo> getESPList(Integer pageNo, Integer pageSize, String projectType, String espApplicationCategory) {
|
||||
public IPage<EnterpriseStandardPlanVo> getESPList(Integer pageNo, Integer pageSize, String projectType, String revisionType) {
|
||||
// 构建查询参数
|
||||
ESPlanQueryDTO esPlanQueryDTO = new ESPlanQueryDTO();
|
||||
|
||||
@@ -90,10 +91,10 @@ public class EnterpriseStandardPlanServiceImpl extends ServiceImpl<EnterpriseSta
|
||||
} else {
|
||||
// 合并 未开始 修订+修订 制定+制定
|
||||
esPlanQueryDTO.setProjectStatus(ESPProjectStatus.NOT_STARTED.getValue());
|
||||
if (ESPProjectType.ENACT.getValue().equals(espApplicationCategory)) {
|
||||
esPlanQueryDTO.setRevisionType(ESPProjectType.ENACT.getValue());
|
||||
if (ESPRevisionType.ENACT.getValue().equals(revisionType)) {
|
||||
esPlanQueryDTO.setRevisionType(ESPRevisionType.ENACT.getValue());
|
||||
} else {
|
||||
esPlanQueryDTO.setRevisionType(ESPProjectType.MODIFY.getValue());
|
||||
esPlanQueryDTO.setRevisionType(ESPRevisionType.MODIFY.getValue());
|
||||
}
|
||||
}
|
||||
IPage<EnterpriseStandardPlanVo> page = new Page<>(pageNo, pageSize);
|
||||
|
||||
Reference in New Issue
Block a user