diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 5f085a5..e014e80 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -6,8 +6,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.json.DateDeserializer; import com.casic.missiles.dto.BaseRequest; +import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; import com.casic.missiles.model.quality.base.IBaseFileModel; +import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -23,7 +25,7 @@ */ @Data @TableName("biz_quality_corrective_record") -public class BizQualityCorrectiveRecord extends BaseRequest implements IBaseDataValid, IBaseFileCodeModel { +public class BizQualityCorrectiveRecord extends BaseRequest implements IBaseDataValid, IBaseFileCodeModel, BaseAuditManagementRelFile { private static final long serialVersionUID = 1L; /** @@ -171,7 +173,13 @@ @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）" , dataType = "Integer") @TableField(exist = false) private Integer decisionItem; + @ApiModelProperty(value = "管理评审ID", dataType = "Long") + @TableField("manager_id") + private Long managerId; + @ApiModelProperty(value = "内审ID", dataType = "Long") + @TableField("internal_audit_id") + private Long internalAuditId; @Override public String toString() { return "BizQualityCorrectiveRecord{" @@ -193,4 +201,29 @@ public void dataValid(QueryWrapper query) { } + + @Override + public Integer getYearTime() { + return null; + } + + @Override + public Integer getYearNum() { + return null; + } + + @Override + public String getYearNo() { + return null; + } + + @Override + public void setYearNo(String yearNo) { + + } + + @Override + public QualityAuditManagementFileTypeEnum getManagementFileType() { + return QualityAuditManagementFileTypeEnum.CORRECTIVE_REP; + } } \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 5f085a5..e014e80 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -6,8 +6,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.json.DateDeserializer; import com.casic.missiles.dto.BaseRequest; +import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; import com.casic.missiles.model.quality.base.IBaseFileModel; +import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -23,7 +25,7 @@ */ @Data @TableName("biz_quality_corrective_record") -public class BizQualityCorrectiveRecord extends BaseRequest implements IBaseDataValid, IBaseFileCodeModel { +public class BizQualityCorrectiveRecord extends BaseRequest implements IBaseDataValid, IBaseFileCodeModel, BaseAuditManagementRelFile { private static final long serialVersionUID = 1L; /** @@ -171,7 +173,13 @@ @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）" , dataType = "Integer") @TableField(exist = false) private Integer decisionItem; + @ApiModelProperty(value = "管理评审ID", dataType = "Long") + @TableField("manager_id") + private Long managerId; + @ApiModelProperty(value = "内审ID", dataType = "Long") + @TableField("internal_audit_id") + private Long internalAuditId; @Override public String toString() { return "BizQualityCorrectiveRecord{" @@ -193,4 +201,29 @@ public void dataValid(QueryWrapper query) { } + + @Override + public Integer getYearTime() { + return null; + } + + @Override + public Integer getYearNum() { + return null; + } + + @Override + public String getYearNo() { + return null; + } + + @Override + public void setYearNo(String yearNo) { + + } + + @Override + public QualityAuditManagementFileTypeEnum getManagementFileType() { + return QualityAuditManagementFileTypeEnum.CORRECTIVE_REP; + } } \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 018e3fd..6b9e0df 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.json.DateDeserializer; import com.casic.missiles.dto.BaseRequest; -import com.casic.missiles.model.quality.base.IBaseFileCodeModel; +import com.casic.missiles.model.quality.base.*; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -22,7 +22,7 @@ */ @Data @TableName("biz_quality_prevent_record") -public class BizQualityPreventRecord extends BaseRequest implements IBaseDataValid, IBaseFileCodeModel{ +public class BizQualityPreventRecord extends BaseRequest implements IBaseDataValid, IBaseFileCodeModel, BaseAuditManagementRelFile { private static final long serialVersionUID = 1L; /** @@ -163,6 +163,15 @@ @TableField(exist = false) private Integer decisionItem; + + @ApiModelProperty(value = "管理评审ID", dataType = "Long") + @TableField("manager_id") + private Long managerId; + + @ApiModelProperty(value = "内审ID", dataType = "Long") + @TableField("internal_audit_id") + private Long internalAuditId; + @Override public String toString() { return "BizQualityPreventRecord{" @@ -193,4 +202,34 @@ BizQualityPreventRecord preventRecord = (BizQualityPreventRecord) obj; return preventRecord.getId().equals(id); } + + @Override + public Integer getYearTime() { + return null; + } + + @Override + public Integer getYearNum() { + return null; + } + + @Override + public String getYearNo() { + return null; + } + + @Override + public void setYearNo(String yearNo) { + + } + + @Override + public Long getManagementReviewId() { + return internalAuditId; + } + + @Override + public QualityAuditManagementFileTypeEnum getManagementFileType() { + return QualityAuditManagementFileTypeEnum.PREVENT_REP; + } } \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 5f085a5..e014e80 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -6,8 +6,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.json.DateDeserializer; import com.casic.missiles.dto.BaseRequest; +import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; import com.casic.missiles.model.quality.base.IBaseFileModel; +import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -23,7 +25,7 @@ */ @Data @TableName("biz_quality_corrective_record") -public class BizQualityCorrectiveRecord extends BaseRequest implements IBaseDataValid, IBaseFileCodeModel { +public class BizQualityCorrectiveRecord extends BaseRequest implements IBaseDataValid, IBaseFileCodeModel, BaseAuditManagementRelFile { private static final long serialVersionUID = 1L; /** @@ -171,7 +173,13 @@ @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）" , dataType = "Integer") @TableField(exist = false) private Integer decisionItem; + @ApiModelProperty(value = "管理评审ID", dataType = "Long") + @TableField("manager_id") + private Long managerId; + @ApiModelProperty(value = "内审ID", dataType = "Long") + @TableField("internal_audit_id") + private Long internalAuditId; @Override public String toString() { return "BizQualityCorrectiveRecord{" @@ -193,4 +201,29 @@ public void dataValid(QueryWrapper query) { } + + @Override + public Integer getYearTime() { + return null; + } + + @Override + public Integer getYearNum() { + return null; + } + + @Override + public String getYearNo() { + return null; + } + + @Override + public void setYearNo(String yearNo) { + + } + + @Override + public QualityAuditManagementFileTypeEnum getManagementFileType() { + return QualityAuditManagementFileTypeEnum.CORRECTIVE_REP; + } } \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 018e3fd..6b9e0df 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.json.DateDeserializer; import com.casic.missiles.dto.BaseRequest; -import com.casic.missiles.model.quality.base.IBaseFileCodeModel; +import com.casic.missiles.model.quality.base.*; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -22,7 +22,7 @@ */ @Data @TableName("biz_quality_prevent_record") -public class BizQualityPreventRecord extends BaseRequest implements IBaseDataValid, IBaseFileCodeModel{ +public class BizQualityPreventRecord extends BaseRequest implements IBaseDataValid, IBaseFileCodeModel, BaseAuditManagementRelFile { private static final long serialVersionUID = 1L; /** @@ -163,6 +163,15 @@ @TableField(exist = false) private Integer decisionItem; + + @ApiModelProperty(value = "管理评审ID", dataType = "Long") + @TableField("manager_id") + private Long managerId; + + @ApiModelProperty(value = "内审ID", dataType = "Long") + @TableField("internal_audit_id") + private Long internalAuditId; + @Override public String toString() { return "BizQualityPreventRecord{" @@ -193,4 +202,34 @@ BizQualityPreventRecord preventRecord = (BizQualityPreventRecord) obj; return preventRecord.getId().equals(id); } + + @Override + public Integer getYearTime() { + return null; + } + + @Override + public Integer getYearNum() { + return null; + } + + @Override + public String getYearNo() { + return null; + } + + @Override + public void setYearNo(String yearNo) { + + } + + @Override + public Long getManagementReviewId() { + return internalAuditId; + } + + @Override + public QualityAuditManagementFileTypeEnum getManagementFileType() { + return QualityAuditManagementFileTypeEnum.PREVENT_REP; + } } \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/BaseManagementReviewRelFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/BaseManagementReviewRelFile.java index 750d9e1..05f1989 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/BaseManagementReviewRelFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/BaseManagementReviewRelFile.java @@ -32,5 +32,14 @@ Integer getYearNum(); + /** + * 管理评审ID 默认值 + * + * @return + */ + default Long getManagementId() { + return null; + } + QualityManagementReviewFileTypeEnum getManagementFileType(); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 5f085a5..e014e80 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -6,8 +6,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.json.DateDeserializer; import com.casic.missiles.dto.BaseRequest; +import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; import com.casic.missiles.model.quality.base.IBaseFileModel; +import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -23,7 +25,7 @@ */ @Data @TableName("biz_quality_corrective_record") -public class BizQualityCorrectiveRecord extends BaseRequest implements IBaseDataValid, IBaseFileCodeModel { +public class BizQualityCorrectiveRecord extends BaseRequest implements IBaseDataValid, IBaseFileCodeModel, BaseAuditManagementRelFile { private static final long serialVersionUID = 1L; /** @@ -171,7 +173,13 @@ @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）" , dataType = "Integer") @TableField(exist = false) private Integer decisionItem; + @ApiModelProperty(value = "管理评审ID", dataType = "Long") + @TableField("manager_id") + private Long managerId; + @ApiModelProperty(value = "内审ID", dataType = "Long") + @TableField("internal_audit_id") + private Long internalAuditId; @Override public String toString() { return "BizQualityCorrectiveRecord{" @@ -193,4 +201,29 @@ public void dataValid(QueryWrapper query) { } + + @Override + public Integer getYearTime() { + return null; + } + + @Override + public Integer getYearNum() { + return null; + } + + @Override + public String getYearNo() { + return null; + } + + @Override + public void setYearNo(String yearNo) { + + } + + @Override + public QualityAuditManagementFileTypeEnum getManagementFileType() { + return QualityAuditManagementFileTypeEnum.CORRECTIVE_REP; + } } \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 018e3fd..6b9e0df 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.json.DateDeserializer; import com.casic.missiles.dto.BaseRequest; -import com.casic.missiles.model.quality.base.IBaseFileCodeModel; +import com.casic.missiles.model.quality.base.*; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -22,7 +22,7 @@ */ @Data @TableName("biz_quality_prevent_record") -public class BizQualityPreventRecord extends BaseRequest implements IBaseDataValid, IBaseFileCodeModel{ +public class BizQualityPreventRecord extends BaseRequest implements IBaseDataValid, IBaseFileCodeModel, BaseAuditManagementRelFile { private static final long serialVersionUID = 1L; /** @@ -163,6 +163,15 @@ @TableField(exist = false) private Integer decisionItem; + + @ApiModelProperty(value = "管理评审ID", dataType = "Long") + @TableField("manager_id") + private Long managerId; + + @ApiModelProperty(value = "内审ID", dataType = "Long") + @TableField("internal_audit_id") + private Long internalAuditId; + @Override public String toString() { return "BizQualityPreventRecord{" @@ -193,4 +202,34 @@ BizQualityPreventRecord preventRecord = (BizQualityPreventRecord) obj; return preventRecord.getId().equals(id); } + + @Override + public Integer getYearTime() { + return null; + } + + @Override + public Integer getYearNum() { + return null; + } + + @Override + public String getYearNo() { + return null; + } + + @Override + public void setYearNo(String yearNo) { + + } + + @Override + public Long getManagementReviewId() { + return internalAuditId; + } + + @Override + public QualityAuditManagementFileTypeEnum getManagementFileType() { + return QualityAuditManagementFileTypeEnum.PREVENT_REP; + } } \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/BaseManagementReviewRelFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/BaseManagementReviewRelFile.java index 750d9e1..05f1989 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/BaseManagementReviewRelFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/BaseManagementReviewRelFile.java @@ -32,5 +32,14 @@ Integer getYearNum(); + /** + * 管理评审ID 默认值 + * + * @return + */ + default Long getManagementId() { + return null; + } + QualityManagementReviewFileTypeEnum getManagementFileType(); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/DefaultManageReviewRelFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/DefaultManageReviewRelFile.java new file mode 100644 index 0000000..e14d5f1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/DefaultManageReviewRelFile.java @@ -0,0 +1,111 @@ +package com.casic.missiles.model.quality.base; + +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + +@Data +public class DefaultManageReviewRelFile implements IBaseFileModel { + /** + * 主键 + * + * @return + */ + private Long id; + + /** + * @return 文件编码 + */ + private String fileCode; + + /** + * @return 文件名 + */ + private String fileName; + + /** + * 实验室代码 + * + * @return + */ + private String bizLabCode; + + private Integer yearTime; + + private Integer yearNum; + private Long managerReviewId; + private QualityManagementReviewFileTypeEnum fileTypeEnum = null; + + @Override + public String getYearNo() { + return null; + } + + @Override + public Long getDeptId() { + return null; + } + + @Override + public void setSysCode(String newCode) { + + } + + @Override + public void setYearNo(String yearNo) { + + } + + @Override + public Long getManagementReviewId() { + return managerReviewId; + } + + @Override + public QualityManagementReviewFileTypeEnum getManagementFileType() { + return null; + } + + /** + * 预防措施转换 + * + * @param bizQualityPreventRecord + * @return + */ + public static DefaultManageReviewRelFile convertByBizQualityPreventRecord(BizQualityPreventRecord bizQualityPreventRecord) { + DefaultManageReviewRelFile defaultManageReviewRelFile = new DefaultManageReviewRelFile(); + defaultManageReviewRelFile.setFileCode(bizQualityPreventRecord.getFileCode()); + defaultManageReviewRelFile.setFileName(bizQualityPreventRecord.getFileName()); + defaultManageReviewRelFile.setId(bizQualityPreventRecord.getId()); + defaultManageReviewRelFile.setYearNum(bizQualityPreventRecord.getYearNum()); + defaultManageReviewRelFile.setYearTime(bizQualityPreventRecord.getYearTime()); + defaultManageReviewRelFile.setFileTypeEnum(QualityManagementReviewFileTypeEnum.PREVENT_REP); + defaultManageReviewRelFile.setManagerReviewId(bizQualityPreventRecord.getManagerId()); + defaultManageReviewRelFile.setId(bizQualityPreventRecord.getId()); + return defaultManageReviewRelFile; + } + + /** + * 纠正措施处理单转换 + * + * @param bizQualityPreventRecord + * @return + */ + public static DefaultManageReviewRelFile convertByBizQualityCorrectiveRecord(BizQualityCorrectiveRecord bizQualityPreventRecord) { + DefaultManageReviewRelFile defaultManageReviewRelFile = new DefaultManageReviewRelFile(); + defaultManageReviewRelFile.setFileCode(bizQualityPreventRecord.getFileCode()); + defaultManageReviewRelFile.setFileName(bizQualityPreventRecord.getFileName()); + defaultManageReviewRelFile.setId(bizQualityPreventRecord.getId()); + defaultManageReviewRelFile.setYearNum(bizQualityPreventRecord.getYearNum()); + defaultManageReviewRelFile.setYearTime(bizQualityPreventRecord.getYearTime()); + defaultManageReviewRelFile.setFileTypeEnum(QualityManagementReviewFileTypeEnum.CORRECTIVE_REP); + defaultManageReviewRelFile.setManagerReviewId(bizQualityPreventRecord.getManagerId()); + defaultManageReviewRelFile.setId(bizQualityPreventRecord.getId()); + return defaultManageReviewRelFile; + } + + @Override + public String getSysCode() { + return null; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 5f085a5..e014e80 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -6,8 +6,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.json.DateDeserializer; import com.casic.missiles.dto.BaseRequest; +import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; import com.casic.missiles.model.quality.base.IBaseFileModel; +import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -23,7 +25,7 @@ */ @Data @TableName("biz_quality_corrective_record") -public class BizQualityCorrectiveRecord extends BaseRequest implements IBaseDataValid, IBaseFileCodeModel { +public class BizQualityCorrectiveRecord extends BaseRequest implements IBaseDataValid, IBaseFileCodeModel, BaseAuditManagementRelFile { private static final long serialVersionUID = 1L; /** @@ -171,7 +173,13 @@ @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）" , dataType = "Integer") @TableField(exist = false) private Integer decisionItem; + @ApiModelProperty(value = "管理评审ID", dataType = "Long") + @TableField("manager_id") + private Long managerId; + @ApiModelProperty(value = "内审ID", dataType = "Long") + @TableField("internal_audit_id") + private Long internalAuditId; @Override public String toString() { return "BizQualityCorrectiveRecord{" @@ -193,4 +201,29 @@ public void dataValid(QueryWrapper query) { } + + @Override + public Integer getYearTime() { + return null; + } + + @Override + public Integer getYearNum() { + return null; + } + + @Override + public String getYearNo() { + return null; + } + + @Override + public void setYearNo(String yearNo) { + + } + + @Override + public QualityAuditManagementFileTypeEnum getManagementFileType() { + return QualityAuditManagementFileTypeEnum.CORRECTIVE_REP; + } } \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 018e3fd..6b9e0df 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.json.DateDeserializer; import com.casic.missiles.dto.BaseRequest; -import com.casic.missiles.model.quality.base.IBaseFileCodeModel; +import com.casic.missiles.model.quality.base.*; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -22,7 +22,7 @@ */ @Data @TableName("biz_quality_prevent_record") -public class BizQualityPreventRecord extends BaseRequest implements IBaseDataValid, IBaseFileCodeModel{ +public class BizQualityPreventRecord extends BaseRequest implements IBaseDataValid, IBaseFileCodeModel, BaseAuditManagementRelFile { private static final long serialVersionUID = 1L; /** @@ -163,6 +163,15 @@ @TableField(exist = false) private Integer decisionItem; + + @ApiModelProperty(value = "管理评审ID", dataType = "Long") + @TableField("manager_id") + private Long managerId; + + @ApiModelProperty(value = "内审ID", dataType = "Long") + @TableField("internal_audit_id") + private Long internalAuditId; + @Override public String toString() { return "BizQualityPreventRecord{" @@ -193,4 +202,34 @@ BizQualityPreventRecord preventRecord = (BizQualityPreventRecord) obj; return preventRecord.getId().equals(id); } + + @Override + public Integer getYearTime() { + return null; + } + + @Override + public Integer getYearNum() { + return null; + } + + @Override + public String getYearNo() { + return null; + } + + @Override + public void setYearNo(String yearNo) { + + } + + @Override + public Long getManagementReviewId() { + return internalAuditId; + } + + @Override + public QualityAuditManagementFileTypeEnum getManagementFileType() { + return QualityAuditManagementFileTypeEnum.PREVENT_REP; + } } \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/BaseManagementReviewRelFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/BaseManagementReviewRelFile.java index 750d9e1..05f1989 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/BaseManagementReviewRelFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/BaseManagementReviewRelFile.java @@ -32,5 +32,14 @@ Integer getYearNum(); + /** + * 管理评审ID 默认值 + * + * @return + */ + default Long getManagementId() { + return null; + } + QualityManagementReviewFileTypeEnum getManagementFileType(); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/DefaultManageReviewRelFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/DefaultManageReviewRelFile.java new file mode 100644 index 0000000..e14d5f1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/DefaultManageReviewRelFile.java @@ -0,0 +1,111 @@ +package com.casic.missiles.model.quality.base; + +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + +@Data +public class DefaultManageReviewRelFile implements IBaseFileModel { + /** + * 主键 + * + * @return + */ + private Long id; + + /** + * @return 文件编码 + */ + private String fileCode; + + /** + * @return 文件名 + */ + private String fileName; + + /** + * 实验室代码 + * + * @return + */ + private String bizLabCode; + + private Integer yearTime; + + private Integer yearNum; + private Long managerReviewId; + private QualityManagementReviewFileTypeEnum fileTypeEnum = null; + + @Override + public String getYearNo() { + return null; + } + + @Override + public Long getDeptId() { + return null; + } + + @Override + public void setSysCode(String newCode) { + + } + + @Override + public void setYearNo(String yearNo) { + + } + + @Override + public Long getManagementReviewId() { + return managerReviewId; + } + + @Override + public QualityManagementReviewFileTypeEnum getManagementFileType() { + return null; + } + + /** + * 预防措施转换 + * + * @param bizQualityPreventRecord + * @return + */ + public static DefaultManageReviewRelFile convertByBizQualityPreventRecord(BizQualityPreventRecord bizQualityPreventRecord) { + DefaultManageReviewRelFile defaultManageReviewRelFile = new DefaultManageReviewRelFile(); + defaultManageReviewRelFile.setFileCode(bizQualityPreventRecord.getFileCode()); + defaultManageReviewRelFile.setFileName(bizQualityPreventRecord.getFileName()); + defaultManageReviewRelFile.setId(bizQualityPreventRecord.getId()); + defaultManageReviewRelFile.setYearNum(bizQualityPreventRecord.getYearNum()); + defaultManageReviewRelFile.setYearTime(bizQualityPreventRecord.getYearTime()); + defaultManageReviewRelFile.setFileTypeEnum(QualityManagementReviewFileTypeEnum.PREVENT_REP); + defaultManageReviewRelFile.setManagerReviewId(bizQualityPreventRecord.getManagerId()); + defaultManageReviewRelFile.setId(bizQualityPreventRecord.getId()); + return defaultManageReviewRelFile; + } + + /** + * 纠正措施处理单转换 + * + * @param bizQualityPreventRecord + * @return + */ + public static DefaultManageReviewRelFile convertByBizQualityCorrectiveRecord(BizQualityCorrectiveRecord bizQualityPreventRecord) { + DefaultManageReviewRelFile defaultManageReviewRelFile = new DefaultManageReviewRelFile(); + defaultManageReviewRelFile.setFileCode(bizQualityPreventRecord.getFileCode()); + defaultManageReviewRelFile.setFileName(bizQualityPreventRecord.getFileName()); + defaultManageReviewRelFile.setId(bizQualityPreventRecord.getId()); + defaultManageReviewRelFile.setYearNum(bizQualityPreventRecord.getYearNum()); + defaultManageReviewRelFile.setYearTime(bizQualityPreventRecord.getYearTime()); + defaultManageReviewRelFile.setFileTypeEnum(QualityManagementReviewFileTypeEnum.CORRECTIVE_REP); + defaultManageReviewRelFile.setManagerReviewId(bizQualityPreventRecord.getManagerId()); + defaultManageReviewRelFile.setId(bizQualityPreventRecord.getId()); + return defaultManageReviewRelFile; + } + + @Override + public String getSysCode() { + return null; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/QualityManagementReviewFileTypeEnum.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/QualityManagementReviewFileTypeEnum.java index 9778d73..e7be6ab 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/QualityManagementReviewFileTypeEnum.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/QualityManagementReviewFileTypeEnum.java @@ -23,7 +23,10 @@ QUALITY_MANAGEMENT_SYSTEM(8, "管理评审计划", "", "", QualityManagementReviewSourceTypeEnum.REVIEW_PLAN), MANAGEMENT_REVIEW(9, "管理评审报告", "", "", QualityManagementReviewSourceTypeEnum.MANAGEMENT_AUDIT_REPORT), EFFECTIVENESS(10, "有效性综合分析报告", "", "", QualityManagementReviewSourceTypeEnum.EFFECTIVENESS_REPORT), - MEETING_MINUTES(11, "会议纪要", "", "", QualityManagementReviewSourceTypeEnum.MEETING_MINUTES); + MEETING_MINUTES(11, "会议纪要", "", "", QualityManagementReviewSourceTypeEnum.MEETING_MINUTES), + + CORRECTIVE_REP(12, "纠正措施处理单","", "",QualityManagementReviewSourceTypeEnum.CORRECTIVE), + PREVENT_REP(13, "预防措施处理单","", "",QualityManagementReviewSourceTypeEnum.PREVENT); public static List FILE_LIST = new ArrayList(); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 5f085a5..e014e80 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -6,8 +6,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.json.DateDeserializer; import com.casic.missiles.dto.BaseRequest; +import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; import com.casic.missiles.model.quality.base.IBaseFileModel; +import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -23,7 +25,7 @@ */ @Data @TableName("biz_quality_corrective_record") -public class BizQualityCorrectiveRecord extends BaseRequest implements IBaseDataValid, IBaseFileCodeModel { +public class BizQualityCorrectiveRecord extends BaseRequest implements IBaseDataValid, IBaseFileCodeModel, BaseAuditManagementRelFile { private static final long serialVersionUID = 1L; /** @@ -171,7 +173,13 @@ @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）" , dataType = "Integer") @TableField(exist = false) private Integer decisionItem; + @ApiModelProperty(value = "管理评审ID", dataType = "Long") + @TableField("manager_id") + private Long managerId; + @ApiModelProperty(value = "内审ID", dataType = "Long") + @TableField("internal_audit_id") + private Long internalAuditId; @Override public String toString() { return "BizQualityCorrectiveRecord{" @@ -193,4 +201,29 @@ public void dataValid(QueryWrapper query) { } + + @Override + public Integer getYearTime() { + return null; + } + + @Override + public Integer getYearNum() { + return null; + } + + @Override + public String getYearNo() { + return null; + } + + @Override + public void setYearNo(String yearNo) { + + } + + @Override + public QualityAuditManagementFileTypeEnum getManagementFileType() { + return QualityAuditManagementFileTypeEnum.CORRECTIVE_REP; + } } \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 018e3fd..6b9e0df 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.json.DateDeserializer; import com.casic.missiles.dto.BaseRequest; -import com.casic.missiles.model.quality.base.IBaseFileCodeModel; +import com.casic.missiles.model.quality.base.*; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -22,7 +22,7 @@ */ @Data @TableName("biz_quality_prevent_record") -public class BizQualityPreventRecord extends BaseRequest implements IBaseDataValid, IBaseFileCodeModel{ +public class BizQualityPreventRecord extends BaseRequest implements IBaseDataValid, IBaseFileCodeModel, BaseAuditManagementRelFile { private static final long serialVersionUID = 1L; /** @@ -163,6 +163,15 @@ @TableField(exist = false) private Integer decisionItem; + + @ApiModelProperty(value = "管理评审ID", dataType = "Long") + @TableField("manager_id") + private Long managerId; + + @ApiModelProperty(value = "内审ID", dataType = "Long") + @TableField("internal_audit_id") + private Long internalAuditId; + @Override public String toString() { return "BizQualityPreventRecord{" @@ -193,4 +202,34 @@ BizQualityPreventRecord preventRecord = (BizQualityPreventRecord) obj; return preventRecord.getId().equals(id); } + + @Override + public Integer getYearTime() { + return null; + } + + @Override + public Integer getYearNum() { + return null; + } + + @Override + public String getYearNo() { + return null; + } + + @Override + public void setYearNo(String yearNo) { + + } + + @Override + public Long getManagementReviewId() { + return internalAuditId; + } + + @Override + public QualityAuditManagementFileTypeEnum getManagementFileType() { + return QualityAuditManagementFileTypeEnum.PREVENT_REP; + } } \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/BaseManagementReviewRelFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/BaseManagementReviewRelFile.java index 750d9e1..05f1989 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/BaseManagementReviewRelFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/BaseManagementReviewRelFile.java @@ -32,5 +32,14 @@ Integer getYearNum(); + /** + * 管理评审ID 默认值 + * + * @return + */ + default Long getManagementId() { + return null; + } + QualityManagementReviewFileTypeEnum getManagementFileType(); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/DefaultManageReviewRelFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/DefaultManageReviewRelFile.java new file mode 100644 index 0000000..e14d5f1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/DefaultManageReviewRelFile.java @@ -0,0 +1,111 @@ +package com.casic.missiles.model.quality.base; + +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + +@Data +public class DefaultManageReviewRelFile implements IBaseFileModel { + /** + * 主键 + * + * @return + */ + private Long id; + + /** + * @return 文件编码 + */ + private String fileCode; + + /** + * @return 文件名 + */ + private String fileName; + + /** + * 实验室代码 + * + * @return + */ + private String bizLabCode; + + private Integer yearTime; + + private Integer yearNum; + private Long managerReviewId; + private QualityManagementReviewFileTypeEnum fileTypeEnum = null; + + @Override + public String getYearNo() { + return null; + } + + @Override + public Long getDeptId() { + return null; + } + + @Override + public void setSysCode(String newCode) { + + } + + @Override + public void setYearNo(String yearNo) { + + } + + @Override + public Long getManagementReviewId() { + return managerReviewId; + } + + @Override + public QualityManagementReviewFileTypeEnum getManagementFileType() { + return null; + } + + /** + * 预防措施转换 + * + * @param bizQualityPreventRecord + * @return + */ + public static DefaultManageReviewRelFile convertByBizQualityPreventRecord(BizQualityPreventRecord bizQualityPreventRecord) { + DefaultManageReviewRelFile defaultManageReviewRelFile = new DefaultManageReviewRelFile(); + defaultManageReviewRelFile.setFileCode(bizQualityPreventRecord.getFileCode()); + defaultManageReviewRelFile.setFileName(bizQualityPreventRecord.getFileName()); + defaultManageReviewRelFile.setId(bizQualityPreventRecord.getId()); + defaultManageReviewRelFile.setYearNum(bizQualityPreventRecord.getYearNum()); + defaultManageReviewRelFile.setYearTime(bizQualityPreventRecord.getYearTime()); + defaultManageReviewRelFile.setFileTypeEnum(QualityManagementReviewFileTypeEnum.PREVENT_REP); + defaultManageReviewRelFile.setManagerReviewId(bizQualityPreventRecord.getManagerId()); + defaultManageReviewRelFile.setId(bizQualityPreventRecord.getId()); + return defaultManageReviewRelFile; + } + + /** + * 纠正措施处理单转换 + * + * @param bizQualityPreventRecord + * @return + */ + public static DefaultManageReviewRelFile convertByBizQualityCorrectiveRecord(BizQualityCorrectiveRecord bizQualityPreventRecord) { + DefaultManageReviewRelFile defaultManageReviewRelFile = new DefaultManageReviewRelFile(); + defaultManageReviewRelFile.setFileCode(bizQualityPreventRecord.getFileCode()); + defaultManageReviewRelFile.setFileName(bizQualityPreventRecord.getFileName()); + defaultManageReviewRelFile.setId(bizQualityPreventRecord.getId()); + defaultManageReviewRelFile.setYearNum(bizQualityPreventRecord.getYearNum()); + defaultManageReviewRelFile.setYearTime(bizQualityPreventRecord.getYearTime()); + defaultManageReviewRelFile.setFileTypeEnum(QualityManagementReviewFileTypeEnum.CORRECTIVE_REP); + defaultManageReviewRelFile.setManagerReviewId(bizQualityPreventRecord.getManagerId()); + defaultManageReviewRelFile.setId(bizQualityPreventRecord.getId()); + return defaultManageReviewRelFile; + } + + @Override + public String getSysCode() { + return null; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/QualityManagementReviewFileTypeEnum.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/QualityManagementReviewFileTypeEnum.java index 9778d73..e7be6ab 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/QualityManagementReviewFileTypeEnum.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/QualityManagementReviewFileTypeEnum.java @@ -23,7 +23,10 @@ QUALITY_MANAGEMENT_SYSTEM(8, "管理评审计划", "", "", QualityManagementReviewSourceTypeEnum.REVIEW_PLAN), MANAGEMENT_REVIEW(9, "管理评审报告", "", "", QualityManagementReviewSourceTypeEnum.MANAGEMENT_AUDIT_REPORT), EFFECTIVENESS(10, "有效性综合分析报告", "", "", QualityManagementReviewSourceTypeEnum.EFFECTIVENESS_REPORT), - MEETING_MINUTES(11, "会议纪要", "", "", QualityManagementReviewSourceTypeEnum.MEETING_MINUTES); + MEETING_MINUTES(11, "会议纪要", "", "", QualityManagementReviewSourceTypeEnum.MEETING_MINUTES), + + CORRECTIVE_REP(12, "纠正措施处理单","", "",QualityManagementReviewSourceTypeEnum.CORRECTIVE), + PREVENT_REP(13, "预防措施处理单","", "",QualityManagementReviewSourceTypeEnum.PREVENT); public static List FILE_LIST = new ArrayList(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index f2abe3b..1d1c727 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -24,12 +24,11 @@ import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; import com.casic.missiles.model.quality.BizQualityCorrectiveRectifFile; +import com.casic.missiles.model.quality.base.DefaultManageReviewRelFile; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.service.quality.IBizLabRelDeptService; -import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; -import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; -import com.casic.missiles.service.quality.IBizQualityCorrectiveRectifFileService; +import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -54,12 +53,18 @@ private final IBizLabRelDeptService relDeptService; private final IBizQualityCorrectiveRectifFileService rectifFileService; - public BizQualityCorrectiveRecordServiceImpl(AbstractPermissionContext permissionContext, AbstractDictService dictService, IBizQualityCorrectiveFileRelService fileRelService, IBizLabRelDeptService relDeptService, IBizQualityCorrectiveRectifFileService rectifFileService) { + //内审管理 + private final IBizQualityInternalAuditManagementService internalAuditManagementService; + private final IBizQualityManagementReviewService managementReviewService; + + public BizQualityCorrectiveRecordServiceImpl(AbstractPermissionContext permissionContext, AbstractDictService dictService, IBizQualityCorrectiveFileRelService fileRelService, IBizLabRelDeptService relDeptService, IBizQualityCorrectiveRectifFileService rectifFileService, @Lazy IBizQualityInternalAuditManagementService internalAuditManagementService, @Lazy IBizQualityManagementReviewService managementReviewService) { this.permissionContext = permissionContext; this.dictService = dictService; this.fileRelService = fileRelService; this.relDeptService = relDeptService; this.rectifFileService = rectifFileService; + this.internalAuditManagementService = internalAuditManagementService; + this.managementReviewService = managementReviewService; } @Transactional @@ -87,6 +92,17 @@ updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); super.updateById(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); + + //添加至管理评审文件 + if (entity.getInternalAuditId() != null) { + internalAuditManagementService.updateAuditFileByBaseAuditManagement(entity); + } + + //添加至管理评审文件 + if (entity.getManagerId() != null) { + DefaultManageReviewRelFile manageReviewRelFile = DefaultManageReviewRelFile.convertByBizQualityCorrectiveRecord(entity); + managementReviewService.updateManagementReviewByBaseManagement(manageReviewRelFile); + } return true; } @@ -154,6 +170,17 @@ updateWrapper.eq("id", request.getId()); updateWrapper.set("sub_time", new Date()); this.update(updateWrapper); + BizQualityCorrectiveRecord entity = getById(request.getId()); + //添加至管理评审文件 + if (entity.getInternalAuditId() != null) { + internalAuditManagementService.addBizQualityInternalAuditFile(entity); + } + + //添加至管理评审文件 + if (entity.getManagerId() != null) { + DefaultManageReviewRelFile manageReviewRelFile = DefaultManageReviewRelFile.convertByBizQualityCorrectiveRecord(entity); + managementReviewService.addBizQualityManagementReview(manageReviewRelFile); + } return ReturnUtil.success(); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java index 5f085a5..e014e80 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityCorrectiveRecord.java @@ -6,8 +6,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.json.DateDeserializer; import com.casic.missiles.dto.BaseRequest; +import com.casic.missiles.model.quality.base.BaseAuditManagementRelFile; import com.casic.missiles.model.quality.base.IBaseFileCodeModel; import com.casic.missiles.model.quality.base.IBaseFileModel; +import com.casic.missiles.model.quality.base.QualityAuditManagementFileTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -23,7 +25,7 @@ */ @Data @TableName("biz_quality_corrective_record") -public class BizQualityCorrectiveRecord extends BaseRequest implements IBaseDataValid, IBaseFileCodeModel { +public class BizQualityCorrectiveRecord extends BaseRequest implements IBaseDataValid, IBaseFileCodeModel, BaseAuditManagementRelFile { private static final long serialVersionUID = 1L; /** @@ -171,7 +173,13 @@ @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）" , dataType = "Integer") @TableField(exist = false) private Integer decisionItem; + @ApiModelProperty(value = "管理评审ID", dataType = "Long") + @TableField("manager_id") + private Long managerId; + @ApiModelProperty(value = "内审ID", dataType = "Long") + @TableField("internal_audit_id") + private Long internalAuditId; @Override public String toString() { return "BizQualityCorrectiveRecord{" @@ -193,4 +201,29 @@ public void dataValid(QueryWrapper query) { } + + @Override + public Integer getYearTime() { + return null; + } + + @Override + public Integer getYearNum() { + return null; + } + + @Override + public String getYearNo() { + return null; + } + + @Override + public void setYearNo(String yearNo) { + + } + + @Override + public QualityAuditManagementFileTypeEnum getManagementFileType() { + return QualityAuditManagementFileTypeEnum.CORRECTIVE_REP; + } } \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java index 018e3fd..6b9e0df 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityPreventRecord.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.base.json.DateDeserializer; import com.casic.missiles.dto.BaseRequest; -import com.casic.missiles.model.quality.base.IBaseFileCodeModel; +import com.casic.missiles.model.quality.base.*; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -22,7 +22,7 @@ */ @Data @TableName("biz_quality_prevent_record") -public class BizQualityPreventRecord extends BaseRequest implements IBaseDataValid, IBaseFileCodeModel{ +public class BizQualityPreventRecord extends BaseRequest implements IBaseDataValid, IBaseFileCodeModel, BaseAuditManagementRelFile { private static final long serialVersionUID = 1L; /** @@ -163,6 +163,15 @@ @TableField(exist = false) private Integer decisionItem; + + @ApiModelProperty(value = "管理评审ID", dataType = "Long") + @TableField("manager_id") + private Long managerId; + + @ApiModelProperty(value = "内审ID", dataType = "Long") + @TableField("internal_audit_id") + private Long internalAuditId; + @Override public String toString() { return "BizQualityPreventRecord{" @@ -193,4 +202,34 @@ BizQualityPreventRecord preventRecord = (BizQualityPreventRecord) obj; return preventRecord.getId().equals(id); } + + @Override + public Integer getYearTime() { + return null; + } + + @Override + public Integer getYearNum() { + return null; + } + + @Override + public String getYearNo() { + return null; + } + + @Override + public void setYearNo(String yearNo) { + + } + + @Override + public Long getManagementReviewId() { + return internalAuditId; + } + + @Override + public QualityAuditManagementFileTypeEnum getManagementFileType() { + return QualityAuditManagementFileTypeEnum.PREVENT_REP; + } } \ No newline at end of file diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/BaseManagementReviewRelFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/BaseManagementReviewRelFile.java index 750d9e1..05f1989 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/BaseManagementReviewRelFile.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/BaseManagementReviewRelFile.java @@ -32,5 +32,14 @@ Integer getYearNum(); + /** + * 管理评审ID 默认值 + * + * @return + */ + default Long getManagementId() { + return null; + } + QualityManagementReviewFileTypeEnum getManagementFileType(); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/DefaultManageReviewRelFile.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/DefaultManageReviewRelFile.java new file mode 100644 index 0000000..e14d5f1 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/DefaultManageReviewRelFile.java @@ -0,0 +1,111 @@ +package com.casic.missiles.model.quality.base; + +import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import lombok.Data; + +@Data +public class DefaultManageReviewRelFile implements IBaseFileModel { + /** + * 主键 + * + * @return + */ + private Long id; + + /** + * @return 文件编码 + */ + private String fileCode; + + /** + * @return 文件名 + */ + private String fileName; + + /** + * 实验室代码 + * + * @return + */ + private String bizLabCode; + + private Integer yearTime; + + private Integer yearNum; + private Long managerReviewId; + private QualityManagementReviewFileTypeEnum fileTypeEnum = null; + + @Override + public String getYearNo() { + return null; + } + + @Override + public Long getDeptId() { + return null; + } + + @Override + public void setSysCode(String newCode) { + + } + + @Override + public void setYearNo(String yearNo) { + + } + + @Override + public Long getManagementReviewId() { + return managerReviewId; + } + + @Override + public QualityManagementReviewFileTypeEnum getManagementFileType() { + return null; + } + + /** + * 预防措施转换 + * + * @param bizQualityPreventRecord + * @return + */ + public static DefaultManageReviewRelFile convertByBizQualityPreventRecord(BizQualityPreventRecord bizQualityPreventRecord) { + DefaultManageReviewRelFile defaultManageReviewRelFile = new DefaultManageReviewRelFile(); + defaultManageReviewRelFile.setFileCode(bizQualityPreventRecord.getFileCode()); + defaultManageReviewRelFile.setFileName(bizQualityPreventRecord.getFileName()); + defaultManageReviewRelFile.setId(bizQualityPreventRecord.getId()); + defaultManageReviewRelFile.setYearNum(bizQualityPreventRecord.getYearNum()); + defaultManageReviewRelFile.setYearTime(bizQualityPreventRecord.getYearTime()); + defaultManageReviewRelFile.setFileTypeEnum(QualityManagementReviewFileTypeEnum.PREVENT_REP); + defaultManageReviewRelFile.setManagerReviewId(bizQualityPreventRecord.getManagerId()); + defaultManageReviewRelFile.setId(bizQualityPreventRecord.getId()); + return defaultManageReviewRelFile; + } + + /** + * 纠正措施处理单转换 + * + * @param bizQualityPreventRecord + * @return + */ + public static DefaultManageReviewRelFile convertByBizQualityCorrectiveRecord(BizQualityCorrectiveRecord bizQualityPreventRecord) { + DefaultManageReviewRelFile defaultManageReviewRelFile = new DefaultManageReviewRelFile(); + defaultManageReviewRelFile.setFileCode(bizQualityPreventRecord.getFileCode()); + defaultManageReviewRelFile.setFileName(bizQualityPreventRecord.getFileName()); + defaultManageReviewRelFile.setId(bizQualityPreventRecord.getId()); + defaultManageReviewRelFile.setYearNum(bizQualityPreventRecord.getYearNum()); + defaultManageReviewRelFile.setYearTime(bizQualityPreventRecord.getYearTime()); + defaultManageReviewRelFile.setFileTypeEnum(QualityManagementReviewFileTypeEnum.CORRECTIVE_REP); + defaultManageReviewRelFile.setManagerReviewId(bizQualityPreventRecord.getManagerId()); + defaultManageReviewRelFile.setId(bizQualityPreventRecord.getId()); + return defaultManageReviewRelFile; + } + + @Override + public String getSysCode() { + return null; + } +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/QualityManagementReviewFileTypeEnum.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/QualityManagementReviewFileTypeEnum.java index 9778d73..e7be6ab 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/QualityManagementReviewFileTypeEnum.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/QualityManagementReviewFileTypeEnum.java @@ -23,7 +23,10 @@ QUALITY_MANAGEMENT_SYSTEM(8, "管理评审计划", "", "", QualityManagementReviewSourceTypeEnum.REVIEW_PLAN), MANAGEMENT_REVIEW(9, "管理评审报告", "", "", QualityManagementReviewSourceTypeEnum.MANAGEMENT_AUDIT_REPORT), EFFECTIVENESS(10, "有效性综合分析报告", "", "", QualityManagementReviewSourceTypeEnum.EFFECTIVENESS_REPORT), - MEETING_MINUTES(11, "会议纪要", "", "", QualityManagementReviewSourceTypeEnum.MEETING_MINUTES); + MEETING_MINUTES(11, "会议纪要", "", "", QualityManagementReviewSourceTypeEnum.MEETING_MINUTES), + + CORRECTIVE_REP(12, "纠正措施处理单","", "",QualityManagementReviewSourceTypeEnum.CORRECTIVE), + PREVENT_REP(13, "预防措施处理单","", "",QualityManagementReviewSourceTypeEnum.PREVENT); public static List FILE_LIST = new ArrayList(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index f2abe3b..1d1c727 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -24,12 +24,11 @@ import com.casic.missiles.model.quality.BizQualityCorrectiveFileRel; import com.casic.missiles.model.quality.BizQualityCorrectiveRecord; import com.casic.missiles.model.quality.BizQualityCorrectiveRectifFile; +import com.casic.missiles.model.quality.base.DefaultManageReviewRelFile; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; -import com.casic.missiles.service.quality.IBizLabRelDeptService; -import com.casic.missiles.service.quality.IBizQualityCorrectiveFileRelService; -import com.casic.missiles.service.quality.IBizQualityCorrectiveRecordService; -import com.casic.missiles.service.quality.IBizQualityCorrectiveRectifFileService; +import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -54,12 +53,18 @@ private final IBizLabRelDeptService relDeptService; private final IBizQualityCorrectiveRectifFileService rectifFileService; - public BizQualityCorrectiveRecordServiceImpl(AbstractPermissionContext permissionContext, AbstractDictService dictService, IBizQualityCorrectiveFileRelService fileRelService, IBizLabRelDeptService relDeptService, IBizQualityCorrectiveRectifFileService rectifFileService) { + //内审管理 + private final IBizQualityInternalAuditManagementService internalAuditManagementService; + private final IBizQualityManagementReviewService managementReviewService; + + public BizQualityCorrectiveRecordServiceImpl(AbstractPermissionContext permissionContext, AbstractDictService dictService, IBizQualityCorrectiveFileRelService fileRelService, IBizLabRelDeptService relDeptService, IBizQualityCorrectiveRectifFileService rectifFileService, @Lazy IBizQualityInternalAuditManagementService internalAuditManagementService, @Lazy IBizQualityManagementReviewService managementReviewService) { this.permissionContext = permissionContext; this.dictService = dictService; this.fileRelService = fileRelService; this.relDeptService = relDeptService; this.rectifFileService = rectifFileService; + this.internalAuditManagementService = internalAuditManagementService; + this.managementReviewService = managementReviewService; } @Transactional @@ -87,6 +92,17 @@ updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); super.updateById(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); + + //添加至管理评审文件 + if (entity.getInternalAuditId() != null) { + internalAuditManagementService.updateAuditFileByBaseAuditManagement(entity); + } + + //添加至管理评审文件 + if (entity.getManagerId() != null) { + DefaultManageReviewRelFile manageReviewRelFile = DefaultManageReviewRelFile.convertByBizQualityCorrectiveRecord(entity); + managementReviewService.updateManagementReviewByBaseManagement(manageReviewRelFile); + } return true; } @@ -154,6 +170,17 @@ updateWrapper.eq("id", request.getId()); updateWrapper.set("sub_time", new Date()); this.update(updateWrapper); + BizQualityCorrectiveRecord entity = getById(request.getId()); + //添加至管理评审文件 + if (entity.getInternalAuditId() != null) { + internalAuditManagementService.addBizQualityInternalAuditFile(entity); + } + + //添加至管理评审文件 + if (entity.getManagerId() != null) { + DefaultManageReviewRelFile manageReviewRelFile = DefaultManageReviewRelFile.convertByBizQualityCorrectiveRecord(entity); + managementReviewService.addBizQualityManagementReview(manageReviewRelFile); + } return ReturnUtil.success(); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 71b45dd..155ae93 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -19,11 +19,14 @@ import com.casic.missiles.enums.quality.file.QualityCorrectiveFileTypeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualityPreventRecordMapper; -import com.casic.missiles.model.quality.*; +import com.casic.missiles.model.quality.BizQualityCorrectiveRectifFile; +import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.model.quality.BizQualityPreventFileRel; +import com.casic.missiles.model.quality.BizQualityPreventRecord; +import com.casic.missiles.model.quality.base.DefaultManageReviewRelFile; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; -import com.casic.missiles.utils.NoGeneratorUtil; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -43,23 +46,28 @@ * @date 2023-10-21 */ @Service -public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService{ +public class BizQualityPreventRecordServiceImpl extends GeneralApprovalServiceImpl implements IBizQualityPreventRecordService, IBaseFileCodeService { private final AbstractPermissionContext permissionContext; private final AbstractDictService dictService; private final IBizQualityPreventFileRelService fileRelService; private final IBizLabRelDeptService relDeptService; private final IBizQualityInternalAuditRepService internalAuditRepService; + //内审管理 + private final IBizQualityInternalAuditManagementService internalAuditManagementService; + private final IBizQualityManagementReviewService managementReviewService; /** * 整改关联文件 */ private final IBizQualityCorrectiveRectifFileService rectifFileService; - public BizQualityPreventRecordServiceImpl(AbstractPermissionContext permissionContext, AbstractDictService dictService, IBizQualityPreventFileRelService fileRelService, IBizLabRelDeptService relDeptService, @Lazy IBizQualityInternalAuditRepService internalAuditRepService, IBizQualityCorrectiveRectifFileService rectifFileService) { + public BizQualityPreventRecordServiceImpl(AbstractPermissionContext permissionContext, AbstractDictService dictService, IBizQualityPreventFileRelService fileRelService, IBizLabRelDeptService relDeptService, @Lazy IBizQualityInternalAuditRepService internalAuditRepService, @Lazy IBizQualityInternalAuditManagementService internalAuditManagementService, @Lazy IBizQualityManagementReviewService managementReviewService, IBizQualityCorrectiveRectifFileService rectifFileService) { this.permissionContext = permissionContext; this.dictService = dictService; this.fileRelService = fileRelService; this.relDeptService = relDeptService; this.internalAuditRepService = internalAuditRepService; + this.internalAuditManagementService = internalAuditManagementService; + this.managementReviewService = managementReviewService; this.rectifFileService = rectifFileService; } @@ -77,7 +85,22 @@ updateWrapper.eq("id", request.getId()); updateWrapper.set("sub_time", new Date()); this.update(updateWrapper); + super.submit(request); + + BizQualityPreventRecord entity = getById(request.getId()); + + //添加至管理评审文件 + if (entity.getInternalAuditId() != null) { + internalAuditManagementService.addBizQualityInternalAuditFile(entity); + } + + //添加至管理评审文件 + if (entity.getManagerId() != null) { + DefaultManageReviewRelFile manageReviewRelFile = DefaultManageReviewRelFile.convertByBizQualityPreventRecord(entity); + managementReviewService.addBizQualityManagementReview(manageReviewRelFile); + } + return ReturnUtil.success(); } @@ -135,6 +158,7 @@ saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); super.save(entity); + fileRelService.saveOrUpdateList(entity, entity.getId()); return true; } @@ -163,9 +187,21 @@ public boolean updateById(BizQualityPreventRecord entity) { BizQualityPreventRecord oldEntity = getById(entity.getId()); //更新系统编码 - updateEntity(entity,oldEntity,QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + updateEntity(entity, oldEntity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); super.updateById(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); + + //修改管理评审文件 + if (entity.getInternalAuditId() != null) { + internalAuditManagementService.updateAuditFileByBaseAuditManagement(entity); + } + + //修改管理评审文件 + if (entity.getManagerId() != null) { + DefaultManageReviewRelFile manageReviewRelFile = DefaultManageReviewRelFile.convertByBizQualityPreventRecord(entity); + managementReviewService.updateManagementReviewByBaseManagement(manageReviewRelFile); + } + return true; }