diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementFileTypeEnum.java index b4c13df..16d6b9e 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementFileTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementFileTypeEnum.java @@ -8,7 +8,7 @@ public enum QualityAuditManagementFileTypeEnum { AUDIT_PLAN(1, "内部审核计划"), WORK_REGISTRATION(2, "内部审核工作登记"), - internal_audit_review(3, "内部审核审查表"), + internal_audit_review(3, "内部审核检查表"), MEETING_MINUTES(4, "会议记录"), INTERNAL_NON_COMPLIANT(5, "内部不符合项报告"), CORRECTIVE_REP(6, "纠正措施处理单"), diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementFileTypeEnum.java index b4c13df..16d6b9e 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementFileTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementFileTypeEnum.java @@ -8,7 +8,7 @@ public enum QualityAuditManagementFileTypeEnum { AUDIT_PLAN(1, "内部审核计划"), WORK_REGISTRATION(2, "内部审核工作登记"), - internal_audit_review(3, "内部审核审查表"), + internal_audit_review(3, "内部审核检查表"), MEETING_MINUTES(4, "会议记录"), INTERNAL_NON_COMPLIANT(5, "内部不符合项报告"), CORRECTIVE_REP(6, "纠正措施处理单"), diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageTypeEnum.java index bf5a7da..f54631f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageTypeEnum.java @@ -8,7 +8,7 @@ public enum QualityAuditManagementStageTypeEnum { AUDIT_PLAN(1, "创建现场审核计划","内部审核计划"), WORK_REGISTRATION(2, "创建内部审核工作登记","内部审核工作登记"), - internal_audit_review(3, "创建内部审核审查表","内部审核审查表"), + internal_audit_review(3, "创建内部审核检查表","内部审核检查表"), MEETING_MINUTES(4, "创建会议记录","会议记录"), INTERNAL_NON_COMPLIANT(5, "创建内部不符合项报告","内部不符合项报告"), CORRECTIVE_REP(6, "创建纠正措施处理单","纠正措施处理单"), diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementFileTypeEnum.java index b4c13df..16d6b9e 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementFileTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementFileTypeEnum.java @@ -8,7 +8,7 @@ public enum QualityAuditManagementFileTypeEnum { AUDIT_PLAN(1, "内部审核计划"), WORK_REGISTRATION(2, "内部审核工作登记"), - internal_audit_review(3, "内部审核审查表"), + internal_audit_review(3, "内部审核检查表"), MEETING_MINUTES(4, "会议记录"), INTERNAL_NON_COMPLIANT(5, "内部不符合项报告"), CORRECTIVE_REP(6, "纠正措施处理单"), diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageTypeEnum.java index bf5a7da..f54631f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageTypeEnum.java @@ -8,7 +8,7 @@ public enum QualityAuditManagementStageTypeEnum { AUDIT_PLAN(1, "创建现场审核计划","内部审核计划"), WORK_REGISTRATION(2, "创建内部审核工作登记","内部审核工作登记"), - internal_audit_review(3, "创建内部审核审查表","内部审核审查表"), + internal_audit_review(3, "创建内部审核检查表","内部审核检查表"), MEETING_MINUTES(4, "创建会议记录","会议记录"), INTERNAL_NON_COMPLIANT(5, "创建内部不符合项报告","内部不符合项报告"), CORRECTIVE_REP(6, "创建纠正措施处理单","纠正措施处理单"), diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityCorrectiveFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityCorrectiveFileTypeEnum.java index d936fcb..361af83 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityCorrectiveFileTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityCorrectiveFileTypeEnum.java @@ -11,7 +11,7 @@ */ public enum QualityCorrectiveFileTypeEnum implements IEnumType { NON_COM(1, "不符合要求情况分析表","", QualitySourceFileTypeEnum.QUALITY_SUPERVISION, "zlhdbfhyqqkfxbg", "/quality/bizQualityNonConformanceRep/approval/listPage"), - INTERNAL_AUDIT(2, "内部审核审查表","biz_quality_review_form", QualitySourceFileTypeEnum.INTERNAL_AUDIT, "zlhdnbshjcb", "/quality/reviewForm/approval/listPage"), + INTERNAL_AUDIT(2, "内部审核检查表","biz_quality_review_form", QualitySourceFileTypeEnum.INTERNAL_AUDIT, "zlhdnbshjcb", "/quality/reviewForm/approval/listPage"), INTERNAL_NON(3, "内部审核不符合项报告","biz_quality_non_review_form", QualitySourceFileTypeEnum.INTERNAL_AUDIT, "zlhdnbshbfhxbg", "/quality/nonReviewForm/approval/listPage"), EXTERNAL(4, "外部审核报告","", QualitySourceFileTypeEnum.EXTERNAL_AUDITING, "", "/quality/externalAudit/listPage"), MANAGER(5, "管理评审报告","", QualitySourceFileTypeEnum.REVIEW, "zlhdglpsbg", "/quality/reviewRep/approval/listPage"), diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementFileTypeEnum.java index b4c13df..16d6b9e 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementFileTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementFileTypeEnum.java @@ -8,7 +8,7 @@ public enum QualityAuditManagementFileTypeEnum { AUDIT_PLAN(1, "内部审核计划"), WORK_REGISTRATION(2, "内部审核工作登记"), - internal_audit_review(3, "内部审核审查表"), + internal_audit_review(3, "内部审核检查表"), MEETING_MINUTES(4, "会议记录"), INTERNAL_NON_COMPLIANT(5, "内部不符合项报告"), CORRECTIVE_REP(6, "纠正措施处理单"), diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageTypeEnum.java index bf5a7da..f54631f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageTypeEnum.java @@ -8,7 +8,7 @@ public enum QualityAuditManagementStageTypeEnum { AUDIT_PLAN(1, "创建现场审核计划","内部审核计划"), WORK_REGISTRATION(2, "创建内部审核工作登记","内部审核工作登记"), - internal_audit_review(3, "创建内部审核审查表","内部审核审查表"), + internal_audit_review(3, "创建内部审核检查表","内部审核检查表"), MEETING_MINUTES(4, "创建会议记录","会议记录"), INTERNAL_NON_COMPLIANT(5, "创建内部不符合项报告","内部不符合项报告"), CORRECTIVE_REP(6, "创建纠正措施处理单","纠正措施处理单"), diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityCorrectiveFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityCorrectiveFileTypeEnum.java index d936fcb..361af83 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityCorrectiveFileTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityCorrectiveFileTypeEnum.java @@ -11,7 +11,7 @@ */ public enum QualityCorrectiveFileTypeEnum implements IEnumType { NON_COM(1, "不符合要求情况分析表","", QualitySourceFileTypeEnum.QUALITY_SUPERVISION, "zlhdbfhyqqkfxbg", "/quality/bizQualityNonConformanceRep/approval/listPage"), - INTERNAL_AUDIT(2, "内部审核审查表","biz_quality_review_form", QualitySourceFileTypeEnum.INTERNAL_AUDIT, "zlhdnbshjcb", "/quality/reviewForm/approval/listPage"), + INTERNAL_AUDIT(2, "内部审核检查表","biz_quality_review_form", QualitySourceFileTypeEnum.INTERNAL_AUDIT, "zlhdnbshjcb", "/quality/reviewForm/approval/listPage"), INTERNAL_NON(3, "内部审核不符合项报告","biz_quality_non_review_form", QualitySourceFileTypeEnum.INTERNAL_AUDIT, "zlhdnbshbfhxbg", "/quality/nonReviewForm/approval/listPage"), EXTERNAL(4, "外部审核报告","", QualitySourceFileTypeEnum.EXTERNAL_AUDITING, "", "/quality/externalAudit/listPage"), MANAGER(5, "管理评审报告","", QualitySourceFileTypeEnum.REVIEW, "zlhdglpsbg", "/quality/reviewRep/approval/listPage"), diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityExternalRelFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityExternalRelFileTypeEnum.java index 6d45623..b418f7f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityExternalRelFileTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityExternalRelFileTypeEnum.java @@ -11,7 +11,7 @@ */ public enum QualityExternalRelFileTypeEnum implements IEnumType { NON_COM(1, "不符合要求情况分析表", QualitySourceFileTypeEnum.QUALITY_SUPERVISION, "zlhdbfhyqqkfxbg", "/quality/bizQualityNonConformanceRep/approval/listPage"), - INTERNAL_AUDIT(2, "内部审核审查表", QualitySourceFileTypeEnum.INTERNAL_AUDIT, "zlhdnbshjcb", "/quality/reviewForm/approval/listPage"), + INTERNAL_AUDIT(2, "内部审核检查表", QualitySourceFileTypeEnum.INTERNAL_AUDIT, "zlhdnbshjcb", "/quality/reviewForm/approval/listPage"), INTERNAL_NON(3, "内部审核不符合项报告", QualitySourceFileTypeEnum.INTERNAL_AUDIT, "zlhdnbshbfhxbg", "/quality/nonReviewForm/approval/listPage"), EXTERNAL(4, "外部审核报告", QualitySourceFileTypeEnum.EXTERNAL_AUDITING, "", "/quality/externalAudit/listPage"), MANAGER(5, "管理评审报告", QualitySourceFileTypeEnum.REVIEW, "zlhdglpsbg", "/quality/reviewRep/approval/listPage"), diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementFileTypeEnum.java index b4c13df..16d6b9e 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementFileTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementFileTypeEnum.java @@ -8,7 +8,7 @@ public enum QualityAuditManagementFileTypeEnum { AUDIT_PLAN(1, "内部审核计划"), WORK_REGISTRATION(2, "内部审核工作登记"), - internal_audit_review(3, "内部审核审查表"), + internal_audit_review(3, "内部审核检查表"), MEETING_MINUTES(4, "会议记录"), INTERNAL_NON_COMPLIANT(5, "内部不符合项报告"), CORRECTIVE_REP(6, "纠正措施处理单"), diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageTypeEnum.java index bf5a7da..f54631f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageTypeEnum.java @@ -8,7 +8,7 @@ public enum QualityAuditManagementStageTypeEnum { AUDIT_PLAN(1, "创建现场审核计划","内部审核计划"), WORK_REGISTRATION(2, "创建内部审核工作登记","内部审核工作登记"), - internal_audit_review(3, "创建内部审核审查表","内部审核审查表"), + internal_audit_review(3, "创建内部审核检查表","内部审核检查表"), MEETING_MINUTES(4, "创建会议记录","会议记录"), INTERNAL_NON_COMPLIANT(5, "创建内部不符合项报告","内部不符合项报告"), CORRECTIVE_REP(6, "创建纠正措施处理单","纠正措施处理单"), diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityCorrectiveFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityCorrectiveFileTypeEnum.java index d936fcb..361af83 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityCorrectiveFileTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityCorrectiveFileTypeEnum.java @@ -11,7 +11,7 @@ */ public enum QualityCorrectiveFileTypeEnum implements IEnumType { NON_COM(1, "不符合要求情况分析表","", QualitySourceFileTypeEnum.QUALITY_SUPERVISION, "zlhdbfhyqqkfxbg", "/quality/bizQualityNonConformanceRep/approval/listPage"), - INTERNAL_AUDIT(2, "内部审核审查表","biz_quality_review_form", QualitySourceFileTypeEnum.INTERNAL_AUDIT, "zlhdnbshjcb", "/quality/reviewForm/approval/listPage"), + INTERNAL_AUDIT(2, "内部审核检查表","biz_quality_review_form", QualitySourceFileTypeEnum.INTERNAL_AUDIT, "zlhdnbshjcb", "/quality/reviewForm/approval/listPage"), INTERNAL_NON(3, "内部审核不符合项报告","biz_quality_non_review_form", QualitySourceFileTypeEnum.INTERNAL_AUDIT, "zlhdnbshbfhxbg", "/quality/nonReviewForm/approval/listPage"), EXTERNAL(4, "外部审核报告","", QualitySourceFileTypeEnum.EXTERNAL_AUDITING, "", "/quality/externalAudit/listPage"), MANAGER(5, "管理评审报告","", QualitySourceFileTypeEnum.REVIEW, "zlhdglpsbg", "/quality/reviewRep/approval/listPage"), diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityExternalRelFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityExternalRelFileTypeEnum.java index 6d45623..b418f7f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityExternalRelFileTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityExternalRelFileTypeEnum.java @@ -11,7 +11,7 @@ */ public enum QualityExternalRelFileTypeEnum implements IEnumType { NON_COM(1, "不符合要求情况分析表", QualitySourceFileTypeEnum.QUALITY_SUPERVISION, "zlhdbfhyqqkfxbg", "/quality/bizQualityNonConformanceRep/approval/listPage"), - INTERNAL_AUDIT(2, "内部审核审查表", QualitySourceFileTypeEnum.INTERNAL_AUDIT, "zlhdnbshjcb", "/quality/reviewForm/approval/listPage"), + INTERNAL_AUDIT(2, "内部审核检查表", QualitySourceFileTypeEnum.INTERNAL_AUDIT, "zlhdnbshjcb", "/quality/reviewForm/approval/listPage"), INTERNAL_NON(3, "内部审核不符合项报告", QualitySourceFileTypeEnum.INTERNAL_AUDIT, "zlhdnbshbfhxbg", "/quality/nonReviewForm/approval/listPage"), EXTERNAL(4, "外部审核报告", QualitySourceFileTypeEnum.EXTERNAL_AUDITING, "", "/quality/externalAudit/listPage"), MANAGER(5, "管理评审报告", QualitySourceFileTypeEnum.REVIEW, "zlhdglpsbg", "/quality/reviewRep/approval/listPage"), diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/QualityAuditManagementFileTypeEnum.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/QualityAuditManagementFileTypeEnum.java index 53b6204..e5afbde 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/QualityAuditManagementFileTypeEnum.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/QualityAuditManagementFileTypeEnum.java @@ -9,7 +9,7 @@ AUDIT_PLAN(1, "内部审核计划","创建现场审核计划表"), SCENE_PLAN(2, "现场审核计划表",""), WORK_REGISTRATION(3, "内部审核工作登记","创建内部审核工作登记表"), - INTERNAL_AUDIT_REVIEW(4, "内部审核审查表","创建内部审核审查表"), + INTERNAL_AUDIT_REVIEW(4, "内部审核检查表","创建内部审核检查表"), MEETING_MINUTES(5, "会议记录","创建会议记录"), INTERNAL_NON_COMPLIANT(6, "内部不符合项报告","创建内部不符合项报告"), CORRECTIVE_REP(7, "纠正措施处理单","创建纠正措施处理单"), diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementFileTypeEnum.java index b4c13df..16d6b9e 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementFileTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementFileTypeEnum.java @@ -8,7 +8,7 @@ public enum QualityAuditManagementFileTypeEnum { AUDIT_PLAN(1, "内部审核计划"), WORK_REGISTRATION(2, "内部审核工作登记"), - internal_audit_review(3, "内部审核审查表"), + internal_audit_review(3, "内部审核检查表"), MEETING_MINUTES(4, "会议记录"), INTERNAL_NON_COMPLIANT(5, "内部不符合项报告"), CORRECTIVE_REP(6, "纠正措施处理单"), diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageTypeEnum.java index bf5a7da..f54631f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageTypeEnum.java @@ -8,7 +8,7 @@ public enum QualityAuditManagementStageTypeEnum { AUDIT_PLAN(1, "创建现场审核计划","内部审核计划"), WORK_REGISTRATION(2, "创建内部审核工作登记","内部审核工作登记"), - internal_audit_review(3, "创建内部审核审查表","内部审核审查表"), + internal_audit_review(3, "创建内部审核检查表","内部审核检查表"), MEETING_MINUTES(4, "创建会议记录","会议记录"), INTERNAL_NON_COMPLIANT(5, "创建内部不符合项报告","内部不符合项报告"), CORRECTIVE_REP(6, "创建纠正措施处理单","纠正措施处理单"), diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityCorrectiveFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityCorrectiveFileTypeEnum.java index d936fcb..361af83 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityCorrectiveFileTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityCorrectiveFileTypeEnum.java @@ -11,7 +11,7 @@ */ public enum QualityCorrectiveFileTypeEnum implements IEnumType { NON_COM(1, "不符合要求情况分析表","", QualitySourceFileTypeEnum.QUALITY_SUPERVISION, "zlhdbfhyqqkfxbg", "/quality/bizQualityNonConformanceRep/approval/listPage"), - INTERNAL_AUDIT(2, "内部审核审查表","biz_quality_review_form", QualitySourceFileTypeEnum.INTERNAL_AUDIT, "zlhdnbshjcb", "/quality/reviewForm/approval/listPage"), + INTERNAL_AUDIT(2, "内部审核检查表","biz_quality_review_form", QualitySourceFileTypeEnum.INTERNAL_AUDIT, "zlhdnbshjcb", "/quality/reviewForm/approval/listPage"), INTERNAL_NON(3, "内部审核不符合项报告","biz_quality_non_review_form", QualitySourceFileTypeEnum.INTERNAL_AUDIT, "zlhdnbshbfhxbg", "/quality/nonReviewForm/approval/listPage"), EXTERNAL(4, "外部审核报告","", QualitySourceFileTypeEnum.EXTERNAL_AUDITING, "", "/quality/externalAudit/listPage"), MANAGER(5, "管理评审报告","", QualitySourceFileTypeEnum.REVIEW, "zlhdglpsbg", "/quality/reviewRep/approval/listPage"), diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityExternalRelFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityExternalRelFileTypeEnum.java index 6d45623..b418f7f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityExternalRelFileTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityExternalRelFileTypeEnum.java @@ -11,7 +11,7 @@ */ public enum QualityExternalRelFileTypeEnum implements IEnumType { NON_COM(1, "不符合要求情况分析表", QualitySourceFileTypeEnum.QUALITY_SUPERVISION, "zlhdbfhyqqkfxbg", "/quality/bizQualityNonConformanceRep/approval/listPage"), - INTERNAL_AUDIT(2, "内部审核审查表", QualitySourceFileTypeEnum.INTERNAL_AUDIT, "zlhdnbshjcb", "/quality/reviewForm/approval/listPage"), + INTERNAL_AUDIT(2, "内部审核检查表", QualitySourceFileTypeEnum.INTERNAL_AUDIT, "zlhdnbshjcb", "/quality/reviewForm/approval/listPage"), INTERNAL_NON(3, "内部审核不符合项报告", QualitySourceFileTypeEnum.INTERNAL_AUDIT, "zlhdnbshbfhxbg", "/quality/nonReviewForm/approval/listPage"), EXTERNAL(4, "外部审核报告", QualitySourceFileTypeEnum.EXTERNAL_AUDITING, "", "/quality/externalAudit/listPage"), MANAGER(5, "管理评审报告", QualitySourceFileTypeEnum.REVIEW, "zlhdglpsbg", "/quality/reviewRep/approval/listPage"), diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/QualityAuditManagementFileTypeEnum.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/QualityAuditManagementFileTypeEnum.java index 53b6204..e5afbde 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/QualityAuditManagementFileTypeEnum.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/QualityAuditManagementFileTypeEnum.java @@ -9,7 +9,7 @@ AUDIT_PLAN(1, "内部审核计划","创建现场审核计划表"), SCENE_PLAN(2, "现场审核计划表",""), WORK_REGISTRATION(3, "内部审核工作登记","创建内部审核工作登记表"), - INTERNAL_AUDIT_REVIEW(4, "内部审核审查表","创建内部审核审查表"), + INTERNAL_AUDIT_REVIEW(4, "内部审核检查表","创建内部审核检查表"), MEETING_MINUTES(5, "会议记录","创建会议记录"), INTERNAL_NON_COMPLIANT(6, "内部不符合项报告","创建内部不符合项报告"), CORRECTIVE_REP(7, "纠正措施处理单","创建纠正措施处理单"), diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java index 05db94b..5f488ac 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.service.quality.IBizQualityConferenceRecordService; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; import java.util.Date; @@ -54,7 +55,7 @@ } return true; } - + @Transactional @Override public boolean updateById(BizQualityConferenceRecord entity) { super.updateById(entity); @@ -71,6 +72,7 @@ public BizQualityConferenceRecord getById(Serializable id) { BizQualityConferenceRecord conferenceRecord = super.getById(id); QueryWrapper query = new QueryWrapper<>(); + query.eq("conference_id",id); List users = bizQualityConferenceRelUserService.list(query); List userDTOS = users.stream().map(relUser -> { UserDTO userDTO = new UserDTO(); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementFileTypeEnum.java index b4c13df..16d6b9e 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementFileTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementFileTypeEnum.java @@ -8,7 +8,7 @@ public enum QualityAuditManagementFileTypeEnum { AUDIT_PLAN(1, "内部审核计划"), WORK_REGISTRATION(2, "内部审核工作登记"), - internal_audit_review(3, "内部审核审查表"), + internal_audit_review(3, "内部审核检查表"), MEETING_MINUTES(4, "会议记录"), INTERNAL_NON_COMPLIANT(5, "内部不符合项报告"), CORRECTIVE_REP(6, "纠正措施处理单"), diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageTypeEnum.java index bf5a7da..f54631f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageTypeEnum.java @@ -8,7 +8,7 @@ public enum QualityAuditManagementStageTypeEnum { AUDIT_PLAN(1, "创建现场审核计划","内部审核计划"), WORK_REGISTRATION(2, "创建内部审核工作登记","内部审核工作登记"), - internal_audit_review(3, "创建内部审核审查表","内部审核审查表"), + internal_audit_review(3, "创建内部审核检查表","内部审核检查表"), MEETING_MINUTES(4, "创建会议记录","会议记录"), INTERNAL_NON_COMPLIANT(5, "创建内部不符合项报告","内部不符合项报告"), CORRECTIVE_REP(6, "创建纠正措施处理单","纠正措施处理单"), diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityCorrectiveFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityCorrectiveFileTypeEnum.java index d936fcb..361af83 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityCorrectiveFileTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityCorrectiveFileTypeEnum.java @@ -11,7 +11,7 @@ */ public enum QualityCorrectiveFileTypeEnum implements IEnumType { NON_COM(1, "不符合要求情况分析表","", QualitySourceFileTypeEnum.QUALITY_SUPERVISION, "zlhdbfhyqqkfxbg", "/quality/bizQualityNonConformanceRep/approval/listPage"), - INTERNAL_AUDIT(2, "内部审核审查表","biz_quality_review_form", QualitySourceFileTypeEnum.INTERNAL_AUDIT, "zlhdnbshjcb", "/quality/reviewForm/approval/listPage"), + INTERNAL_AUDIT(2, "内部审核检查表","biz_quality_review_form", QualitySourceFileTypeEnum.INTERNAL_AUDIT, "zlhdnbshjcb", "/quality/reviewForm/approval/listPage"), INTERNAL_NON(3, "内部审核不符合项报告","biz_quality_non_review_form", QualitySourceFileTypeEnum.INTERNAL_AUDIT, "zlhdnbshbfhxbg", "/quality/nonReviewForm/approval/listPage"), EXTERNAL(4, "外部审核报告","", QualitySourceFileTypeEnum.EXTERNAL_AUDITING, "", "/quality/externalAudit/listPage"), MANAGER(5, "管理评审报告","", QualitySourceFileTypeEnum.REVIEW, "zlhdglpsbg", "/quality/reviewRep/approval/listPage"), diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityExternalRelFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityExternalRelFileTypeEnum.java index 6d45623..b418f7f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityExternalRelFileTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityExternalRelFileTypeEnum.java @@ -11,7 +11,7 @@ */ public enum QualityExternalRelFileTypeEnum implements IEnumType { NON_COM(1, "不符合要求情况分析表", QualitySourceFileTypeEnum.QUALITY_SUPERVISION, "zlhdbfhyqqkfxbg", "/quality/bizQualityNonConformanceRep/approval/listPage"), - INTERNAL_AUDIT(2, "内部审核审查表", QualitySourceFileTypeEnum.INTERNAL_AUDIT, "zlhdnbshjcb", "/quality/reviewForm/approval/listPage"), + INTERNAL_AUDIT(2, "内部审核检查表", QualitySourceFileTypeEnum.INTERNAL_AUDIT, "zlhdnbshjcb", "/quality/reviewForm/approval/listPage"), INTERNAL_NON(3, "内部审核不符合项报告", QualitySourceFileTypeEnum.INTERNAL_AUDIT, "zlhdnbshbfhxbg", "/quality/nonReviewForm/approval/listPage"), EXTERNAL(4, "外部审核报告", QualitySourceFileTypeEnum.EXTERNAL_AUDITING, "", "/quality/externalAudit/listPage"), MANAGER(5, "管理评审报告", QualitySourceFileTypeEnum.REVIEW, "zlhdglpsbg", "/quality/reviewRep/approval/listPage"), diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/QualityAuditManagementFileTypeEnum.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/QualityAuditManagementFileTypeEnum.java index 53b6204..e5afbde 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/QualityAuditManagementFileTypeEnum.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/QualityAuditManagementFileTypeEnum.java @@ -9,7 +9,7 @@ AUDIT_PLAN(1, "内部审核计划","创建现场审核计划表"), SCENE_PLAN(2, "现场审核计划表",""), WORK_REGISTRATION(3, "内部审核工作登记","创建内部审核工作登记表"), - INTERNAL_AUDIT_REVIEW(4, "内部审核审查表","创建内部审核审查表"), + INTERNAL_AUDIT_REVIEW(4, "内部审核检查表","创建内部审核检查表"), MEETING_MINUTES(5, "会议记录","创建会议记录"), INTERNAL_NON_COMPLIANT(6, "内部不符合项报告","创建内部不符合项报告"), CORRECTIVE_REP(7, "纠正措施处理单","创建纠正措施处理单"), diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java index 05db94b..5f488ac 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.service.quality.IBizQualityConferenceRecordService; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; import java.util.Date; @@ -54,7 +55,7 @@ } return true; } - + @Transactional @Override public boolean updateById(BizQualityConferenceRecord entity) { super.updateById(entity); @@ -71,6 +72,7 @@ public BizQualityConferenceRecord getById(Serializable id) { BizQualityConferenceRecord conferenceRecord = super.getById(id); QueryWrapper query = new QueryWrapper<>(); + query.eq("conference_id",id); List users = bizQualityConferenceRelUserService.list(query); List userDTOS = users.stream().map(relUser -> { UserDTO userDTO = new UserDTO(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java index 1ccb63a..b27a235 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.dto.quality.QualityUserDTO; @@ -42,6 +43,7 @@ QueryWrapper query = new QueryWrapper<>(); query.eq("conference_id", dto.getId()); List list = list(query); + //历史转数组 List userIds = list.stream().map(BizQualityConferenceRelUser::getUserId).collect(Collectors.toList()); List userDtos = dto.getUserIds().stream().map(UserDTO::getId).collect(Collectors.toList()); Map userDTOMap = dto.getUserIds().stream().collect(Collectors.toMap(UserDTO::getId, (userDTO -> userDTO))); @@ -49,7 +51,7 @@ List dels = CollectionUtil.subtract(userIds, userDtos).stream().collect(Collectors.toList()); //过滤新增名单 List adds = CollectionUtil.subtract(userDtos, userIds).stream().collect(Collectors.toList()); - + List updates = CollectionUtil.intersection(userDtos, userIds).stream().collect(Collectors.toList()); //移除清理名单 List delIds = list.stream().filter(bizQualityConferenceRelUser -> dels.contains(bizQualityConferenceRelUser.getUserId())).map(BizQualityConferenceRelUser::getId).collect(Collectors.toList()); removeBatchByIds(delIds); @@ -63,8 +65,23 @@ relUser.setUserName(userDTOMap.get(userId).getName()); return relUser; }).collect(Collectors.toList()); - - //保存用户信息 + //保存新用户信息 saveBatch(userList); + + List updateList = updates.stream().map(userId -> { + BizQualityConferenceRelUser relUser = new BizQualityConferenceRelUser(); + relUser.setUserId(userId); + relUser.setConferenceId(dto.getId()); + relUser.setUserName(userDTOMap.get(userId).getName()); + return relUser; + }).collect(Collectors.toList()); + + for (BizQualityConferenceRelUser relUser : updateList) { + LambdaQueryWrapper lambdaQuery = new LambdaQueryWrapper<>(); + lambdaQuery.eq(BizQualityConferenceRelUser::getConferenceId, relUser.getConferenceId()); + lambdaQuery.eq(BizQualityConferenceRelUser::getUserId,relUser.getUserId()); + saveOrUpdate(relUser,lambdaQuery); + } + } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementFileTypeEnum.java index b4c13df..16d6b9e 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementFileTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementFileTypeEnum.java @@ -8,7 +8,7 @@ public enum QualityAuditManagementFileTypeEnum { AUDIT_PLAN(1, "内部审核计划"), WORK_REGISTRATION(2, "内部审核工作登记"), - internal_audit_review(3, "内部审核审查表"), + internal_audit_review(3, "内部审核检查表"), MEETING_MINUTES(4, "会议记录"), INTERNAL_NON_COMPLIANT(5, "内部不符合项报告"), CORRECTIVE_REP(6, "纠正措施处理单"), diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageTypeEnum.java index bf5a7da..f54631f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityAuditManagementStageTypeEnum.java @@ -8,7 +8,7 @@ public enum QualityAuditManagementStageTypeEnum { AUDIT_PLAN(1, "创建现场审核计划","内部审核计划"), WORK_REGISTRATION(2, "创建内部审核工作登记","内部审核工作登记"), - internal_audit_review(3, "创建内部审核审查表","内部审核审查表"), + internal_audit_review(3, "创建内部审核检查表","内部审核检查表"), MEETING_MINUTES(4, "创建会议记录","会议记录"), INTERNAL_NON_COMPLIANT(5, "创建内部不符合项报告","内部不符合项报告"), CORRECTIVE_REP(6, "创建纠正措施处理单","纠正措施处理单"), diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityCorrectiveFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityCorrectiveFileTypeEnum.java index d936fcb..361af83 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityCorrectiveFileTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityCorrectiveFileTypeEnum.java @@ -11,7 +11,7 @@ */ public enum QualityCorrectiveFileTypeEnum implements IEnumType { NON_COM(1, "不符合要求情况分析表","", QualitySourceFileTypeEnum.QUALITY_SUPERVISION, "zlhdbfhyqqkfxbg", "/quality/bizQualityNonConformanceRep/approval/listPage"), - INTERNAL_AUDIT(2, "内部审核审查表","biz_quality_review_form", QualitySourceFileTypeEnum.INTERNAL_AUDIT, "zlhdnbshjcb", "/quality/reviewForm/approval/listPage"), + INTERNAL_AUDIT(2, "内部审核检查表","biz_quality_review_form", QualitySourceFileTypeEnum.INTERNAL_AUDIT, "zlhdnbshjcb", "/quality/reviewForm/approval/listPage"), INTERNAL_NON(3, "内部审核不符合项报告","biz_quality_non_review_form", QualitySourceFileTypeEnum.INTERNAL_AUDIT, "zlhdnbshbfhxbg", "/quality/nonReviewForm/approval/listPage"), EXTERNAL(4, "外部审核报告","", QualitySourceFileTypeEnum.EXTERNAL_AUDITING, "", "/quality/externalAudit/listPage"), MANAGER(5, "管理评审报告","", QualitySourceFileTypeEnum.REVIEW, "zlhdglpsbg", "/quality/reviewRep/approval/listPage"), diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityExternalRelFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityExternalRelFileTypeEnum.java index 6d45623..b418f7f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityExternalRelFileTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityExternalRelFileTypeEnum.java @@ -11,7 +11,7 @@ */ public enum QualityExternalRelFileTypeEnum implements IEnumType { NON_COM(1, "不符合要求情况分析表", QualitySourceFileTypeEnum.QUALITY_SUPERVISION, "zlhdbfhyqqkfxbg", "/quality/bizQualityNonConformanceRep/approval/listPage"), - INTERNAL_AUDIT(2, "内部审核审查表", QualitySourceFileTypeEnum.INTERNAL_AUDIT, "zlhdnbshjcb", "/quality/reviewForm/approval/listPage"), + INTERNAL_AUDIT(2, "内部审核检查表", QualitySourceFileTypeEnum.INTERNAL_AUDIT, "zlhdnbshjcb", "/quality/reviewForm/approval/listPage"), INTERNAL_NON(3, "内部审核不符合项报告", QualitySourceFileTypeEnum.INTERNAL_AUDIT, "zlhdnbshbfhxbg", "/quality/nonReviewForm/approval/listPage"), EXTERNAL(4, "外部审核报告", QualitySourceFileTypeEnum.EXTERNAL_AUDITING, "", "/quality/externalAudit/listPage"), MANAGER(5, "管理评审报告", QualitySourceFileTypeEnum.REVIEW, "zlhdglpsbg", "/quality/reviewRep/approval/listPage"), diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/QualityAuditManagementFileTypeEnum.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/QualityAuditManagementFileTypeEnum.java index 53b6204..e5afbde 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/QualityAuditManagementFileTypeEnum.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/base/QualityAuditManagementFileTypeEnum.java @@ -9,7 +9,7 @@ AUDIT_PLAN(1, "内部审核计划","创建现场审核计划表"), SCENE_PLAN(2, "现场审核计划表",""), WORK_REGISTRATION(3, "内部审核工作登记","创建内部审核工作登记表"), - INTERNAL_AUDIT_REVIEW(4, "内部审核审查表","创建内部审核审查表"), + INTERNAL_AUDIT_REVIEW(4, "内部审核检查表","创建内部审核检查表"), MEETING_MINUTES(5, "会议记录","创建会议记录"), INTERNAL_NON_COMPLIANT(6, "内部不符合项报告","创建内部不符合项报告"), CORRECTIVE_REP(7, "纠正措施处理单","创建纠正措施处理单"), diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java index 05db94b..5f488ac 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRecordServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.service.quality.IBizQualityConferenceRecordService; import com.casic.missiles.service.quality.IBizQualityConferenceRelUserService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; import java.util.Date; @@ -54,7 +55,7 @@ } return true; } - + @Transactional @Override public boolean updateById(BizQualityConferenceRecord entity) { super.updateById(entity); @@ -71,6 +72,7 @@ public BizQualityConferenceRecord getById(Serializable id) { BizQualityConferenceRecord conferenceRecord = super.getById(id); QueryWrapper query = new QueryWrapper<>(); + query.eq("conference_id",id); List users = bizQualityConferenceRelUserService.list(query); List userDTOS = users.stream().map(relUser -> { UserDTO userDTO = new UserDTO(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java index 1ccb63a..b27a235 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityConferenceRelUserServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.dto.quality.QualityUserDTO; @@ -42,6 +43,7 @@ QueryWrapper query = new QueryWrapper<>(); query.eq("conference_id", dto.getId()); List list = list(query); + //历史转数组 List userIds = list.stream().map(BizQualityConferenceRelUser::getUserId).collect(Collectors.toList()); List userDtos = dto.getUserIds().stream().map(UserDTO::getId).collect(Collectors.toList()); Map userDTOMap = dto.getUserIds().stream().collect(Collectors.toMap(UserDTO::getId, (userDTO -> userDTO))); @@ -49,7 +51,7 @@ List dels = CollectionUtil.subtract(userIds, userDtos).stream().collect(Collectors.toList()); //过滤新增名单 List adds = CollectionUtil.subtract(userDtos, userIds).stream().collect(Collectors.toList()); - + List updates = CollectionUtil.intersection(userDtos, userIds).stream().collect(Collectors.toList()); //移除清理名单 List delIds = list.stream().filter(bizQualityConferenceRelUser -> dels.contains(bizQualityConferenceRelUser.getUserId())).map(BizQualityConferenceRelUser::getId).collect(Collectors.toList()); removeBatchByIds(delIds); @@ -63,8 +65,23 @@ relUser.setUserName(userDTOMap.get(userId).getName()); return relUser; }).collect(Collectors.toList()); - - //保存用户信息 + //保存新用户信息 saveBatch(userList); + + List updateList = updates.stream().map(userId -> { + BizQualityConferenceRelUser relUser = new BizQualityConferenceRelUser(); + relUser.setUserId(userId); + relUser.setConferenceId(dto.getId()); + relUser.setUserName(userDTOMap.get(userId).getName()); + return relUser; + }).collect(Collectors.toList()); + + for (BizQualityConferenceRelUser relUser : updateList) { + LambdaQueryWrapper lambdaQuery = new LambdaQueryWrapper<>(); + lambdaQuery.eq(BizQualityConferenceRelUser::getConferenceId, relUser.getConferenceId()); + lambdaQuery.eq(BizQualityConferenceRelUser::getUserId,relUser.getUserId()); + saveOrUpdate(relUser,lambdaQuery); + } + } } 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 a52a163..814b59b 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 @@ -276,7 +276,7 @@ private List getBizQualityPreventRecordList(QualityCorrectiveFileTypeEnum enums, String yearNo) { QueryWrapper query = new QueryWrapper<>(); - //检索内部审核审查表 + //检索内部审核检查表 query.eq("b.file_type", enums.getCode()); query.eq("c.year_no", yearNo); List preventRecords = this.baseMapper.listByInternalAuditRepId(query, enums.getTableName());