diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingMaterialChangeAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingMaterialChangeAddCmd.java index 052a9e7..e68c87a 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingMaterialChangeAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingMaterialChangeAddCmd.java @@ -28,7 +28,7 @@ public class QualFilingMaterialChangeAddCmd implements Serializable { */ @ApiModelProperty(value = "材料类型1,申请材料目录(原件),2,申请书(原件),3,法人证明(复印件),4,三年内无重大违法失信记录查询证明,5,法定代表人承诺书(原件),6,固定资产法定证明材料,7,工作场所及档案室面积证明,8,安全评价师专业能力证明,9,相关负责人证明材料,10,机构内部管理制度", required = true) @NotBlank(message = "材料类型1,申请材料目录(原件),2,申请书(原件),3,法人证明(复印件),4,三年内无重大违法失信记录查询证明,5,法定代表人承诺书(原件),6,固定资产法定证明材料,7,工作场所及档案室面积证明,8,安全评价师专业能力证明,9,相关负责人证明材料,10,机构内部管理制度不能为空") - private String materialType; + private Integer materialType; /** * 材料内容 */ diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingChangeGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingChangeGatewayImpl.java index 8c72b51..72d37af 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingChangeGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingChangeGatewayImpl.java @@ -145,8 +145,10 @@ public class QualFilingChangeGatewayImpl implements QualFilingChangeGateway { QualFilingChangeDO dataObject = qualFilingChangeDoConvertor.convertEeToDo(entity); if (Objects.nonNull(dataObject.getId())) { // 编辑 + InsertFieldDefaults.applyForUpdate(dataObject); qualFilingChangeMapper.updateById(dataObject); } else { + InsertFieldDefaults.apply(dataObject); qualFilingChangeMapper.insert(dataObject); } if (Objects.isNull(dataObject.getId())) {