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

fix: 修复流程企标计划接口查询Bug

Browse Source
This commit is contained in:
mzaxd
2023-10-13 15:38:19 +08:00
parent 057dd2b65f
commit 37583e5a37
3 changed files with 6 additions and 5 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
+3 -1
View File
@@ -6,6 +6,7 @@ import com.jero.common.aspect.annotation.AutoLog;
import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange; import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange;
import com.jero.modules.activiti.process.esInitChange.service.ProcessEsInitChangeService; import com.jero.modules.activiti.process.esInitChange.service.ProcessEsInitChangeService;
import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.common.constant.FieldCommon;
import com.jero.modules.laws.enterprise.entity.dto.ESPlanQueryDTO;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService; import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService;
import com.jero.modules.laws.enterprise.util.EnterpriseStandardUtil; import com.jero.modules.laws.enterprise.util.EnterpriseStandardUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
@@ -147,8 +148,9 @@ public class ProcessESInitChangeController {
@GetMapping(value = "/getESPList") @GetMapping(value = "/getESPList")
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,
@RequestParam("projectType") String projectType, @RequestParam("projectType") String projectType,
@RequestParam(name="revisionType", required = false) String revisionType) { @RequestParam(name="revisionType", required = false) String revisionType) {
return Result.OK(espService.getESPList(pageNo, pageSize, projectType, revisionType)); return Result.OK(espService.getESPList(pageNo, pageSize, esPlanQueryDTO, projectType, revisionType));
} }
} }
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardPlanService.java
+2 -1
View File
@@ -51,9 +51,10 @@ public interface EnterpriseStandardPlanService extends IService<EnterpriseStanda
* *
* @param pageNo * @param pageNo
* @param pageSize * @param pageSize
* @param esPlanQueryDTO
* @param projectType * @param projectType
* @param revisionType * @param revisionType
* @return * @return
*/ */
IPage<EnterpriseStandardPlanVo> getESPList(Integer pageNo, Integer pageSize, String projectType, String revisionType); IPage<EnterpriseStandardPlanVo> getESPList(Integer pageNo, Integer pageSize, ESPlanQueryDTO esPlanQueryDTO, String projectType, String revisionType);
} }
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardPlanServiceImpl.java
+1 -3
View File
@@ -76,10 +76,8 @@ public class EnterpriseStandardPlanServiceImpl extends ServiceImpl<EnterpriseSta
@Override @Override
public IPage<EnterpriseStandardPlanVo> getESPList(Integer pageNo, Integer pageSize, String projectType, String revisionType) { public IPage<EnterpriseStandardPlanVo> getESPList(Integer pageNo, Integer pageSize, ESPlanQueryDTO esPlanQueryDTO, String projectType, String revisionType) {
// 构建查询参数 // 构建查询参数
ESPlanQueryDTO esPlanQueryDTO = new ESPlanQueryDTO();
if (!ESPProjectType.MERGE.getValue().equals(projectType)) { if (!ESPProjectType.MERGE.getValue().equals(projectType)) {
// 完成时间变更 未开始/进行中 // 完成时间变更 未开始/进行中
// 工作中止 未开始/进行中 // 工作中止 未开始/进行中