cq_anquan
/
safety-eval-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 项目资料

dev
zhanglei 2026-07-21 18:29:46 +08:00
parent 7a9a4656d6
commit 1289bd0cc7
6 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/EvalProjectController.java
View File

@ -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<Boolean> delete(@RequestBody Req<List<Long>> req) {
return evalProjectApi.delete(req.getData());
}
@ApiOperation("项目进度管理统计")
@GetMapping("/progress-stat")
public SingleResponse<EvalProjectProgressStatCO> progressStat() {

2
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalCustomerExecutor.java
View File

@ -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);
}

11
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProjectExecutor.java
View File

@ -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<EvalProjectCO> save(EvalProjectAddCmd cmd) {
@ -75,6 +80,12 @@ public class EvalProjectExecutor implements EvalProjectApi {
return SingleResponse.success(evalProjectCmdConvertor.buildEnums());
}
@Override
public SingleResponse<Boolean> delete(List<Long> data) {
evalProjectMapper.deleteBatchIds(data);
return SingleResponse.success(true);
}
@Override
public SingleResponse<EvalProjectProgressStatCO> progressStat() {
Long orgId = ThreadLocalUserInfoAdapter.getOrgId();

4
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/regulator/RegulatorEvalProjectMonitorExecutor.java
View File

@ -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<EvalProjectEntity> pageResult = evalProjectGateway.page(domainQuery);
return PageResponse.of(
pageResult.getRecords().stream()

4
safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/institution/EvalProjectApi.java
View File

@ -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<EvalProjectCO> save(EvalProjectAddCmd cmd);
@ -20,6 +22,8 @@ public interface EvalProjectApi {
SingleResponse<EvalProjectEnumsCO> enums();
SingleResponse<Boolean> delete(List<Long> data);
SingleResponse<EvalProjectProgressStatCO> progressStat();
PageResponse<EvalProjectProgressCO> progressPage(EvalProjectProgressPageQuery query);

19
safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/regulator/RegulatorEvalProjectMonitorPageQuery.java
View File

@ -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;
}