diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index aec6229..efa03b2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -142,8 +142,8 @@ * 状态(0,草稿 1公开) */ @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") - @TableField("plan_status") - private Integer planStatus; + @TableField("status") + private Integer status; @Override public String toString() { diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index aec6229..efa03b2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -142,8 +142,8 @@ * 状态(0,草稿 1公开) */ @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") - @TableField("plan_status") - private Integer planStatus; + @TableField("status") + private Integer status; @Override public String toString() { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 1104e90..90a7c07 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -95,7 +95,7 @@ private String localFileDir; - public BizQualityNonConformanceRepServiceImpl(AbstractPermissionContext permissionContext, @Lazy IBizQualitySupervisionRecordService supervisionRecordService, IBizLabRelDeptService relDeptService, AbstractDictService dictService, @Lazy IBizQualityCorrectiveRecordService correctiveRecordService, IBizQualityPreventRecordService preventRecordService, @Lazy IBizQualityNonConformanceFileRelService fileRelService, PrintFileRegister printFileRegister, ISystemSignService signService, IBizQualityProcessRecordService bizQualityProcessRecordService ) { + public BizQualityNonConformanceRepServiceImpl(AbstractPermissionContext permissionContext, @Lazy IBizQualitySupervisionRecordService supervisionRecordService, IBizLabRelDeptService relDeptService, AbstractDictService dictService, @Lazy IBizQualityCorrectiveRecordService correctiveRecordService, IBizQualityPreventRecordService preventRecordService, @Lazy IBizQualityNonConformanceFileRelService fileRelService, PrintFileRegister printFileRegister, ISystemSignService signService, IBizQualityProcessRecordService bizQualityProcessRecordService) { this.permissionContext = permissionContext; this.supervisionRecordService = supervisionRecordService; this.relDeptService = relDeptService; @@ -311,7 +311,14 @@ */ @Override public BizQualityNonConformanceRep selectById(Long targetId) { - return this.baseMapper.selectById(targetId); + return this.baseMapper.selectById(targetId); + } + + @Override + public String genCode(String id) { + BizQualityNonConformanceRep entity = getById(id); + saveEntity(entity, entity.getGroupNo(), QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); } @Override @@ -449,8 +456,11 @@ entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); - saveEntity(entity,entity.getGroupNo(), QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// saveEntity(entity,entity.getGroupNo(), QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + + saveZeroCodeEntity(entity, entity.getGroupNo(), QualityTableEnum.NON_CONFORMANCE_REP); + entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); super.save(entity); //关联附件保存 @@ -463,8 +473,8 @@ @Override public boolean updateById(BizQualityNonConformanceRep entity) { BizQualityNonConformanceRep oldRep = getById(entity.getId()); - updateEntity(entity,entity.getGroupNo(), oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// updateEntity(entity, entity.getGroupNo(), oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index aec6229..efa03b2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -142,8 +142,8 @@ * 状态(0,草稿 1公开) */ @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") - @TableField("plan_status") - private Integer planStatus; + @TableField("status") + private Integer status; @Override public String toString() { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 1104e90..90a7c07 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -95,7 +95,7 @@ private String localFileDir; - public BizQualityNonConformanceRepServiceImpl(AbstractPermissionContext permissionContext, @Lazy IBizQualitySupervisionRecordService supervisionRecordService, IBizLabRelDeptService relDeptService, AbstractDictService dictService, @Lazy IBizQualityCorrectiveRecordService correctiveRecordService, IBizQualityPreventRecordService preventRecordService, @Lazy IBizQualityNonConformanceFileRelService fileRelService, PrintFileRegister printFileRegister, ISystemSignService signService, IBizQualityProcessRecordService bizQualityProcessRecordService ) { + public BizQualityNonConformanceRepServiceImpl(AbstractPermissionContext permissionContext, @Lazy IBizQualitySupervisionRecordService supervisionRecordService, IBizLabRelDeptService relDeptService, AbstractDictService dictService, @Lazy IBizQualityCorrectiveRecordService correctiveRecordService, IBizQualityPreventRecordService preventRecordService, @Lazy IBizQualityNonConformanceFileRelService fileRelService, PrintFileRegister printFileRegister, ISystemSignService signService, IBizQualityProcessRecordService bizQualityProcessRecordService) { this.permissionContext = permissionContext; this.supervisionRecordService = supervisionRecordService; this.relDeptService = relDeptService; @@ -311,7 +311,14 @@ */ @Override public BizQualityNonConformanceRep selectById(Long targetId) { - return this.baseMapper.selectById(targetId); + return this.baseMapper.selectById(targetId); + } + + @Override + public String genCode(String id) { + BizQualityNonConformanceRep entity = getById(id); + saveEntity(entity, entity.getGroupNo(), QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); } @Override @@ -449,8 +456,11 @@ entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); - saveEntity(entity,entity.getGroupNo(), QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// saveEntity(entity,entity.getGroupNo(), QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + + saveZeroCodeEntity(entity, entity.getGroupNo(), QualityTableEnum.NON_CONFORMANCE_REP); + entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); super.save(entity); //关联附件保存 @@ -463,8 +473,8 @@ @Override public boolean updateById(BizQualityNonConformanceRep entity) { BizQualityNonConformanceRep oldRep = getById(entity.getId()); - updateEntity(entity,entity.getGroupNo(), oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// updateEntity(entity, entity.getGroupNo(), oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 378bbb3..2fbce90 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,6 +28,7 @@ import com.casic.missiles.mapper.quality.BizQualityScenePlanMapper; import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; @@ -192,6 +193,13 @@ } @Override + public String genCode(String id) { + BizQualityScenePlan entity = getById(id); + saveEntity(entity,null, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + + @Override public Page listPage(Page page, BizQualityScenePlanVO request) throws Exception { Page planPage = super.listPage(page, request); planPage.getRecords().forEach(this::wrapInfo); @@ -221,8 +229,10 @@ private synchronized void saveScenePlan(BizQualityScenePlan entity) { //生成文件编码 - saveEntity(entity, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// saveEntity(entity, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + saveZeroCodeEntity(entity,QualityTableEnum.SCENE_PLAN); + entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); //生成年度编码 entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); @@ -242,10 +252,11 @@ public boolean updateById(BizQualityScenePlan entity) { BizQualityScenePlan old = getById(entity.getId()); - updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.ScenePlan); bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.SITE_AUDIT,entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index aec6229..efa03b2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -142,8 +142,8 @@ * 状态(0,草稿 1公开) */ @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") - @TableField("plan_status") - private Integer planStatus; + @TableField("status") + private Integer status; @Override public String toString() { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 1104e90..90a7c07 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -95,7 +95,7 @@ private String localFileDir; - public BizQualityNonConformanceRepServiceImpl(AbstractPermissionContext permissionContext, @Lazy IBizQualitySupervisionRecordService supervisionRecordService, IBizLabRelDeptService relDeptService, AbstractDictService dictService, @Lazy IBizQualityCorrectiveRecordService correctiveRecordService, IBizQualityPreventRecordService preventRecordService, @Lazy IBizQualityNonConformanceFileRelService fileRelService, PrintFileRegister printFileRegister, ISystemSignService signService, IBizQualityProcessRecordService bizQualityProcessRecordService ) { + public BizQualityNonConformanceRepServiceImpl(AbstractPermissionContext permissionContext, @Lazy IBizQualitySupervisionRecordService supervisionRecordService, IBizLabRelDeptService relDeptService, AbstractDictService dictService, @Lazy IBizQualityCorrectiveRecordService correctiveRecordService, IBizQualityPreventRecordService preventRecordService, @Lazy IBizQualityNonConformanceFileRelService fileRelService, PrintFileRegister printFileRegister, ISystemSignService signService, IBizQualityProcessRecordService bizQualityProcessRecordService) { this.permissionContext = permissionContext; this.supervisionRecordService = supervisionRecordService; this.relDeptService = relDeptService; @@ -311,7 +311,14 @@ */ @Override public BizQualityNonConformanceRep selectById(Long targetId) { - return this.baseMapper.selectById(targetId); + return this.baseMapper.selectById(targetId); + } + + @Override + public String genCode(String id) { + BizQualityNonConformanceRep entity = getById(id); + saveEntity(entity, entity.getGroupNo(), QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); } @Override @@ -449,8 +456,11 @@ entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); - saveEntity(entity,entity.getGroupNo(), QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// saveEntity(entity,entity.getGroupNo(), QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + + saveZeroCodeEntity(entity, entity.getGroupNo(), QualityTableEnum.NON_CONFORMANCE_REP); + entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); super.save(entity); //关联附件保存 @@ -463,8 +473,8 @@ @Override public boolean updateById(BizQualityNonConformanceRep entity) { BizQualityNonConformanceRep oldRep = getById(entity.getId()); - updateEntity(entity,entity.getGroupNo(), oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// updateEntity(entity, entity.getGroupNo(), oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 378bbb3..2fbce90 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,6 +28,7 @@ import com.casic.missiles.mapper.quality.BizQualityScenePlanMapper; import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; @@ -192,6 +193,13 @@ } @Override + public String genCode(String id) { + BizQualityScenePlan entity = getById(id); + saveEntity(entity,null, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + + @Override public Page listPage(Page page, BizQualityScenePlanVO request) throws Exception { Page planPage = super.listPage(page, request); planPage.getRecords().forEach(this::wrapInfo); @@ -221,8 +229,10 @@ private synchronized void saveScenePlan(BizQualityScenePlan entity) { //生成文件编码 - saveEntity(entity, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// saveEntity(entity, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + saveZeroCodeEntity(entity,QualityTableEnum.SCENE_PLAN); + entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); //生成年度编码 entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); @@ -242,10 +252,11 @@ public boolean updateById(BizQualityScenePlan entity) { BizQualityScenePlan old = getById(entity.getId()); - updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.ScenePlan); bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.SITE_AUDIT,entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// 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/listeners/processor/QualityNonConformanceRepEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonConformanceRepEventPostProcessor.java index 0e6303c..f9d44fd 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonConformanceRepEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonConformanceRepEventPostProcessor.java @@ -35,6 +35,11 @@ }); IBizQualityNonConformanceRepService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityNonConformanceRepService.class); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); + String genCode = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); + + update.set(BizQualityNonConformanceRep::getFileCode, genCode); + update.set(BizQualityNonConformanceRep::getSysCode, genCode); + update.set(BizQualityNonConformanceRep::getApprovalStatus, ApprovalStatusEnum.PASSED); update.eq(BizQualityNonConformanceRep::getId, notifyEventStatusDTO.getId()); boolean updateFlag = supervisionRepMapper.update(update); @@ -44,6 +49,7 @@ throw new BusinessException(BusinessExceptionEnum.APPROVAL_PROCESSOR_HANDLE_FAILED); } + BizQualityNonConformanceRep conformanceRep = supervisionRepMapper.selectById(id); doHandleApprovalMessage(conformanceRep.getCreator(), conformanceRep.getProcessId(), ApplyFromIdEnum.QUALITY_NON_CONFORMANCE_REP.getCode(), conformanceRep.getFileName(), notifyEventStatusDTO.getId(), ApplyFromIdEnum.QUALITY_NON_CONFORMANCE_REP.getSerialNumber()); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index aec6229..efa03b2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -142,8 +142,8 @@ * 状态(0,草稿 1公开) */ @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") - @TableField("plan_status") - private Integer planStatus; + @TableField("status") + private Integer status; @Override public String toString() { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 1104e90..90a7c07 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -95,7 +95,7 @@ private String localFileDir; - public BizQualityNonConformanceRepServiceImpl(AbstractPermissionContext permissionContext, @Lazy IBizQualitySupervisionRecordService supervisionRecordService, IBizLabRelDeptService relDeptService, AbstractDictService dictService, @Lazy IBizQualityCorrectiveRecordService correctiveRecordService, IBizQualityPreventRecordService preventRecordService, @Lazy IBizQualityNonConformanceFileRelService fileRelService, PrintFileRegister printFileRegister, ISystemSignService signService, IBizQualityProcessRecordService bizQualityProcessRecordService ) { + public BizQualityNonConformanceRepServiceImpl(AbstractPermissionContext permissionContext, @Lazy IBizQualitySupervisionRecordService supervisionRecordService, IBizLabRelDeptService relDeptService, AbstractDictService dictService, @Lazy IBizQualityCorrectiveRecordService correctiveRecordService, IBizQualityPreventRecordService preventRecordService, @Lazy IBizQualityNonConformanceFileRelService fileRelService, PrintFileRegister printFileRegister, ISystemSignService signService, IBizQualityProcessRecordService bizQualityProcessRecordService) { this.permissionContext = permissionContext; this.supervisionRecordService = supervisionRecordService; this.relDeptService = relDeptService; @@ -311,7 +311,14 @@ */ @Override public BizQualityNonConformanceRep selectById(Long targetId) { - return this.baseMapper.selectById(targetId); + return this.baseMapper.selectById(targetId); + } + + @Override + public String genCode(String id) { + BizQualityNonConformanceRep entity = getById(id); + saveEntity(entity, entity.getGroupNo(), QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); } @Override @@ -449,8 +456,11 @@ entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); - saveEntity(entity,entity.getGroupNo(), QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// saveEntity(entity,entity.getGroupNo(), QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + + saveZeroCodeEntity(entity, entity.getGroupNo(), QualityTableEnum.NON_CONFORMANCE_REP); + entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); super.save(entity); //关联附件保存 @@ -463,8 +473,8 @@ @Override public boolean updateById(BizQualityNonConformanceRep entity) { BizQualityNonConformanceRep oldRep = getById(entity.getId()); - updateEntity(entity,entity.getGroupNo(), oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// updateEntity(entity, entity.getGroupNo(), oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 378bbb3..2fbce90 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,6 +28,7 @@ import com.casic.missiles.mapper.quality.BizQualityScenePlanMapper; import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; @@ -192,6 +193,13 @@ } @Override + public String genCode(String id) { + BizQualityScenePlan entity = getById(id); + saveEntity(entity,null, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + + @Override public Page listPage(Page page, BizQualityScenePlanVO request) throws Exception { Page planPage = super.listPage(page, request); planPage.getRecords().forEach(this::wrapInfo); @@ -221,8 +229,10 @@ private synchronized void saveScenePlan(BizQualityScenePlan entity) { //生成文件编码 - saveEntity(entity, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// saveEntity(entity, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + saveZeroCodeEntity(entity,QualityTableEnum.SCENE_PLAN); + entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); //生成年度编码 entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); @@ -242,10 +252,11 @@ public boolean updateById(BizQualityScenePlan entity) { BizQualityScenePlan old = getById(entity.getId()); - updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.ScenePlan); bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.SITE_AUDIT,entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// 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/listeners/processor/QualityNonConformanceRepEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonConformanceRepEventPostProcessor.java index 0e6303c..f9d44fd 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonConformanceRepEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonConformanceRepEventPostProcessor.java @@ -35,6 +35,11 @@ }); IBizQualityNonConformanceRepService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityNonConformanceRepService.class); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); + String genCode = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); + + update.set(BizQualityNonConformanceRep::getFileCode, genCode); + update.set(BizQualityNonConformanceRep::getSysCode, genCode); + update.set(BizQualityNonConformanceRep::getApprovalStatus, ApprovalStatusEnum.PASSED); update.eq(BizQualityNonConformanceRep::getId, notifyEventStatusDTO.getId()); boolean updateFlag = supervisionRepMapper.update(update); @@ -44,6 +49,7 @@ throw new BusinessException(BusinessExceptionEnum.APPROVAL_PROCESSOR_HANDLE_FAILED); } + BizQualityNonConformanceRep conformanceRep = supervisionRepMapper.selectById(id); doHandleApprovalMessage(conformanceRep.getCreator(), conformanceRep.getProcessId(), ApplyFromIdEnum.QUALITY_NON_CONFORMANCE_REP.getCode(), conformanceRep.getFileName(), notifyEventStatusDTO.getId(), ApplyFromIdEnum.QUALITY_NON_CONFORMANCE_REP.getSerialNumber()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityScenePlanEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityScenePlanEventPostProcessor.java index a7f2b2d..68ca7a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityScenePlanEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityScenePlanEventPostProcessor.java @@ -34,7 +34,11 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityScenePlanService scenePlanService = SpringContextUtil.getBean(IBizQualityScenePlanService.class); + String code = scenePlanService.genCode(notifyEventStatusDTO.getId()); + LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); + update.set(BizQualityScenePlan::getSysCode,code); + update.set(BizQualityScenePlan::getFileCode,code); update.set(BizQualityScenePlan::getApprovalStatus, ApprovalStatusEnum.PASSED); update.eq(BizQualityScenePlan::getId, notifyEventStatusDTO.getId()); boolean updateFlag = scenePlanService.update(update); @@ -44,6 +48,7 @@ throw new BusinessException(BusinessExceptionEnum.APPROVAL_PROCESSOR_HANDLE_FAILED); } + BizQualityScenePlan plan = scenePlanService.getById(id); doHandleApprovalMessage(plan.getCommanderId(), plan.getProcessId(), ApplyFromIdEnum.QUALITY_SCENE_PLAN.getCode(), plan.getFileName(), notifyEventStatusDTO.getId(), ApplyFromIdEnum.QUALITY_SCENE_PLAN.getSerialNumber()); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index aec6229..efa03b2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -142,8 +142,8 @@ * 状态(0,草稿 1公开) */ @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") - @TableField("plan_status") - private Integer planStatus; + @TableField("status") + private Integer status; @Override public String toString() { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 1104e90..90a7c07 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -95,7 +95,7 @@ private String localFileDir; - public BizQualityNonConformanceRepServiceImpl(AbstractPermissionContext permissionContext, @Lazy IBizQualitySupervisionRecordService supervisionRecordService, IBizLabRelDeptService relDeptService, AbstractDictService dictService, @Lazy IBizQualityCorrectiveRecordService correctiveRecordService, IBizQualityPreventRecordService preventRecordService, @Lazy IBizQualityNonConformanceFileRelService fileRelService, PrintFileRegister printFileRegister, ISystemSignService signService, IBizQualityProcessRecordService bizQualityProcessRecordService ) { + public BizQualityNonConformanceRepServiceImpl(AbstractPermissionContext permissionContext, @Lazy IBizQualitySupervisionRecordService supervisionRecordService, IBizLabRelDeptService relDeptService, AbstractDictService dictService, @Lazy IBizQualityCorrectiveRecordService correctiveRecordService, IBizQualityPreventRecordService preventRecordService, @Lazy IBizQualityNonConformanceFileRelService fileRelService, PrintFileRegister printFileRegister, ISystemSignService signService, IBizQualityProcessRecordService bizQualityProcessRecordService) { this.permissionContext = permissionContext; this.supervisionRecordService = supervisionRecordService; this.relDeptService = relDeptService; @@ -311,7 +311,14 @@ */ @Override public BizQualityNonConformanceRep selectById(Long targetId) { - return this.baseMapper.selectById(targetId); + return this.baseMapper.selectById(targetId); + } + + @Override + public String genCode(String id) { + BizQualityNonConformanceRep entity = getById(id); + saveEntity(entity, entity.getGroupNo(), QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); } @Override @@ -449,8 +456,11 @@ entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); - saveEntity(entity,entity.getGroupNo(), QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// saveEntity(entity,entity.getGroupNo(), QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + + saveZeroCodeEntity(entity, entity.getGroupNo(), QualityTableEnum.NON_CONFORMANCE_REP); + entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); super.save(entity); //关联附件保存 @@ -463,8 +473,8 @@ @Override public boolean updateById(BizQualityNonConformanceRep entity) { BizQualityNonConformanceRep oldRep = getById(entity.getId()); - updateEntity(entity,entity.getGroupNo(), oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// updateEntity(entity, entity.getGroupNo(), oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 378bbb3..2fbce90 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,6 +28,7 @@ import com.casic.missiles.mapper.quality.BizQualityScenePlanMapper; import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; @@ -192,6 +193,13 @@ } @Override + public String genCode(String id) { + BizQualityScenePlan entity = getById(id); + saveEntity(entity,null, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + + @Override public Page listPage(Page page, BizQualityScenePlanVO request) throws Exception { Page planPage = super.listPage(page, request); planPage.getRecords().forEach(this::wrapInfo); @@ -221,8 +229,10 @@ private synchronized void saveScenePlan(BizQualityScenePlan entity) { //生成文件编码 - saveEntity(entity, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// saveEntity(entity, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + saveZeroCodeEntity(entity,QualityTableEnum.SCENE_PLAN); + entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); //生成年度编码 entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); @@ -242,10 +252,11 @@ public boolean updateById(BizQualityScenePlan entity) { BizQualityScenePlan old = getById(entity.getId()); - updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.ScenePlan); bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.SITE_AUDIT,entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// 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/listeners/processor/QualityNonConformanceRepEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonConformanceRepEventPostProcessor.java index 0e6303c..f9d44fd 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonConformanceRepEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonConformanceRepEventPostProcessor.java @@ -35,6 +35,11 @@ }); IBizQualityNonConformanceRepService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityNonConformanceRepService.class); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); + String genCode = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); + + update.set(BizQualityNonConformanceRep::getFileCode, genCode); + update.set(BizQualityNonConformanceRep::getSysCode, genCode); + update.set(BizQualityNonConformanceRep::getApprovalStatus, ApprovalStatusEnum.PASSED); update.eq(BizQualityNonConformanceRep::getId, notifyEventStatusDTO.getId()); boolean updateFlag = supervisionRepMapper.update(update); @@ -44,6 +49,7 @@ throw new BusinessException(BusinessExceptionEnum.APPROVAL_PROCESSOR_HANDLE_FAILED); } + BizQualityNonConformanceRep conformanceRep = supervisionRepMapper.selectById(id); doHandleApprovalMessage(conformanceRep.getCreator(), conformanceRep.getProcessId(), ApplyFromIdEnum.QUALITY_NON_CONFORMANCE_REP.getCode(), conformanceRep.getFileName(), notifyEventStatusDTO.getId(), ApplyFromIdEnum.QUALITY_NON_CONFORMANCE_REP.getSerialNumber()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityScenePlanEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityScenePlanEventPostProcessor.java index a7f2b2d..68ca7a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityScenePlanEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityScenePlanEventPostProcessor.java @@ -34,7 +34,11 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityScenePlanService scenePlanService = SpringContextUtil.getBean(IBizQualityScenePlanService.class); + String code = scenePlanService.genCode(notifyEventStatusDTO.getId()); + LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); + update.set(BizQualityScenePlan::getSysCode,code); + update.set(BizQualityScenePlan::getFileCode,code); update.set(BizQualityScenePlan::getApprovalStatus, ApprovalStatusEnum.PASSED); update.eq(BizQualityScenePlan::getId, notifyEventStatusDTO.getId()); boolean updateFlag = scenePlanService.update(update); @@ -44,6 +48,7 @@ throw new BusinessException(BusinessExceptionEnum.APPROVAL_PROCESSOR_HANDLE_FAILED); } + BizQualityScenePlan plan = scenePlanService.getById(id); doHandleApprovalMessage(plan.getCommanderId(), plan.getProcessId(), ApplyFromIdEnum.QUALITY_SCENE_PLAN.getCode(), plan.getFileName(), notifyEventStatusDTO.getId(), ApplyFromIdEnum.QUALITY_SCENE_PLAN.getSerialNumber()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonConformanceRepService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonConformanceRepService.java index 9736a5a..1897c24 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonConformanceRepService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonConformanceRepService.java @@ -43,4 +43,11 @@ List selectByIds(List idList); BizQualityNonConformanceRep selectById(Long targetId); + + /** + * 生成编码 + * @param id + * @return + */ + String genCode(String id); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index aec6229..efa03b2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -142,8 +142,8 @@ * 状态(0,草稿 1公开) */ @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") - @TableField("plan_status") - private Integer planStatus; + @TableField("status") + private Integer status; @Override public String toString() { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 1104e90..90a7c07 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -95,7 +95,7 @@ private String localFileDir; - public BizQualityNonConformanceRepServiceImpl(AbstractPermissionContext permissionContext, @Lazy IBizQualitySupervisionRecordService supervisionRecordService, IBizLabRelDeptService relDeptService, AbstractDictService dictService, @Lazy IBizQualityCorrectiveRecordService correctiveRecordService, IBizQualityPreventRecordService preventRecordService, @Lazy IBizQualityNonConformanceFileRelService fileRelService, PrintFileRegister printFileRegister, ISystemSignService signService, IBizQualityProcessRecordService bizQualityProcessRecordService ) { + public BizQualityNonConformanceRepServiceImpl(AbstractPermissionContext permissionContext, @Lazy IBizQualitySupervisionRecordService supervisionRecordService, IBizLabRelDeptService relDeptService, AbstractDictService dictService, @Lazy IBizQualityCorrectiveRecordService correctiveRecordService, IBizQualityPreventRecordService preventRecordService, @Lazy IBizQualityNonConformanceFileRelService fileRelService, PrintFileRegister printFileRegister, ISystemSignService signService, IBizQualityProcessRecordService bizQualityProcessRecordService) { this.permissionContext = permissionContext; this.supervisionRecordService = supervisionRecordService; this.relDeptService = relDeptService; @@ -311,7 +311,14 @@ */ @Override public BizQualityNonConformanceRep selectById(Long targetId) { - return this.baseMapper.selectById(targetId); + return this.baseMapper.selectById(targetId); + } + + @Override + public String genCode(String id) { + BizQualityNonConformanceRep entity = getById(id); + saveEntity(entity, entity.getGroupNo(), QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); } @Override @@ -449,8 +456,11 @@ entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); - saveEntity(entity,entity.getGroupNo(), QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// saveEntity(entity,entity.getGroupNo(), QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + + saveZeroCodeEntity(entity, entity.getGroupNo(), QualityTableEnum.NON_CONFORMANCE_REP); + entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); super.save(entity); //关联附件保存 @@ -463,8 +473,8 @@ @Override public boolean updateById(BizQualityNonConformanceRep entity) { BizQualityNonConformanceRep oldRep = getById(entity.getId()); - updateEntity(entity,entity.getGroupNo(), oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// updateEntity(entity, entity.getGroupNo(), oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 378bbb3..2fbce90 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,6 +28,7 @@ import com.casic.missiles.mapper.quality.BizQualityScenePlanMapper; import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; @@ -192,6 +193,13 @@ } @Override + public String genCode(String id) { + BizQualityScenePlan entity = getById(id); + saveEntity(entity,null, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + + @Override public Page listPage(Page page, BizQualityScenePlanVO request) throws Exception { Page planPage = super.listPage(page, request); planPage.getRecords().forEach(this::wrapInfo); @@ -221,8 +229,10 @@ private synchronized void saveScenePlan(BizQualityScenePlan entity) { //生成文件编码 - saveEntity(entity, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// saveEntity(entity, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + saveZeroCodeEntity(entity,QualityTableEnum.SCENE_PLAN); + entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); //生成年度编码 entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); @@ -242,10 +252,11 @@ public boolean updateById(BizQualityScenePlan entity) { BizQualityScenePlan old = getById(entity.getId()); - updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.ScenePlan); bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.SITE_AUDIT,entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// 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/listeners/processor/QualityNonConformanceRepEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonConformanceRepEventPostProcessor.java index 0e6303c..f9d44fd 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonConformanceRepEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonConformanceRepEventPostProcessor.java @@ -35,6 +35,11 @@ }); IBizQualityNonConformanceRepService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityNonConformanceRepService.class); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); + String genCode = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); + + update.set(BizQualityNonConformanceRep::getFileCode, genCode); + update.set(BizQualityNonConformanceRep::getSysCode, genCode); + update.set(BizQualityNonConformanceRep::getApprovalStatus, ApprovalStatusEnum.PASSED); update.eq(BizQualityNonConformanceRep::getId, notifyEventStatusDTO.getId()); boolean updateFlag = supervisionRepMapper.update(update); @@ -44,6 +49,7 @@ throw new BusinessException(BusinessExceptionEnum.APPROVAL_PROCESSOR_HANDLE_FAILED); } + BizQualityNonConformanceRep conformanceRep = supervisionRepMapper.selectById(id); doHandleApprovalMessage(conformanceRep.getCreator(), conformanceRep.getProcessId(), ApplyFromIdEnum.QUALITY_NON_CONFORMANCE_REP.getCode(), conformanceRep.getFileName(), notifyEventStatusDTO.getId(), ApplyFromIdEnum.QUALITY_NON_CONFORMANCE_REP.getSerialNumber()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityScenePlanEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityScenePlanEventPostProcessor.java index a7f2b2d..68ca7a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityScenePlanEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityScenePlanEventPostProcessor.java @@ -34,7 +34,11 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityScenePlanService scenePlanService = SpringContextUtil.getBean(IBizQualityScenePlanService.class); + String code = scenePlanService.genCode(notifyEventStatusDTO.getId()); + LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); + update.set(BizQualityScenePlan::getSysCode,code); + update.set(BizQualityScenePlan::getFileCode,code); update.set(BizQualityScenePlan::getApprovalStatus, ApprovalStatusEnum.PASSED); update.eq(BizQualityScenePlan::getId, notifyEventStatusDTO.getId()); boolean updateFlag = scenePlanService.update(update); @@ -44,6 +48,7 @@ throw new BusinessException(BusinessExceptionEnum.APPROVAL_PROCESSOR_HANDLE_FAILED); } + BizQualityScenePlan plan = scenePlanService.getById(id); doHandleApprovalMessage(plan.getCommanderId(), plan.getProcessId(), ApplyFromIdEnum.QUALITY_SCENE_PLAN.getCode(), plan.getFileName(), notifyEventStatusDTO.getId(), ApplyFromIdEnum.QUALITY_SCENE_PLAN.getSerialNumber()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonConformanceRepService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonConformanceRepService.java index 9736a5a..1897c24 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonConformanceRepService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonConformanceRepService.java @@ -43,4 +43,11 @@ List selectByIds(List idList); BizQualityNonConformanceRep selectById(Long targetId); + + /** + * 生成编码 + * @param id + * @return + */ + String genCode(String id); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityScenePlanService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityScenePlanService.java index 723b725..72c8ccc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityScenePlanService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityScenePlanService.java @@ -30,4 +30,6 @@ void exportFile(ExportDTO exportDTO, HttpServletResponse response); void exportZip(List planList, HttpServletResponse response); + + String genCode(String id); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java index aec6229..efa03b2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityInternalAuditManagement.java @@ -142,8 +142,8 @@ * 状态(0,草稿 1公开) */ @ApiModelProperty(value = "状态(0,草稿 1公开)", dataType = "Integer") - @TableField("plan_status") - private Integer planStatus; + @TableField("status") + private Integer status; @Override public String toString() { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java index 1104e90..90a7c07 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java @@ -95,7 +95,7 @@ private String localFileDir; - public BizQualityNonConformanceRepServiceImpl(AbstractPermissionContext permissionContext, @Lazy IBizQualitySupervisionRecordService supervisionRecordService, IBizLabRelDeptService relDeptService, AbstractDictService dictService, @Lazy IBizQualityCorrectiveRecordService correctiveRecordService, IBizQualityPreventRecordService preventRecordService, @Lazy IBizQualityNonConformanceFileRelService fileRelService, PrintFileRegister printFileRegister, ISystemSignService signService, IBizQualityProcessRecordService bizQualityProcessRecordService ) { + public BizQualityNonConformanceRepServiceImpl(AbstractPermissionContext permissionContext, @Lazy IBizQualitySupervisionRecordService supervisionRecordService, IBizLabRelDeptService relDeptService, AbstractDictService dictService, @Lazy IBizQualityCorrectiveRecordService correctiveRecordService, IBizQualityPreventRecordService preventRecordService, @Lazy IBizQualityNonConformanceFileRelService fileRelService, PrintFileRegister printFileRegister, ISystemSignService signService, IBizQualityProcessRecordService bizQualityProcessRecordService) { this.permissionContext = permissionContext; this.supervisionRecordService = supervisionRecordService; this.relDeptService = relDeptService; @@ -311,7 +311,14 @@ */ @Override public BizQualityNonConformanceRep selectById(Long targetId) { - return this.baseMapper.selectById(targetId); + return this.baseMapper.selectById(targetId); + } + + @Override + public String genCode(String id) { + BizQualityNonConformanceRep entity = getById(id); + saveEntity(entity, entity.getGroupNo(), QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); } @Override @@ -449,8 +456,11 @@ entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); - saveEntity(entity,entity.getGroupNo(), QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// saveEntity(entity,entity.getGroupNo(), QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + + saveZeroCodeEntity(entity, entity.getGroupNo(), QualityTableEnum.NON_CONFORMANCE_REP); + entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); super.save(entity); //关联附件保存 @@ -463,8 +473,8 @@ @Override public boolean updateById(BizQualityNonConformanceRep entity) { BizQualityNonConformanceRep oldRep = getById(entity.getId()); - updateEntity(entity,entity.getGroupNo(), oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// updateEntity(entity, entity.getGroupNo(), oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); entity.setUpdateTime(DateUtil.now()); fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId()); return super.updateById(entity); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java index 378bbb3..2fbce90 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityScenePlanServiceImpl.java @@ -28,6 +28,7 @@ import com.casic.missiles.mapper.quality.BizQualityScenePlanMapper; import com.casic.missiles.mapper.system.UserInfoMapper; import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.quality.BizQualityNonConformanceRep; import com.casic.missiles.model.quality.BizQualityScenePlan; import com.casic.missiles.model.quality.BizQualitySceneSchedule; import com.casic.missiles.model.quality.BizQualitySceneUser; @@ -192,6 +193,13 @@ } @Override + public String genCode(String id) { + BizQualityScenePlan entity = getById(id); + saveEntity(entity,null, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + + @Override public Page listPage(Page page, BizQualityScenePlanVO request) throws Exception { Page planPage = super.listPage(page, request); planPage.getRecords().forEach(this::wrapInfo); @@ -221,8 +229,10 @@ private synchronized void saveScenePlan(BizQualityScenePlan entity) { //生成文件编码 - saveEntity(entity, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// saveEntity(entity, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + saveZeroCodeEntity(entity,QualityTableEnum.SCENE_PLAN); + entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); //生成年度编码 entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); @@ -242,10 +252,11 @@ public boolean updateById(BizQualityScenePlan entity) { BizQualityScenePlan old = getById(entity.getId()); - updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityYearNoCheckEnum.ScenePlan); bizQualityWorkRegistrationService.checkIsCompleted(QualityCurrentStageEnum.SITE_AUDIT,entity.getYearNo()); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// updateEntity(entity, old, QualityTableEnum.SCENE_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// 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/listeners/processor/QualityNonConformanceRepEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonConformanceRepEventPostProcessor.java index 0e6303c..f9d44fd 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonConformanceRepEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityNonConformanceRepEventPostProcessor.java @@ -35,6 +35,11 @@ }); IBizQualityNonConformanceRepService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityNonConformanceRepService.class); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); + String genCode = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); + + update.set(BizQualityNonConformanceRep::getFileCode, genCode); + update.set(BizQualityNonConformanceRep::getSysCode, genCode); + update.set(BizQualityNonConformanceRep::getApprovalStatus, ApprovalStatusEnum.PASSED); update.eq(BizQualityNonConformanceRep::getId, notifyEventStatusDTO.getId()); boolean updateFlag = supervisionRepMapper.update(update); @@ -44,6 +49,7 @@ throw new BusinessException(BusinessExceptionEnum.APPROVAL_PROCESSOR_HANDLE_FAILED); } + BizQualityNonConformanceRep conformanceRep = supervisionRepMapper.selectById(id); doHandleApprovalMessage(conformanceRep.getCreator(), conformanceRep.getProcessId(), ApplyFromIdEnum.QUALITY_NON_CONFORMANCE_REP.getCode(), conformanceRep.getFileName(), notifyEventStatusDTO.getId(), ApplyFromIdEnum.QUALITY_NON_CONFORMANCE_REP.getSerialNumber()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityScenePlanEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityScenePlanEventPostProcessor.java index a7f2b2d..68ca7a5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityScenePlanEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityScenePlanEventPostProcessor.java @@ -34,7 +34,11 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityScenePlanService scenePlanService = SpringContextUtil.getBean(IBizQualityScenePlanService.class); + String code = scenePlanService.genCode(notifyEventStatusDTO.getId()); + LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); + update.set(BizQualityScenePlan::getSysCode,code); + update.set(BizQualityScenePlan::getFileCode,code); update.set(BizQualityScenePlan::getApprovalStatus, ApprovalStatusEnum.PASSED); update.eq(BizQualityScenePlan::getId, notifyEventStatusDTO.getId()); boolean updateFlag = scenePlanService.update(update); @@ -44,6 +48,7 @@ throw new BusinessException(BusinessExceptionEnum.APPROVAL_PROCESSOR_HANDLE_FAILED); } + BizQualityScenePlan plan = scenePlanService.getById(id); doHandleApprovalMessage(plan.getCommanderId(), plan.getProcessId(), ApplyFromIdEnum.QUALITY_SCENE_PLAN.getCode(), plan.getFileName(), notifyEventStatusDTO.getId(), ApplyFromIdEnum.QUALITY_SCENE_PLAN.getSerialNumber()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonConformanceRepService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonConformanceRepService.java index 9736a5a..1897c24 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonConformanceRepService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityNonConformanceRepService.java @@ -43,4 +43,11 @@ List selectByIds(List idList); BizQualityNonConformanceRep selectById(Long targetId); + + /** + * 生成编码 + * @param id + * @return + */ + String genCode(String id); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityScenePlanService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityScenePlanService.java index 723b725..72c8ccc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityScenePlanService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityScenePlanService.java @@ -30,4 +30,6 @@ void exportFile(ExportDTO exportDTO, HttpServletResponse response); void exportZip(List planList, HttpServletResponse response); + + 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 d5341b3..8f8636e 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 @@ -87,7 +87,14 @@ default void saveEntity(T entity, QualityTableEnum tableEnum, BiFunction func) { saveEntity(entity, null, tableEnum, func); } - + default void saveZeroCodeEntity(T entity, QualityTableEnum tableEnum) { + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genZeroMaxNo(labCode, null, 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();