diff --git a/src/main/java/com/pms/ocp/mapper/ModelRequirementApprovalMapper.java b/src/main/java/com/pms/ocp/mapper/ModelRequirementApprovalMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..f64dcf76a652b11a6985be07888834dfcf1f3209 --- /dev/null +++ b/src/main/java/com/pms/ocp/mapper/ModelRequirementApprovalMapper.java @@ -0,0 +1,24 @@ +package com.pms.ocp.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.pms.ocp.model.entity.ModelRequirementApproval; +import org.apache.ibatis.annotations.Mapper; + +/** + * @Auther: wangjian + * @Date: 2022/3/29 17:36 + * @Description: + */ + +@Mapper +public interface ModelRequirementApprovalMapper extends BaseMapper { + + +// List listModelRequirementVO(@Param("modelName") String modelName, +// @Param("modelCode") String modelCode, +// @Param("modelGroupCodes") List modelGroupCodes); +// +// List listModelPropertyVersionRequirementVO(@Param("requirementCode") String requirementCode, +// @Param("modelCode") String modelCode); + +} \ No newline at end of file diff --git a/src/main/java/com/pms/ocp/model/entity/ModelRequirementApproval.java b/src/main/java/com/pms/ocp/model/entity/ModelRequirementApproval.java new file mode 100644 index 0000000000000000000000000000000000000000..67e536fcf95c39611140b48426a116286dd7d3e8 --- /dev/null +++ b/src/main/java/com/pms/ocp/model/entity/ModelRequirementApproval.java @@ -0,0 +1,113 @@ +package com.pms.ocp.model.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +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; + +/** + * @Auther: wangjian + * @Date: 2022/4/7 11:17 + * @Description:模型需求审批表对象 + */ + +@Data +@TableName("ocp_model_requirement_approval") +public class ModelRequirementApproval { + + /** + * 主键 + */ + private String objId; + + /** + * 需求编码 + */ + private String requirementCode; + + /** + * 审批状态 0:未审核 1：审核通过 2：审核拒绝 + */ + private Integer approvalStats; + + /** + * 审核人单位 + */ + private String approvalCompanyCode; + + /** + * 审核人部门 + */ + private String approvalDepartment; + + /** + * 审核人id + */ + private String approvalUserId; + + /** + * 审核人姓名 + */ + private String approvalUserName; + + /** + * 审核时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime approvalCtime; + + /** + * 修改时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime approvalMtime; + + /** + * 是否删除 0：否 1：是 + */ + @TableField("is_delete") + private Integer boolDelete; + + /** + * 审核意见 + */ + private String approvalComment; + +} + + +// DROP TABLE IF EXISTS operating_platform.ocp_model_requirement_approval; +// CREATE TABLE operating_platform.ocp_model_requirement_approval ( +// obj_id varchar(42) NOT NULL , +// requirement_code varchar(42) NOT NULL , +// approval_stats Int2 NOT NULL , +// approval_company_code varchar(42) NOT NULL , +// approval_department varchar(42) NOT NULL , +// approval_user_id varchar(42) NOT NULL , +// approval_user_name varchar(64) NOT NULL , +// approval_ctime timestamp(6) NOT NULL , +// approval_mtime timestamp(6) , +// is_delete int2 NOT NULL , +// approval_comment varchar(500) NOT NULL , +// PRIMARY KEY (obj_id) +// ) +// ; +// +// COMMENT ON COLUMN operating_platform.ocp_model_requirement_approval.obj_id IS '主键　'; +// COMMENT ON COLUMN operating_platform.ocp_model_requirement_approval.requirement_code IS '需求编码　'; +// COMMENT ON COLUMN operating_platform.ocp_model_requirement_approval.approval_stats IS '审批状态0:未审核 1：审核通过 2：审核拒绝'; +// COMMENT ON COLUMN operating_platform.ocp_model_requirement_approval.approval_company_code IS '审核人单位　'; +// COMMENT ON COLUMN operating_platform.ocp_model_requirement_approval.approval_department IS '审核人部门　'; +// COMMENT ON COLUMN operating_platform.ocp_model_requirement_approval.approval_user_id IS '审核人id　'; +// COMMENT ON COLUMN operating_platform.ocp_model_requirement_approval.approval_user_name IS '审核人姓名　'; +// COMMENT ON COLUMN operating_platform.ocp_model_requirement_approval.approval_ctime IS '审核时间　'; +// COMMENT ON COLUMN operating_platform.ocp_model_requirement_approval.approval_mtime IS '修改时间　'; +// COMMENT ON COLUMN operating_platform.ocp_model_requirement_approval.is_delete IS '是否删除0：否 1：是'; +// COMMENT ON COLUMN operating_platform.ocp_model_requirement_approval.approval_comment IS '审核意见　'; +// +// COMMENT ON TABLE operating_platform.ocp_model_requirement_approval IS '模型需求审批表'; \ No newline at end of file diff --git a/src/main/java/com/pms/ocp/service/ModelRequirementApprovalService.java b/src/main/java/com/pms/ocp/service/ModelRequirementApprovalService.java new file mode 100644 index 0000000000000000000000000000000000000000..157623af0de5bf2fe0d2b1f79fc29b07c7a09645 --- /dev/null +++ b/src/main/java/com/pms/ocp/service/ModelRequirementApprovalService.java @@ -0,0 +1,58 @@ +package com.pms.ocp.service; + +import com.pms.ocp.model.entity.ModelRequirement; +import com.pms.ocp.model.entity.ModelRequirementApproval; +import com.pms.ocp.model.vo.ModelVersionRequirementVO; + +import java.util.List; + +/** + * @Auther: wangjian + * @Date: 2022/3/29 17:43 + * @Description:模型需求审批业务层接口 + */ +public interface ModelRequirementApprovalService { + + /** + * 创建模型需求审批 + * + * @param modelRequirementApproval + * @return + */ + Integer createModelRequirementApproval(ModelRequirementApproval modelRequirementApproval); + + /** + * 删除模型需求审批 + * + * @param objId + * @param requirementCode + * @return + */ + Integer deleteModelRequirementApproval(String objId, String requirementCode); + + /** + * 更新模型需求审批 + * + * @param modelRequirementApproval + * @return + */ + Integer updateModelRequirementApproval(ModelRequirementApproval modelRequirementApproval); + + /** + * 获取模型需求审批列表 + * + * @param + * @return + */ + List getModelRequirementApprovalList(String modelName, String modelCode, List modelGroupCodes); + + /** + * 获取模型需求审批 + * + * @param objId + * @param modelCode + * @return + */ + ModelRequirement getModelRequirementApproval(String objId, String modelCode); + +} diff --git a/src/main/java/com/pms/ocp/service/impl/ModelRequirementApprovalServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelRequirementApprovalServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..ca6ddeb510611f75fc63ce237de207b94317b715 --- /dev/null +++ b/src/main/java/com/pms/ocp/service/impl/ModelRequirementApprovalServiceImpl.java @@ -0,0 +1,40 @@ +package com.pms.ocp.service.impl; + +import com.pms.ocp.model.entity.ModelRequirement; +import com.pms.ocp.model.entity.ModelRequirementApproval; +import com.pms.ocp.model.vo.ModelVersionRequirementVO; +import com.pms.ocp.service.ModelRequirementApprovalService; + +import java.util.List; + +/** + * @Auther: wangjian + * @Date: 2022/4/7 20:05 + * @Description:模型需求审批业务层接口实现 + */ +public class ModelRequirementApprovalServiceImpl implements ModelRequirementApprovalService { + @Override + public Integer createModelRequirementApproval(ModelRequirementApproval modelRequirementApproval) { + return null; + } + + @Override + public Integer deleteModelRequirementApproval(String objId, String requirementCode) { + return null; + } + + @Override + public Integer updateModelRequirementApproval(ModelRequirementApproval modelRequirementApproval) { + return null; + } + + @Override + public List getModelRequirementApprovalList(String modelName, String modelCode, List modelGroupCodes) { + return null; + } + + @Override + public ModelRequirement getModelRequirementApproval(String objId, String modelCode) { + return null; + } +}