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 cbd8ecd2d27636f5aa4bc30afea041e3019cd0b4..ec1723628bb152ef7e989d6374c0021a88485749 100644 --- a/src/main/java/com/pms/ocp/biz/impl/BizModelRequirementInfoServiceImpl.java +++ b/src/main/java/com/pms/ocp/biz/impl/BizModelRequirementInfoServiceImpl.java @@ -67,7 +67,7 @@ public class BizModelRequirementInfoServiceImpl implements BizModelRequirementIn modelRequirementApproval.setRequirementCode(modelVersionRequirementDTO.getRequirementCode()); modelRequirementApproval.setApprovalStatus(0); // 校验是否模型名称重复 - ModelBaseVersion modelBaseVersion1 = modelBaseVersionService.getModelBaseVersion(modelVersionRequirementDTO.getModelTable(), null, null); + ModelBaseVersion modelBaseVersion1 = modelBaseVersionService.getModelBaseVersion(modelVersionRequirementDTO.getModelTable(), null, modelVersionRequirementDTO.getModelName()); if (modelBaseVersion1 != null) { return -1; diff --git a/src/main/java/com/pms/ocp/controller/ModelControlDemandController.java b/src/main/java/com/pms/ocp/controller/ModelControlDemandController.java index 09dd0382231539b5a538d5b7a5263a092e28f02b..3172d58bd8d07f7664d71e7874f442deb5dc20de 100644 --- a/src/main/java/com/pms/ocp/controller/ModelControlDemandController.java +++ b/src/main/java/com/pms/ocp/controller/ModelControlDemandController.java @@ -41,7 +41,7 @@ public class ModelControlDemandController { Integer integer = bizModelRequirementInfoService.createModelRequirementInfo(modelVersionRequirementDTO); if (integer.equals(-1)) { - return ResponseVO.ok(CodeEnum.MODEL_NAME_REPETITION.getDesc()); + return ResponseVO.error(CodeEnum.MODEL_NAME_REPETITION); } return ResponseVO.ok(integer); diff --git a/src/main/java/com/pms/ocp/model/entity/ModelAudit.java b/src/main/java/com/pms/ocp/model/entity/ModelAudit.java index 0ba1f14e871e5f3a125da42bb558e23fb43a9d81..b353ddc0824afad0cdfefeda2ad23d6e03b74f22 100644 --- a/src/main/java/com/pms/ocp/model/entity/ModelAudit.java +++ b/src/main/java/com/pms/ocp/model/entity/ModelAudit.java @@ -3,7 +3,9 @@ package com.pms.ocp.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; @@ -17,19 +19,31 @@ import java.time.LocalDateTime; @TableName("ocp_model_audit") public class ModelAudit { + /** + * 事记表主键 + */ @TableId(value = "obj_id", type = IdType.ASSIGN_ID) private String objId; /** * 模型代码 */ - private int modelCode; + private String modelCode; /** * 属性代码 */ - private int propCode; + private String propCode; + /** + * 异动类型 0:新增,1:迭代 + */ + private Integer operStatus; + + /** + * 操作对象0:表，1:属性 + */ + private Integer operTarget; /** * 事记类型 0:人工操作,1:流程管控,3:总部下发 @@ -41,11 +55,6 @@ public class ModelAudit { */ private String auditMessageJson; - /** - * 异动类型 0:新增,1:迭代 - */ - private int operStatus; - /** * 异动申请人id */ @@ -57,39 +66,50 @@ public class ModelAudit { private String applyUserName; /** - * 异动时间 + * 提交人id */ - private long applyTime; + private String auditUserId; /** - * 版本 + * 提交人姓名 */ - private String applyVersion; + private String auditUserName; + + /** + * 异动时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime applyTime; /** - * 新增时间 + * 事记新增时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime auditCtime; /** - * 异动公司编号 + * 事记修改时间 */ - private String auditCompanyCode; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime auditMtime; /** - * 提交人id + * 版本 */ - private String auditUserId; + private String applyVersion; /** - * 提交人姓名 + * 异动公司编号 */ - private String auditUserName; + private String auditCompanyCode; /** - * 修改时间 + * 上一版本 */ - private LocalDateTime auditMtime; + private String preModelVersion; } diff --git a/src/main/java/com/pms/ocp/model/vo/ModelAcceptListVo.java b/src/main/java/com/pms/ocp/model/vo/ModelAcceptListVo.java index 19b813ef7b1bf5f0cc33f837e4aeebafc9e8e98c..6b1ca9bad4b267320fa8fc375cf222dd2962b16c 100644 --- a/src/main/java/com/pms/ocp/model/vo/ModelAcceptListVo.java +++ b/src/main/java/com/pms/ocp/model/vo/ModelAcceptListVo.java @@ -9,6 +9,7 @@ import lombok.Data; */ @Data public class ModelAcceptListVo { + private String modelCode; private String modelName; private String requirementCode; diff --git a/src/main/java/com/pms/ocp/model/vo/ModelPropertyVersionRequirementVO.java b/src/main/java/com/pms/ocp/model/vo/ModelPropertyVersionRequirementVO.java index 6650fd674166f7ca205c8f63eb0ac2d9d1a24495..429ef04db38f5f76f0b7a805ab3d499420e39314 100644 --- a/src/main/java/com/pms/ocp/model/vo/ModelPropertyVersionRequirementVO.java +++ b/src/main/java/com/pms/ocp/model/vo/ModelPropertyVersionRequirementVO.java @@ -1,7 +1,6 @@ package com.pms.ocp.model.vo; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -22,7 +21,7 @@ import java.time.LocalDateTime; public class ModelPropertyVersionRequirementVO { /** - * 主键 + * 属性版本表主键 */ @ApiModelProperty(value = "主键") @TableId(value = "obj_id", type = IdType.ASSIGN_ID) @@ -34,6 +33,12 @@ public class ModelPropertyVersionRequirementVO { @ApiModelProperty(value = "模型编码") private String modelCode; + /** + * 模型名称 + */ + @ApiModelProperty(value = "模型名称") + private String modelName; + /** * 属性名称 */ @@ -60,8 +65,9 @@ public class ModelPropertyVersionRequirementVO { /** * 数据类型 + * 1：数值，2：货币，3：字符，4：时间日期，5：布尔 */ - @ApiModelProperty(value = "数据类型") + @ApiModelProperty(value = "数据类型 1：数值，2：货币，3：字符，4：时间日期，5：布尔") private String dataType; /** @@ -80,14 +86,12 @@ public class ModelPropertyVersionRequirementVO { * 是否主键 0:否,1:是 */ @ApiModelProperty(value = "是否主键 0:否,1:是") - @TableField("is_pk") private Integer boolPk; /** * 是否必填 0:否,1:是 */ @ApiModelProperty(value = "是否必填 0:否,1:是") - @TableField("is_required") private Integer boolRequired; /** @@ -154,6 +158,12 @@ public class ModelPropertyVersionRequirementVO { @ApiModelProperty(value = "需求提报公司") private String companyCode; + /** + * 需求提报公司名称 + */ + @ApiModelProperty(value = "需求提报公司名称") + private String companyName; + /** * 提交人id */ diff --git a/src/main/java/com/pms/ocp/model/vo/ModelVersionRequirementVO.java b/src/main/java/com/pms/ocp/model/vo/ModelVersionRequirementVO.java index 6214cf3c5894b5dd32ccd71906b4ccc7a94aaaca..ac46410d70eb7a430b591e50b53d16e1a04d2edf 100644 --- a/src/main/java/com/pms/ocp/model/vo/ModelVersionRequirementVO.java +++ b/src/main/java/com/pms/ocp/model/vo/ModelVersionRequirementVO.java @@ -1,8 +1,6 @@ package com.pms.ocp.model.vo; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -25,7 +23,6 @@ public class ModelVersionRequirementVO { * 主键 */ @ApiModelProperty(value = "主键") - @TableId(value = "obj_id", type = IdType.ASSIGN_ID) private String objId; /** @@ -171,6 +168,12 @@ public class ModelVersionRequirementVO { @ApiModelProperty(value = "需求提报公司") private String companyCode; + /** + * 需求提报公司名称 + */ + @ApiModelProperty(value = "需求提报公司名称") + private String companyName; + /** * 提交人id */ @@ -205,12 +208,11 @@ public class ModelVersionRequirementVO { @ApiModelProperty(value = "需求审核状态 0:未通过, 1:通过") private Integer requirementStatus; - /** * 审批状态 0:未审核 1：审核通过 2：审核拒绝 */ @ApiModelProperty(value = "审批状态 0:未审核 1：审核通过 2：审核拒绝") - private Integer approvalStatus; + private Integer approvalStats; /** * 审核人单位 diff --git a/src/main/java/com/pms/ocp/service/impl/ModelBaseVersionServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelBaseVersionServiceImpl.java index 741f244030ef5d7cf86cf6394826f1277fcf35e5..b7bc926b816de08812487406c98a44fdf4e4951d 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelBaseVersionServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelBaseVersionServiceImpl.java @@ -81,15 +81,15 @@ public class ModelBaseVersionServiceImpl implements ModelBaseVersionService { QueryWrapper queryWrapper = new QueryWrapper(); if (StringUtils.isNotEmpty(modelTable)) { - queryWrapper.lambda().eq(ModelBaseVersion::getModelTable, modelTable); + queryWrapper.lambda().or().eq(ModelBaseVersion::getModelTable, modelTable); } if (StringUtils.isNotEmpty(modelCode)) { - queryWrapper.lambda().eq(ModelBaseVersion::getModelCode, modelCode); + queryWrapper.lambda().or().eq(ModelBaseVersion::getModelCode, modelCode); } if (StringUtils.isNotEmpty(modelName)) { - queryWrapper.lambda().eq(ModelBaseVersion::getModelName, modelName); + queryWrapper.lambda().or().eq(ModelBaseVersion::getModelName, modelName); } return modelBaseVersionMapper.selectOne(queryWrapper); diff --git a/src/main/resources/mapper/ModelRequirementMapper.xml b/src/main/resources/mapper/ModelRequirementMapper.xml index d37a5215c8048547637e993bb4ef8f6935a4de66..9eafb02bbf0a1a3145e77d48418cfcb290d9d7fd 100644 --- a/src/main/resources/mapper/ModelRequirementMapper.xml +++ b/src/main/resources/mapper/ModelRequirementMapper.xml @@ -20,10 +20,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +