diff --git a/casic-metering-api/src/main/resources/config/application-test.yml b/casic-metering-api/src/main/resources/config/application-test.yml index 26a465b..2d87b84 100644 --- a/casic-metering-api/src/main/resources/config/application-test.yml +++ b/casic-metering-api/src/main/resources/config/application-test.yml @@ -5,16 +5,16 @@ datasource: driver-class-name: com.mysql.cj.jdbc.Driver # url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true - url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://192.168.83.42:3306/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true # urls: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root # password: Casic203 - password: Casic203! + password: casic203 redis: - host: 111.198.10.15 -# port: 11412 - port: 21903 - password: ew5T4K3#203 + host: localhost +# port: 11412 ew5T4K3#203 + port: 6379 + password: database: 1 serializer: org.springframework.data.redis.serializer.StringRedisSerializer redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer diff --git a/casic-metering-api/src/main/resources/config/application-test.yml b/casic-metering-api/src/main/resources/config/application-test.yml index 26a465b..2d87b84 100644 --- a/casic-metering-api/src/main/resources/config/application-test.yml +++ b/casic-metering-api/src/main/resources/config/application-test.yml @@ -5,16 +5,16 @@ datasource: driver-class-name: com.mysql.cj.jdbc.Driver # url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true - url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://192.168.83.42:3306/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true # urls: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root # password: Casic203 - password: Casic203! + password: casic203 redis: - host: 111.198.10.15 -# port: 11412 - port: 21903 - password: ew5T4K3#203 + host: localhost +# port: 11412 ew5T4K3#203 + port: 6379 + password: database: 1 serializer: org.springframework.data.redis.serializer.StringRedisSerializer redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index e18a28e..9f8064a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -77,7 +77,7 @@ @Value("${casic.file.dir}") private String localFileDir; - public BizQualityInternalAuditRepServiceImpl(AbstractPermissionContext permissionContext, IBizQualityInternalAuditManagementService internalAuditManagementService, AbstractDictService dictService, IBizQualityAuditRepDeptService repDeptService, IBizQualityAuditRepUserService repUserService, PrintFileRegister printFileRegister, ISystemSignService signService,@Lazy IBizQualityWorkRegistrationService bizQualityWorkRegistrationService) { + public BizQualityInternalAuditRepServiceImpl(AbstractPermissionContext permissionContext, IBizQualityInternalAuditManagementService internalAuditManagementService, AbstractDictService dictService, IBizQualityAuditRepDeptService repDeptService, IBizQualityAuditRepUserService repUserService, PrintFileRegister printFileRegister, ISystemSignService signService, @Lazy IBizQualityWorkRegistrationService bizQualityWorkRegistrationService) { this.permissionContext = permissionContext; this.internalAuditManagementService = internalAuditManagementService; this.dictService = dictService; @@ -106,12 +106,13 @@ //生成文件编码 entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + saveZeroCodeEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP); //校验创建年份 - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityYearNoCheckEnum.AuditRep); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.AuditRep); //内审报告校验末次会议是否召开 - bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING,entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING, entity.getYearNo()); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -120,15 +121,23 @@ } @Override + public String genCode(String id) { + BizQualityInternalAuditRep entity = getById(id); + saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + + + @Override public boolean updateById(BizQualityInternalAuditRep entity) { BizQualityInternalAuditRep old = getById(entity.getId()); - updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); //校验创建年份 - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityYearNoCheckEnum.AuditRep); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.AuditRep); //内审报告校验末次会议是否召开 - bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING,entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING, entity.getYearNo()); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); diff --git a/casic-metering-api/src/main/resources/config/application-test.yml b/casic-metering-api/src/main/resources/config/application-test.yml index 26a465b..2d87b84 100644 --- a/casic-metering-api/src/main/resources/config/application-test.yml +++ b/casic-metering-api/src/main/resources/config/application-test.yml @@ -5,16 +5,16 @@ datasource: driver-class-name: com.mysql.cj.jdbc.Driver # url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true - url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://192.168.83.42:3306/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true # urls: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root # password: Casic203 - password: Casic203! + password: casic203 redis: - host: 111.198.10.15 -# port: 11412 - port: 21903 - password: ew5T4K3#203 + host: localhost +# port: 11412 ew5T4K3#203 + port: 6379 + password: database: 1 serializer: org.springframework.data.redis.serializer.StringRedisSerializer redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index e18a28e..9f8064a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -77,7 +77,7 @@ @Value("${casic.file.dir}") private String localFileDir; - public BizQualityInternalAuditRepServiceImpl(AbstractPermissionContext permissionContext, IBizQualityInternalAuditManagementService internalAuditManagementService, AbstractDictService dictService, IBizQualityAuditRepDeptService repDeptService, IBizQualityAuditRepUserService repUserService, PrintFileRegister printFileRegister, ISystemSignService signService,@Lazy IBizQualityWorkRegistrationService bizQualityWorkRegistrationService) { + public BizQualityInternalAuditRepServiceImpl(AbstractPermissionContext permissionContext, IBizQualityInternalAuditManagementService internalAuditManagementService, AbstractDictService dictService, IBizQualityAuditRepDeptService repDeptService, IBizQualityAuditRepUserService repUserService, PrintFileRegister printFileRegister, ISystemSignService signService, @Lazy IBizQualityWorkRegistrationService bizQualityWorkRegistrationService) { this.permissionContext = permissionContext; this.internalAuditManagementService = internalAuditManagementService; this.dictService = dictService; @@ -106,12 +106,13 @@ //生成文件编码 entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + saveZeroCodeEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP); //校验创建年份 - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityYearNoCheckEnum.AuditRep); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.AuditRep); //内审报告校验末次会议是否召开 - bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING,entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING, entity.getYearNo()); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -120,15 +121,23 @@ } @Override + public String genCode(String id) { + BizQualityInternalAuditRep entity = getById(id); + saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + + + @Override public boolean updateById(BizQualityInternalAuditRep entity) { BizQualityInternalAuditRep old = getById(entity.getId()); - updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); //校验创建年份 - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityYearNoCheckEnum.AuditRep); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.AuditRep); //内审报告校验末次会议是否召开 - bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING,entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING, entity.getYearNo()); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index 74d975a..f92aeb4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -97,7 +97,8 @@ entity.setCreatorName(user.getName()); //生成文件编码 - saveEntity(entity, entity.getGroupNo(),QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// saveEntity(entity, entity.getGroupNo(),QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + saveZeroCodeEntity(entity, entity.getGroupNo(), QualityTableEnum.NON_REVIEW_FORM); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); super.save(entity); @@ -105,6 +106,13 @@ return true; } + @Override + public String genCode(String id) { + BizQualityNonReviewForm entity = getById(id); + saveEntity(entity, entity.getGroupNo(), QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + private void wrapInfo(BizQualityNonReviewForm entity) { entity.setApprovalStatusName(dictService.getDictNameByCode(QualityDictTypeEnum.APPROVAL_STATUS.getCode(), entity.getApprovalStatus())); @@ -121,9 +129,9 @@ @Override public boolean updateById(BizQualityNonReviewForm entity) { - BizQualityNonReviewForm old = getById(entity.getId()); - updateEntity(entity, entity.getGroupNo(), old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + +// updateEntity(entity, entity.getGroupNo(), old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); @@ -239,9 +247,10 @@ */ @Override public BizQualityNonReviewForm selectById(Long targetId) { - return this.baseMapper.selectById(targetId); + return this.baseMapper.selectById(targetId); } + @Transactional @Override public ReturnDTO agree(BizQualityNonReviewFormApprovalVO request) { diff --git a/casic-metering-api/src/main/resources/config/application-test.yml b/casic-metering-api/src/main/resources/config/application-test.yml index 26a465b..2d87b84 100644 --- a/casic-metering-api/src/main/resources/config/application-test.yml +++ b/casic-metering-api/src/main/resources/config/application-test.yml @@ -5,16 +5,16 @@ datasource: driver-class-name: com.mysql.cj.jdbc.Driver # url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true - url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://192.168.83.42:3306/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true # urls: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root # password: Casic203 - password: Casic203! + password: casic203 redis: - host: 111.198.10.15 -# port: 11412 - port: 21903 - password: ew5T4K3#203 + host: localhost +# port: 11412 ew5T4K3#203 + port: 6379 + password: database: 1 serializer: org.springframework.data.redis.serializer.StringRedisSerializer redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index e18a28e..9f8064a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -77,7 +77,7 @@ @Value("${casic.file.dir}") private String localFileDir; - public BizQualityInternalAuditRepServiceImpl(AbstractPermissionContext permissionContext, IBizQualityInternalAuditManagementService internalAuditManagementService, AbstractDictService dictService, IBizQualityAuditRepDeptService repDeptService, IBizQualityAuditRepUserService repUserService, PrintFileRegister printFileRegister, ISystemSignService signService,@Lazy IBizQualityWorkRegistrationService bizQualityWorkRegistrationService) { + public BizQualityInternalAuditRepServiceImpl(AbstractPermissionContext permissionContext, IBizQualityInternalAuditManagementService internalAuditManagementService, AbstractDictService dictService, IBizQualityAuditRepDeptService repDeptService, IBizQualityAuditRepUserService repUserService, PrintFileRegister printFileRegister, ISystemSignService signService, @Lazy IBizQualityWorkRegistrationService bizQualityWorkRegistrationService) { this.permissionContext = permissionContext; this.internalAuditManagementService = internalAuditManagementService; this.dictService = dictService; @@ -106,12 +106,13 @@ //生成文件编码 entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + saveZeroCodeEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP); //校验创建年份 - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityYearNoCheckEnum.AuditRep); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.AuditRep); //内审报告校验末次会议是否召开 - bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING,entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING, entity.getYearNo()); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -120,15 +121,23 @@ } @Override + public String genCode(String id) { + BizQualityInternalAuditRep entity = getById(id); + saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + + + @Override public boolean updateById(BizQualityInternalAuditRep entity) { BizQualityInternalAuditRep old = getById(entity.getId()); - updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); //校验创建年份 - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityYearNoCheckEnum.AuditRep); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.AuditRep); //内审报告校验末次会议是否召开 - bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING,entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING, entity.getYearNo()); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index 74d975a..f92aeb4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -97,7 +97,8 @@ entity.setCreatorName(user.getName()); //生成文件编码 - saveEntity(entity, entity.getGroupNo(),QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// saveEntity(entity, entity.getGroupNo(),QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + saveZeroCodeEntity(entity, entity.getGroupNo(), QualityTableEnum.NON_REVIEW_FORM); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); super.save(entity); @@ -105,6 +106,13 @@ return true; } + @Override + public String genCode(String id) { + BizQualityNonReviewForm entity = getById(id); + saveEntity(entity, entity.getGroupNo(), QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + private void wrapInfo(BizQualityNonReviewForm entity) { entity.setApprovalStatusName(dictService.getDictNameByCode(QualityDictTypeEnum.APPROVAL_STATUS.getCode(), entity.getApprovalStatus())); @@ -121,9 +129,9 @@ @Override public boolean updateById(BizQualityNonReviewForm entity) { - BizQualityNonReviewForm old = getById(entity.getId()); - updateEntity(entity, entity.getGroupNo(), old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + +// updateEntity(entity, entity.getGroupNo(), old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); @@ -239,9 +247,10 @@ */ @Override public BizQualityNonReviewForm selectById(Long targetId) { - return this.baseMapper.selectById(targetId); + return this.baseMapper.selectById(targetId); } + @Transactional @Override public ReturnDTO agree(BizQualityNonReviewFormApprovalVO request) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index aeca9d7..d9102b2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -182,6 +182,7 @@ return this.baseMapper.selectById(targetId); } + @Override public Page listPage(Page page, BizQualityReviewFormVO request) throws Exception { Page reviewFormPage = super.listPage(page, request); @@ -200,12 +201,12 @@ entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 - saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - +// saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + saveZeroCodeEntity(entity, QualityTableEnum.REVIEW_FORM); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); //校验该年份次数的内审计划是否已完成 bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.REVIEW_FORM, entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); super.save(entity); @@ -213,6 +214,13 @@ return true; } + @Override + public String genCode(String id) { + BizQualityReviewForm entity = getById(id); + saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + private void wrapInfo(BizQualityReviewForm entity) { entity.setApprovalStatusName(dictService.getDictNameByCode(QualityDictTypeEnum.APPROVAL_STATUS.getCode(), entity.getApprovalStatus())); entity.setBizLabCodeName(dictService.getDictNameByCode(MeterDictCode.LAB_CODE, entity.getBizLabCode())); @@ -226,11 +234,11 @@ @Override public boolean updateById(BizQualityReviewForm entity) { - BizQualityReviewForm old = getById(entity.getId()); - updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + +// updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); //校验该年份次数的内审计划是否已完成 bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.REVIEW_FORM, entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); diff --git a/casic-metering-api/src/main/resources/config/application-test.yml b/casic-metering-api/src/main/resources/config/application-test.yml index 26a465b..2d87b84 100644 --- a/casic-metering-api/src/main/resources/config/application-test.yml +++ b/casic-metering-api/src/main/resources/config/application-test.yml @@ -5,16 +5,16 @@ datasource: driver-class-name: com.mysql.cj.jdbc.Driver # url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true - url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://192.168.83.42:3306/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true # urls: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root # password: Casic203 - password: Casic203! + password: casic203 redis: - host: 111.198.10.15 -# port: 11412 - port: 21903 - password: ew5T4K3#203 + host: localhost +# port: 11412 ew5T4K3#203 + port: 6379 + password: database: 1 serializer: org.springframework.data.redis.serializer.StringRedisSerializer redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index e18a28e..9f8064a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -77,7 +77,7 @@ @Value("${casic.file.dir}") private String localFileDir; - public BizQualityInternalAuditRepServiceImpl(AbstractPermissionContext permissionContext, IBizQualityInternalAuditManagementService internalAuditManagementService, AbstractDictService dictService, IBizQualityAuditRepDeptService repDeptService, IBizQualityAuditRepUserService repUserService, PrintFileRegister printFileRegister, ISystemSignService signService,@Lazy IBizQualityWorkRegistrationService bizQualityWorkRegistrationService) { + public BizQualityInternalAuditRepServiceImpl(AbstractPermissionContext permissionContext, IBizQualityInternalAuditManagementService internalAuditManagementService, AbstractDictService dictService, IBizQualityAuditRepDeptService repDeptService, IBizQualityAuditRepUserService repUserService, PrintFileRegister printFileRegister, ISystemSignService signService, @Lazy IBizQualityWorkRegistrationService bizQualityWorkRegistrationService) { this.permissionContext = permissionContext; this.internalAuditManagementService = internalAuditManagementService; this.dictService = dictService; @@ -106,12 +106,13 @@ //生成文件编码 entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + saveZeroCodeEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP); //校验创建年份 - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityYearNoCheckEnum.AuditRep); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.AuditRep); //内审报告校验末次会议是否召开 - bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING,entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING, entity.getYearNo()); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -120,15 +121,23 @@ } @Override + public String genCode(String id) { + BizQualityInternalAuditRep entity = getById(id); + saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + + + @Override public boolean updateById(BizQualityInternalAuditRep entity) { BizQualityInternalAuditRep old = getById(entity.getId()); - updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); //校验创建年份 - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityYearNoCheckEnum.AuditRep); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.AuditRep); //内审报告校验末次会议是否召开 - bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING,entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING, entity.getYearNo()); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index 74d975a..f92aeb4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -97,7 +97,8 @@ entity.setCreatorName(user.getName()); //生成文件编码 - saveEntity(entity, entity.getGroupNo(),QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// saveEntity(entity, entity.getGroupNo(),QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + saveZeroCodeEntity(entity, entity.getGroupNo(), QualityTableEnum.NON_REVIEW_FORM); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); super.save(entity); @@ -105,6 +106,13 @@ return true; } + @Override + public String genCode(String id) { + BizQualityNonReviewForm entity = getById(id); + saveEntity(entity, entity.getGroupNo(), QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + private void wrapInfo(BizQualityNonReviewForm entity) { entity.setApprovalStatusName(dictService.getDictNameByCode(QualityDictTypeEnum.APPROVAL_STATUS.getCode(), entity.getApprovalStatus())); @@ -121,9 +129,9 @@ @Override public boolean updateById(BizQualityNonReviewForm entity) { - BizQualityNonReviewForm old = getById(entity.getId()); - updateEntity(entity, entity.getGroupNo(), old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + +// updateEntity(entity, entity.getGroupNo(), old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); @@ -239,9 +247,10 @@ */ @Override public BizQualityNonReviewForm selectById(Long targetId) { - return this.baseMapper.selectById(targetId); + return this.baseMapper.selectById(targetId); } + @Transactional @Override public ReturnDTO agree(BizQualityNonReviewFormApprovalVO request) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index aeca9d7..d9102b2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -182,6 +182,7 @@ return this.baseMapper.selectById(targetId); } + @Override public Page listPage(Page page, BizQualityReviewFormVO request) throws Exception { Page reviewFormPage = super.listPage(page, request); @@ -200,12 +201,12 @@ entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 - saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - +// saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + saveZeroCodeEntity(entity, QualityTableEnum.REVIEW_FORM); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); //校验该年份次数的内审计划是否已完成 bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.REVIEW_FORM, entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); super.save(entity); @@ -213,6 +214,13 @@ return true; } + @Override + public String genCode(String id) { + BizQualityReviewForm entity = getById(id); + saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + private void wrapInfo(BizQualityReviewForm entity) { entity.setApprovalStatusName(dictService.getDictNameByCode(QualityDictTypeEnum.APPROVAL_STATUS.getCode(), entity.getApprovalStatus())); entity.setBizLabCodeName(dictService.getDictNameByCode(MeterDictCode.LAB_CODE, entity.getBizLabCode())); @@ -226,11 +234,11 @@ @Override public boolean updateById(BizQualityReviewForm entity) { - BizQualityReviewForm old = getById(entity.getId()); - updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + +// updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); //校验该年份次数的内审计划是否已完成 bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.REVIEW_FORM, entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java index de029bb..0adf7d4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java @@ -112,6 +112,12 @@ internalAuditManagementService.addBizQualityInternalAuditFile(this.getById(request.getId())); return super.submit(request); } + @Override + public String genCode(String id) { + BizQualityWorkRegistration entity = getById(id); + saveEntity(entity, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } @Transactional @Override @@ -129,9 +135,10 @@ throw new ServiceException(500, "该工作审核登记表已由" + registration.getCreatorName() + "创建"); } - saveEntity(entity, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// saveEntity(entity, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.WorkRegistration); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + saveZeroCodeEntity(entity, QualityTableEnum.WORK_REGISTRATION); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); // //生成文件编码 // String labCode = entity.getBizLabCode(); // String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.WORK_REGISTRATION,); @@ -299,19 +306,22 @@ return false; } + + @Transactional @Override public boolean updateById(BizQualityWorkRegistration entity) { - BizQualityWorkRegistration oldPlan = getById(entity.getId()); - updateEntity(entity, oldPlan, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// BizQualityWorkRegistration oldPlan = getById(entity.getId()); +// updateEntity(entity, oldPlan, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); // if (!oldPlan.getBizLabCode().equals(entity.getBizLabCode())) { // String labCode = entity.getBizLabCode(); // String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); // entity.setFileCode(newCode); // entity.setSysCode(newCode); // } - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.WorkRegistration); entity.setUpdateTime(DateUtil.now()); //查询最大的已完成记录更新至当前阶段 diff --git a/casic-metering-api/src/main/resources/config/application-test.yml b/casic-metering-api/src/main/resources/config/application-test.yml index 26a465b..2d87b84 100644 --- a/casic-metering-api/src/main/resources/config/application-test.yml +++ b/casic-metering-api/src/main/resources/config/application-test.yml @@ -5,16 +5,16 @@ datasource: driver-class-name: com.mysql.cj.jdbc.Driver # url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true - url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://192.168.83.42:3306/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true # urls: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root # password: Casic203 - password: Casic203! + password: casic203 redis: - host: 111.198.10.15 -# port: 11412 - port: 21903 - password: ew5T4K3#203 + host: localhost +# port: 11412 ew5T4K3#203 + port: 6379 + password: database: 1 serializer: org.springframework.data.redis.serializer.StringRedisSerializer redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index e18a28e..9f8064a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -77,7 +77,7 @@ @Value("${casic.file.dir}") private String localFileDir; - public BizQualityInternalAuditRepServiceImpl(AbstractPermissionContext permissionContext, IBizQualityInternalAuditManagementService internalAuditManagementService, AbstractDictService dictService, IBizQualityAuditRepDeptService repDeptService, IBizQualityAuditRepUserService repUserService, PrintFileRegister printFileRegister, ISystemSignService signService,@Lazy IBizQualityWorkRegistrationService bizQualityWorkRegistrationService) { + public BizQualityInternalAuditRepServiceImpl(AbstractPermissionContext permissionContext, IBizQualityInternalAuditManagementService internalAuditManagementService, AbstractDictService dictService, IBizQualityAuditRepDeptService repDeptService, IBizQualityAuditRepUserService repUserService, PrintFileRegister printFileRegister, ISystemSignService signService, @Lazy IBizQualityWorkRegistrationService bizQualityWorkRegistrationService) { this.permissionContext = permissionContext; this.internalAuditManagementService = internalAuditManagementService; this.dictService = dictService; @@ -106,12 +106,13 @@ //生成文件编码 entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + saveZeroCodeEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP); //校验创建年份 - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityYearNoCheckEnum.AuditRep); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.AuditRep); //内审报告校验末次会议是否召开 - bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING,entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING, entity.getYearNo()); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -120,15 +121,23 @@ } @Override + public String genCode(String id) { + BizQualityInternalAuditRep entity = getById(id); + saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + + + @Override public boolean updateById(BizQualityInternalAuditRep entity) { BizQualityInternalAuditRep old = getById(entity.getId()); - updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); //校验创建年份 - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityYearNoCheckEnum.AuditRep); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.AuditRep); //内审报告校验末次会议是否召开 - bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING,entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING, entity.getYearNo()); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index 74d975a..f92aeb4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -97,7 +97,8 @@ entity.setCreatorName(user.getName()); //生成文件编码 - saveEntity(entity, entity.getGroupNo(),QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// saveEntity(entity, entity.getGroupNo(),QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + saveZeroCodeEntity(entity, entity.getGroupNo(), QualityTableEnum.NON_REVIEW_FORM); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); super.save(entity); @@ -105,6 +106,13 @@ return true; } + @Override + public String genCode(String id) { + BizQualityNonReviewForm entity = getById(id); + saveEntity(entity, entity.getGroupNo(), QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + private void wrapInfo(BizQualityNonReviewForm entity) { entity.setApprovalStatusName(dictService.getDictNameByCode(QualityDictTypeEnum.APPROVAL_STATUS.getCode(), entity.getApprovalStatus())); @@ -121,9 +129,9 @@ @Override public boolean updateById(BizQualityNonReviewForm entity) { - BizQualityNonReviewForm old = getById(entity.getId()); - updateEntity(entity, entity.getGroupNo(), old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + +// updateEntity(entity, entity.getGroupNo(), old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); @@ -239,9 +247,10 @@ */ @Override public BizQualityNonReviewForm selectById(Long targetId) { - return this.baseMapper.selectById(targetId); + return this.baseMapper.selectById(targetId); } + @Transactional @Override public ReturnDTO agree(BizQualityNonReviewFormApprovalVO request) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index aeca9d7..d9102b2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -182,6 +182,7 @@ return this.baseMapper.selectById(targetId); } + @Override public Page listPage(Page page, BizQualityReviewFormVO request) throws Exception { Page reviewFormPage = super.listPage(page, request); @@ -200,12 +201,12 @@ entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 - saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - +// saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + saveZeroCodeEntity(entity, QualityTableEnum.REVIEW_FORM); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); //校验该年份次数的内审计划是否已完成 bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.REVIEW_FORM, entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); super.save(entity); @@ -213,6 +214,13 @@ return true; } + @Override + public String genCode(String id) { + BizQualityReviewForm entity = getById(id); + saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + private void wrapInfo(BizQualityReviewForm entity) { entity.setApprovalStatusName(dictService.getDictNameByCode(QualityDictTypeEnum.APPROVAL_STATUS.getCode(), entity.getApprovalStatus())); entity.setBizLabCodeName(dictService.getDictNameByCode(MeterDictCode.LAB_CODE, entity.getBizLabCode())); @@ -226,11 +234,11 @@ @Override public boolean updateById(BizQualityReviewForm entity) { - BizQualityReviewForm old = getById(entity.getId()); - updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + +// updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); //校验该年份次数的内审计划是否已完成 bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.REVIEW_FORM, entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java index de029bb..0adf7d4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java @@ -112,6 +112,12 @@ internalAuditManagementService.addBizQualityInternalAuditFile(this.getById(request.getId())); return super.submit(request); } + @Override + public String genCode(String id) { + BizQualityWorkRegistration entity = getById(id); + saveEntity(entity, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } @Transactional @Override @@ -129,9 +135,10 @@ throw new ServiceException(500, "该工作审核登记表已由" + registration.getCreatorName() + "创建"); } - saveEntity(entity, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// saveEntity(entity, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.WorkRegistration); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + saveZeroCodeEntity(entity, QualityTableEnum.WORK_REGISTRATION); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); // //生成文件编码 // String labCode = entity.getBizLabCode(); // String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.WORK_REGISTRATION,); @@ -299,19 +306,22 @@ return false; } + + @Transactional @Override public boolean updateById(BizQualityWorkRegistration entity) { - BizQualityWorkRegistration oldPlan = getById(entity.getId()); - updateEntity(entity, oldPlan, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// BizQualityWorkRegistration oldPlan = getById(entity.getId()); +// updateEntity(entity, oldPlan, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); // if (!oldPlan.getBizLabCode().equals(entity.getBizLabCode())) { // String labCode = entity.getBizLabCode(); // String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); // entity.setFileCode(newCode); // entity.setSysCode(newCode); // } - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.WorkRegistration); entity.setUpdateTime(DateUtil.now()); //查询最大的已完成记录更新至当前阶段 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityInternalAuditRepEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityInternalAuditRepEventPostProcessor.java index 44065be..7cf65c5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityInternalAuditRepEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityInternalAuditRepEventPostProcessor.java @@ -9,6 +9,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.service.listeners.NotifyEventPostProcessor; import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.utils.SpringContextUtil; @@ -34,8 +35,11 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityInternalAuditRepService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityInternalAuditRepService.class); + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityInternalAuditRep::getApprovalStatus, ApprovalStatusEnum.PASSED); + update.set(BizQualityInternalAuditRep::getSysCode, code); + update.set(BizQualityInternalAuditRep::getFileCode, code); update.eq(BizQualityInternalAuditRep::getId, notifyEventStatusDTO.getId()); boolean updateFlag = supervisionRepMapper.update(update); diff --git a/casic-metering-api/src/main/resources/config/application-test.yml b/casic-metering-api/src/main/resources/config/application-test.yml index 26a465b..2d87b84 100644 --- a/casic-metering-api/src/main/resources/config/application-test.yml +++ b/casic-metering-api/src/main/resources/config/application-test.yml @@ -5,16 +5,16 @@ datasource: driver-class-name: com.mysql.cj.jdbc.Driver # url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true - url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://192.168.83.42:3306/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true # urls: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root # password: Casic203 - password: Casic203! + password: casic203 redis: - host: 111.198.10.15 -# port: 11412 - port: 21903 - password: ew5T4K3#203 + host: localhost +# port: 11412 ew5T4K3#203 + port: 6379 + password: database: 1 serializer: org.springframework.data.redis.serializer.StringRedisSerializer redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index e18a28e..9f8064a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -77,7 +77,7 @@ @Value("${casic.file.dir}") private String localFileDir; - public BizQualityInternalAuditRepServiceImpl(AbstractPermissionContext permissionContext, IBizQualityInternalAuditManagementService internalAuditManagementService, AbstractDictService dictService, IBizQualityAuditRepDeptService repDeptService, IBizQualityAuditRepUserService repUserService, PrintFileRegister printFileRegister, ISystemSignService signService,@Lazy IBizQualityWorkRegistrationService bizQualityWorkRegistrationService) { + public BizQualityInternalAuditRepServiceImpl(AbstractPermissionContext permissionContext, IBizQualityInternalAuditManagementService internalAuditManagementService, AbstractDictService dictService, IBizQualityAuditRepDeptService repDeptService, IBizQualityAuditRepUserService repUserService, PrintFileRegister printFileRegister, ISystemSignService signService, @Lazy IBizQualityWorkRegistrationService bizQualityWorkRegistrationService) { this.permissionContext = permissionContext; this.internalAuditManagementService = internalAuditManagementService; this.dictService = dictService; @@ -106,12 +106,13 @@ //生成文件编码 entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + saveZeroCodeEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP); //校验创建年份 - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityYearNoCheckEnum.AuditRep); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.AuditRep); //内审报告校验末次会议是否召开 - bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING,entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING, entity.getYearNo()); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -120,15 +121,23 @@ } @Override + public String genCode(String id) { + BizQualityInternalAuditRep entity = getById(id); + saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + + + @Override public boolean updateById(BizQualityInternalAuditRep entity) { BizQualityInternalAuditRep old = getById(entity.getId()); - updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); //校验创建年份 - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityYearNoCheckEnum.AuditRep); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.AuditRep); //内审报告校验末次会议是否召开 - bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING,entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING, entity.getYearNo()); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index 74d975a..f92aeb4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -97,7 +97,8 @@ entity.setCreatorName(user.getName()); //生成文件编码 - saveEntity(entity, entity.getGroupNo(),QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// saveEntity(entity, entity.getGroupNo(),QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + saveZeroCodeEntity(entity, entity.getGroupNo(), QualityTableEnum.NON_REVIEW_FORM); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); super.save(entity); @@ -105,6 +106,13 @@ return true; } + @Override + public String genCode(String id) { + BizQualityNonReviewForm entity = getById(id); + saveEntity(entity, entity.getGroupNo(), QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + private void wrapInfo(BizQualityNonReviewForm entity) { entity.setApprovalStatusName(dictService.getDictNameByCode(QualityDictTypeEnum.APPROVAL_STATUS.getCode(), entity.getApprovalStatus())); @@ -121,9 +129,9 @@ @Override public boolean updateById(BizQualityNonReviewForm entity) { - BizQualityNonReviewForm old = getById(entity.getId()); - updateEntity(entity, entity.getGroupNo(), old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + +// updateEntity(entity, entity.getGroupNo(), old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); @@ -239,9 +247,10 @@ */ @Override public BizQualityNonReviewForm selectById(Long targetId) { - return this.baseMapper.selectById(targetId); + return this.baseMapper.selectById(targetId); } + @Transactional @Override public ReturnDTO agree(BizQualityNonReviewFormApprovalVO request) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index aeca9d7..d9102b2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -182,6 +182,7 @@ return this.baseMapper.selectById(targetId); } + @Override public Page listPage(Page page, BizQualityReviewFormVO request) throws Exception { Page reviewFormPage = super.listPage(page, request); @@ -200,12 +201,12 @@ entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 - saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - +// saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + saveZeroCodeEntity(entity, QualityTableEnum.REVIEW_FORM); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); //校验该年份次数的内审计划是否已完成 bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.REVIEW_FORM, entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); super.save(entity); @@ -213,6 +214,13 @@ return true; } + @Override + public String genCode(String id) { + BizQualityReviewForm entity = getById(id); + saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + private void wrapInfo(BizQualityReviewForm entity) { entity.setApprovalStatusName(dictService.getDictNameByCode(QualityDictTypeEnum.APPROVAL_STATUS.getCode(), entity.getApprovalStatus())); entity.setBizLabCodeName(dictService.getDictNameByCode(MeterDictCode.LAB_CODE, entity.getBizLabCode())); @@ -226,11 +234,11 @@ @Override public boolean updateById(BizQualityReviewForm entity) { - BizQualityReviewForm old = getById(entity.getId()); - updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + +// updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); //校验该年份次数的内审计划是否已完成 bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.REVIEW_FORM, entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java index de029bb..0adf7d4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java @@ -112,6 +112,12 @@ internalAuditManagementService.addBizQualityInternalAuditFile(this.getById(request.getId())); return super.submit(request); } + @Override + public String genCode(String id) { + BizQualityWorkRegistration entity = getById(id); + saveEntity(entity, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } @Transactional @Override @@ -129,9 +135,10 @@ throw new ServiceException(500, "该工作审核登记表已由" + registration.getCreatorName() + "创建"); } - saveEntity(entity, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// saveEntity(entity, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.WorkRegistration); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + saveZeroCodeEntity(entity, QualityTableEnum.WORK_REGISTRATION); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); // //生成文件编码 // String labCode = entity.getBizLabCode(); // String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.WORK_REGISTRATION,); @@ -299,19 +306,22 @@ return false; } + + @Transactional @Override public boolean updateById(BizQualityWorkRegistration entity) { - BizQualityWorkRegistration oldPlan = getById(entity.getId()); - updateEntity(entity, oldPlan, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// BizQualityWorkRegistration oldPlan = getById(entity.getId()); +// updateEntity(entity, oldPlan, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); // if (!oldPlan.getBizLabCode().equals(entity.getBizLabCode())) { // String labCode = entity.getBizLabCode(); // String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); // entity.setFileCode(newCode); // entity.setSysCode(newCode); // } - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.WorkRegistration); entity.setUpdateTime(DateUtil.now()); //查询最大的已完成记录更新至当前阶段 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityInternalAuditRepEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityInternalAuditRepEventPostProcessor.java index 44065be..7cf65c5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityInternalAuditRepEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityInternalAuditRepEventPostProcessor.java @@ -9,6 +9,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.service.listeners.NotifyEventPostProcessor; import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.utils.SpringContextUtil; @@ -34,8 +35,11 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityInternalAuditRepService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityInternalAuditRepService.class); + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityInternalAuditRep::getApprovalStatus, ApprovalStatusEnum.PASSED); + update.set(BizQualityInternalAuditRep::getSysCode, code); + update.set(BizQualityInternalAuditRep::getFileCode, code); update.eq(BizQualityInternalAuditRep::getId, notifyEventStatusDTO.getId()); boolean updateFlag = supervisionRepMapper.update(update); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonReviewFormEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonReviewFormEventPostProcessor.java index 1ba54e1..e4071a6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonReviewFormEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonReviewFormEventPostProcessor.java @@ -9,6 +9,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.quality.BizQualityNonReviewForm; +import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.service.listeners.NotifyEventPostProcessor; import com.casic.missiles.service.quality.IBizQualityNonReviewFormService; import com.casic.missiles.utils.SpringContextUtil; @@ -34,9 +35,15 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityNonReviewFormService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityNonReviewFormService.class); + //重新生成编码 + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); + LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); + update.set(BizQualityNonReviewForm::getSysCode, code); + update.set(BizQualityNonReviewForm::getFileCode, code); update.set(BizQualityNonReviewForm::getApprovalStatus, ApprovalStatusEnum.PASSED); update.eq(BizQualityNonReviewForm::getId, notifyEventStatusDTO.getId()); + boolean updateFlag = supervisionRepMapper.update(update); if (!updateFlag) { diff --git a/casic-metering-api/src/main/resources/config/application-test.yml b/casic-metering-api/src/main/resources/config/application-test.yml index 26a465b..2d87b84 100644 --- a/casic-metering-api/src/main/resources/config/application-test.yml +++ b/casic-metering-api/src/main/resources/config/application-test.yml @@ -5,16 +5,16 @@ datasource: driver-class-name: com.mysql.cj.jdbc.Driver # url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true - url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://192.168.83.42:3306/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true # urls: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root # password: Casic203 - password: Casic203! + password: casic203 redis: - host: 111.198.10.15 -# port: 11412 - port: 21903 - password: ew5T4K3#203 + host: localhost +# port: 11412 ew5T4K3#203 + port: 6379 + password: database: 1 serializer: org.springframework.data.redis.serializer.StringRedisSerializer redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index e18a28e..9f8064a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -77,7 +77,7 @@ @Value("${casic.file.dir}") private String localFileDir; - public BizQualityInternalAuditRepServiceImpl(AbstractPermissionContext permissionContext, IBizQualityInternalAuditManagementService internalAuditManagementService, AbstractDictService dictService, IBizQualityAuditRepDeptService repDeptService, IBizQualityAuditRepUserService repUserService, PrintFileRegister printFileRegister, ISystemSignService signService,@Lazy IBizQualityWorkRegistrationService bizQualityWorkRegistrationService) { + public BizQualityInternalAuditRepServiceImpl(AbstractPermissionContext permissionContext, IBizQualityInternalAuditManagementService internalAuditManagementService, AbstractDictService dictService, IBizQualityAuditRepDeptService repDeptService, IBizQualityAuditRepUserService repUserService, PrintFileRegister printFileRegister, ISystemSignService signService, @Lazy IBizQualityWorkRegistrationService bizQualityWorkRegistrationService) { this.permissionContext = permissionContext; this.internalAuditManagementService = internalAuditManagementService; this.dictService = dictService; @@ -106,12 +106,13 @@ //生成文件编码 entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + saveZeroCodeEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP); //校验创建年份 - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityYearNoCheckEnum.AuditRep); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.AuditRep); //内审报告校验末次会议是否召开 - bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING,entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING, entity.getYearNo()); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -120,15 +121,23 @@ } @Override + public String genCode(String id) { + BizQualityInternalAuditRep entity = getById(id); + saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + + + @Override public boolean updateById(BizQualityInternalAuditRep entity) { BizQualityInternalAuditRep old = getById(entity.getId()); - updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); //校验创建年份 - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityYearNoCheckEnum.AuditRep); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.AuditRep); //内审报告校验末次会议是否召开 - bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING,entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING, entity.getYearNo()); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index 74d975a..f92aeb4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -97,7 +97,8 @@ entity.setCreatorName(user.getName()); //生成文件编码 - saveEntity(entity, entity.getGroupNo(),QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// saveEntity(entity, entity.getGroupNo(),QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + saveZeroCodeEntity(entity, entity.getGroupNo(), QualityTableEnum.NON_REVIEW_FORM); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); super.save(entity); @@ -105,6 +106,13 @@ return true; } + @Override + public String genCode(String id) { + BizQualityNonReviewForm entity = getById(id); + saveEntity(entity, entity.getGroupNo(), QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + private void wrapInfo(BizQualityNonReviewForm entity) { entity.setApprovalStatusName(dictService.getDictNameByCode(QualityDictTypeEnum.APPROVAL_STATUS.getCode(), entity.getApprovalStatus())); @@ -121,9 +129,9 @@ @Override public boolean updateById(BizQualityNonReviewForm entity) { - BizQualityNonReviewForm old = getById(entity.getId()); - updateEntity(entity, entity.getGroupNo(), old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + +// updateEntity(entity, entity.getGroupNo(), old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); @@ -239,9 +247,10 @@ */ @Override public BizQualityNonReviewForm selectById(Long targetId) { - return this.baseMapper.selectById(targetId); + return this.baseMapper.selectById(targetId); } + @Transactional @Override public ReturnDTO agree(BizQualityNonReviewFormApprovalVO request) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index aeca9d7..d9102b2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -182,6 +182,7 @@ return this.baseMapper.selectById(targetId); } + @Override public Page listPage(Page page, BizQualityReviewFormVO request) throws Exception { Page reviewFormPage = super.listPage(page, request); @@ -200,12 +201,12 @@ entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 - saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - +// saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + saveZeroCodeEntity(entity, QualityTableEnum.REVIEW_FORM); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); //校验该年份次数的内审计划是否已完成 bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.REVIEW_FORM, entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); super.save(entity); @@ -213,6 +214,13 @@ return true; } + @Override + public String genCode(String id) { + BizQualityReviewForm entity = getById(id); + saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + private void wrapInfo(BizQualityReviewForm entity) { entity.setApprovalStatusName(dictService.getDictNameByCode(QualityDictTypeEnum.APPROVAL_STATUS.getCode(), entity.getApprovalStatus())); entity.setBizLabCodeName(dictService.getDictNameByCode(MeterDictCode.LAB_CODE, entity.getBizLabCode())); @@ -226,11 +234,11 @@ @Override public boolean updateById(BizQualityReviewForm entity) { - BizQualityReviewForm old = getById(entity.getId()); - updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + +// updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); //校验该年份次数的内审计划是否已完成 bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.REVIEW_FORM, entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java index de029bb..0adf7d4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java @@ -112,6 +112,12 @@ internalAuditManagementService.addBizQualityInternalAuditFile(this.getById(request.getId())); return super.submit(request); } + @Override + public String genCode(String id) { + BizQualityWorkRegistration entity = getById(id); + saveEntity(entity, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } @Transactional @Override @@ -129,9 +135,10 @@ throw new ServiceException(500, "该工作审核登记表已由" + registration.getCreatorName() + "创建"); } - saveEntity(entity, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// saveEntity(entity, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.WorkRegistration); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + saveZeroCodeEntity(entity, QualityTableEnum.WORK_REGISTRATION); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); // //生成文件编码 // String labCode = entity.getBizLabCode(); // String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.WORK_REGISTRATION,); @@ -299,19 +306,22 @@ return false; } + + @Transactional @Override public boolean updateById(BizQualityWorkRegistration entity) { - BizQualityWorkRegistration oldPlan = getById(entity.getId()); - updateEntity(entity, oldPlan, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// BizQualityWorkRegistration oldPlan = getById(entity.getId()); +// updateEntity(entity, oldPlan, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); // if (!oldPlan.getBizLabCode().equals(entity.getBizLabCode())) { // String labCode = entity.getBizLabCode(); // String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); // entity.setFileCode(newCode); // entity.setSysCode(newCode); // } - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.WorkRegistration); entity.setUpdateTime(DateUtil.now()); //查询最大的已完成记录更新至当前阶段 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityInternalAuditRepEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityInternalAuditRepEventPostProcessor.java index 44065be..7cf65c5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityInternalAuditRepEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityInternalAuditRepEventPostProcessor.java @@ -9,6 +9,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.service.listeners.NotifyEventPostProcessor; import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.utils.SpringContextUtil; @@ -34,8 +35,11 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityInternalAuditRepService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityInternalAuditRepService.class); + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityInternalAuditRep::getApprovalStatus, ApprovalStatusEnum.PASSED); + update.set(BizQualityInternalAuditRep::getSysCode, code); + update.set(BizQualityInternalAuditRep::getFileCode, code); update.eq(BizQualityInternalAuditRep::getId, notifyEventStatusDTO.getId()); boolean updateFlag = supervisionRepMapper.update(update); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonReviewFormEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonReviewFormEventPostProcessor.java index 1ba54e1..e4071a6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonReviewFormEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonReviewFormEventPostProcessor.java @@ -9,6 +9,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.quality.BizQualityNonReviewForm; +import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.service.listeners.NotifyEventPostProcessor; import com.casic.missiles.service.quality.IBizQualityNonReviewFormService; import com.casic.missiles.utils.SpringContextUtil; @@ -34,9 +35,15 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityNonReviewFormService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityNonReviewFormService.class); + //重新生成编码 + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); + LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); + update.set(BizQualityNonReviewForm::getSysCode, code); + update.set(BizQualityNonReviewForm::getFileCode, code); update.set(BizQualityNonReviewForm::getApprovalStatus, ApprovalStatusEnum.PASSED); update.eq(BizQualityNonReviewForm::getId, notifyEventStatusDTO.getId()); + boolean updateFlag = supervisionRepMapper.update(update); if (!updateFlag) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityReviewFormEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityReviewFormEventPostProcessor.java index 5e31d32..461958f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityReviewFormEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityReviewFormEventPostProcessor.java @@ -34,8 +34,11 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityReviewFormService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityReviewFormService.class); + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityReviewForm::getApprovalStatus, ApprovalStatusEnum.PASSED); + update.set(BizQualityReviewForm::getSysCode, code); + update.set(BizQualityReviewForm::getFileCode, code); update.eq(BizQualityReviewForm::getId, notifyEventStatusDTO.getId()); boolean updateFlag = supervisionRepMapper.update(update); diff --git a/casic-metering-api/src/main/resources/config/application-test.yml b/casic-metering-api/src/main/resources/config/application-test.yml index 26a465b..2d87b84 100644 --- a/casic-metering-api/src/main/resources/config/application-test.yml +++ b/casic-metering-api/src/main/resources/config/application-test.yml @@ -5,16 +5,16 @@ datasource: driver-class-name: com.mysql.cj.jdbc.Driver # url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true - url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://192.168.83.42:3306/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true # urls: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root # password: Casic203 - password: Casic203! + password: casic203 redis: - host: 111.198.10.15 -# port: 11412 - port: 21903 - password: ew5T4K3#203 + host: localhost +# port: 11412 ew5T4K3#203 + port: 6379 + password: database: 1 serializer: org.springframework.data.redis.serializer.StringRedisSerializer redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index e18a28e..9f8064a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -77,7 +77,7 @@ @Value("${casic.file.dir}") private String localFileDir; - public BizQualityInternalAuditRepServiceImpl(AbstractPermissionContext permissionContext, IBizQualityInternalAuditManagementService internalAuditManagementService, AbstractDictService dictService, IBizQualityAuditRepDeptService repDeptService, IBizQualityAuditRepUserService repUserService, PrintFileRegister printFileRegister, ISystemSignService signService,@Lazy IBizQualityWorkRegistrationService bizQualityWorkRegistrationService) { + public BizQualityInternalAuditRepServiceImpl(AbstractPermissionContext permissionContext, IBizQualityInternalAuditManagementService internalAuditManagementService, AbstractDictService dictService, IBizQualityAuditRepDeptService repDeptService, IBizQualityAuditRepUserService repUserService, PrintFileRegister printFileRegister, ISystemSignService signService, @Lazy IBizQualityWorkRegistrationService bizQualityWorkRegistrationService) { this.permissionContext = permissionContext; this.internalAuditManagementService = internalAuditManagementService; this.dictService = dictService; @@ -106,12 +106,13 @@ //生成文件编码 entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + saveZeroCodeEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP); //校验创建年份 - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityYearNoCheckEnum.AuditRep); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.AuditRep); //内审报告校验末次会议是否召开 - bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING,entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING, entity.getYearNo()); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -120,15 +121,23 @@ } @Override + public String genCode(String id) { + BizQualityInternalAuditRep entity = getById(id); + saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + + + @Override public boolean updateById(BizQualityInternalAuditRep entity) { BizQualityInternalAuditRep old = getById(entity.getId()); - updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); //校验创建年份 - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityYearNoCheckEnum.AuditRep); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.AuditRep); //内审报告校验末次会议是否召开 - bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING,entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING, entity.getYearNo()); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index 74d975a..f92aeb4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -97,7 +97,8 @@ entity.setCreatorName(user.getName()); //生成文件编码 - saveEntity(entity, entity.getGroupNo(),QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// saveEntity(entity, entity.getGroupNo(),QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + saveZeroCodeEntity(entity, entity.getGroupNo(), QualityTableEnum.NON_REVIEW_FORM); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); super.save(entity); @@ -105,6 +106,13 @@ return true; } + @Override + public String genCode(String id) { + BizQualityNonReviewForm entity = getById(id); + saveEntity(entity, entity.getGroupNo(), QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + private void wrapInfo(BizQualityNonReviewForm entity) { entity.setApprovalStatusName(dictService.getDictNameByCode(QualityDictTypeEnum.APPROVAL_STATUS.getCode(), entity.getApprovalStatus())); @@ -121,9 +129,9 @@ @Override public boolean updateById(BizQualityNonReviewForm entity) { - BizQualityNonReviewForm old = getById(entity.getId()); - updateEntity(entity, entity.getGroupNo(), old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + +// updateEntity(entity, entity.getGroupNo(), old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); @@ -239,9 +247,10 @@ */ @Override public BizQualityNonReviewForm selectById(Long targetId) { - return this.baseMapper.selectById(targetId); + return this.baseMapper.selectById(targetId); } + @Transactional @Override public ReturnDTO agree(BizQualityNonReviewFormApprovalVO request) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index aeca9d7..d9102b2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -182,6 +182,7 @@ return this.baseMapper.selectById(targetId); } + @Override public Page listPage(Page page, BizQualityReviewFormVO request) throws Exception { Page reviewFormPage = super.listPage(page, request); @@ -200,12 +201,12 @@ entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 - saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - +// saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + saveZeroCodeEntity(entity, QualityTableEnum.REVIEW_FORM); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); //校验该年份次数的内审计划是否已完成 bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.REVIEW_FORM, entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); super.save(entity); @@ -213,6 +214,13 @@ return true; } + @Override + public String genCode(String id) { + BizQualityReviewForm entity = getById(id); + saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + private void wrapInfo(BizQualityReviewForm entity) { entity.setApprovalStatusName(dictService.getDictNameByCode(QualityDictTypeEnum.APPROVAL_STATUS.getCode(), entity.getApprovalStatus())); entity.setBizLabCodeName(dictService.getDictNameByCode(MeterDictCode.LAB_CODE, entity.getBizLabCode())); @@ -226,11 +234,11 @@ @Override public boolean updateById(BizQualityReviewForm entity) { - BizQualityReviewForm old = getById(entity.getId()); - updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + +// updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); //校验该年份次数的内审计划是否已完成 bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.REVIEW_FORM, entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java index de029bb..0adf7d4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java @@ -112,6 +112,12 @@ internalAuditManagementService.addBizQualityInternalAuditFile(this.getById(request.getId())); return super.submit(request); } + @Override + public String genCode(String id) { + BizQualityWorkRegistration entity = getById(id); + saveEntity(entity, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } @Transactional @Override @@ -129,9 +135,10 @@ throw new ServiceException(500, "该工作审核登记表已由" + registration.getCreatorName() + "创建"); } - saveEntity(entity, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// saveEntity(entity, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.WorkRegistration); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + saveZeroCodeEntity(entity, QualityTableEnum.WORK_REGISTRATION); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); // //生成文件编码 // String labCode = entity.getBizLabCode(); // String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.WORK_REGISTRATION,); @@ -299,19 +306,22 @@ return false; } + + @Transactional @Override public boolean updateById(BizQualityWorkRegistration entity) { - BizQualityWorkRegistration oldPlan = getById(entity.getId()); - updateEntity(entity, oldPlan, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// BizQualityWorkRegistration oldPlan = getById(entity.getId()); +// updateEntity(entity, oldPlan, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); // if (!oldPlan.getBizLabCode().equals(entity.getBizLabCode())) { // String labCode = entity.getBizLabCode(); // String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); // entity.setFileCode(newCode); // entity.setSysCode(newCode); // } - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.WorkRegistration); entity.setUpdateTime(DateUtil.now()); //查询最大的已完成记录更新至当前阶段 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityInternalAuditRepEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityInternalAuditRepEventPostProcessor.java index 44065be..7cf65c5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityInternalAuditRepEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityInternalAuditRepEventPostProcessor.java @@ -9,6 +9,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.service.listeners.NotifyEventPostProcessor; import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.utils.SpringContextUtil; @@ -34,8 +35,11 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityInternalAuditRepService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityInternalAuditRepService.class); + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityInternalAuditRep::getApprovalStatus, ApprovalStatusEnum.PASSED); + update.set(BizQualityInternalAuditRep::getSysCode, code); + update.set(BizQualityInternalAuditRep::getFileCode, code); update.eq(BizQualityInternalAuditRep::getId, notifyEventStatusDTO.getId()); boolean updateFlag = supervisionRepMapper.update(update); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonReviewFormEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonReviewFormEventPostProcessor.java index 1ba54e1..e4071a6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonReviewFormEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonReviewFormEventPostProcessor.java @@ -9,6 +9,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.quality.BizQualityNonReviewForm; +import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.service.listeners.NotifyEventPostProcessor; import com.casic.missiles.service.quality.IBizQualityNonReviewFormService; import com.casic.missiles.utils.SpringContextUtil; @@ -34,9 +35,15 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityNonReviewFormService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityNonReviewFormService.class); + //重新生成编码 + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); + LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); + update.set(BizQualityNonReviewForm::getSysCode, code); + update.set(BizQualityNonReviewForm::getFileCode, code); update.set(BizQualityNonReviewForm::getApprovalStatus, ApprovalStatusEnum.PASSED); update.eq(BizQualityNonReviewForm::getId, notifyEventStatusDTO.getId()); + boolean updateFlag = supervisionRepMapper.update(update); if (!updateFlag) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityReviewFormEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityReviewFormEventPostProcessor.java index 5e31d32..461958f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityReviewFormEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityReviewFormEventPostProcessor.java @@ -34,8 +34,11 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityReviewFormService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityReviewFormService.class); + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityReviewForm::getApprovalStatus, ApprovalStatusEnum.PASSED); + update.set(BizQualityReviewForm::getSysCode, code); + update.set(BizQualityReviewForm::getFileCode, code); update.eq(BizQualityReviewForm::getId, notifyEventStatusDTO.getId()); boolean updateFlag = supervisionRepMapper.update(update); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityWorkRegistrationEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityWorkRegistrationEventPostProcessor.java index b48971c..1d1adf1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityWorkRegistrationEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityWorkRegistrationEventPostProcessor.java @@ -34,7 +34,10 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityWorkRegistrationService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityWorkRegistrationService.class); + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); + update.set(BizQualityWorkRegistration::getFileCode,code); + update.set(BizQualityWorkRegistration::getSysCode,code); update.set(BizQualityWorkRegistration::getApprovalStatus, ApprovalStatusEnum.PASSED); update.eq(BizQualityWorkRegistration::getId, notifyEventStatusDTO.getId()); boolean updateFlag = supervisionRepMapper.update(update); @@ -44,6 +47,7 @@ throw new BusinessException(BusinessExceptionEnum.APPROVAL_PROCESSOR_HANDLE_FAILED); } + BizQualityWorkRegistration registration = supervisionRepMapper.getById(id); doHandleApprovalMessage(registration.getCreator(), registration.getProcessId(), ApplyFromIdEnum.QUALITY_WORK_REGISTRATION.getCode(), registration.getFileName(), notifyEventStatusDTO.getId(), ApplyFromIdEnum.QUALITY_WORK_REGISTRATION.getSerialNumber()); diff --git a/casic-metering-api/src/main/resources/config/application-test.yml b/casic-metering-api/src/main/resources/config/application-test.yml index 26a465b..2d87b84 100644 --- a/casic-metering-api/src/main/resources/config/application-test.yml +++ b/casic-metering-api/src/main/resources/config/application-test.yml @@ -5,16 +5,16 @@ datasource: driver-class-name: com.mysql.cj.jdbc.Driver # url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true - url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://192.168.83.42:3306/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true # urls: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root # password: Casic203 - password: Casic203! + password: casic203 redis: - host: 111.198.10.15 -# port: 11412 - port: 21903 - password: ew5T4K3#203 + host: localhost +# port: 11412 ew5T4K3#203 + port: 6379 + password: database: 1 serializer: org.springframework.data.redis.serializer.StringRedisSerializer redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index e18a28e..9f8064a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -77,7 +77,7 @@ @Value("${casic.file.dir}") private String localFileDir; - public BizQualityInternalAuditRepServiceImpl(AbstractPermissionContext permissionContext, IBizQualityInternalAuditManagementService internalAuditManagementService, AbstractDictService dictService, IBizQualityAuditRepDeptService repDeptService, IBizQualityAuditRepUserService repUserService, PrintFileRegister printFileRegister, ISystemSignService signService,@Lazy IBizQualityWorkRegistrationService bizQualityWorkRegistrationService) { + public BizQualityInternalAuditRepServiceImpl(AbstractPermissionContext permissionContext, IBizQualityInternalAuditManagementService internalAuditManagementService, AbstractDictService dictService, IBizQualityAuditRepDeptService repDeptService, IBizQualityAuditRepUserService repUserService, PrintFileRegister printFileRegister, ISystemSignService signService, @Lazy IBizQualityWorkRegistrationService bizQualityWorkRegistrationService) { this.permissionContext = permissionContext; this.internalAuditManagementService = internalAuditManagementService; this.dictService = dictService; @@ -106,12 +106,13 @@ //生成文件编码 entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + saveZeroCodeEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP); //校验创建年份 - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityYearNoCheckEnum.AuditRep); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.AuditRep); //内审报告校验末次会议是否召开 - bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING,entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING, entity.getYearNo()); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -120,15 +121,23 @@ } @Override + public String genCode(String id) { + BizQualityInternalAuditRep entity = getById(id); + saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + + + @Override public boolean updateById(BizQualityInternalAuditRep entity) { BizQualityInternalAuditRep old = getById(entity.getId()); - updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); //校验创建年份 - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityYearNoCheckEnum.AuditRep); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.AuditRep); //内审报告校验末次会议是否召开 - bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING,entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING, entity.getYearNo()); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index 74d975a..f92aeb4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -97,7 +97,8 @@ entity.setCreatorName(user.getName()); //生成文件编码 - saveEntity(entity, entity.getGroupNo(),QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// saveEntity(entity, entity.getGroupNo(),QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + saveZeroCodeEntity(entity, entity.getGroupNo(), QualityTableEnum.NON_REVIEW_FORM); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); super.save(entity); @@ -105,6 +106,13 @@ return true; } + @Override + public String genCode(String id) { + BizQualityNonReviewForm entity = getById(id); + saveEntity(entity, entity.getGroupNo(), QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + private void wrapInfo(BizQualityNonReviewForm entity) { entity.setApprovalStatusName(dictService.getDictNameByCode(QualityDictTypeEnum.APPROVAL_STATUS.getCode(), entity.getApprovalStatus())); @@ -121,9 +129,9 @@ @Override public boolean updateById(BizQualityNonReviewForm entity) { - BizQualityNonReviewForm old = getById(entity.getId()); - updateEntity(entity, entity.getGroupNo(), old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + +// updateEntity(entity, entity.getGroupNo(), old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); @@ -239,9 +247,10 @@ */ @Override public BizQualityNonReviewForm selectById(Long targetId) { - return this.baseMapper.selectById(targetId); + return this.baseMapper.selectById(targetId); } + @Transactional @Override public ReturnDTO agree(BizQualityNonReviewFormApprovalVO request) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index aeca9d7..d9102b2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -182,6 +182,7 @@ return this.baseMapper.selectById(targetId); } + @Override public Page listPage(Page page, BizQualityReviewFormVO request) throws Exception { Page reviewFormPage = super.listPage(page, request); @@ -200,12 +201,12 @@ entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 - saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - +// saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + saveZeroCodeEntity(entity, QualityTableEnum.REVIEW_FORM); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); //校验该年份次数的内审计划是否已完成 bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.REVIEW_FORM, entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); super.save(entity); @@ -213,6 +214,13 @@ return true; } + @Override + public String genCode(String id) { + BizQualityReviewForm entity = getById(id); + saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + private void wrapInfo(BizQualityReviewForm entity) { entity.setApprovalStatusName(dictService.getDictNameByCode(QualityDictTypeEnum.APPROVAL_STATUS.getCode(), entity.getApprovalStatus())); entity.setBizLabCodeName(dictService.getDictNameByCode(MeterDictCode.LAB_CODE, entity.getBizLabCode())); @@ -226,11 +234,11 @@ @Override public boolean updateById(BizQualityReviewForm entity) { - BizQualityReviewForm old = getById(entity.getId()); - updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + +// updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); //校验该年份次数的内审计划是否已完成 bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.REVIEW_FORM, entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java index de029bb..0adf7d4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java @@ -112,6 +112,12 @@ internalAuditManagementService.addBizQualityInternalAuditFile(this.getById(request.getId())); return super.submit(request); } + @Override + public String genCode(String id) { + BizQualityWorkRegistration entity = getById(id); + saveEntity(entity, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } @Transactional @Override @@ -129,9 +135,10 @@ throw new ServiceException(500, "该工作审核登记表已由" + registration.getCreatorName() + "创建"); } - saveEntity(entity, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// saveEntity(entity, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.WorkRegistration); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + saveZeroCodeEntity(entity, QualityTableEnum.WORK_REGISTRATION); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); // //生成文件编码 // String labCode = entity.getBizLabCode(); // String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.WORK_REGISTRATION,); @@ -299,19 +306,22 @@ return false; } + + @Transactional @Override public boolean updateById(BizQualityWorkRegistration entity) { - BizQualityWorkRegistration oldPlan = getById(entity.getId()); - updateEntity(entity, oldPlan, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// BizQualityWorkRegistration oldPlan = getById(entity.getId()); +// updateEntity(entity, oldPlan, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); // if (!oldPlan.getBizLabCode().equals(entity.getBizLabCode())) { // String labCode = entity.getBizLabCode(); // String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); // entity.setFileCode(newCode); // entity.setSysCode(newCode); // } - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.WorkRegistration); entity.setUpdateTime(DateUtil.now()); //查询最大的已完成记录更新至当前阶段 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityInternalAuditRepEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityInternalAuditRepEventPostProcessor.java index 44065be..7cf65c5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityInternalAuditRepEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityInternalAuditRepEventPostProcessor.java @@ -9,6 +9,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.service.listeners.NotifyEventPostProcessor; import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.utils.SpringContextUtil; @@ -34,8 +35,11 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityInternalAuditRepService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityInternalAuditRepService.class); + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityInternalAuditRep::getApprovalStatus, ApprovalStatusEnum.PASSED); + update.set(BizQualityInternalAuditRep::getSysCode, code); + update.set(BizQualityInternalAuditRep::getFileCode, code); update.eq(BizQualityInternalAuditRep::getId, notifyEventStatusDTO.getId()); boolean updateFlag = supervisionRepMapper.update(update); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonReviewFormEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonReviewFormEventPostProcessor.java index 1ba54e1..e4071a6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonReviewFormEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonReviewFormEventPostProcessor.java @@ -9,6 +9,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.quality.BizQualityNonReviewForm; +import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.service.listeners.NotifyEventPostProcessor; import com.casic.missiles.service.quality.IBizQualityNonReviewFormService; import com.casic.missiles.utils.SpringContextUtil; @@ -34,9 +35,15 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityNonReviewFormService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityNonReviewFormService.class); + //重新生成编码 + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); + LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); + update.set(BizQualityNonReviewForm::getSysCode, code); + update.set(BizQualityNonReviewForm::getFileCode, code); update.set(BizQualityNonReviewForm::getApprovalStatus, ApprovalStatusEnum.PASSED); update.eq(BizQualityNonReviewForm::getId, notifyEventStatusDTO.getId()); + boolean updateFlag = supervisionRepMapper.update(update); if (!updateFlag) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityReviewFormEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityReviewFormEventPostProcessor.java index 5e31d32..461958f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityReviewFormEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityReviewFormEventPostProcessor.java @@ -34,8 +34,11 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityReviewFormService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityReviewFormService.class); + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityReviewForm::getApprovalStatus, ApprovalStatusEnum.PASSED); + update.set(BizQualityReviewForm::getSysCode, code); + update.set(BizQualityReviewForm::getFileCode, code); update.eq(BizQualityReviewForm::getId, notifyEventStatusDTO.getId()); boolean updateFlag = supervisionRepMapper.update(update); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityWorkRegistrationEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityWorkRegistrationEventPostProcessor.java index b48971c..1d1adf1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityWorkRegistrationEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityWorkRegistrationEventPostProcessor.java @@ -34,7 +34,10 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityWorkRegistrationService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityWorkRegistrationService.class); + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); + update.set(BizQualityWorkRegistration::getFileCode,code); + update.set(BizQualityWorkRegistration::getSysCode,code); update.set(BizQualityWorkRegistration::getApprovalStatus, ApprovalStatusEnum.PASSED); update.eq(BizQualityWorkRegistration::getId, notifyEventStatusDTO.getId()); boolean updateFlag = supervisionRepMapper.update(update); @@ -44,6 +47,7 @@ throw new BusinessException(BusinessExceptionEnum.APPROVAL_PROCESSOR_HANDLE_FAILED); } + BizQualityWorkRegistration registration = supervisionRepMapper.getById(id); doHandleApprovalMessage(registration.getCreator(), registration.getProcessId(), ApplyFromIdEnum.QUALITY_WORK_REGISTRATION.getCode(), registration.getFileName(), notifyEventStatusDTO.getId(), ApplyFromIdEnum.QUALITY_WORK_REGISTRATION.getSerialNumber()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityInternalAuditRepService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityInternalAuditRepService.java index b1aeec2..5872c1b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityInternalAuditRepService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityInternalAuditRepService.java @@ -30,4 +30,6 @@ void exportFile(ExportDTO exportDTO, HttpServletResponse response); void exportZip(List repList, HttpServletResponse response); + + String genCode(String id); } diff --git a/casic-metering-api/src/main/resources/config/application-test.yml b/casic-metering-api/src/main/resources/config/application-test.yml index 26a465b..2d87b84 100644 --- a/casic-metering-api/src/main/resources/config/application-test.yml +++ b/casic-metering-api/src/main/resources/config/application-test.yml @@ -5,16 +5,16 @@ datasource: driver-class-name: com.mysql.cj.jdbc.Driver # url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true - url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://192.168.83.42:3306/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true # urls: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root # password: Casic203 - password: Casic203! + password: casic203 redis: - host: 111.198.10.15 -# port: 11412 - port: 21903 - password: ew5T4K3#203 + host: localhost +# port: 11412 ew5T4K3#203 + port: 6379 + password: database: 1 serializer: org.springframework.data.redis.serializer.StringRedisSerializer redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index e18a28e..9f8064a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -77,7 +77,7 @@ @Value("${casic.file.dir}") private String localFileDir; - public BizQualityInternalAuditRepServiceImpl(AbstractPermissionContext permissionContext, IBizQualityInternalAuditManagementService internalAuditManagementService, AbstractDictService dictService, IBizQualityAuditRepDeptService repDeptService, IBizQualityAuditRepUserService repUserService, PrintFileRegister printFileRegister, ISystemSignService signService,@Lazy IBizQualityWorkRegistrationService bizQualityWorkRegistrationService) { + public BizQualityInternalAuditRepServiceImpl(AbstractPermissionContext permissionContext, IBizQualityInternalAuditManagementService internalAuditManagementService, AbstractDictService dictService, IBizQualityAuditRepDeptService repDeptService, IBizQualityAuditRepUserService repUserService, PrintFileRegister printFileRegister, ISystemSignService signService, @Lazy IBizQualityWorkRegistrationService bizQualityWorkRegistrationService) { this.permissionContext = permissionContext; this.internalAuditManagementService = internalAuditManagementService; this.dictService = dictService; @@ -106,12 +106,13 @@ //生成文件编码 entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + saveZeroCodeEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP); //校验创建年份 - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityYearNoCheckEnum.AuditRep); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.AuditRep); //内审报告校验末次会议是否召开 - bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING,entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING, entity.getYearNo()); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -120,15 +121,23 @@ } @Override + public String genCode(String id) { + BizQualityInternalAuditRep entity = getById(id); + saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + + + @Override public boolean updateById(BizQualityInternalAuditRep entity) { BizQualityInternalAuditRep old = getById(entity.getId()); - updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); //校验创建年份 - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityYearNoCheckEnum.AuditRep); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.AuditRep); //内审报告校验末次会议是否召开 - bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING,entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING, entity.getYearNo()); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index 74d975a..f92aeb4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -97,7 +97,8 @@ entity.setCreatorName(user.getName()); //生成文件编码 - saveEntity(entity, entity.getGroupNo(),QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// saveEntity(entity, entity.getGroupNo(),QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + saveZeroCodeEntity(entity, entity.getGroupNo(), QualityTableEnum.NON_REVIEW_FORM); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); super.save(entity); @@ -105,6 +106,13 @@ return true; } + @Override + public String genCode(String id) { + BizQualityNonReviewForm entity = getById(id); + saveEntity(entity, entity.getGroupNo(), QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + private void wrapInfo(BizQualityNonReviewForm entity) { entity.setApprovalStatusName(dictService.getDictNameByCode(QualityDictTypeEnum.APPROVAL_STATUS.getCode(), entity.getApprovalStatus())); @@ -121,9 +129,9 @@ @Override public boolean updateById(BizQualityNonReviewForm entity) { - BizQualityNonReviewForm old = getById(entity.getId()); - updateEntity(entity, entity.getGroupNo(), old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + +// updateEntity(entity, entity.getGroupNo(), old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); @@ -239,9 +247,10 @@ */ @Override public BizQualityNonReviewForm selectById(Long targetId) { - return this.baseMapper.selectById(targetId); + return this.baseMapper.selectById(targetId); } + @Transactional @Override public ReturnDTO agree(BizQualityNonReviewFormApprovalVO request) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index aeca9d7..d9102b2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -182,6 +182,7 @@ return this.baseMapper.selectById(targetId); } + @Override public Page listPage(Page page, BizQualityReviewFormVO request) throws Exception { Page reviewFormPage = super.listPage(page, request); @@ -200,12 +201,12 @@ entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 - saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - +// saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + saveZeroCodeEntity(entity, QualityTableEnum.REVIEW_FORM); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); //校验该年份次数的内审计划是否已完成 bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.REVIEW_FORM, entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); super.save(entity); @@ -213,6 +214,13 @@ return true; } + @Override + public String genCode(String id) { + BizQualityReviewForm entity = getById(id); + saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + private void wrapInfo(BizQualityReviewForm entity) { entity.setApprovalStatusName(dictService.getDictNameByCode(QualityDictTypeEnum.APPROVAL_STATUS.getCode(), entity.getApprovalStatus())); entity.setBizLabCodeName(dictService.getDictNameByCode(MeterDictCode.LAB_CODE, entity.getBizLabCode())); @@ -226,11 +234,11 @@ @Override public boolean updateById(BizQualityReviewForm entity) { - BizQualityReviewForm old = getById(entity.getId()); - updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + +// updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); //校验该年份次数的内审计划是否已完成 bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.REVIEW_FORM, entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java index de029bb..0adf7d4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java @@ -112,6 +112,12 @@ internalAuditManagementService.addBizQualityInternalAuditFile(this.getById(request.getId())); return super.submit(request); } + @Override + public String genCode(String id) { + BizQualityWorkRegistration entity = getById(id); + saveEntity(entity, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } @Transactional @Override @@ -129,9 +135,10 @@ throw new ServiceException(500, "该工作审核登记表已由" + registration.getCreatorName() + "创建"); } - saveEntity(entity, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// saveEntity(entity, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.WorkRegistration); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + saveZeroCodeEntity(entity, QualityTableEnum.WORK_REGISTRATION); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); // //生成文件编码 // String labCode = entity.getBizLabCode(); // String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.WORK_REGISTRATION,); @@ -299,19 +306,22 @@ return false; } + + @Transactional @Override public boolean updateById(BizQualityWorkRegistration entity) { - BizQualityWorkRegistration oldPlan = getById(entity.getId()); - updateEntity(entity, oldPlan, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// BizQualityWorkRegistration oldPlan = getById(entity.getId()); +// updateEntity(entity, oldPlan, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); // if (!oldPlan.getBizLabCode().equals(entity.getBizLabCode())) { // String labCode = entity.getBizLabCode(); // String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); // entity.setFileCode(newCode); // entity.setSysCode(newCode); // } - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.WorkRegistration); entity.setUpdateTime(DateUtil.now()); //查询最大的已完成记录更新至当前阶段 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityInternalAuditRepEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityInternalAuditRepEventPostProcessor.java index 44065be..7cf65c5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityInternalAuditRepEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityInternalAuditRepEventPostProcessor.java @@ -9,6 +9,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.service.listeners.NotifyEventPostProcessor; import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.utils.SpringContextUtil; @@ -34,8 +35,11 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityInternalAuditRepService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityInternalAuditRepService.class); + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityInternalAuditRep::getApprovalStatus, ApprovalStatusEnum.PASSED); + update.set(BizQualityInternalAuditRep::getSysCode, code); + update.set(BizQualityInternalAuditRep::getFileCode, code); update.eq(BizQualityInternalAuditRep::getId, notifyEventStatusDTO.getId()); boolean updateFlag = supervisionRepMapper.update(update); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonReviewFormEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonReviewFormEventPostProcessor.java index 1ba54e1..e4071a6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonReviewFormEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonReviewFormEventPostProcessor.java @@ -9,6 +9,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.quality.BizQualityNonReviewForm; +import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.service.listeners.NotifyEventPostProcessor; import com.casic.missiles.service.quality.IBizQualityNonReviewFormService; import com.casic.missiles.utils.SpringContextUtil; @@ -34,9 +35,15 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityNonReviewFormService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityNonReviewFormService.class); + //重新生成编码 + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); + LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); + update.set(BizQualityNonReviewForm::getSysCode, code); + update.set(BizQualityNonReviewForm::getFileCode, code); update.set(BizQualityNonReviewForm::getApprovalStatus, ApprovalStatusEnum.PASSED); update.eq(BizQualityNonReviewForm::getId, notifyEventStatusDTO.getId()); + boolean updateFlag = supervisionRepMapper.update(update); if (!updateFlag) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityReviewFormEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityReviewFormEventPostProcessor.java index 5e31d32..461958f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityReviewFormEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityReviewFormEventPostProcessor.java @@ -34,8 +34,11 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityReviewFormService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityReviewFormService.class); + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityReviewForm::getApprovalStatus, ApprovalStatusEnum.PASSED); + update.set(BizQualityReviewForm::getSysCode, code); + update.set(BizQualityReviewForm::getFileCode, code); update.eq(BizQualityReviewForm::getId, notifyEventStatusDTO.getId()); boolean updateFlag = supervisionRepMapper.update(update); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityWorkRegistrationEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityWorkRegistrationEventPostProcessor.java index b48971c..1d1adf1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityWorkRegistrationEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityWorkRegistrationEventPostProcessor.java @@ -34,7 +34,10 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityWorkRegistrationService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityWorkRegistrationService.class); + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); + update.set(BizQualityWorkRegistration::getFileCode,code); + update.set(BizQualityWorkRegistration::getSysCode,code); update.set(BizQualityWorkRegistration::getApprovalStatus, ApprovalStatusEnum.PASSED); update.eq(BizQualityWorkRegistration::getId, notifyEventStatusDTO.getId()); boolean updateFlag = supervisionRepMapper.update(update); @@ -44,6 +47,7 @@ throw new BusinessException(BusinessExceptionEnum.APPROVAL_PROCESSOR_HANDLE_FAILED); } + BizQualityWorkRegistration registration = supervisionRepMapper.getById(id); doHandleApprovalMessage(registration.getCreator(), registration.getProcessId(), ApplyFromIdEnum.QUALITY_WORK_REGISTRATION.getCode(), registration.getFileName(), notifyEventStatusDTO.getId(), ApplyFromIdEnum.QUALITY_WORK_REGISTRATION.getSerialNumber()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityInternalAuditRepService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityInternalAuditRepService.java index b1aeec2..5872c1b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityInternalAuditRepService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityInternalAuditRepService.java @@ -30,4 +30,6 @@ void exportFile(ExportDTO exportDTO, HttpServletResponse response); void exportZip(List repList, HttpServletResponse response); + + String genCode(String id); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonReviewFormService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonReviewFormService.java index ce5a972..378f00f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonReviewFormService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonReviewFormService.java @@ -38,4 +38,6 @@ List selectByIds(List idList); BizQualityNonReviewForm selectById(Long targetId); + + String genCode(String id); } diff --git a/casic-metering-api/src/main/resources/config/application-test.yml b/casic-metering-api/src/main/resources/config/application-test.yml index 26a465b..2d87b84 100644 --- a/casic-metering-api/src/main/resources/config/application-test.yml +++ b/casic-metering-api/src/main/resources/config/application-test.yml @@ -5,16 +5,16 @@ datasource: driver-class-name: com.mysql.cj.jdbc.Driver # url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true - url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://192.168.83.42:3306/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true # urls: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root # password: Casic203 - password: Casic203! + password: casic203 redis: - host: 111.198.10.15 -# port: 11412 - port: 21903 - password: ew5T4K3#203 + host: localhost +# port: 11412 ew5T4K3#203 + port: 6379 + password: database: 1 serializer: org.springframework.data.redis.serializer.StringRedisSerializer redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index e18a28e..9f8064a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -77,7 +77,7 @@ @Value("${casic.file.dir}") private String localFileDir; - public BizQualityInternalAuditRepServiceImpl(AbstractPermissionContext permissionContext, IBizQualityInternalAuditManagementService internalAuditManagementService, AbstractDictService dictService, IBizQualityAuditRepDeptService repDeptService, IBizQualityAuditRepUserService repUserService, PrintFileRegister printFileRegister, ISystemSignService signService,@Lazy IBizQualityWorkRegistrationService bizQualityWorkRegistrationService) { + public BizQualityInternalAuditRepServiceImpl(AbstractPermissionContext permissionContext, IBizQualityInternalAuditManagementService internalAuditManagementService, AbstractDictService dictService, IBizQualityAuditRepDeptService repDeptService, IBizQualityAuditRepUserService repUserService, PrintFileRegister printFileRegister, ISystemSignService signService, @Lazy IBizQualityWorkRegistrationService bizQualityWorkRegistrationService) { this.permissionContext = permissionContext; this.internalAuditManagementService = internalAuditManagementService; this.dictService = dictService; @@ -106,12 +106,13 @@ //生成文件编码 entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + saveZeroCodeEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP); //校验创建年份 - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityYearNoCheckEnum.AuditRep); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.AuditRep); //内审报告校验末次会议是否召开 - bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING,entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING, entity.getYearNo()); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -120,15 +121,23 @@ } @Override + public String genCode(String id) { + BizQualityInternalAuditRep entity = getById(id); + saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + + + @Override public boolean updateById(BizQualityInternalAuditRep entity) { BizQualityInternalAuditRep old = getById(entity.getId()); - updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); //校验创建年份 - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityYearNoCheckEnum.AuditRep); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.AuditRep); //内审报告校验末次会议是否召开 - bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING,entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING, entity.getYearNo()); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index 74d975a..f92aeb4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -97,7 +97,8 @@ entity.setCreatorName(user.getName()); //生成文件编码 - saveEntity(entity, entity.getGroupNo(),QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// saveEntity(entity, entity.getGroupNo(),QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + saveZeroCodeEntity(entity, entity.getGroupNo(), QualityTableEnum.NON_REVIEW_FORM); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); super.save(entity); @@ -105,6 +106,13 @@ return true; } + @Override + public String genCode(String id) { + BizQualityNonReviewForm entity = getById(id); + saveEntity(entity, entity.getGroupNo(), QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + private void wrapInfo(BizQualityNonReviewForm entity) { entity.setApprovalStatusName(dictService.getDictNameByCode(QualityDictTypeEnum.APPROVAL_STATUS.getCode(), entity.getApprovalStatus())); @@ -121,9 +129,9 @@ @Override public boolean updateById(BizQualityNonReviewForm entity) { - BizQualityNonReviewForm old = getById(entity.getId()); - updateEntity(entity, entity.getGroupNo(), old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + +// updateEntity(entity, entity.getGroupNo(), old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); @@ -239,9 +247,10 @@ */ @Override public BizQualityNonReviewForm selectById(Long targetId) { - return this.baseMapper.selectById(targetId); + return this.baseMapper.selectById(targetId); } + @Transactional @Override public ReturnDTO agree(BizQualityNonReviewFormApprovalVO request) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index aeca9d7..d9102b2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -182,6 +182,7 @@ return this.baseMapper.selectById(targetId); } + @Override public Page listPage(Page page, BizQualityReviewFormVO request) throws Exception { Page reviewFormPage = super.listPage(page, request); @@ -200,12 +201,12 @@ entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 - saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - +// saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + saveZeroCodeEntity(entity, QualityTableEnum.REVIEW_FORM); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); //校验该年份次数的内审计划是否已完成 bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.REVIEW_FORM, entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); super.save(entity); @@ -213,6 +214,13 @@ return true; } + @Override + public String genCode(String id) { + BizQualityReviewForm entity = getById(id); + saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + private void wrapInfo(BizQualityReviewForm entity) { entity.setApprovalStatusName(dictService.getDictNameByCode(QualityDictTypeEnum.APPROVAL_STATUS.getCode(), entity.getApprovalStatus())); entity.setBizLabCodeName(dictService.getDictNameByCode(MeterDictCode.LAB_CODE, entity.getBizLabCode())); @@ -226,11 +234,11 @@ @Override public boolean updateById(BizQualityReviewForm entity) { - BizQualityReviewForm old = getById(entity.getId()); - updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + +// updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); //校验该年份次数的内审计划是否已完成 bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.REVIEW_FORM, entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java index de029bb..0adf7d4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java @@ -112,6 +112,12 @@ internalAuditManagementService.addBizQualityInternalAuditFile(this.getById(request.getId())); return super.submit(request); } + @Override + public String genCode(String id) { + BizQualityWorkRegistration entity = getById(id); + saveEntity(entity, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } @Transactional @Override @@ -129,9 +135,10 @@ throw new ServiceException(500, "该工作审核登记表已由" + registration.getCreatorName() + "创建"); } - saveEntity(entity, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// saveEntity(entity, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.WorkRegistration); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + saveZeroCodeEntity(entity, QualityTableEnum.WORK_REGISTRATION); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); // //生成文件编码 // String labCode = entity.getBizLabCode(); // String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.WORK_REGISTRATION,); @@ -299,19 +306,22 @@ return false; } + + @Transactional @Override public boolean updateById(BizQualityWorkRegistration entity) { - BizQualityWorkRegistration oldPlan = getById(entity.getId()); - updateEntity(entity, oldPlan, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// BizQualityWorkRegistration oldPlan = getById(entity.getId()); +// updateEntity(entity, oldPlan, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); // if (!oldPlan.getBizLabCode().equals(entity.getBizLabCode())) { // String labCode = entity.getBizLabCode(); // String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); // entity.setFileCode(newCode); // entity.setSysCode(newCode); // } - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.WorkRegistration); entity.setUpdateTime(DateUtil.now()); //查询最大的已完成记录更新至当前阶段 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityInternalAuditRepEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityInternalAuditRepEventPostProcessor.java index 44065be..7cf65c5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityInternalAuditRepEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityInternalAuditRepEventPostProcessor.java @@ -9,6 +9,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.service.listeners.NotifyEventPostProcessor; import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.utils.SpringContextUtil; @@ -34,8 +35,11 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityInternalAuditRepService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityInternalAuditRepService.class); + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityInternalAuditRep::getApprovalStatus, ApprovalStatusEnum.PASSED); + update.set(BizQualityInternalAuditRep::getSysCode, code); + update.set(BizQualityInternalAuditRep::getFileCode, code); update.eq(BizQualityInternalAuditRep::getId, notifyEventStatusDTO.getId()); boolean updateFlag = supervisionRepMapper.update(update); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonReviewFormEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonReviewFormEventPostProcessor.java index 1ba54e1..e4071a6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonReviewFormEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonReviewFormEventPostProcessor.java @@ -9,6 +9,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.quality.BizQualityNonReviewForm; +import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.service.listeners.NotifyEventPostProcessor; import com.casic.missiles.service.quality.IBizQualityNonReviewFormService; import com.casic.missiles.utils.SpringContextUtil; @@ -34,9 +35,15 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityNonReviewFormService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityNonReviewFormService.class); + //重新生成编码 + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); + LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); + update.set(BizQualityNonReviewForm::getSysCode, code); + update.set(BizQualityNonReviewForm::getFileCode, code); update.set(BizQualityNonReviewForm::getApprovalStatus, ApprovalStatusEnum.PASSED); update.eq(BizQualityNonReviewForm::getId, notifyEventStatusDTO.getId()); + boolean updateFlag = supervisionRepMapper.update(update); if (!updateFlag) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityReviewFormEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityReviewFormEventPostProcessor.java index 5e31d32..461958f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityReviewFormEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityReviewFormEventPostProcessor.java @@ -34,8 +34,11 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityReviewFormService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityReviewFormService.class); + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityReviewForm::getApprovalStatus, ApprovalStatusEnum.PASSED); + update.set(BizQualityReviewForm::getSysCode, code); + update.set(BizQualityReviewForm::getFileCode, code); update.eq(BizQualityReviewForm::getId, notifyEventStatusDTO.getId()); boolean updateFlag = supervisionRepMapper.update(update); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityWorkRegistrationEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityWorkRegistrationEventPostProcessor.java index b48971c..1d1adf1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityWorkRegistrationEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityWorkRegistrationEventPostProcessor.java @@ -34,7 +34,10 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityWorkRegistrationService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityWorkRegistrationService.class); + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); + update.set(BizQualityWorkRegistration::getFileCode,code); + update.set(BizQualityWorkRegistration::getSysCode,code); update.set(BizQualityWorkRegistration::getApprovalStatus, ApprovalStatusEnum.PASSED); update.eq(BizQualityWorkRegistration::getId, notifyEventStatusDTO.getId()); boolean updateFlag = supervisionRepMapper.update(update); @@ -44,6 +47,7 @@ throw new BusinessException(BusinessExceptionEnum.APPROVAL_PROCESSOR_HANDLE_FAILED); } + BizQualityWorkRegistration registration = supervisionRepMapper.getById(id); doHandleApprovalMessage(registration.getCreator(), registration.getProcessId(), ApplyFromIdEnum.QUALITY_WORK_REGISTRATION.getCode(), registration.getFileName(), notifyEventStatusDTO.getId(), ApplyFromIdEnum.QUALITY_WORK_REGISTRATION.getSerialNumber()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityInternalAuditRepService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityInternalAuditRepService.java index b1aeec2..5872c1b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityInternalAuditRepService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityInternalAuditRepService.java @@ -30,4 +30,6 @@ void exportFile(ExportDTO exportDTO, HttpServletResponse response); void exportZip(List repList, HttpServletResponse response); + + String genCode(String id); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonReviewFormService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonReviewFormService.java index ce5a972..378f00f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonReviewFormService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonReviewFormService.java @@ -38,4 +38,6 @@ List selectByIds(List idList); BizQualityNonReviewForm selectById(Long targetId); + + String genCode(String id); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityReviewFormService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityReviewFormService.java index 443223c..2167dad 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityReviewFormService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityReviewFormService.java @@ -36,4 +36,6 @@ List selectByIds(List idList); BizQualityReviewForm selectById(Long targetId); + + String genCode(String id); } diff --git a/casic-metering-api/src/main/resources/config/application-test.yml b/casic-metering-api/src/main/resources/config/application-test.yml index 26a465b..2d87b84 100644 --- a/casic-metering-api/src/main/resources/config/application-test.yml +++ b/casic-metering-api/src/main/resources/config/application-test.yml @@ -5,16 +5,16 @@ datasource: driver-class-name: com.mysql.cj.jdbc.Driver # url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true - url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://192.168.83.42:3306/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true # urls: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root # password: Casic203 - password: Casic203! + password: casic203 redis: - host: 111.198.10.15 -# port: 11412 - port: 21903 - password: ew5T4K3#203 + host: localhost +# port: 11412 ew5T4K3#203 + port: 6379 + password: database: 1 serializer: org.springframework.data.redis.serializer.StringRedisSerializer redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index e18a28e..9f8064a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -77,7 +77,7 @@ @Value("${casic.file.dir}") private String localFileDir; - public BizQualityInternalAuditRepServiceImpl(AbstractPermissionContext permissionContext, IBizQualityInternalAuditManagementService internalAuditManagementService, AbstractDictService dictService, IBizQualityAuditRepDeptService repDeptService, IBizQualityAuditRepUserService repUserService, PrintFileRegister printFileRegister, ISystemSignService signService,@Lazy IBizQualityWorkRegistrationService bizQualityWorkRegistrationService) { + public BizQualityInternalAuditRepServiceImpl(AbstractPermissionContext permissionContext, IBizQualityInternalAuditManagementService internalAuditManagementService, AbstractDictService dictService, IBizQualityAuditRepDeptService repDeptService, IBizQualityAuditRepUserService repUserService, PrintFileRegister printFileRegister, ISystemSignService signService, @Lazy IBizQualityWorkRegistrationService bizQualityWorkRegistrationService) { this.permissionContext = permissionContext; this.internalAuditManagementService = internalAuditManagementService; this.dictService = dictService; @@ -106,12 +106,13 @@ //生成文件编码 entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + saveZeroCodeEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP); //校验创建年份 - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityYearNoCheckEnum.AuditRep); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.AuditRep); //内审报告校验末次会议是否召开 - bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING,entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING, entity.getYearNo()); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -120,15 +121,23 @@ } @Override + public String genCode(String id) { + BizQualityInternalAuditRep entity = getById(id); + saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + + + @Override public boolean updateById(BizQualityInternalAuditRep entity) { BizQualityInternalAuditRep old = getById(entity.getId()); - updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); //校验创建年份 - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityYearNoCheckEnum.AuditRep); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.AuditRep); //内审报告校验末次会议是否召开 - bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING,entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING, entity.getYearNo()); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index 74d975a..f92aeb4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -97,7 +97,8 @@ entity.setCreatorName(user.getName()); //生成文件编码 - saveEntity(entity, entity.getGroupNo(),QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// saveEntity(entity, entity.getGroupNo(),QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + saveZeroCodeEntity(entity, entity.getGroupNo(), QualityTableEnum.NON_REVIEW_FORM); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); super.save(entity); @@ -105,6 +106,13 @@ return true; } + @Override + public String genCode(String id) { + BizQualityNonReviewForm entity = getById(id); + saveEntity(entity, entity.getGroupNo(), QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + private void wrapInfo(BizQualityNonReviewForm entity) { entity.setApprovalStatusName(dictService.getDictNameByCode(QualityDictTypeEnum.APPROVAL_STATUS.getCode(), entity.getApprovalStatus())); @@ -121,9 +129,9 @@ @Override public boolean updateById(BizQualityNonReviewForm entity) { - BizQualityNonReviewForm old = getById(entity.getId()); - updateEntity(entity, entity.getGroupNo(), old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + +// updateEntity(entity, entity.getGroupNo(), old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); @@ -239,9 +247,10 @@ */ @Override public BizQualityNonReviewForm selectById(Long targetId) { - return this.baseMapper.selectById(targetId); + return this.baseMapper.selectById(targetId); } + @Transactional @Override public ReturnDTO agree(BizQualityNonReviewFormApprovalVO request) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index aeca9d7..d9102b2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -182,6 +182,7 @@ return this.baseMapper.selectById(targetId); } + @Override public Page listPage(Page page, BizQualityReviewFormVO request) throws Exception { Page reviewFormPage = super.listPage(page, request); @@ -200,12 +201,12 @@ entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 - saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - +// saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + saveZeroCodeEntity(entity, QualityTableEnum.REVIEW_FORM); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); //校验该年份次数的内审计划是否已完成 bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.REVIEW_FORM, entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); super.save(entity); @@ -213,6 +214,13 @@ return true; } + @Override + public String genCode(String id) { + BizQualityReviewForm entity = getById(id); + saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + private void wrapInfo(BizQualityReviewForm entity) { entity.setApprovalStatusName(dictService.getDictNameByCode(QualityDictTypeEnum.APPROVAL_STATUS.getCode(), entity.getApprovalStatus())); entity.setBizLabCodeName(dictService.getDictNameByCode(MeterDictCode.LAB_CODE, entity.getBizLabCode())); @@ -226,11 +234,11 @@ @Override public boolean updateById(BizQualityReviewForm entity) { - BizQualityReviewForm old = getById(entity.getId()); - updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + +// updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); //校验该年份次数的内审计划是否已完成 bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.REVIEW_FORM, entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java index de029bb..0adf7d4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java @@ -112,6 +112,12 @@ internalAuditManagementService.addBizQualityInternalAuditFile(this.getById(request.getId())); return super.submit(request); } + @Override + public String genCode(String id) { + BizQualityWorkRegistration entity = getById(id); + saveEntity(entity, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } @Transactional @Override @@ -129,9 +135,10 @@ throw new ServiceException(500, "该工作审核登记表已由" + registration.getCreatorName() + "创建"); } - saveEntity(entity, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// saveEntity(entity, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.WorkRegistration); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + saveZeroCodeEntity(entity, QualityTableEnum.WORK_REGISTRATION); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); // //生成文件编码 // String labCode = entity.getBizLabCode(); // String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.WORK_REGISTRATION,); @@ -299,19 +306,22 @@ return false; } + + @Transactional @Override public boolean updateById(BizQualityWorkRegistration entity) { - BizQualityWorkRegistration oldPlan = getById(entity.getId()); - updateEntity(entity, oldPlan, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// BizQualityWorkRegistration oldPlan = getById(entity.getId()); +// updateEntity(entity, oldPlan, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); // if (!oldPlan.getBizLabCode().equals(entity.getBizLabCode())) { // String labCode = entity.getBizLabCode(); // String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); // entity.setFileCode(newCode); // entity.setSysCode(newCode); // } - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.WorkRegistration); entity.setUpdateTime(DateUtil.now()); //查询最大的已完成记录更新至当前阶段 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityInternalAuditRepEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityInternalAuditRepEventPostProcessor.java index 44065be..7cf65c5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityInternalAuditRepEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityInternalAuditRepEventPostProcessor.java @@ -9,6 +9,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.service.listeners.NotifyEventPostProcessor; import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.utils.SpringContextUtil; @@ -34,8 +35,11 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityInternalAuditRepService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityInternalAuditRepService.class); + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityInternalAuditRep::getApprovalStatus, ApprovalStatusEnum.PASSED); + update.set(BizQualityInternalAuditRep::getSysCode, code); + update.set(BizQualityInternalAuditRep::getFileCode, code); update.eq(BizQualityInternalAuditRep::getId, notifyEventStatusDTO.getId()); boolean updateFlag = supervisionRepMapper.update(update); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonReviewFormEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonReviewFormEventPostProcessor.java index 1ba54e1..e4071a6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonReviewFormEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonReviewFormEventPostProcessor.java @@ -9,6 +9,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.quality.BizQualityNonReviewForm; +import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.service.listeners.NotifyEventPostProcessor; import com.casic.missiles.service.quality.IBizQualityNonReviewFormService; import com.casic.missiles.utils.SpringContextUtil; @@ -34,9 +35,15 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityNonReviewFormService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityNonReviewFormService.class); + //重新生成编码 + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); + LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); + update.set(BizQualityNonReviewForm::getSysCode, code); + update.set(BizQualityNonReviewForm::getFileCode, code); update.set(BizQualityNonReviewForm::getApprovalStatus, ApprovalStatusEnum.PASSED); update.eq(BizQualityNonReviewForm::getId, notifyEventStatusDTO.getId()); + boolean updateFlag = supervisionRepMapper.update(update); if (!updateFlag) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityReviewFormEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityReviewFormEventPostProcessor.java index 5e31d32..461958f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityReviewFormEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityReviewFormEventPostProcessor.java @@ -34,8 +34,11 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityReviewFormService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityReviewFormService.class); + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityReviewForm::getApprovalStatus, ApprovalStatusEnum.PASSED); + update.set(BizQualityReviewForm::getSysCode, code); + update.set(BizQualityReviewForm::getFileCode, code); update.eq(BizQualityReviewForm::getId, notifyEventStatusDTO.getId()); boolean updateFlag = supervisionRepMapper.update(update); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityWorkRegistrationEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityWorkRegistrationEventPostProcessor.java index b48971c..1d1adf1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityWorkRegistrationEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityWorkRegistrationEventPostProcessor.java @@ -34,7 +34,10 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityWorkRegistrationService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityWorkRegistrationService.class); + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); + update.set(BizQualityWorkRegistration::getFileCode,code); + update.set(BizQualityWorkRegistration::getSysCode,code); update.set(BizQualityWorkRegistration::getApprovalStatus, ApprovalStatusEnum.PASSED); update.eq(BizQualityWorkRegistration::getId, notifyEventStatusDTO.getId()); boolean updateFlag = supervisionRepMapper.update(update); @@ -44,6 +47,7 @@ throw new BusinessException(BusinessExceptionEnum.APPROVAL_PROCESSOR_HANDLE_FAILED); } + BizQualityWorkRegistration registration = supervisionRepMapper.getById(id); doHandleApprovalMessage(registration.getCreator(), registration.getProcessId(), ApplyFromIdEnum.QUALITY_WORK_REGISTRATION.getCode(), registration.getFileName(), notifyEventStatusDTO.getId(), ApplyFromIdEnum.QUALITY_WORK_REGISTRATION.getSerialNumber()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityInternalAuditRepService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityInternalAuditRepService.java index b1aeec2..5872c1b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityInternalAuditRepService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityInternalAuditRepService.java @@ -30,4 +30,6 @@ void exportFile(ExportDTO exportDTO, HttpServletResponse response); void exportZip(List repList, HttpServletResponse response); + + String genCode(String id); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonReviewFormService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonReviewFormService.java index ce5a972..378f00f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonReviewFormService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonReviewFormService.java @@ -38,4 +38,6 @@ List selectByIds(List idList); BizQualityNonReviewForm selectById(Long targetId); + + String genCode(String id); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityReviewFormService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityReviewFormService.java index 443223c..2167dad 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityReviewFormService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityReviewFormService.java @@ -36,4 +36,6 @@ List selectByIds(List idList); BizQualityReviewForm selectById(Long targetId); + + String genCode(String id); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityWorkRegistrationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityWorkRegistrationService.java index ce93a1d..94a7803 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityWorkRegistrationService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityWorkRegistrationService.java @@ -58,4 +58,11 @@ * @return */ boolean checkIsCompleted(QualityCurrentStageEnum stageEnum, String yearNo); + + /** + * 工作登记编码生成 + * @param id + * @return + */ + String genCode(String id); } diff --git a/casic-metering-api/src/main/resources/config/application-test.yml b/casic-metering-api/src/main/resources/config/application-test.yml index 26a465b..2d87b84 100644 --- a/casic-metering-api/src/main/resources/config/application-test.yml +++ b/casic-metering-api/src/main/resources/config/application-test.yml @@ -5,16 +5,16 @@ datasource: driver-class-name: com.mysql.cj.jdbc.Driver # url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true - url: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://192.168.83.42:3306/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true # urls: jdbc:mysql://111.198.10.15:21906/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root # password: Casic203 - password: Casic203! + password: casic203 redis: - host: 111.198.10.15 -# port: 11412 - port: 21903 - password: ew5T4K3#203 + host: localhost +# port: 11412 ew5T4K3#203 + port: 6379 + password: database: 1 serializer: org.springframework.data.redis.serializer.StringRedisSerializer redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java index e18a28e..9f8064a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityInternalAuditRepServiceImpl.java @@ -77,7 +77,7 @@ @Value("${casic.file.dir}") private String localFileDir; - public BizQualityInternalAuditRepServiceImpl(AbstractPermissionContext permissionContext, IBizQualityInternalAuditManagementService internalAuditManagementService, AbstractDictService dictService, IBizQualityAuditRepDeptService repDeptService, IBizQualityAuditRepUserService repUserService, PrintFileRegister printFileRegister, ISystemSignService signService,@Lazy IBizQualityWorkRegistrationService bizQualityWorkRegistrationService) { + public BizQualityInternalAuditRepServiceImpl(AbstractPermissionContext permissionContext, IBizQualityInternalAuditManagementService internalAuditManagementService, AbstractDictService dictService, IBizQualityAuditRepDeptService repDeptService, IBizQualityAuditRepUserService repUserService, PrintFileRegister printFileRegister, ISystemSignService signService, @Lazy IBizQualityWorkRegistrationService bizQualityWorkRegistrationService) { this.permissionContext = permissionContext; this.internalAuditManagementService = internalAuditManagementService; this.dictService = dictService; @@ -106,12 +106,13 @@ //生成文件编码 entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + saveZeroCodeEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP); //校验创建年份 - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityYearNoCheckEnum.AuditRep); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.AuditRep); //内审报告校验末次会议是否召开 - bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING,entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING, entity.getYearNo()); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); repDeptService.saveList(entity.getRepDeptList(), entity.getId()); @@ -120,15 +121,23 @@ } @Override + public String genCode(String id) { + BizQualityInternalAuditRep entity = getById(id); + saveEntity(entity, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + + + @Override public boolean updateById(BizQualityInternalAuditRep entity) { BizQualityInternalAuditRep old = getById(entity.getId()); - updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// updateEntity(entity, old, QualityTableEnum.INTERNAL_AUDIT_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); //校验创建年份 - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityYearNoCheckEnum.AuditRep); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.AuditRep); //内审报告校验末次会议是否召开 - bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING,entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.FINAL_MEETING, entity.getYearNo()); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index 74d975a..f92aeb4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -97,7 +97,8 @@ entity.setCreatorName(user.getName()); //生成文件编码 - saveEntity(entity, entity.getGroupNo(),QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// saveEntity(entity, entity.getGroupNo(),QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + saveZeroCodeEntity(entity, entity.getGroupNo(), QualityTableEnum.NON_REVIEW_FORM); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); super.save(entity); @@ -105,6 +106,13 @@ return true; } + @Override + public String genCode(String id) { + BizQualityNonReviewForm entity = getById(id); + saveEntity(entity, entity.getGroupNo(), QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + private void wrapInfo(BizQualityNonReviewForm entity) { entity.setApprovalStatusName(dictService.getDictNameByCode(QualityDictTypeEnum.APPROVAL_STATUS.getCode(), entity.getApprovalStatus())); @@ -121,9 +129,9 @@ @Override public boolean updateById(BizQualityNonReviewForm entity) { - BizQualityNonReviewForm old = getById(entity.getId()); - updateEntity(entity, entity.getGroupNo(), old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + +// updateEntity(entity, entity.getGroupNo(), old, QualityTableEnum.NON_REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); nonReviewFileService.saveList(entity.getNonReviewFiles(), entity.getId(), NonReviewRelFileTypeEnum.PROBLEM); @@ -239,9 +247,10 @@ */ @Override public BizQualityNonReviewForm selectById(Long targetId) { - return this.baseMapper.selectById(targetId); + return this.baseMapper.selectById(targetId); } + @Transactional @Override public ReturnDTO agree(BizQualityNonReviewFormApprovalVO request) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java index aeca9d7..d9102b2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityReviewFormServiceImpl.java @@ -182,6 +182,7 @@ return this.baseMapper.selectById(targetId); } + @Override public Page listPage(Page page, BizQualityReviewFormVO request) throws Exception { Page reviewFormPage = super.listPage(page, request); @@ -200,12 +201,12 @@ entity.setUpdateTime(DateUtil.now()); entity.setLogTime(new Date()); //生成文件编码 - saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - +// saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + saveZeroCodeEntity(entity, QualityTableEnum.REVIEW_FORM); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); //校验该年份次数的内审计划是否已完成 bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.REVIEW_FORM, entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); super.save(entity); @@ -213,6 +214,13 @@ return true; } + @Override + public String genCode(String id) { + BizQualityReviewForm entity = getById(id); + saveEntity(entity, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + private void wrapInfo(BizQualityReviewForm entity) { entity.setApprovalStatusName(dictService.getDictNameByCode(QualityDictTypeEnum.APPROVAL_STATUS.getCode(), entity.getApprovalStatus())); entity.setBizLabCodeName(dictService.getDictNameByCode(MeterDictCode.LAB_CODE, entity.getBizLabCode())); @@ -226,11 +234,11 @@ @Override public boolean updateById(BizQualityReviewForm entity) { - BizQualityReviewForm old = getById(entity.getId()); - updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + +// updateEntity(entity, old, QualityTableEnum.REVIEW_FORM, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); //校验该年份次数的内审计划是否已完成 bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.REVIEW_FORM, entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); itemService.saveList(entity.getItemList(), entity.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java index de029bb..0adf7d4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityWorkRegistrationServiceImpl.java @@ -112,6 +112,12 @@ internalAuditManagementService.addBizQualityInternalAuditFile(this.getById(request.getId())); return super.submit(request); } + @Override + public String genCode(String id) { + BizQualityWorkRegistration entity = getById(id); + saveEntity(entity, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } @Transactional @Override @@ -129,9 +135,10 @@ throw new ServiceException(500, "该工作审核登记表已由" + registration.getCreatorName() + "创建"); } - saveEntity(entity, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// saveEntity(entity, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.WorkRegistration); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + saveZeroCodeEntity(entity, QualityTableEnum.WORK_REGISTRATION); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); // //生成文件编码 // String labCode = entity.getBizLabCode(); // String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.WORK_REGISTRATION,); @@ -299,19 +306,22 @@ return false; } + + @Transactional @Override public boolean updateById(BizQualityWorkRegistration entity) { - BizQualityWorkRegistration oldPlan = getById(entity.getId()); - updateEntity(entity, oldPlan, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// BizQualityWorkRegistration oldPlan = getById(entity.getId()); +// updateEntity(entity, oldPlan, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); // if (!oldPlan.getBizLabCode().equals(entity.getBizLabCode())) { // String labCode = entity.getBizLabCode(); // String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.WORK_REGISTRATION, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); // entity.setFileCode(newCode); // entity.setSysCode(newCode); // } - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.WorkRegistration); entity.setUpdateTime(DateUtil.now()); //查询最大的已完成记录更新至当前阶段 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityInternalAuditRepEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityInternalAuditRepEventPostProcessor.java index 44065be..7cf65c5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityInternalAuditRepEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityInternalAuditRepEventPostProcessor.java @@ -9,6 +9,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.quality.BizQualityInternalAuditRep; +import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.service.listeners.NotifyEventPostProcessor; import com.casic.missiles.service.quality.IBizQualityInternalAuditRepService; import com.casic.missiles.utils.SpringContextUtil; @@ -34,8 +35,11 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityInternalAuditRepService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityInternalAuditRepService.class); + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityInternalAuditRep::getApprovalStatus, ApprovalStatusEnum.PASSED); + update.set(BizQualityInternalAuditRep::getSysCode, code); + update.set(BizQualityInternalAuditRep::getFileCode, code); update.eq(BizQualityInternalAuditRep::getId, notifyEventStatusDTO.getId()); boolean updateFlag = supervisionRepMapper.update(update); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonReviewFormEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonReviewFormEventPostProcessor.java index 1ba54e1..e4071a6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonReviewFormEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonReviewFormEventPostProcessor.java @@ -9,6 +9,7 @@ import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.quality.BizQualityNonReviewForm; +import com.casic.missiles.model.quality.BizQualityReviewForm; import com.casic.missiles.service.listeners.NotifyEventPostProcessor; import com.casic.missiles.service.quality.IBizQualityNonReviewFormService; import com.casic.missiles.utils.SpringContextUtil; @@ -34,9 +35,15 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityNonReviewFormService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityNonReviewFormService.class); + //重新生成编码 + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); + LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); + update.set(BizQualityNonReviewForm::getSysCode, code); + update.set(BizQualityNonReviewForm::getFileCode, code); update.set(BizQualityNonReviewForm::getApprovalStatus, ApprovalStatusEnum.PASSED); update.eq(BizQualityNonReviewForm::getId, notifyEventStatusDTO.getId()); + boolean updateFlag = supervisionRepMapper.update(update); if (!updateFlag) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityReviewFormEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityReviewFormEventPostProcessor.java index 5e31d32..461958f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityReviewFormEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityReviewFormEventPostProcessor.java @@ -34,8 +34,11 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityReviewFormService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityReviewFormService.class); + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityReviewForm::getApprovalStatus, ApprovalStatusEnum.PASSED); + update.set(BizQualityReviewForm::getSysCode, code); + update.set(BizQualityReviewForm::getFileCode, code); update.eq(BizQualityReviewForm::getId, notifyEventStatusDTO.getId()); boolean updateFlag = supervisionRepMapper.update(update); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityWorkRegistrationEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityWorkRegistrationEventPostProcessor.java index b48971c..1d1adf1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityWorkRegistrationEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityWorkRegistrationEventPostProcessor.java @@ -34,7 +34,10 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityWorkRegistrationService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityWorkRegistrationService.class); + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); + update.set(BizQualityWorkRegistration::getFileCode,code); + update.set(BizQualityWorkRegistration::getSysCode,code); update.set(BizQualityWorkRegistration::getApprovalStatus, ApprovalStatusEnum.PASSED); update.eq(BizQualityWorkRegistration::getId, notifyEventStatusDTO.getId()); boolean updateFlag = supervisionRepMapper.update(update); @@ -44,6 +47,7 @@ throw new BusinessException(BusinessExceptionEnum.APPROVAL_PROCESSOR_HANDLE_FAILED); } + BizQualityWorkRegistration registration = supervisionRepMapper.getById(id); doHandleApprovalMessage(registration.getCreator(), registration.getProcessId(), ApplyFromIdEnum.QUALITY_WORK_REGISTRATION.getCode(), registration.getFileName(), notifyEventStatusDTO.getId(), ApplyFromIdEnum.QUALITY_WORK_REGISTRATION.getSerialNumber()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityInternalAuditRepService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityInternalAuditRepService.java index b1aeec2..5872c1b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityInternalAuditRepService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityInternalAuditRepService.java @@ -30,4 +30,6 @@ void exportFile(ExportDTO exportDTO, HttpServletResponse response); void exportZip(List repList, HttpServletResponse response); + + String genCode(String id); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonReviewFormService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonReviewFormService.java index ce5a972..378f00f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonReviewFormService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonReviewFormService.java @@ -38,4 +38,6 @@ List selectByIds(List idList); BizQualityNonReviewForm selectById(Long targetId); + + String genCode(String id); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityReviewFormService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityReviewFormService.java index 443223c..2167dad 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityReviewFormService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityReviewFormService.java @@ -36,4 +36,6 @@ List selectByIds(List idList); BizQualityReviewForm selectById(Long targetId); + + String genCode(String id); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityWorkRegistrationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityWorkRegistrationService.java index ce93a1d..94a7803 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityWorkRegistrationService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityWorkRegistrationService.java @@ -58,4 +58,11 @@ * @return */ boolean checkIsCompleted(QualityCurrentStageEnum stageEnum, String yearNo); + + /** + * 工作登记编码生成 + * @param id + * @return + */ + String genCode(String id); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/base/IBaseFileService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/base/IBaseFileService.java index 8f8636e..ff960ed 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/base/IBaseFileService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/base/IBaseFileService.java @@ -88,6 +88,7 @@ saveEntity(entity, null, tableEnum, func); } default void saveZeroCodeEntity(T entity, QualityTableEnum tableEnum) { + entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); String labCode = entity.getBizLabCode(); String newCode = QualityNoUtil.genZeroMaxNo(labCode, null, tableEnum); entity.setSysCode(newCode); @@ -95,6 +96,14 @@ entity.setFileCode(newCode); } } + default void saveZeroCodeEntity(T entity, String groupNo, QualityTableEnum tableEnum) { + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genZeroMaxNo(labCode, groupNo, tableEnum); + entity.setSysCode(newCode); + if (StrUtil.isEmpty(entity.getFileCode())) { + entity.setFileCode(newCode); + } + } default void saveEntity(T entity, String groupNo, QualityTableEnum tableEnum, BiFunction func) { entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); String labCode = entity.getBizLabCode();