diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/EvalProjectController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/EvalProjectController.java index a416720..126a66b 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/EvalProjectController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/EvalProjectController.java @@ -13,10 +13,12 @@ import org.qinan.safetyeval.client.dto.SingleResponse; import org.qinan.safetyeval.client.dto.institution.EvalProjectAddCmd; import org.qinan.safetyeval.client.dto.institution.EvalProjectPageQuery; import org.qinan.safetyeval.client.dto.institution.EvalProjectProgressPageQuery; +import org.qinan.safetyeval.infrastructure.dataobject.base.Req; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.List; @Api(tags = "机构端-安评项目") @RestController @@ -50,6 +52,12 @@ public class EvalProjectController { return evalProjectApi.enums(); } + @ApiOperation("删除项目") + @PostMapping("/delete") + public SingleResponse delete(@RequestBody Req> req) { + return evalProjectApi.delete(req.getData()); + } + @ApiOperation("项目进度管理统计") @GetMapping("/progress-stat") public SingleResponse progressStat() { diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalCustomerExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalCustomerExecutor.java index 27e81dd..011cecc 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalCustomerExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalCustomerExecutor.java @@ -61,6 +61,8 @@ public class EvalCustomerExecutor implements EvalCustomerApi { co.setProjectCount(projectCount); EvalProjectPageQuery evalProjectPageQuery = new EvalProjectPageQuery(); evalProjectPageQuery.setCustomerId(id); + evalProjectPageQuery.setSize(5000L); + evalProjectPageQuery.setCurrent(1L); co.setProjects(evalProjectApi.page(evalProjectPageQuery).getData()); return SingleResponse.success(co); } diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProjectExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProjectExecutor.java index 0849ff8..1b7a3ab 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProjectExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProjectExecutor.java @@ -18,6 +18,7 @@ import org.qinan.safetyeval.domain.exception.ErrorCode; import org.qinan.safetyeval.domain.query.EvalProjectQuery; import org.qinan.safetyeval.domain.query.PageResult; import org.qinan.safetyeval.domain.service.EvalProjectDomainService; +import org.qinan.safetyeval.infrastructure.mapper.EvalProjectMapper; import org.qinan.safetyeval.infrastructure.adapter.ThreadLocalUserInfoAdapter; import org.qinan.safetyeval.infrastructure.support.InstitutionOrgSupport; import org.qinan.safetyeval.infrastructure.support.ProjectNoGenerator; @@ -26,6 +27,8 @@ import org.springframework.context.annotation.Lazy; import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class EvalProjectExecutor implements EvalProjectApi { @@ -44,6 +47,8 @@ public class EvalProjectExecutor implements EvalProjectApi { @Lazy @Autowired(required = false) private EvalProjectCmdConvertor evalProjectCmdConvertor; + @Autowired + private EvalProjectMapper evalProjectMapper; @Override public SingleResponse save(EvalProjectAddCmd cmd) { @@ -75,6 +80,12 @@ public class EvalProjectExecutor implements EvalProjectApi { return SingleResponse.success(evalProjectCmdConvertor.buildEnums()); } + @Override + public SingleResponse delete(List data) { + evalProjectMapper.deleteBatchIds(data); + return SingleResponse.success(true); + } + @Override public SingleResponse progressStat() { Long orgId = ThreadLocalUserInfoAdapter.getOrgId(); diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/regulator/RegulatorEvalProjectMonitorExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/regulator/RegulatorEvalProjectMonitorExecutor.java index 852f6be..8a18490 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/regulator/RegulatorEvalProjectMonitorExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/regulator/RegulatorEvalProjectMonitorExecutor.java @@ -33,8 +33,8 @@ public class RegulatorEvalProjectMonitorExecutor implements RegulatorEvalProject domainQuery.setPageNum(query.getCurrent()); domainQuery.setPageSize(query.getSize()); domainQuery.setOrgId(query.getOrgId()); - domainQuery.setPlanStartDateFrom(query.getPlanStartDateFrom()); - domainQuery.setPlanStartDateTo(query.getPlanStartDateTo()); + domainQuery.setStartTime(query.getStartTime()); + domainQuery.setEndTime(query.getEndTime()); PageResult pageResult = evalProjectGateway.page(domainQuery); return PageResponse.of( pageResult.getRecords().stream() diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/institution/EvalProjectApi.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/institution/EvalProjectApi.java index 397ba3a..ca15e5b 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/institution/EvalProjectApi.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/institution/EvalProjectApi.java @@ -10,6 +10,8 @@ import org.qinan.safetyeval.client.dto.institution.EvalProjectAddCmd; import org.qinan.safetyeval.client.dto.institution.EvalProjectPageQuery; import org.qinan.safetyeval.client.dto.institution.EvalProjectProgressPageQuery; +import java.util.List; + public interface EvalProjectApi { SingleResponse save(EvalProjectAddCmd cmd); @@ -20,6 +22,8 @@ public interface EvalProjectApi { SingleResponse enums(); + SingleResponse delete(List data); + SingleResponse progressStat(); PageResponse progressPage(EvalProjectProgressPageQuery query); diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/regulator/RegulatorEvalProjectMonitorPageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/regulator/RegulatorEvalProjectMonitorPageQuery.java index 0765a35..d0fbbd9 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/regulator/RegulatorEvalProjectMonitorPageQuery.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/regulator/RegulatorEvalProjectMonitorPageQuery.java @@ -4,10 +4,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.qinan.safetyeval.client.dto.BasePageQuery; -import org.springframework.format.annotation.DateTimeFormat; - -import java.time.LocalDate; -import java.time.LocalDateTime; @Data @EqualsAndHashCode(callSuper = true) @@ -22,19 +18,4 @@ public class RegulatorEvalProjectMonitorPageQuery extends BasePageQuery { @ApiModelProperty(value = "当前阶段编码:NODE_01风险分析 NODE_02业务合同 NODE_03项目组成立 NODE_04现场踏勘 NODE_05报告编制 NODE_06内部审核 NODE_07技术审核 NODE_08过程控制 ARCHIVED已归档 CANCELLED已作废", example = "NODE_02") private String currentStageCode; - @ApiModelProperty("创建时间起") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime createTimeFrom; - - @ApiModelProperty("创建时间止") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime createTimeTo; - - @ApiModelProperty("计划开始日期起(可选)") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private LocalDate planStartDateFrom; - - @ApiModelProperty("计划开始日期止(可选)") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private LocalDate planStartDateTo; }