From 7aa13fef1213c450b90e17e80d35d887528240fc Mon Sep 17 00:00:00 2001 From: zhanglei Date: Fri, 24 Jul 2026 11:12:48 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=AD=BE=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../institution/EvalSignRecordController.java | 35 ---- .../institution/EvalSignTaskController.java | 34 ++- .../institution/EvalSignRecordExecutor.java | 74 ------- .../institution/EvalSignTaskExecutor.java | 97 +++------ .../support/EvalNodeCoConverter.java | 10 - .../api/institution/EvalSignRecordApi.java | 14 -- .../api/institution/EvalSignTaskApi.java | 11 +- .../co/institution/EvalSignRecordCO.java | 195 ------------------ .../client/co/institution/EvalSignTaskCO.java | 190 ++--------------- .../institution/EvalSignRecordSaveCmd.java | 173 ---------------- .../institution/EvalSignTaskPageQuery.java | 6 + .../dto/institution/EvalSignTaskSaveCmd.java | 182 +++------------- .../domain/entity/EvalSignRecordEntity.java | 31 --- .../domain/entity/EvalSignTaskEntity.java | 8 +- .../domain/gateway/EvalSignRecordGateway.java | 16 -- .../domain/gateway/EvalSignTaskGateway.java | 6 +- .../domain/query/EvalSignRecordQuery.java | 15 -- .../domain/query/EvalSignTaskQuery.java | 4 +- .../domain/support/EvalStatusHelper.java | 20 -- .../dataobject/EvalSignRecordDO.java | 34 --- .../dataobject/EvalSignTaskDO.java | 13 +- .../EvalSignRecordGatewayImpl.java | 86 -------- .../gatewayimpl/EvalSignTaskGatewayImpl.java | 52 ++--- .../mapper/EvalSignRecordMapper.java | 9 - 24 files changed, 115 insertions(+), 1200 deletions(-) delete mode 100644 safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/EvalSignRecordController.java delete mode 100644 safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalSignRecordExecutor.java delete mode 100644 safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/institution/EvalSignRecordApi.java delete mode 100644 safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/institution/EvalSignRecordCO.java delete mode 100644 safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalSignRecordSaveCmd.java delete mode 100644 safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/EvalSignRecordEntity.java delete mode 100644 safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/gateway/EvalSignRecordGateway.java delete mode 100644 safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/EvalSignRecordQuery.java delete mode 100644 safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/EvalSignRecordDO.java delete mode 100644 safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/EvalSignRecordGatewayImpl.java delete mode 100644 safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/mapper/EvalSignRecordMapper.java diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/EvalSignRecordController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/EvalSignRecordController.java deleted file mode 100644 index 45c1d5d2..00000000 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/EvalSignRecordController.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.qinan.safetyeval.adapter.web.institution; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import org.qinan.safetyeval.client.api.institution.EvalSignRecordApi; -import org.qinan.safetyeval.client.co.institution.EvalSignRecordCO; -import org.qinan.safetyeval.client.dto.SingleResponse; -import org.qinan.safetyeval.client.dto.institution.EvalSignRecordSaveCmd; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -@Api(tags = "机构端-签字记录") -@RestController -@RequestMapping("/safetyEval/institution/eval-sign-record") -public class EvalSignRecordController { - - @Resource - private EvalSignRecordApi evalSignRecordApi; - - @ApiOperation("保存签字记录") - @PostMapping("/save") - public SingleResponse save(@Validated @RequestBody EvalSignRecordSaveCmd cmd) { - return evalSignRecordApi.save(cmd); - } - - @ApiOperation("签字记录列表") - @GetMapping("/list") - public SingleResponse> list(@ApiParam("签字任务ID") @RequestParam String signTaskId) { - return evalSignRecordApi.list(signTaskId); - } -} diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/EvalSignTaskController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/EvalSignTaskController.java index 185e1197..70de0f7e 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/EvalSignTaskController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/EvalSignTaskController.java @@ -2,15 +2,19 @@ package org.qinan.safetyeval.adapter.web.institution; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.institution.EvalSignTaskApi; import org.qinan.safetyeval.client.co.institution.EvalSignTaskCO; +import org.qinan.safetyeval.client.co.institution.EvalSignTaskEnumsCO; import org.qinan.safetyeval.client.dto.PageResponse; import org.qinan.safetyeval.client.dto.SingleResponse; import org.qinan.safetyeval.client.dto.institution.EvalSignTaskPageQuery; import org.qinan.safetyeval.client.dto.institution.EvalSignTaskSaveCmd; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -22,33 +26,21 @@ public class EvalSignTaskController { @Resource private EvalSignTaskApi evalSignTaskApi; - @ApiOperation("创建签字任务") + @ApiOperation("新增签字任务") @PostMapping("/save") public SingleResponse save(@Validated @RequestBody EvalSignTaskSaveCmd cmd) { return evalSignTaskApi.save(cmd); } - @ApiOperation("修改签字任务") - @PostMapping("/modify") - public SingleResponse modify(@Validated @RequestBody EvalSignTaskSaveCmd cmd) { - return evalSignTaskApi.modify(cmd); - } - - @ApiOperation("作废签字任务") - @PostMapping("/cancel") - public SingleResponse cancel(@ApiParam("任务ID") @RequestParam String id) { - return evalSignTaskApi.cancel(id); - } - - @ApiOperation("签字任务详情") - @GetMapping("/get") - public SingleResponse get(@ApiParam("任务ID") @RequestParam String id) { - return evalSignTaskApi.get(id); - } - @ApiOperation("签字任务分页") @GetMapping("/page") public PageResponse page(@Validated EvalSignTaskPageQuery query) { return evalSignTaskApi.page(query); } + + @ApiOperation("签字任务枚举映射") + @GetMapping("/enums") + public SingleResponse enums() { + return evalSignTaskApi.enums(); + } } diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalSignRecordExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalSignRecordExecutor.java deleted file mode 100644 index df6923cb..00000000 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalSignRecordExecutor.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.qinan.safetyeval.app.executor.institution; - -import org.qinan.safetyeval.app.executor.institution.support.EvalCmdCopy; -import org.qinan.safetyeval.app.executor.institution.support.EvalNodeCoConverter; -import org.qinan.safetyeval.app.executor.institution.support.EvalProjectNodeSupport; -import org.qinan.safetyeval.client.api.institution.EvalSignRecordApi; -import org.qinan.safetyeval.client.co.institution.EvalSignRecordCO; -import org.qinan.safetyeval.client.dto.SingleResponse; -import org.qinan.safetyeval.client.dto.institution.EvalSignRecordSaveCmd; -import org.qinan.safetyeval.domain.entity.EvalSignRecordEntity; -import org.qinan.safetyeval.domain.entity.EvalSignTaskEntity; -import org.qinan.safetyeval.domain.exception.BizException; -import org.qinan.safetyeval.domain.exception.ErrorCode; -import org.qinan.safetyeval.domain.gateway.EvalSignRecordGateway; -import org.qinan.safetyeval.domain.gateway.EvalSignTaskGateway; -import org.qinan.safetyeval.domain.support.EvalNodeCodes; -import org.qinan.safetyeval.domain.support.EvalStatusHelper; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.time.LocalDateTime; -import java.util.List; -import java.util.stream.Collectors; - -@Service -public class EvalSignRecordExecutor implements EvalSignRecordApi { - - @Resource - private EvalSignRecordGateway evalSignRecordGateway; - @Resource - private EvalSignTaskGateway evalSignTaskGateway; - @Resource - private EvalProjectNodeSupport evalProjectNodeSupport; - - @Override - public SingleResponse save(EvalSignRecordSaveCmd cmd) { - EvalSignTaskEntity task = requireTask(cmd.getSignTaskId()); - evalProjectNodeSupport.assertWrite(task.getProjectId(), EvalNodeCodes.SIGN); - if (task.getTaskStatusCode() != null && task.getTaskStatusCode() == 3) { - throw new BizException(ErrorCode.EVAL_SIGN_TASK_INVALID); - } - EvalSignRecordEntity entity = new EvalSignRecordEntity(); - entity.setOrgId(task.getOrgId()); - entity.setProjectId(task.getProjectId()); - entity.setSignTaskId(task.getId()); - EvalCmdCopy.apply(cmd, entity); - if (entity.getSignTime() == null) { - entity.setSignTime(LocalDateTime.now()); - } - entity = evalSignRecordGateway.save(entity); - task.setTaskStatusCode(2); - EvalStatusHelper.fillSignTaskStatus(2, task); - evalSignTaskGateway.modify(task); - return SingleResponse.success(EvalNodeCoConverter.toSignRecordCO(entity)); - } - - @Override - public SingleResponse> list(String signTaskId) { - EvalSignTaskEntity task = requireTask(signTaskId); - evalProjectNodeSupport.assertRead(task.getProjectId()); - List list = evalSignRecordGateway.listBySignTaskId(task.getId(), task.getOrgId()) - .stream().map(EvalNodeCoConverter::toSignRecordCO).collect(Collectors.toList()); - return SingleResponse.success(list); - } - - private EvalSignTaskEntity requireTask(String signTaskId) { - EvalSignTaskEntity task = evalSignTaskGateway.get(Long.parseLong(signTaskId)); - if (task == null) { - throw new BizException(ErrorCode.EVAL_SIGN_TASK_NOT_FOUND); - } - evalProjectNodeSupport.requireProject(task.getProjectId()); - return task; - } -} diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalSignTaskExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalSignTaskExecutor.java index b5de7dcc..91a866cf 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalSignTaskExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalSignTaskExecutor.java @@ -1,102 +1,63 @@ package org.qinan.safetyeval.app.executor.institution; -import org.qinan.safetyeval.app.executor.institution.support.EvalCmdCopy; -import org.qinan.safetyeval.app.executor.institution.support.EvalNodeCoConverter; -import org.qinan.safetyeval.app.executor.institution.support.EvalProjectNodeSupport; +import org.qinan.safetyeval.app.convertor.EvalSignTaskCmdConvertor; import org.qinan.safetyeval.client.api.institution.EvalSignTaskApi; +import org.qinan.safetyeval.client.co.institution.EnumOptionCO; import org.qinan.safetyeval.client.co.institution.EvalSignTaskCO; +import org.qinan.safetyeval.client.co.institution.EvalSignTaskEnumsCO; import org.qinan.safetyeval.client.dto.PageResponse; import org.qinan.safetyeval.client.dto.SingleResponse; import org.qinan.safetyeval.client.dto.institution.EvalSignTaskPageQuery; import org.qinan.safetyeval.client.dto.institution.EvalSignTaskSaveCmd; -import org.qinan.safetyeval.domain.entity.EvalProjectEntity; +import org.qinan.safetyeval.domain.constant.SignTaskStatusEnum; import org.qinan.safetyeval.domain.entity.EvalSignTaskEntity; -import org.qinan.safetyeval.domain.exception.BizException; -import org.qinan.safetyeval.domain.exception.ErrorCode; -import org.qinan.safetyeval.domain.gateway.EvalSignTaskGateway; import org.qinan.safetyeval.domain.query.EvalSignTaskQuery; import org.qinan.safetyeval.domain.query.PageResult; -import org.qinan.safetyeval.domain.support.EvalNodeCodes; -import org.qinan.safetyeval.domain.support.EvalStatusHelper; +import org.qinan.safetyeval.domain.service.EvalSignTaskDomainService; +import org.qinan.safetyeval.infrastructure.support.InstitutionOrgSupport; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Arrays; import java.util.stream.Collectors; @Service public class EvalSignTaskExecutor implements EvalSignTaskApi { @Resource - private EvalSignTaskGateway evalSignTaskGateway; + private EvalSignTaskDomainService evalSignTaskDomainService; + @Resource - private EvalProjectNodeSupport evalProjectNodeSupport; + private EvalSignTaskCmdConvertor evalSignTaskCmdConvertor; + + @Resource + private InstitutionOrgSupport institutionOrgSupport; @Override public SingleResponse save(EvalSignTaskSaveCmd cmd) { - Long projectId = Long.parseLong(cmd.getProjectId()); - EvalProjectEntity project = evalProjectNodeSupport.requireProject(projectId); - evalProjectNodeSupport.assertWrite(projectId, EvalNodeCodes.SIGN); - EvalSignTaskEntity entity = new EvalSignTaskEntity(); - entity.setOrgId(project.getOrgId()); - entity.setProjectId(projectId); - EvalCmdCopy.apply(cmd, entity); - if (entity.getTaskStatusCode() == null) { - entity.setTaskStatusCode(1); - } - EvalStatusHelper.fillSignTaskStatus(entity.getTaskStatusCode(), entity); - entity = evalSignTaskGateway.save(entity); - return SingleResponse.success(EvalNodeCoConverter.toSignTaskCO(entity)); - } - - @Override - public SingleResponse modify(EvalSignTaskSaveCmd cmd) { - EvalSignTaskEntity existing = requireTask(cmd.getId()); - evalProjectNodeSupport.assertWrite(existing.getProjectId(), EvalNodeCodes.SIGN); - EvalCmdCopy.apply(cmd, existing); - EvalStatusHelper.fillSignTaskStatus(existing.getTaskStatusCode(), existing); - existing = evalSignTaskGateway.modify(existing); - return SingleResponse.success(EvalNodeCoConverter.toSignTaskCO(existing)); - } - - @Override - public SingleResponse cancel(String id) { - EvalSignTaskEntity existing = requireTask(id); - evalProjectNodeSupport.assertWrite(existing.getProjectId(), EvalNodeCodes.SIGN); - existing.setTaskStatusCode(3); - EvalStatusHelper.fillSignTaskStatus(3, existing); - existing = evalSignTaskGateway.modify(existing); - return SingleResponse.success(EvalNodeCoConverter.toSignTaskCO(existing)); - } - - @Override - public SingleResponse get(String id) { - EvalSignTaskEntity entity = requireTask(id); - evalProjectNodeSupport.assertRead(entity.getProjectId()); - return SingleResponse.success(EvalNodeCoConverter.toSignTaskCO(entity)); + Long orgId = institutionOrgSupport.resolveCurrentOrgId(); + EvalSignTaskEntity entity = evalSignTaskCmdConvertor.convertSaveCmdToE(cmd); + entity.setOrgId(orgId); + EvalSignTaskEntity result = evalSignTaskDomainService.add(entity); + return SingleResponse.success(evalSignTaskCmdConvertor.convertEToCO(result)); } @Override public PageResponse page(EvalSignTaskPageQuery query) { - Long projectId = Long.parseLong(query.getProjectId()); - EvalProjectEntity project = evalProjectNodeSupport.requireProject(projectId); - evalProjectNodeSupport.assertRead(projectId); - EvalSignTaskQuery domainQuery = new EvalSignTaskQuery(); - domainQuery.setPageNum(query.getCurrent()); - domainQuery.setPageSize(query.getSize()); - domainQuery.setOrgId(project.getOrgId()); - domainQuery.setProjectId(projectId); - PageResult pageResult = evalSignTaskGateway.page(domainQuery); + EvalSignTaskQuery domainQuery = evalSignTaskCmdConvertor.convertPageQueryToQ(query); + domainQuery.setOrgId(institutionOrgSupport.resolveCurrentOrgId()); + PageResult pageResult = evalSignTaskDomainService.page(domainQuery); return PageResponse.of( - pageResult.getRecords().stream().map(EvalNodeCoConverter::toSignTaskCO).collect(Collectors.toList()), + evalSignTaskCmdConvertor.convertEListToCOList(pageResult.getRecords()), pageResult.getTotal()); } - private EvalSignTaskEntity requireTask(String id) { - EvalSignTaskEntity entity = evalSignTaskGateway.get(Long.parseLong(id)); - if (entity == null) { - throw new BizException(ErrorCode.EVAL_SIGN_TASK_NOT_FOUND); - } - evalProjectNodeSupport.requireProject(entity.getProjectId()); - return entity; + @Override + public SingleResponse enums() { + EvalSignTaskEnumsCO co = new EvalSignTaskEnumsCO(); + co.setTaskStatus(Arrays.stream(SignTaskStatusEnum.values()) + .map(e -> new EnumOptionCO(String.valueOf(e.getCode()), e.getValue())) + .collect(Collectors.toList())); + return SingleResponse.success(co); } } diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/support/EvalNodeCoConverter.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/support/EvalNodeCoConverter.java index 25b433f1..27d8097a 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/support/EvalNodeCoConverter.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/support/EvalNodeCoConverter.java @@ -4,8 +4,6 @@ import org.springframework.beans.BeanUtils; import org.qinan.safetyeval.client.co.institution.EvalInternalReviewCO; import org.qinan.safetyeval.client.co.institution.EvalProcessControlCO; import org.qinan.safetyeval.client.co.institution.EvalReportDraftCO; -import org.qinan.safetyeval.client.co.institution.EvalSignRecordCO; -import org.qinan.safetyeval.client.co.institution.EvalSignTaskCO; import org.qinan.safetyeval.client.co.institution.EvalTeamCO; import org.qinan.safetyeval.client.co.institution.EvalTechReviewCO; @@ -34,14 +32,6 @@ public final class EvalNodeCoConverter { return copy(entity, new EvalProcessControlCO()); } - public static EvalSignTaskCO toSignTaskCO(Object entity) { - return copy(entity, new EvalSignTaskCO()); - } - - public static EvalSignRecordCO toSignRecordCO(Object entity) { - return copy(entity, new EvalSignRecordCO()); - } - private static T copy(Object entity, T co) { if (entity == null) { return null; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/institution/EvalSignRecordApi.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/institution/EvalSignRecordApi.java deleted file mode 100644 index 0bcbcd80..00000000 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/institution/EvalSignRecordApi.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.qinan.safetyeval.client.api.institution; - -import org.qinan.safetyeval.client.co.institution.EvalSignRecordCO; -import org.qinan.safetyeval.client.dto.SingleResponse; -import org.qinan.safetyeval.client.dto.institution.EvalSignRecordSaveCmd; - -import java.util.List; - -public interface EvalSignRecordApi { - - SingleResponse save(EvalSignRecordSaveCmd cmd); - - SingleResponse> list(String signTaskId); -} diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/institution/EvalSignTaskApi.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/institution/EvalSignTaskApi.java index 54bbe21d..9592e784 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/institution/EvalSignTaskApi.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/institution/EvalSignTaskApi.java @@ -1,20 +1,17 @@ package org.qinan.safetyeval.client.api.institution; import org.qinan.safetyeval.client.co.institution.EvalSignTaskCO; +import org.qinan.safetyeval.client.co.institution.EvalSignTaskEnumsCO; import org.qinan.safetyeval.client.dto.PageResponse; import org.qinan.safetyeval.client.dto.SingleResponse; -import org.qinan.safetyeval.client.dto.institution.EvalSignTaskSaveCmd; import org.qinan.safetyeval.client.dto.institution.EvalSignTaskPageQuery; +import org.qinan.safetyeval.client.dto.institution.EvalSignTaskSaveCmd; public interface EvalSignTaskApi { SingleResponse save(EvalSignTaskSaveCmd cmd); - SingleResponse modify(EvalSignTaskSaveCmd cmd); - - SingleResponse cancel(String id); - - SingleResponse get(String id); - PageResponse page(EvalSignTaskPageQuery query); + + SingleResponse enums(); } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/institution/EvalSignRecordCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/institution/EvalSignRecordCO.java deleted file mode 100644 index 40945e4f..00000000 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/institution/EvalSignRecordCO.java +++ /dev/null @@ -1,195 +0,0 @@ -package org.qinan.safetyeval.client.co.institution; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.time.LocalDate; -import java.time.LocalDateTime; - -@Data -public class EvalSignRecordCO { - - private String id; - private String orgId; - private String projectId; - private String riskId; - private String surveyId; - private String signTaskId; - private LocalDate analysisDate; - @ApiModelProperty(value = "评价类型编码：PRE安全预评价 ACCEPT安全验收评价 STATUS安全现状评价", example = "PRE") - private String evalTypeCode; - @ApiModelProperty(value = "评价类型名称：安全预评价/安全验收评价/安全现状评价", example = "安全预评价") - private String evalTypeName; - private String industryCode; - private String industryName; - private String evalScope; - @ApiModelProperty(value = "是否在资质业务范围内：1是 2否", example = "1") - private Integer inBizScopeFlag; - private String unitOverview; - private String industryRiskDesc; - @ApiModelProperty(value = "人员专业构成是否满足：1满足 2不满足", example = "1") - private Integer staffMatchCode; - @ApiModelProperty(value = "是否需要聘请专家：1需要 2不需要", example = "2") - private Integer needExpertCode; - @ApiModelProperty(value = "是否有能力承担评价风险：1是 2否", example = "1") - private Integer capabilityCode; - @ApiModelProperty(value = "项目可行性：1可行 2不可行", example = "1") - private Integer feasibleCode; - @ApiModelProperty(value = "经济性：1有经济效益 2无经济效益", example = "1") - private Integer economicCode; - @ApiModelProperty(value = "风险程度编码：1低度 2中度 3高度", example = "1") - private Integer riskLevelCode; - @ApiModelProperty(value = "风险程度名称：低度/中度/高度", example = "低度") - private String riskLevelName; - @ApiModelProperty(value = "合同签订结论：1签合同 2不签合同", example = "1") - private Integer signContractCode; - private String conclusionContent; - private String approverName; - @ApiModelProperty(value = "批准意见编码：1同意 2退回补充 3不同意承接", example = "1") - private Integer approvalOpinionCode; - @ApiModelProperty(value = "批准意见名称：同意/退回补充/不同意承接", example = "同意") - private String approvalOpinionName; - private LocalDate approvalDate; - @ApiModelProperty(value = "节点状态编码：1未开始 2进行中 3已完成 4退回", example = "2") - private Integer statusCode; - @ApiModelProperty(value = "节点状态名称：未开始/进行中/已完成/退回", example = "进行中") - private String statusName; - private String personnelId; - private String personnelName; - private String deptName; - @ApiModelProperty(value = "签字状态编码：1待签 2已签", example = "1") - private Integer signStatusCode; - @ApiModelProperty(value = "签字状态名称：待签/已签", example = "待签") - private String signStatusName; - private String signFileUrl; - private Integer sortOrder; - private String orgName; - private String contractNo; - private String projectName; - private String projectIntro; - private Long amountFen; - private String projectTypeCode; - private String projectTypeName; - private String riskSummary; - private String projectRegion; - private String projectAddress; - private LocalDate contractStartDate; - private LocalDate contractEndDate; - @ApiModelProperty(value = "是否生产剧毒化学品：1是 2否", example = "2") - private Integer toxicFlag; - @ApiModelProperty(value = "是否生产易制毒化学品：1是 2否", example = "2") - private Integer precursorFlag; - @ApiModelProperty(value = "是否跨省建设项目：1是 2否", example = "2") - private Integer crossProvinceFlag; - private String businessScope; - private String enterpriseName; - private String industryCategory; - private String officeAddress; - private String creditCode; - private String postCode; - private String enterprisePhone; - private String fax; - private String legalPerson; - private String contactName; - private Integer staffCount; - private String scanFileUrl; - private String leaderPersonnelId; - private String leaderName; - private String controlPersonnelId; - private String controlName; - private Integer memberCount; - private LocalDateTime finishTime; - private LocalDate planSurveyDate; - private String surveyPlace; - @ApiModelProperty(value = "从业告知是否完成：1是 2否", example = "2") - private Integer noticeDoneFlag; - @ApiModelProperty(value = "现场勘查是否完成：1是 2否", example = "2") - private Integer inspectDoneFlag; - @ApiModelProperty(value = "整改通知是否完成：1是 2否", example = "2") - private Integer rectifyDoneFlag; - @ApiModelProperty(value = "企业整改报告是否完成：1是 2否", example = "2") - private Integer enterpriseDoneFlag; - @ApiModelProperty(value = "整改复查是否完成：1是 2否", example = "2") - private Integer reviewDoneFlag; - private String noticeContent; - private String memberSnapshot; - private String stampFileUrl; - @ApiModelProperty(value = "任务状态编码：1待签 2已签 3已作废", example = "1") - private Integer taskStatusCode; - @ApiModelProperty(value = "任务状态名称：待签/已签/已作废", example = "待签") - private String taskStatusName; - private LocalDateTime planTime; - @ApiModelProperty(value = "打卡类型编码：1签到 2签退", example = "1") - private Integer checkinTypeCode; - @ApiModelProperty(value = "打卡类型名称：签到/签退", example = "签到") - private String checkinTypeName; - private LocalDateTime checkinTime; - private java.math.BigDecimal longitude; - private java.math.BigDecimal latitude; - private String address; - @ApiModelProperty(value = "人脸校验是否通过：1是 2否", example = "2") - private Integer facePassFlag; - private String photoUrls; - private String signImageUrl; - @ApiModelProperty(value = "附件类型编码：CHECKLIST检查表 RECTIFY整改通知 ENTERPRISE企业整改报告 REVIEW复查单 OTHER其他", example = "CHECKLIST") - private String attachTypeCode; - @ApiModelProperty(value = "附件类型名称：检查表/整改通知/企业整改报告/复查单/其他", example = "检查表") - private String attachTypeName; - private String fileName; - private String fileUrl; - @ApiModelProperty(value = "复查结论编码：1整改合格 2整改不合格 3继续整改", example = "1") - private Integer reviewResultCode; - @ApiModelProperty(value = "复查结论名称：整改合格/整改不合格/继续整改", example = "整改合格") - private String reviewResultName; - private String reviewContent; - private Integer draftVersionNo; - private String templateCode; - private String templateName; - private String contentUrl; - private String hintContent; - private String draftId; - private String reviewerPersonnelId; - private String reviewerName; - @ApiModelProperty(value = "审核结果编码：1通过 2退回修改", example = "1") - private Integer resultCode; - @ApiModelProperty(value = "审核结果名称：通过/退回修改", example = "通过") - private String resultName; - private String opinionContent; - private LocalDateTime reviewTime; - private String controllerPersonnelId; - private String controllerName; - @ApiModelProperty(value = "前7节点是否全部完成：1是 2否", example = "2") - private Integer precheckPassFlag; - @ApiModelProperty(value = "是否归档：1是 2否", example = "2") - private Integer archiveFlag; - private LocalDateTime controlTime; - @ApiModelProperty(value = "所属节点编码：NODE_01风险分析 NODE_02业务合同 NODE_03项目组成立 NODE_04现场踏勘 NODE_05报告编制 NODE_06内部审核 NODE_07技术审核 NODE_08过程控制", example = "NODE_01") - private String nodeCode; - @ApiModelProperty(value = "所属节点名称：风险分析/业务合同/项目组成立/现场踏勘/报告编制/内部审核/技术审核/过程控制", example = "风险分析") - private String nodeName; - private String bizTypeCode; - private String bizTypeName; - private String bizRefId; - private String signerPersonnelId; - private String signerName; - private String taskTitle; - private LocalDateTime expireTime; - private LocalDateTime signTime; - @ApiModelProperty(value = "客户端类型编码：1PC 2APP", example = "1") - private Integer clientTypeCode; - @ApiModelProperty(value = "客户端类型名称：PC/APP", example = "PC") - private String clientTypeName; - private String customerId; - private String reportNo; - private String reportName; - private Integer reportYear; - @ApiModelProperty(value = "是否公开：1是 2否", example = "2") - private Integer publicFlag; - @ApiModelProperty(value = "资料是否完整：1是 2否", example = "2") - private Integer completeFlag; - @ApiModelProperty(value = "报告状态编码：1已入库 2抽查中 3待整改 4已复核", example = "1") - private Integer reportStatusCode; - @ApiModelProperty(value = "报告状态名称：已入库/抽查中/待整改/已复核", example = "已入库") - private String reportStatusName; - private LocalDateTime archiveTime; -} diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/institution/EvalSignTaskCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/institution/EvalSignTaskCO.java index 6066b505..acbf38aa 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/institution/EvalSignTaskCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/institution/EvalSignTaskCO.java @@ -3,7 +3,6 @@ package org.qinan.safetyeval.client.co.institution; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.time.LocalDate; import java.time.LocalDateTime; @Data @@ -12,184 +11,21 @@ public class EvalSignTaskCO { private String id; private String orgId; private String projectId; - private String riskId; - private String surveyId; - private String signTaskId; - private LocalDate analysisDate; - @ApiModelProperty(value = "评价类型编码：PRE安全预评价 ACCEPT安全验收评价 STATUS安全现状评价", example = "PRE") - private String evalTypeCode; - @ApiModelProperty(value = "评价类型名称：安全预评价/安全验收评价/安全现状评价", example = "安全预评价") - private String evalTypeName; - private String industryCode; - private String industryName; - private String evalScope; - @ApiModelProperty(value = "是否在资质业务范围内：1是 2否", example = "1") - private Integer inBizScopeFlag; - private String unitOverview; - private String industryRiskDesc; - @ApiModelProperty(value = "人员专业构成是否满足：1满足 2不满足", example = "1") - private Integer staffMatchCode; - @ApiModelProperty(value = "是否需要聘请专家：1需要 2不需要", example = "2") - private Integer needExpertCode; - @ApiModelProperty(value = "是否有能力承担评价风险：1是 2否", example = "1") - private Integer capabilityCode; - @ApiModelProperty(value = "项目可行性：1可行 2不可行", example = "1") - private Integer feasibleCode; - @ApiModelProperty(value = "经济性：1有经济效益 2无经济效益", example = "1") - private Integer economicCode; - @ApiModelProperty(value = "风险程度编码：1低度 2中度 3高度", example = "1") - private Integer riskLevelCode; - @ApiModelProperty(value = "风险程度名称：低度/中度/高度", example = "低度") - private String riskLevelName; - @ApiModelProperty(value = "合同签订结论：1签合同 2不签合同", example = "1") - private Integer signContractCode; - private String conclusionContent; - private String approverName; - @ApiModelProperty(value = "批准意见编码：1同意 2退回补充 3不同意承接", example = "1") - private Integer approvalOpinionCode; - @ApiModelProperty(value = "批准意见名称：同意/退回补充/不同意承接", example = "同意") - private String approvalOpinionName; - private LocalDate approvalDate; - @ApiModelProperty(value = "节点状态编码：1未开始 2进行中 3已完成 4退回", example = "2") - private Integer statusCode; - @ApiModelProperty(value = "节点状态名称：未开始/进行中/已完成/退回", example = "进行中") - private String statusName; - private String personnelId; - private String personnelName; - private String deptName; - @ApiModelProperty(value = "签字状态编码：1待签 2已签", example = "1") - private Integer signStatusCode; - @ApiModelProperty(value = "签字状态名称：待签/已签", example = "待签") - private String signStatusName; - private String signFileUrl; - private Integer sortOrder; - private String orgName; - private String contractNo; - private String projectName; - private String projectIntro; - private Long amountFen; - private String projectTypeCode; - private String projectTypeName; - private String riskSummary; - private String projectRegion; - private String projectAddress; - private LocalDate contractStartDate; - private LocalDate contractEndDate; - @ApiModelProperty(value = "是否生产剧毒化学品：1是 2否", example = "2") - private Integer toxicFlag; - @ApiModelProperty(value = "是否生产易制毒化学品：1是 2否", example = "2") - private Integer precursorFlag; - @ApiModelProperty(value = "是否跨省建设项目：1是 2否", example = "2") - private Integer crossProvinceFlag; - private String businessScope; - private String enterpriseName; - private String industryCategory; - private String officeAddress; - private String creditCode; - private String postCode; - private String enterprisePhone; - private String fax; - private String legalPerson; - private String contactName; - private Integer staffCount; - private String scanFileUrl; - private String leaderPersonnelId; - private String leaderName; - private String controlPersonnelId; - private String controlName; - private Integer memberCount; - private LocalDateTime finishTime; - private LocalDate planSurveyDate; - private String surveyPlace; - @ApiModelProperty(value = "从业告知是否完成：1是 2否", example = "2") - private Integer noticeDoneFlag; - @ApiModelProperty(value = "现场勘查是否完成：1是 2否", example = "2") - private Integer inspectDoneFlag; - @ApiModelProperty(value = "整改通知是否完成：1是 2否", example = "2") - private Integer rectifyDoneFlag; - @ApiModelProperty(value = "企业整改报告是否完成：1是 2否", example = "2") - private Integer enterpriseDoneFlag; - @ApiModelProperty(value = "整改复查是否完成：1是 2否", example = "2") - private Integer reviewDoneFlag; - private String noticeContent; - private String memberSnapshot; - private String stampFileUrl; - @ApiModelProperty(value = "任务状态编码：1待签 2已签 3已作废", example = "1") - private Integer taskStatusCode; - @ApiModelProperty(value = "任务状态名称：待签/已签/已作废", example = "待签") - private String taskStatusName; - private LocalDateTime planTime; - @ApiModelProperty(value = "打卡类型编码：1签到 2签退", example = "1") - private Integer checkinTypeCode; - @ApiModelProperty(value = "打卡类型名称：签到/签退", example = "签到") - private String checkinTypeName; - private LocalDateTime checkinTime; - private java.math.BigDecimal longitude; - private java.math.BigDecimal latitude; - private String address; - @ApiModelProperty(value = "人脸校验是否通过：1是 2否", example = "2") - private Integer facePassFlag; - private String photoUrls; - private String signImageUrl; - @ApiModelProperty(value = "附件类型编码：CHECKLIST检查表 RECTIFY整改通知 ENTERPRISE企业整改报告 REVIEW复查单 OTHER其他", example = "CHECKLIST") - private String attachTypeCode; - @ApiModelProperty(value = "附件类型名称：检查表/整改通知/企业整改报告/复查单/其他", example = "检查表") - private String attachTypeName; - private String fileName; - private String fileUrl; - @ApiModelProperty(value = "复查结论编码：1整改合格 2整改不合格 3继续整改", example = "1") - private Integer reviewResultCode; - @ApiModelProperty(value = "复查结论名称：整改合格/整改不合格/继续整改", example = "整改合格") - private String reviewResultName; - private String reviewContent; - private Integer draftVersionNo; - private String templateCode; - private String templateName; - private String contentUrl; - private String hintContent; - private String draftId; - private String reviewerPersonnelId; - private String reviewerName; - @ApiModelProperty(value = "审核结果编码：1通过 2退回修改", example = "1") - private Integer resultCode; - @ApiModelProperty(value = "审核结果名称：通过/退回修改", example = "通过") - private String resultName; - private String opinionContent; - private LocalDateTime reviewTime; - private String controllerPersonnelId; - private String controllerName; - @ApiModelProperty(value = "前7节点是否全部完成：1是 2否", example = "2") - private Integer precheckPassFlag; - @ApiModelProperty(value = "是否归档：1是 2否", example = "2") - private Integer archiveFlag; - private LocalDateTime controlTime; - @ApiModelProperty(value = "所属节点编码：NODE_01风险分析 NODE_02业务合同 NODE_03项目组成立 NODE_04现场踏勘 NODE_05报告编制 NODE_06内部审核 NODE_07技术审核 NODE_08过程控制", example = "NODE_01") private String nodeCode; - @ApiModelProperty(value = "所属节点名称：风险分析/业务合同/项目组成立/现场踏勘/报告编制/内部审核/技术审核/过程控制", example = "风险分析") - private String nodeName; - private String bizTypeCode; - private String bizTypeName; private String bizRefId; private String signerPersonnelId; - private String signerName; private String taskTitle; - private LocalDateTime expireTime; - private LocalDateTime signTime; - @ApiModelProperty(value = "客户端类型编码：1PC 2APP", example = "1") - private Integer clientTypeCode; - @ApiModelProperty(value = "客户端类型名称：PC/APP", example = "PC") - private String clientTypeName; - private String customerId; - private String reportNo; - private String reportName; - private Integer reportYear; - @ApiModelProperty(value = "是否公开：1是 2否", example = "2") - private Integer publicFlag; - @ApiModelProperty(value = "资料是否完整：1是 2否", example = "2") - private Integer completeFlag; - @ApiModelProperty(value = "报告状态编码：1已入库 2抽查中 3待整改 4已复核", example = "1") - private Integer reportStatusCode; - @ApiModelProperty(value = "报告状态名称：已入库/抽查中/待整改/已复核", example = "已入库") - private String reportStatusName; - private LocalDateTime archiveTime; + + @ApiModelProperty(value = "任务状态编码：1待签 2已签 3已作废", example = "1") + private Integer taskStatusCode; + + @ApiModelProperty(value = "任务状态名称：待签/已签/已作废", example = "待签") + private String taskStatusName; + + private LocalDateTime issueTime; + private String signerUrl; + private String remarks; + private String createName; + private LocalDateTime createTime; + private LocalDateTime updateTime; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalSignRecordSaveCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalSignRecordSaveCmd.java deleted file mode 100644 index 399d3014..00000000 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalSignRecordSaveCmd.java +++ /dev/null @@ -1,173 +0,0 @@ -package org.qinan.safetyeval.client.dto.institution; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.time.LocalDate; -import java.time.LocalDateTime; - -@Data -public class EvalSignRecordSaveCmd { - private String id; - private String projectId; - private String riskId; - private String surveyId; - private String signTaskId; - private LocalDate analysisDate; - @ApiModelProperty(value = "评价类型编码：PRE安全预评价 ACCEPT安全验收评价 STATUS安全现状评价", example = "PRE") - private String evalTypeCode; - @ApiModelProperty(value = "评价类型名称：安全预评价/安全验收评价/安全现状评价", example = "安全预评价") - private String evalTypeName; - private String industryCode; - private String industryName; - private String evalScope; - @ApiModelProperty(value = "是否在资质业务范围内：1是 2否", example = "1") - private Integer inBizScopeFlag; - private String unitOverview; - private String industryRiskDesc; - @ApiModelProperty(value = "人员专业构成是否满足：1满足 2不满足", example = "1") - private Integer staffMatchCode; - @ApiModelProperty(value = "是否需要聘请专家：1需要 2不需要", example = "2") - private Integer needExpertCode; - @ApiModelProperty(value = "是否有能力承担评价风险：1是 2否", example = "1") - private Integer capabilityCode; - @ApiModelProperty(value = "项目可行性：1可行 2不可行", example = "1") - private Integer feasibleCode; - @ApiModelProperty(value = "经济性：1有经济效益 2无经济效益", example = "1") - private Integer economicCode; - @ApiModelProperty(value = "风险程度编码：1低度 2中度 3高度", example = "1") - private Integer riskLevelCode; - @ApiModelProperty(value = "风险程度名称：低度/中度/高度", example = "低度") - private String riskLevelName; - @ApiModelProperty(value = "合同签订结论：1签合同 2不签合同", example = "1") - private Integer signContractCode; - private String conclusionContent; - private String approverName; - @ApiModelProperty(value = "批准意见编码：1同意 2退回补充 3不同意承接", example = "1") - private Integer approvalOpinionCode; - @ApiModelProperty(value = "批准意见名称：同意/退回补充/不同意承接", example = "同意") - private String approvalOpinionName; - private LocalDate approvalDate; - @ApiModelProperty(value = "节点状态编码：1未开始 2进行中 3已完成 4退回", example = "2") - private Integer statusCode; - private String personnelId; - private String personnelName; - private String deptName; - @ApiModelProperty(value = "签字状态编码：1待签 2已签", example = "1") - private Integer signStatusCode; - private String signFileUrl; - private Integer sortOrder; - private String orgName; - private String contractNo; - private String projectName; - private String projectIntro; - private Long amountFen; - private String projectTypeCode; - private String projectTypeName; - private String riskSummary; - private String projectRegion; - private String projectAddress; - private LocalDate contractStartDate; - private LocalDate contractEndDate; - @ApiModelProperty(value = "是否生产剧毒化学品：1是 2否", example = "2") - private Integer toxicFlag; - @ApiModelProperty(value = "是否生产易制毒化学品：1是 2否", example = "2") - private Integer precursorFlag; - @ApiModelProperty(value = "是否跨省建设项目：1是 2否", example = "2") - private Integer crossProvinceFlag; - private String businessScope; - private String enterpriseName; - private String industryCategory; - private String officeAddress; - private String creditCode; - private String postCode; - private String enterprisePhone; - private String fax; - private String legalPerson; - private String contactName; - private Integer staffCount; - private String scanFileUrl; - private String leaderPersonnelId; - private String leaderName; - private String controlPersonnelId; - private String controlName; - private Integer memberCount; - private LocalDate planSurveyDate; - private String surveyPlace; - @ApiModelProperty(value = "从业告知是否完成：1是 2否", example = "2") - private Integer noticeDoneFlag; - @ApiModelProperty(value = "现场勘查是否完成：1是 2否", example = "2") - private Integer inspectDoneFlag; - @ApiModelProperty(value = "整改通知是否完成：1是 2否", example = "2") - private Integer rectifyDoneFlag; - @ApiModelProperty(value = "企业整改报告是否完成：1是 2否", example = "2") - private Integer enterpriseDoneFlag; - @ApiModelProperty(value = "整改复查是否完成：1是 2否", example = "2") - private Integer reviewDoneFlag; - private String noticeContent; - private String memberSnapshot; - private String stampFileUrl; - @ApiModelProperty(value = "任务状态编码：1待签 2已签 3已作废", example = "1") - private Integer taskStatusCode; - private LocalDateTime planTime; - @ApiModelProperty(value = "打卡类型编码：1签到 2签退", example = "1") - private Integer checkinTypeCode; - @ApiModelProperty(value = "打卡类型名称：签到/签退", example = "签到") - private String checkinTypeName; - private LocalDateTime checkinTime; - private java.math.BigDecimal longitude; - private java.math.BigDecimal latitude; - private String address; - @ApiModelProperty(value = "人脸校验是否通过：1是 2否", example = "2") - private Integer facePassFlag; - private String photoUrls; - private String signImageUrl; - @ApiModelProperty(value = "附件类型编码：CHECKLIST检查表 RECTIFY整改通知 ENTERPRISE企业整改报告 REVIEW复查单 OTHER其他", example = "CHECKLIST") - private String attachTypeCode; - @ApiModelProperty(value = "附件类型名称：检查表/整改通知/企业整改报告/复查单/其他", example = "检查表") - private String attachTypeName; - private String fileName; - private String fileUrl; - @ApiModelProperty(value = "复查结论编码：1整改合格 2整改不合格 3继续整改", example = "1") - private Integer reviewResultCode; - @ApiModelProperty(value = "复查结论名称：整改合格/整改不合格/继续整改", example = "整改合格") - private String reviewResultName; - private String reviewContent; - private String templateCode; - private String templateName; - private String contentUrl; - private String hintContent; - private String draftId; - private String reviewerPersonnelId; - private String reviewerName; - @ApiModelProperty(value = "审核结果编码：1通过 2退回修改", example = "1") - private Integer resultCode; - @ApiModelProperty(value = "审核结果名称：通过/退回修改", example = "通过") - private String resultName; - private String opinionContent; - private LocalDateTime reviewTime; - private String controllerPersonnelId; - private String controllerName; - @ApiModelProperty(value = "前7节点是否全部完成：1是 2否", example = "2") - private Integer precheckPassFlag; - @ApiModelProperty(value = "是否归档：1是 2否", example = "2") - private Integer archiveFlag; - private LocalDateTime controlTime; - @ApiModelProperty(value = "所属节点编码：NODE_01风险分析 NODE_02业务合同 NODE_03项目组成立 NODE_04现场踏勘 NODE_05报告编制 NODE_06内部审核 NODE_07技术审核 NODE_08过程控制", example = "NODE_01") - private String nodeCode; - @ApiModelProperty(value = "所属节点名称：风险分析/业务合同/项目组成立/现场踏勘/报告编制/内部审核/技术审核/过程控制", example = "风险分析") - private String nodeName; - private String bizTypeCode; - private String bizTypeName; - private String bizRefId; - private String signerPersonnelId; - private String signerName; - private String taskTitle; - private LocalDateTime expireTime; - private LocalDateTime signTime; - @ApiModelProperty(value = "客户端类型编码：1PC 2APP", example = "1") - private Integer clientTypeCode; - @ApiModelProperty(value = "客户端类型名称：PC/APP", example = "PC") - private String clientTypeName; - private String remarks; -} diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalSignTaskPageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalSignTaskPageQuery.java index 58cd946c..05f1cb29 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalSignTaskPageQuery.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalSignTaskPageQuery.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto.institution; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.qinan.safetyeval.client.dto.BasePageQuery; @@ -7,5 +8,10 @@ import org.qinan.safetyeval.client.dto.BasePageQuery; @Data @EqualsAndHashCode(callSuper = true) public class EvalSignTaskPageQuery extends BasePageQuery { + + @ApiModelProperty("项目id") private String projectId; + + @ApiModelProperty("待签人员id") + private String signerPersonnelId; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalSignTaskSaveCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalSignTaskSaveCmd.java index f1ba67db..fd61fc1c 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalSignTaskSaveCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalSignTaskSaveCmd.java @@ -3,171 +3,35 @@ package org.qinan.safetyeval.client.dto.institution; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.time.LocalDate; import java.time.LocalDateTime; @Data public class EvalSignTaskSaveCmd { - private String id; + + @ApiModelProperty(value = "项目id", required = true) private String projectId; - private String riskId; - private String surveyId; - private String signTaskId; - private LocalDate analysisDate; - @ApiModelProperty(value = "评价类型编码：PRE安全预评价 ACCEPT安全验收评价 STATUS安全现状评价", example = "PRE") - private String evalTypeCode; - @ApiModelProperty(value = "评价类型名称：安全预评价/安全验收评价/安全现状评价", example = "安全预评价") - private String evalTypeName; - private String industryCode; - private String industryName; - private String evalScope; - @ApiModelProperty(value = "是否在资质业务范围内：1是 2否", example = "1") - private Integer inBizScopeFlag; - private String unitOverview; - private String industryRiskDesc; - @ApiModelProperty(value = "人员专业构成是否满足：1满足 2不满足", example = "1") - private Integer staffMatchCode; - @ApiModelProperty(value = "是否需要聘请专家：1需要 2不需要", example = "2") - private Integer needExpertCode; - @ApiModelProperty(value = "是否有能力承担评价风险：1是 2否", example = "1") - private Integer capabilityCode; - @ApiModelProperty(value = "项目可行性：1可行 2不可行", example = "1") - private Integer feasibleCode; - @ApiModelProperty(value = "经济性：1有经济效益 2无经济效益", example = "1") - private Integer economicCode; - @ApiModelProperty(value = "风险程度编码：1低度 2中度 3高度", example = "1") - private Integer riskLevelCode; - @ApiModelProperty(value = "风险程度名称：低度/中度/高度", example = "低度") - private String riskLevelName; - @ApiModelProperty(value = "合同签订结论：1签合同 2不签合同", example = "1") - private Integer signContractCode; - private String conclusionContent; - private String approverName; - @ApiModelProperty(value = "批准意见编码：1同意 2退回补充 3不同意承接", example = "1") - private Integer approvalOpinionCode; - @ApiModelProperty(value = "批准意见名称：同意/退回补充/不同意承接", example = "同意") - private String approvalOpinionName; - private LocalDate approvalDate; - @ApiModelProperty(value = "节点状态编码：1未开始 2进行中 3已完成 4退回", example = "2") - private Integer statusCode; - private String personnelId; - private String personnelName; - private String deptName; - @ApiModelProperty(value = "签字状态编码：1待签 2已签", example = "1") - private Integer signStatusCode; - private String signFileUrl; - private Integer sortOrder; - private String orgName; - private String contractNo; - private String projectName; - private String projectIntro; - private Long amountFen; - private String projectTypeCode; - private String projectTypeName; - private String riskSummary; - private String projectRegion; - private String projectAddress; - private LocalDate contractStartDate; - private LocalDate contractEndDate; - @ApiModelProperty(value = "是否生产剧毒化学品：1是 2否", example = "2") - private Integer toxicFlag; - @ApiModelProperty(value = "是否生产易制毒化学品：1是 2否", example = "2") - private Integer precursorFlag; - @ApiModelProperty(value = "是否跨省建设项目：1是 2否", example = "2") - private Integer crossProvinceFlag; - private String businessScope; - private String enterpriseName; - private String industryCategory; - private String officeAddress; - private String creditCode; - private String postCode; - private String enterprisePhone; - private String fax; - private String legalPerson; - private String contactName; - private Integer staffCount; - private String scanFileUrl; - private String leaderPersonnelId; - private String leaderName; - private String controlPersonnelId; - private String controlName; - private Integer memberCount; - private LocalDate planSurveyDate; - private String surveyPlace; - @ApiModelProperty(value = "从业告知是否完成：1是 2否", example = "2") - private Integer noticeDoneFlag; - @ApiModelProperty(value = "现场勘查是否完成：1是 2否", example = "2") - private Integer inspectDoneFlag; - @ApiModelProperty(value = "整改通知是否完成：1是 2否", example = "2") - private Integer rectifyDoneFlag; - @ApiModelProperty(value = "企业整改报告是否完成：1是 2否", example = "2") - private Integer enterpriseDoneFlag; - @ApiModelProperty(value = "整改复查是否完成：1是 2否", example = "2") - private Integer reviewDoneFlag; - private String noticeContent; - private String memberSnapshot; - private String stampFileUrl; + + @ApiModelProperty(value = "所属节点编码") + private String nodeCode; + + @ApiModelProperty("业务单据id") + private String bizRefId; + + @ApiModelProperty("待签人员id") + private String signerPersonnelId; + + @ApiModelProperty("签字任务标题") + private String taskTitle; + @ApiModelProperty(value = "任务状态编码：1待签 2已签 3已作废", example = "1") private Integer taskStatusCode; - private LocalDateTime planTime; - @ApiModelProperty(value = "打卡类型编码：1签到 2签退", example = "1") - private Integer checkinTypeCode; - @ApiModelProperty(value = "打卡类型名称：签到/签退", example = "签到") - private String checkinTypeName; - private LocalDateTime checkinTime; - private java.math.BigDecimal longitude; - private java.math.BigDecimal latitude; - private String address; - @ApiModelProperty(value = "人脸校验是否通过：1是 2否", example = "2") - private Integer facePassFlag; - private String photoUrls; - private String signImageUrl; - @ApiModelProperty(value = "附件类型编码：CHECKLIST检查表 RECTIFY整改通知 ENTERPRISE企业整改报告 REVIEW复查单 OTHER其他", example = "CHECKLIST") - private String attachTypeCode; - @ApiModelProperty(value = "附件类型名称：检查表/整改通知/企业整改报告/复查单/其他", example = "检查表") - private String attachTypeName; - private String fileName; - private String fileUrl; - @ApiModelProperty(value = "复查结论编码：1整改合格 2整改不合格 3继续整改", example = "1") - private Integer reviewResultCode; - @ApiModelProperty(value = "复查结论名称：整改合格/整改不合格/继续整改", example = "整改合格") - private String reviewResultName; - private String reviewContent; - private String templateCode; - private String templateName; - private String contentUrl; - private String hintContent; - private String draftId; - private String reviewerPersonnelId; - private String reviewerName; - @ApiModelProperty(value = "审核结果编码：1通过 2退回修改", example = "1") - private Integer resultCode; - @ApiModelProperty(value = "审核结果名称：通过/退回修改", example = "通过") - private String resultName; - private String opinionContent; - private LocalDateTime reviewTime; - private String controllerPersonnelId; - private String controllerName; - @ApiModelProperty(value = "前7节点是否全部完成：1是 2否", example = "2") - private Integer precheckPassFlag; - @ApiModelProperty(value = "是否归档：1是 2否", example = "2") - private Integer archiveFlag; - private LocalDateTime controlTime; - @ApiModelProperty(value = "所属节点编码：NODE_01风险分析 NODE_02业务合同 NODE_03项目组成立 NODE_04现场踏勘 NODE_05报告编制 NODE_06内部审核 NODE_07技术审核 NODE_08过程控制", example = "NODE_01") - private String nodeCode; - @ApiModelProperty(value = "所属节点名称：风险分析/业务合同/项目组成立/现场踏勘/报告编制/内部审核/技术审核/过程控制", example = "风险分析") - private String nodeName; - private String bizTypeCode; - private String bizTypeName; - private String bizRefId; - private String signerPersonnelId; - private String signerName; - private String taskTitle; - private LocalDateTime expireTime; - private LocalDateTime signTime; - @ApiModelProperty(value = "客户端类型编码：1PC 2APP", example = "1") - private Integer clientTypeCode; - @ApiModelProperty(value = "客户端类型名称：PC/APP", example = "PC") - private String clientTypeName; + + @ApiModelProperty("下发时间") + private LocalDateTime issueTime; + + @ApiModelProperty("签字图片") + private String signerUrl; + + @ApiModelProperty("备注") private String remarks; } diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/EvalSignRecordEntity.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/EvalSignRecordEntity.java deleted file mode 100644 index 60279d30..00000000 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/EvalSignRecordEntity.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.qinan.safetyeval.domain.entity; - -import lombok.Data; - -import java.time.LocalDateTime; - -@Data -public class EvalSignRecordEntity { - - private Long id; - private Long orgId; - private Long projectId; - private Long signTaskId; - private Long signerPersonnelId; - private String signerName; - private String signImageUrl; - private LocalDateTime signTime; - private Integer clientTypeCode; - private String clientTypeName; - private String deleteEnum; - private String remarks; - private String createName; - private String updateName; - private Long tenantId; - private Integer version; - private LocalDateTime createTime; - private LocalDateTime updateTime; - private Long createId; - private Long updateId; - private String env; -} diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/EvalSignTaskEntity.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/EvalSignTaskEntity.java index 94ed1450..1ae12444 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/EvalSignTaskEntity.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/EvalSignTaskEntity.java @@ -11,16 +11,12 @@ public class EvalSignTaskEntity { private Long orgId; private Long projectId; private String nodeCode; - private String nodeName; - private String bizTypeCode; - private String bizTypeName; private Long bizRefId; private Long signerPersonnelId; - private String signerName; private String taskTitle; private Integer taskStatusCode; - private String taskStatusName; - private LocalDateTime expireTime; + private LocalDateTime issueTime; + private String signerUrl; private String deleteEnum; private String remarks; private String createName; diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/gateway/EvalSignRecordGateway.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/gateway/EvalSignRecordGateway.java deleted file mode 100644 index 874818df..00000000 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/gateway/EvalSignRecordGateway.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.qinan.safetyeval.domain.gateway; - -import org.qinan.safetyeval.domain.entity.EvalSignRecordEntity; -import org.qinan.safetyeval.domain.query.EvalSignRecordQuery; -import org.qinan.safetyeval.domain.query.PageResult; - -import java.util.List; - -public interface EvalSignRecordGateway { - - EvalSignRecordEntity save(EvalSignRecordEntity entity); - EvalSignRecordEntity get(Long id); - EvalSignRecordEntity modify(EvalSignRecordEntity entity); - void delete(Long id); - java.util.List listBySignTaskId(Long signTaskId, Long orgId); -} diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/gateway/EvalSignTaskGateway.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/gateway/EvalSignTaskGateway.java index 267d55d1..97a8acb8 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/gateway/EvalSignTaskGateway.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/gateway/EvalSignTaskGateway.java @@ -4,13 +4,11 @@ import org.qinan.safetyeval.domain.entity.EvalSignTaskEntity; import org.qinan.safetyeval.domain.query.EvalSignTaskQuery; import org.qinan.safetyeval.domain.query.PageResult; -import java.util.List; - public interface EvalSignTaskGateway { EvalSignTaskEntity save(EvalSignTaskEntity entity); + EvalSignTaskEntity get(Long id); - EvalSignTaskEntity modify(EvalSignTaskEntity entity); - void delete(Long id); + PageResult page(EvalSignTaskQuery query); } diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/EvalSignRecordQuery.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/EvalSignRecordQuery.java deleted file mode 100644 index 37993b8d..00000000 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/EvalSignRecordQuery.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.qinan.safetyeval.domain.query; - -import lombok.Data; - -@Data -public class EvalSignRecordQuery { - - private Long pageNum; - private Long pageSize; - private Long orgId; - private Long projectId; - private Long riskId; - private Long surveyId; - private Long signTaskId; -} diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/EvalSignTaskQuery.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/EvalSignTaskQuery.java index bac71e4d..71ad79f8 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/EvalSignTaskQuery.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/EvalSignTaskQuery.java @@ -9,7 +9,5 @@ public class EvalSignTaskQuery { private Long pageSize; private Long orgId; private Long projectId; - private Long riskId; - private Long surveyId; - private Long signTaskId; + private Long signerPersonnelId; } diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/support/EvalStatusHelper.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/support/EvalStatusHelper.java index c4e641eb..1910deb2 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/support/EvalStatusHelper.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/support/EvalStatusHelper.java @@ -73,26 +73,6 @@ public final class EvalStatusHelper { } } - public static void fillSignTaskStatus(Integer statusCode, Object target) { - if (statusCode == null || target == null) { - return; - } - setInt(target, "taskStatusCode", statusCode); - switch (statusCode) { - case 1: - setString(target, "taskStatusName", "待签"); - break; - case 2: - setString(target, "taskStatusName", "已签"); - break; - case 3: - setString(target, "taskStatusName", "已作废"); - break; - default: - break; - } - } - public static void fillCheckinTaskStatus(Integer statusCode, Object target) { if (statusCode == null || target == null) { return; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/EvalSignRecordDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/EvalSignRecordDO.java deleted file mode 100644 index bf88050a..00000000 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/EvalSignRecordDO.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.qinan.safetyeval.infrastructure.dataobject; - -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import java.time.LocalDateTime; - -@Data -@TableName("eval_sign_record") -public class EvalSignRecordDO { - - private Long id; - private Long orgId; - private Long projectId; - private Long signTaskId; - private Long signerPersonnelId; - private String signerName; - private String signImageUrl; - private LocalDateTime signTime; - /** 客户端类型编码：1PC 2APP，示例：1 */ - private Integer clientTypeCode; - /** 客户端类型名称：PC/APP，示例：PC */ - private String clientTypeName; - private String deleteEnum; - private String remarks; - private String createName; - private String updateName; - private Long tenantId; - private Integer version; - private LocalDateTime createTime; - private LocalDateTime updateTime; - private Long createId; - private Long updateId; - private String env; -} diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/EvalSignTaskDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/EvalSignTaskDO.java index 412aa2cd..5725ba2a 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/EvalSignTaskDO.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/EvalSignTaskDO.java @@ -2,6 +2,7 @@ package org.qinan.safetyeval.infrastructure.dataobject; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; + import java.time.LocalDateTime; @Data @@ -11,21 +12,13 @@ public class EvalSignTaskDO { private Long id; private Long orgId; private Long projectId; - /** 所属节点编码：NODE_01风险分析 NODE_02业务合同 NODE_03项目组成立 NODE_04现场踏勘 NODE_05报告编制 NODE_06内部审核 NODE_07技术审核 NODE_08过程控制，示例：NODE_01 */ private String nodeCode; - /** 所属节点名称：风险分析/业务合同/项目组成立/现场踏勘/报告编制/内部审核/技术审核/过程控制，示例：风险分析 */ - private String nodeName; - private String bizTypeCode; - private String bizTypeName; private Long bizRefId; private Long signerPersonnelId; - private String signerName; private String taskTitle; - /** 任务状态编码：1待签 2已签 3已作废，示例：1 */ private Integer taskStatusCode; - /** 任务状态名称：待签/已签/已作废，示例：待签 */ - private String taskStatusName; - private LocalDateTime expireTime; + private LocalDateTime issueTime; + private String signerUrl; private String deleteEnum; private String remarks; private String createName; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/EvalSignRecordGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/EvalSignRecordGatewayImpl.java deleted file mode 100644 index 5e568dbe..00000000 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/EvalSignRecordGatewayImpl.java +++ /dev/null @@ -1,86 +0,0 @@ -package org.qinan.safetyeval.infrastructure.gatewayimpl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.qinan.safetyeval.domain.entity.EvalSignRecordEntity; -import org.qinan.safetyeval.domain.gateway.EvalSignRecordGateway; -import org.qinan.safetyeval.domain.query.EvalSignRecordQuery; -import org.qinan.safetyeval.domain.query.PageResult; -import org.qinan.safetyeval.infrastructure.dataobject.EvalSignRecordDO; -import org.qinan.safetyeval.infrastructure.mapper.EvalSignRecordMapper; -import org.qinan.safetyeval.infrastructure.support.EvalBeanCopy; -import org.qinan.safetyeval.infrastructure.support.InsertFieldDefaults; -import org.qinan.safetyeval.infrastructure.support.OrgContextResolver; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; -import java.util.List; -import java.util.stream.Collectors; - -@Component -public class EvalSignRecordGatewayImpl implements EvalSignRecordGateway { - - @Resource - private EvalSignRecordMapper evalSignRecordMapper; - - @Resource - private OrgContextResolver orgContextResolver; - - @Override - public EvalSignRecordEntity save(EvalSignRecordEntity entity) { - EvalSignRecordDO dataObject = toDO(entity); - InsertFieldDefaults.apply(dataObject); - evalSignRecordMapper.insert(dataObject); - entity.setId(dataObject.getId()); - return entity; - } - - @Override - public EvalSignRecordEntity get(Long id) { - EvalSignRecordDO dataObject = evalSignRecordMapper.selectById(id); - if (dataObject == null || !"false".equals(dataObject.getDeleteEnum())) { - return null; - } - return toEntity(dataObject); - } - - @Override - public EvalSignRecordEntity modify(EvalSignRecordEntity entity) { - EvalSignRecordDO dataObject = toDO(entity); - dataObject.setId(entity.getId()); - InsertFieldDefaults.applyForUpdate(dataObject); - evalSignRecordMapper.updateById(dataObject); - return get(entity.getId()); - } - - @Override - public void delete(Long id) { - evalSignRecordMapper.deleteById(id); - } - - @Override - public List listBySignTaskId(Long signTaskId, Long orgId) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(EvalSignRecordDO::getDeleteEnum, "false"); - wrapper.eq(EvalSignRecordDO::getSignTaskId, signTaskId); - if (orgId != null) { - wrapper.eq(EvalSignRecordDO::getOrgId, orgId); - } - wrapper.orderByDesc(EvalSignRecordDO::getCreateTime); - return evalSignRecordMapper.selectList(wrapper).stream().map(this::toEntity).collect(Collectors.toList()); - } - - private EvalSignRecordDO toDO(EvalSignRecordEntity entity) { - EvalSignRecordDO dataObject = EvalBeanCopy.toNew(entity, EvalSignRecordDO.class); - dataObject.setOrgId(orgContextResolver.resolveOrgId(entity.getOrgId())); - return dataObject; - } - - private EvalSignRecordEntity toEntity(EvalSignRecordDO dataObject) { - if (dataObject == null) { - return null; - } - return EvalBeanCopy.toNew(dataObject, EvalSignRecordEntity.class); - } -} diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/EvalSignTaskGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/EvalSignTaskGatewayImpl.java index ccd5bab8..6c788d65 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/EvalSignTaskGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/EvalSignTaskGatewayImpl.java @@ -7,9 +7,9 @@ import org.qinan.safetyeval.domain.entity.EvalSignTaskEntity; import org.qinan.safetyeval.domain.gateway.EvalSignTaskGateway; import org.qinan.safetyeval.domain.query.EvalSignTaskQuery; import org.qinan.safetyeval.domain.query.PageResult; +import org.qinan.safetyeval.infrastructure.convertor.EvalSignTaskDoConvertor; import org.qinan.safetyeval.infrastructure.dataobject.EvalSignTaskDO; import org.qinan.safetyeval.infrastructure.mapper.EvalSignTaskMapper; -import org.qinan.safetyeval.infrastructure.support.EvalBeanCopy; import org.qinan.safetyeval.infrastructure.support.InsertFieldDefaults; import org.qinan.safetyeval.infrastructure.support.OrgContextResolver; import org.springframework.stereotype.Component; @@ -24,12 +24,16 @@ public class EvalSignTaskGatewayImpl implements EvalSignTaskGateway { @Resource private EvalSignTaskMapper evalSignTaskMapper; + @Resource + private EvalSignTaskDoConvertor evalSignTaskDoConvertor; + @Resource private OrgContextResolver orgContextResolver; @Override public EvalSignTaskEntity save(EvalSignTaskEntity entity) { - EvalSignTaskDO dataObject = toDO(entity); + EvalSignTaskDO dataObject = evalSignTaskDoConvertor.convertEToDo(entity); + dataObject.setOrgId(orgContextResolver.resolveOrgId(entity.getOrgId())); InsertFieldDefaults.apply(dataObject); evalSignTaskMapper.insert(dataObject); entity.setId(dataObject.getId()); @@ -42,26 +46,20 @@ public class EvalSignTaskGatewayImpl implements EvalSignTaskGateway { if (dataObject == null || !"false".equals(dataObject.getDeleteEnum())) { return null; } - return toEntity(dataObject); - } - - @Override - public EvalSignTaskEntity modify(EvalSignTaskEntity entity) { - EvalSignTaskDO dataObject = toDO(entity); - dataObject.setId(entity.getId()); - InsertFieldDefaults.applyForUpdate(dataObject); - evalSignTaskMapper.updateById(dataObject); - return get(entity.getId()); - } - - @Override - public void delete(Long id) { - evalSignTaskMapper.deleteById(id); + return evalSignTaskDoConvertor.convertDoToE(dataObject); } @Override public PageResult page(EvalSignTaskQuery query) { Page page = new Page<>(query.getPageNum(), query.getPageSize()); + IPage result = evalSignTaskMapper.selectPage(page, buildQueryWrapper(query)); + List entities = result.getRecords().stream() + .map(evalSignTaskDoConvertor::convertDoToE) + .collect(Collectors.toList()); + return PageResult.of(entities, result.getTotal(), result.getCurrent(), result.getSize()); + } + + private LambdaQueryWrapper buildQueryWrapper(EvalSignTaskQuery query) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(EvalSignTaskDO::getDeleteEnum, "false"); if (query.getOrgId() != null) { @@ -70,22 +68,10 @@ public class EvalSignTaskGatewayImpl implements EvalSignTaskGateway { if (query.getProjectId() != null) { wrapper.eq(EvalSignTaskDO::getProjectId, query.getProjectId()); } - wrapper.orderByDesc(EvalSignTaskDO::getCreateTime); - IPage result = evalSignTaskMapper.selectPage(page, wrapper); - List records = result.getRecords().stream().map(this::toEntity).collect(Collectors.toList()); - return PageResult.of(records, result.getTotal(), result.getCurrent(), result.getSize()); - } - - private EvalSignTaskDO toDO(EvalSignTaskEntity entity) { - EvalSignTaskDO dataObject = EvalBeanCopy.toNew(entity, EvalSignTaskDO.class); - dataObject.setOrgId(orgContextResolver.resolveOrgId(entity.getOrgId())); - return dataObject; - } - - private EvalSignTaskEntity toEntity(EvalSignTaskDO dataObject) { - if (dataObject == null) { - return null; + if (query.getSignerPersonnelId() != null) { + wrapper.eq(EvalSignTaskDO::getSignerPersonnelId, query.getSignerPersonnelId()); } - return EvalBeanCopy.toNew(dataObject, EvalSignTaskEntity.class); + wrapper.orderByDesc(EvalSignTaskDO::getCreateTime); + return wrapper; } } diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/mapper/EvalSignRecordMapper.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/mapper/EvalSignRecordMapper.java deleted file mode 100644 index 5969d274..00000000 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/mapper/EvalSignRecordMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.qinan.safetyeval.infrastructure.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; -import org.qinan.safetyeval.infrastructure.dataobject.EvalSignRecordDO; - -@Mapper -public interface EvalSignRecordMapper extends BaseMapper { -}