diff --git a/src/main/java/com/pms/ocp/biz/impl/BizModelRequirementInfoServiceImpl.java b/src/main/java/com/pms/ocp/biz/impl/BizModelRequirementInfoServiceImpl.java index ec1723628bb152ef7e989d6374c0021a88485749..efd08f16201f49927a6117460b7e25f91f151059 100644 --- a/src/main/java/com/pms/ocp/biz/impl/BizModelRequirementInfoServiceImpl.java +++ b/src/main/java/com/pms/ocp/biz/impl/BizModelRequirementInfoServiceImpl.java @@ -65,7 +65,7 @@ public class BizModelRequirementInfoServiceImpl implements BizModelRequirementIn // 需求审批信息创建 ModelRequirementApproval modelRequirementApproval = new ModelRequirementApproval(); modelRequirementApproval.setRequirementCode(modelVersionRequirementDTO.getRequirementCode()); - modelRequirementApproval.setApprovalStatus(0); + modelRequirementApproval.setApprovalStats(0); // 校验是否模型名称重复 ModelBaseVersion modelBaseVersion1 = modelBaseVersionService.getModelBaseVersion(modelVersionRequirementDTO.getModelTable(), null, modelVersionRequirementDTO.getModelName()); diff --git a/src/main/java/com/pms/ocp/model/entity/ModelRequirement.java b/src/main/java/com/pms/ocp/model/entity/ModelRequirement.java index cab2649f1829a682f175f0b8afff5f45f56b47ae..5c5cf5313e04d6bd287485ae22be62126d76f334 100644 --- a/src/main/java/com/pms/ocp/model/entity/ModelRequirement.java +++ b/src/main/java/com/pms/ocp/model/entity/ModelRequirement.java @@ -19,18 +19,6 @@ import java.util.UUID; @Data @TableName("ocp_model_requirement") public class ModelRequirement { - public ModelRequirement() { - this.objId =UUID.randomUUID().toString(); - this.requirementCode = "-1"; - this.requirementType = -1; - this.requirementDesc = "-1"; - this.companyCode = "-1"; - this.userId = "-1"; - this.userName = "-1"; - this.ctime = LocalDateTime.now(); - this.mtime = LocalDateTime.now(); - this.requirementStatu = -1; - } /** * 主键 @@ -85,7 +73,7 @@ public class ModelRequirement { /** * 需求审核状态0:未通过1:通过 */ - private Integer requirementStatu; + private Integer requirementStatus; // /** // * diff --git a/src/main/java/com/pms/ocp/model/entity/ModelRequirementApproval.java b/src/main/java/com/pms/ocp/model/entity/ModelRequirementApproval.java index 3318eb751f17c26077ebe56cf6e1624b347df87c..6a82aa9b85eddd61bd5d13ee619c40ea9f6f5ebe 100644 --- a/src/main/java/com/pms/ocp/model/entity/ModelRequirementApproval.java +++ b/src/main/java/com/pms/ocp/model/entity/ModelRequirementApproval.java @@ -20,19 +20,6 @@ import java.util.UUID; @Data @TableName("ocp_model_requirement_approval") public class ModelRequirementApproval { - public ModelRequirementApproval() { - this.objId = UUID.randomUUID().toString(); - this.requirementCode = "-1"; - this.approvalStatus = -1; - this.approvalCompanyCode = "-1"; - this.approvalDepartment = "-1"; - this.approvalUserId = "-1"; - this.approvalUserName = "-1"; - this.approvalCtime = LocalDateTime.now(); - this.approvalMtime = LocalDateTime.now(); - this.boolDelete = -1; - this.approvalComment = "-1"; - } /** * 主键 @@ -48,7 +35,7 @@ public class ModelRequirementApproval { /** * 审批状态 0:未审核 1:审核通过 2:审核拒绝 */ - private Integer approvalStatus; + private Integer approvalStats; /** * 审核人单位 diff --git a/src/main/resources/mapper/ModelRequirementMapper.xml b/src/main/resources/mapper/ModelRequirementMapper.xml index 9eafb02bbf0a1a3145e77d48418cfcb290d9d7fd..13d15ad97e361212c4eb8d382463bf6258a15cdb 100644 --- a/src/main/resources/mapper/ModelRequirementMapper.xml +++ b/src/main/resources/mapper/ModelRequirementMapper.xml @@ -79,7 +79,7 @@ from ocp_model_version omv left join ocp_model_requirement omr on omv.requirement_code = omr.requirement_code left join ocp_model_requirement_approval omra on omra.requirement_code = omr.requirement_code - join ocp_organization oo on omr.company_code = oo.org_code + left join ocp_organization oo on omr.company_code = oo.org_code @@ -113,7 +113,7 @@ from ocp_model_prop_version ompv left join ocp_model_version omv on omv.model_code = ompv.model_code and omv.requirement_code = ompv.requirement_code left join ocp_model_requirement omr on omv.requirement_code = omr.requirement_code - join ocp_organization oo on omr.company_code = oo.org_code + left join ocp_organization oo on omr.company_code = oo.org_code and ompv.model_code = #{modelCode}