diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml index 551a3df..3329c24 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml @@ -53,7 +53,7 @@ a.file_name as fileName , a.file_code as fileCode, sys_code as sysCode, - a.remarks,a.conclusion + a.remarks,a.conclusion,a.status from biz_quality_target_evaluation_rep a diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml index 551a3df..3329c24 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml @@ -53,7 +53,7 @@ a.file_name as fileName , a.file_code as fileCode, sys_code as sysCode, - a.remarks,a.conclusion + a.remarks,a.conclusion,a.status from biz_quality_target_evaluation_rep a diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java index cc4ce67..5377c65 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java @@ -51,11 +51,14 @@ private String createTimeStart; @ApiModelProperty(value = "创建时间结束", dataType = "Date") private String createTimeEnd; + @ApiModelProperty(value = "草稿状态", dataType = "Integer") + private Integer status; /** * 导出ids */ - @ApiModelProperty(value = "导出ids",dataType = "List") + @ApiModelProperty(value = "导出ids", dataType = "List") private List ids; + public QueryWrapper genQuery() { QueryWrapper query = new QueryWrapper<>(); if (StrUtil.isNotEmpty(bizLabCode)) { @@ -79,6 +82,9 @@ if (StrUtil.isNotEmpty(createTimeEnd)) { query.le("create_time", createTimeEnd); } + if (status != null) { + query.eq("status", status); + } return query; } } diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml index 551a3df..3329c24 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml @@ -53,7 +53,7 @@ a.file_name as fileName , a.file_code as fileCode, sys_code as sysCode, - a.remarks,a.conclusion + a.remarks,a.conclusion,a.status from biz_quality_target_evaluation_rep a diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java index cc4ce67..5377c65 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java @@ -51,11 +51,14 @@ private String createTimeStart; @ApiModelProperty(value = "创建时间结束", dataType = "Date") private String createTimeEnd; + @ApiModelProperty(value = "草稿状态", dataType = "Integer") + private Integer status; /** * 导出ids */ - @ApiModelProperty(value = "导出ids",dataType = "List") + @ApiModelProperty(value = "导出ids", dataType = "List") private List ids; + public QueryWrapper genQuery() { QueryWrapper query = new QueryWrapper<>(); if (StrUtil.isNotEmpty(bizLabCode)) { @@ -79,6 +82,9 @@ if (StrUtil.isNotEmpty(createTimeEnd)) { query.le("create_time", createTimeEnd); } + if (status != null) { + query.eq("status", status); + } return query; } } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java index 56c1cd6..c2953b4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java @@ -95,7 +95,9 @@ @ApiModelProperty(value = "结论", dataType = "String") @TableField("conclusion") private String conclusion; - + @ApiModelProperty(value = "状态(0 草稿)", dataType = "String") + @TableField("status") + private Integer status; @ApiModelProperty(value = "报告内容", dataType = "String") @TableField(exist = false) private List targetEvaluationContents; diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml index 551a3df..3329c24 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml @@ -53,7 +53,7 @@ a.file_name as fileName , a.file_code as fileCode, sys_code as sysCode, - a.remarks,a.conclusion + a.remarks,a.conclusion,a.status from biz_quality_target_evaluation_rep a diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java index cc4ce67..5377c65 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java @@ -51,11 +51,14 @@ private String createTimeStart; @ApiModelProperty(value = "创建时间结束", dataType = "Date") private String createTimeEnd; + @ApiModelProperty(value = "草稿状态", dataType = "Integer") + private Integer status; /** * 导出ids */ - @ApiModelProperty(value = "导出ids",dataType = "List") + @ApiModelProperty(value = "导出ids", dataType = "List") private List ids; + public QueryWrapper genQuery() { QueryWrapper query = new QueryWrapper<>(); if (StrUtil.isNotEmpty(bizLabCode)) { @@ -79,6 +82,9 @@ if (StrUtil.isNotEmpty(createTimeEnd)) { query.le("create_time", createTimeEnd); } + if (status != null) { + query.eq("status", status); + } return query; } } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java index 56c1cd6..c2953b4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java @@ -95,7 +95,9 @@ @ApiModelProperty(value = "结论", dataType = "String") @TableField("conclusion") private String conclusion; - + @ApiModelProperty(value = "状态(0 草稿)", dataType = "String") + @TableField("status") + private Integer status; @ApiModelProperty(value = "报告内容", dataType = "String") @TableField(exist = false) private List targetEvaluationContents; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 95b6b11..1e5a4d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -112,6 +112,14 @@ this.correctiveRectifFileMapper = correctiveRectifFileMapper; } + @Override + public String genCode(String id) { + BizQualityCorrectiveRecord entity = getById(id); + entity.setUpdateTime(DateUtil.now()); + saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + @Transactional @Override public boolean save(BizQualityCorrectiveRecord entity) { @@ -123,8 +131,9 @@ entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + saveZeroCodeEntity(entity, null, QualityTableEnum.CORRECTIVE_RECORD); +// saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); return true; @@ -133,10 +142,9 @@ @Transactional @Override public boolean updateById(BizQualityCorrectiveRecord entity) { - BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(DateUtil.now()); - updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + +// updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); @@ -212,7 +220,7 @@ @Override public ReturnDTO submit(BaseApprovalSubmitRequest request) { - ReturnDTO returnDTO = super.submit(request); + ReturnDTO returnDTO = super.submit(request); if (ResponseData.DEFAULT_SUCCESS_CODE != returnDTO.getCode()) { return returnDTO; } @@ -428,6 +436,7 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml index 551a3df..3329c24 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml @@ -53,7 +53,7 @@ a.file_name as fileName , a.file_code as fileCode, sys_code as sysCode, - a.remarks,a.conclusion + a.remarks,a.conclusion,a.status from biz_quality_target_evaluation_rep a diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java index cc4ce67..5377c65 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java @@ -51,11 +51,14 @@ private String createTimeStart; @ApiModelProperty(value = "创建时间结束", dataType = "Date") private String createTimeEnd; + @ApiModelProperty(value = "草稿状态", dataType = "Integer") + private Integer status; /** * 导出ids */ - @ApiModelProperty(value = "导出ids",dataType = "List") + @ApiModelProperty(value = "导出ids", dataType = "List") private List ids; + public QueryWrapper genQuery() { QueryWrapper query = new QueryWrapper<>(); if (StrUtil.isNotEmpty(bizLabCode)) { @@ -79,6 +82,9 @@ if (StrUtil.isNotEmpty(createTimeEnd)) { query.le("create_time", createTimeEnd); } + if (status != null) { + query.eq("status", status); + } return query; } } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java index 56c1cd6..c2953b4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java @@ -95,7 +95,9 @@ @ApiModelProperty(value = "结论", dataType = "String") @TableField("conclusion") private String conclusion; - + @ApiModelProperty(value = "状态(0 草稿)", dataType = "String") + @TableField("status") + private Integer status; @ApiModelProperty(value = "报告内容", dataType = "String") @TableField(exist = false) private List targetEvaluationContents; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 95b6b11..1e5a4d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -112,6 +112,14 @@ this.correctiveRectifFileMapper = correctiveRectifFileMapper; } + @Override + public String genCode(String id) { + BizQualityCorrectiveRecord entity = getById(id); + entity.setUpdateTime(DateUtil.now()); + saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + @Transactional @Override public boolean save(BizQualityCorrectiveRecord entity) { @@ -123,8 +131,9 @@ entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + saveZeroCodeEntity(entity, null, QualityTableEnum.CORRECTIVE_RECORD); +// saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); return true; @@ -133,10 +142,9 @@ @Transactional @Override public boolean updateById(BizQualityCorrectiveRecord entity) { - BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(DateUtil.now()); - updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + +// updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); @@ -212,7 +220,7 @@ @Override public ReturnDTO submit(BaseApprovalSubmitRequest request) { - ReturnDTO returnDTO = super.submit(request); + ReturnDTO returnDTO = super.submit(request); if (ResponseData.DEFAULT_SUCCESS_CODE != returnDTO.getCode()) { return returnDTO; } @@ -428,6 +436,7 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index b436037..395f010 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -170,6 +170,8 @@ } } + + @Resource private IBizLabRelDeptService labRelDeptService; @@ -226,10 +228,11 @@ entity.setCommanderName(user.getName()); //生成文件编码 - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); + getNewCode(entity); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); //生成年度编码 @@ -238,17 +241,32 @@ super.save(entity); return true; } + @Override + public String genCode(String id) { + BizQualityManagementReviewPlan entity = getById(id); + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + return entity.getSysCode(); + } + private void getNewCode(BizQualityManagementReviewPlan entity) { + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genZeroMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + } @Transactional @Override public boolean updateById(BizQualityManagementReviewPlan entity) { - BizQualityManagementReviewPlan oldInfo = getById(entity.getId()); - if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); - } + +// if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); +// } entity.setUpdateTime(DateUtil.now()); checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_PLAN); super.updateById(entity); diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml index 551a3df..3329c24 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml @@ -53,7 +53,7 @@ a.file_name as fileName , a.file_code as fileCode, sys_code as sysCode, - a.remarks,a.conclusion + a.remarks,a.conclusion,a.status from biz_quality_target_evaluation_rep a diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java index cc4ce67..5377c65 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java @@ -51,11 +51,14 @@ private String createTimeStart; @ApiModelProperty(value = "创建时间结束", dataType = "Date") private String createTimeEnd; + @ApiModelProperty(value = "草稿状态", dataType = "Integer") + private Integer status; /** * 导出ids */ - @ApiModelProperty(value = "导出ids",dataType = "List") + @ApiModelProperty(value = "导出ids", dataType = "List") private List ids; + public QueryWrapper genQuery() { QueryWrapper query = new QueryWrapper<>(); if (StrUtil.isNotEmpty(bizLabCode)) { @@ -79,6 +82,9 @@ if (StrUtil.isNotEmpty(createTimeEnd)) { query.le("create_time", createTimeEnd); } + if (status != null) { + query.eq("status", status); + } return query; } } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java index 56c1cd6..c2953b4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java @@ -95,7 +95,9 @@ @ApiModelProperty(value = "结论", dataType = "String") @TableField("conclusion") private String conclusion; - + @ApiModelProperty(value = "状态(0 草稿)", dataType = "String") + @TableField("status") + private Integer status; @ApiModelProperty(value = "报告内容", dataType = "String") @TableField(exist = false) private List targetEvaluationContents; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 95b6b11..1e5a4d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -112,6 +112,14 @@ this.correctiveRectifFileMapper = correctiveRectifFileMapper; } + @Override + public String genCode(String id) { + BizQualityCorrectiveRecord entity = getById(id); + entity.setUpdateTime(DateUtil.now()); + saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + @Transactional @Override public boolean save(BizQualityCorrectiveRecord entity) { @@ -123,8 +131,9 @@ entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + saveZeroCodeEntity(entity, null, QualityTableEnum.CORRECTIVE_RECORD); +// saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); return true; @@ -133,10 +142,9 @@ @Transactional @Override public boolean updateById(BizQualityCorrectiveRecord entity) { - BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(DateUtil.now()); - updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + +// updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); @@ -212,7 +220,7 @@ @Override public ReturnDTO submit(BaseApprovalSubmitRequest request) { - ReturnDTO returnDTO = super.submit(request); + ReturnDTO returnDTO = super.submit(request); if (ResponseData.DEFAULT_SUCCESS_CODE != returnDTO.getCode()) { return returnDTO; } @@ -428,6 +436,7 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index b436037..395f010 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -170,6 +170,8 @@ } } + + @Resource private IBizLabRelDeptService labRelDeptService; @@ -226,10 +228,11 @@ entity.setCommanderName(user.getName()); //生成文件编码 - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); + getNewCode(entity); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); //生成年度编码 @@ -238,17 +241,32 @@ super.save(entity); return true; } + @Override + public String genCode(String id) { + BizQualityManagementReviewPlan entity = getById(id); + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + return entity.getSysCode(); + } + private void getNewCode(BizQualityManagementReviewPlan entity) { + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genZeroMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + } @Transactional @Override public boolean updateById(BizQualityManagementReviewPlan entity) { - BizQualityManagementReviewPlan oldInfo = getById(entity.getId()); - if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); - } + +// if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); +// } entity.setUpdateTime(DateUtil.now()); checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_PLAN); super.updateById(entity); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index fa087a6..1f45214 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -148,6 +148,16 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public String genCode(String id) { + BizQualityManagementReviewRep entity = getById(id); + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + return entity.getSysCode(); + } + @Transactional @Override public boolean save(BizQualityManagementReviewRep entity) { @@ -158,33 +168,40 @@ entity.setCreatorName(user.getName()); //生成文件编码 - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); + getZeroCode(entity); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); //生成年度编码 entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); super.save(entity); //整改内容保存 itemService.saveList(entity.getRepItems(), entity.getId()); return true; } + private void getZeroCode(BizQualityManagementReviewRep entity) { + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genZeroMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + } @Transactional @Override public boolean updateById(BizQualityManagementReviewRep entity) { - BizQualityManagementReviewRep oldInfo = getById(entity.getId()); - if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); - } - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); + +// if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); +// } + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml index 551a3df..3329c24 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml @@ -53,7 +53,7 @@ a.file_name as fileName , a.file_code as fileCode, sys_code as sysCode, - a.remarks,a.conclusion + a.remarks,a.conclusion,a.status from biz_quality_target_evaluation_rep a diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java index cc4ce67..5377c65 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java @@ -51,11 +51,14 @@ private String createTimeStart; @ApiModelProperty(value = "创建时间结束", dataType = "Date") private String createTimeEnd; + @ApiModelProperty(value = "草稿状态", dataType = "Integer") + private Integer status; /** * 导出ids */ - @ApiModelProperty(value = "导出ids",dataType = "List") + @ApiModelProperty(value = "导出ids", dataType = "List") private List ids; + public QueryWrapper genQuery() { QueryWrapper query = new QueryWrapper<>(); if (StrUtil.isNotEmpty(bizLabCode)) { @@ -79,6 +82,9 @@ if (StrUtil.isNotEmpty(createTimeEnd)) { query.le("create_time", createTimeEnd); } + if (status != null) { + query.eq("status", status); + } return query; } } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java index 56c1cd6..c2953b4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java @@ -95,7 +95,9 @@ @ApiModelProperty(value = "结论", dataType = "String") @TableField("conclusion") private String conclusion; - + @ApiModelProperty(value = "状态(0 草稿)", dataType = "String") + @TableField("status") + private Integer status; @ApiModelProperty(value = "报告内容", dataType = "String") @TableField(exist = false) private List targetEvaluationContents; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 95b6b11..1e5a4d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -112,6 +112,14 @@ this.correctiveRectifFileMapper = correctiveRectifFileMapper; } + @Override + public String genCode(String id) { + BizQualityCorrectiveRecord entity = getById(id); + entity.setUpdateTime(DateUtil.now()); + saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + @Transactional @Override public boolean save(BizQualityCorrectiveRecord entity) { @@ -123,8 +131,9 @@ entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + saveZeroCodeEntity(entity, null, QualityTableEnum.CORRECTIVE_RECORD); +// saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); return true; @@ -133,10 +142,9 @@ @Transactional @Override public boolean updateById(BizQualityCorrectiveRecord entity) { - BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(DateUtil.now()); - updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + +// updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); @@ -212,7 +220,7 @@ @Override public ReturnDTO submit(BaseApprovalSubmitRequest request) { - ReturnDTO returnDTO = super.submit(request); + ReturnDTO returnDTO = super.submit(request); if (ResponseData.DEFAULT_SUCCESS_CODE != returnDTO.getCode()) { return returnDTO; } @@ -428,6 +436,7 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index b436037..395f010 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -170,6 +170,8 @@ } } + + @Resource private IBizLabRelDeptService labRelDeptService; @@ -226,10 +228,11 @@ entity.setCommanderName(user.getName()); //生成文件编码 - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); + getNewCode(entity); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); //生成年度编码 @@ -238,17 +241,32 @@ super.save(entity); return true; } + @Override + public String genCode(String id) { + BizQualityManagementReviewPlan entity = getById(id); + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + return entity.getSysCode(); + } + private void getNewCode(BizQualityManagementReviewPlan entity) { + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genZeroMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + } @Transactional @Override public boolean updateById(BizQualityManagementReviewPlan entity) { - BizQualityManagementReviewPlan oldInfo = getById(entity.getId()); - if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); - } + +// if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); +// } entity.setUpdateTime(DateUtil.now()); checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_PLAN); super.updateById(entity); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index fa087a6..1f45214 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -148,6 +148,16 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public String genCode(String id) { + BizQualityManagementReviewRep entity = getById(id); + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + return entity.getSysCode(); + } + @Transactional @Override public boolean save(BizQualityManagementReviewRep entity) { @@ -158,33 +168,40 @@ entity.setCreatorName(user.getName()); //生成文件编码 - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); + getZeroCode(entity); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); //生成年度编码 entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); super.save(entity); //整改内容保存 itemService.saveList(entity.getRepItems(), entity.getId()); return true; } + private void getZeroCode(BizQualityManagementReviewRep entity) { + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genZeroMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + } @Transactional @Override public boolean updateById(BizQualityManagementReviewRep entity) { - BizQualityManagementReviewRep oldInfo = getById(entity.getId()); - if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); - } - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); + +// if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); +// } + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 5efbfe2..c79899b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -133,7 +133,7 @@ updateWrapper.set("sub_time", new Date()); this.update(updateWrapper); - ReturnDTO returnDTO = super.submit(request); + ReturnDTO returnDTO = super.submit(request); if (ResponseData.DEFAULT_SUCCESS_CODE != returnDTO.getCode()) { return returnDTO; } @@ -193,6 +193,13 @@ record.setRectificationSituationFiles(preventFiles); } + @Override + public String genCode(String id) { + BizQualityPreventRecord entity = getById(id); + saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + @Transactional @Override public boolean save(BizQualityPreventRecord entity) { @@ -205,8 +212,9 @@ entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); entity.setUpdateTime(DateUtil.now()); //设置系统编码 - saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + saveZeroCodeEntity(entity, null, QualityTableEnum.PREVENT_RECORD); +// saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); @@ -235,10 +243,10 @@ @Transactional @Override public boolean updateById(BizQualityPreventRecord entity) { - BizQualityPreventRecord oldEntity = getById(entity.getId()); + //更新系统编码 - updateEntity(entity, oldEntity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// updateEntity(entity, oldEntity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); @@ -357,7 +365,7 @@ String currentFileName = rootFileName + File.separator + record.getFileCode() + record.getFileName(); Map map = BeanUtil.beanToMap(record); List fileRelList = bizQualityPreventFileRelMapper.selectList(new QueryWrapper().eq("prevent_id", record.getId())); - if (CollectionUtils.isNotEmpty(fileRelList)){ + if (CollectionUtils.isNotEmpty(fileRelList)) { for (BizQualityPreventFileRel fileRel : fileRelList) { switch (fileRel.getFileType()) { case 1: @@ -406,6 +414,7 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override public void setBizName(BizQualityPreventRecord obj) { obj.setBizName(obj.getFileName()); diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml index 551a3df..3329c24 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml @@ -53,7 +53,7 @@ a.file_name as fileName , a.file_code as fileCode, sys_code as sysCode, - a.remarks,a.conclusion + a.remarks,a.conclusion,a.status from biz_quality_target_evaluation_rep a diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java index cc4ce67..5377c65 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java @@ -51,11 +51,14 @@ private String createTimeStart; @ApiModelProperty(value = "创建时间结束", dataType = "Date") private String createTimeEnd; + @ApiModelProperty(value = "草稿状态", dataType = "Integer") + private Integer status; /** * 导出ids */ - @ApiModelProperty(value = "导出ids",dataType = "List") + @ApiModelProperty(value = "导出ids", dataType = "List") private List ids; + public QueryWrapper genQuery() { QueryWrapper query = new QueryWrapper<>(); if (StrUtil.isNotEmpty(bizLabCode)) { @@ -79,6 +82,9 @@ if (StrUtil.isNotEmpty(createTimeEnd)) { query.le("create_time", createTimeEnd); } + if (status != null) { + query.eq("status", status); + } return query; } } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java index 56c1cd6..c2953b4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java @@ -95,7 +95,9 @@ @ApiModelProperty(value = "结论", dataType = "String") @TableField("conclusion") private String conclusion; - + @ApiModelProperty(value = "状态(0 草稿)", dataType = "String") + @TableField("status") + private Integer status; @ApiModelProperty(value = "报告内容", dataType = "String") @TableField(exist = false) private List targetEvaluationContents; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 95b6b11..1e5a4d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -112,6 +112,14 @@ this.correctiveRectifFileMapper = correctiveRectifFileMapper; } + @Override + public String genCode(String id) { + BizQualityCorrectiveRecord entity = getById(id); + entity.setUpdateTime(DateUtil.now()); + saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + @Transactional @Override public boolean save(BizQualityCorrectiveRecord entity) { @@ -123,8 +131,9 @@ entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + saveZeroCodeEntity(entity, null, QualityTableEnum.CORRECTIVE_RECORD); +// saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); return true; @@ -133,10 +142,9 @@ @Transactional @Override public boolean updateById(BizQualityCorrectiveRecord entity) { - BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(DateUtil.now()); - updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + +// updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); @@ -212,7 +220,7 @@ @Override public ReturnDTO submit(BaseApprovalSubmitRequest request) { - ReturnDTO returnDTO = super.submit(request); + ReturnDTO returnDTO = super.submit(request); if (ResponseData.DEFAULT_SUCCESS_CODE != returnDTO.getCode()) { return returnDTO; } @@ -428,6 +436,7 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index b436037..395f010 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -170,6 +170,8 @@ } } + + @Resource private IBizLabRelDeptService labRelDeptService; @@ -226,10 +228,11 @@ entity.setCommanderName(user.getName()); //生成文件编码 - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); + getNewCode(entity); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); //生成年度编码 @@ -238,17 +241,32 @@ super.save(entity); return true; } + @Override + public String genCode(String id) { + BizQualityManagementReviewPlan entity = getById(id); + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + return entity.getSysCode(); + } + private void getNewCode(BizQualityManagementReviewPlan entity) { + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genZeroMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + } @Transactional @Override public boolean updateById(BizQualityManagementReviewPlan entity) { - BizQualityManagementReviewPlan oldInfo = getById(entity.getId()); - if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); - } + +// if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); +// } entity.setUpdateTime(DateUtil.now()); checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_PLAN); super.updateById(entity); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index fa087a6..1f45214 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -148,6 +148,16 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public String genCode(String id) { + BizQualityManagementReviewRep entity = getById(id); + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + return entity.getSysCode(); + } + @Transactional @Override public boolean save(BizQualityManagementReviewRep entity) { @@ -158,33 +168,40 @@ entity.setCreatorName(user.getName()); //生成文件编码 - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); + getZeroCode(entity); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); //生成年度编码 entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); super.save(entity); //整改内容保存 itemService.saveList(entity.getRepItems(), entity.getId()); return true; } + private void getZeroCode(BizQualityManagementReviewRep entity) { + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genZeroMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + } @Transactional @Override public boolean updateById(BizQualityManagementReviewRep entity) { - BizQualityManagementReviewRep oldInfo = getById(entity.getId()); - if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); - } - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); + +// if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); +// } + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 5efbfe2..c79899b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -133,7 +133,7 @@ updateWrapper.set("sub_time", new Date()); this.update(updateWrapper); - ReturnDTO returnDTO = super.submit(request); + ReturnDTO returnDTO = super.submit(request); if (ResponseData.DEFAULT_SUCCESS_CODE != returnDTO.getCode()) { return returnDTO; } @@ -193,6 +193,13 @@ record.setRectificationSituationFiles(preventFiles); } + @Override + public String genCode(String id) { + BizQualityPreventRecord entity = getById(id); + saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + @Transactional @Override public boolean save(BizQualityPreventRecord entity) { @@ -205,8 +212,9 @@ entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); entity.setUpdateTime(DateUtil.now()); //设置系统编码 - saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + saveZeroCodeEntity(entity, null, QualityTableEnum.PREVENT_RECORD); +// saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); @@ -235,10 +243,10 @@ @Transactional @Override public boolean updateById(BizQualityPreventRecord entity) { - BizQualityPreventRecord oldEntity = getById(entity.getId()); + //更新系统编码 - updateEntity(entity, oldEntity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// updateEntity(entity, oldEntity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); @@ -357,7 +365,7 @@ String currentFileName = rootFileName + File.separator + record.getFileCode() + record.getFileName(); Map map = BeanUtil.beanToMap(record); List fileRelList = bizQualityPreventFileRelMapper.selectList(new QueryWrapper().eq("prevent_id", record.getId())); - if (CollectionUtils.isNotEmpty(fileRelList)){ + if (CollectionUtils.isNotEmpty(fileRelList)) { for (BizQualityPreventFileRel fileRel : fileRelList) { switch (fileRel.getFileType()) { case 1: @@ -406,6 +414,7 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override public void setBizName(BizQualityPreventRecord obj) { obj.setBizName(obj.getFileName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityCorrectiveRepEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityCorrectiveRepEventPostProcessor.java index f080fe7..cc9cb4f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityCorrectiveRepEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityCorrectiveRepEventPostProcessor.java @@ -32,9 +32,14 @@ Long id = Long.valueOf(notifyEventStatusDTO.getId()); Assert.isFalse(Objects.isNull(id), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityCorrectiveRecordService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityCorrectiveRecordService.class); + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityCorrectiveRecord::getApprovalStatus, ApprovalStatusEnum.PASSED); + update.set(BizQualityCorrectiveRecord::getSysCode,code); + update.set(BizQualityCorrectiveRecord::getFileCode,code); + update.eq(BizQualityCorrectiveRecord::getId, notifyEventStatusDTO.getId()); + boolean updateFlag = supervisionRepMapper.update(update); if (!updateFlag) { log.error("纠正措施处理单审批处理失败"); diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml index 551a3df..3329c24 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml @@ -53,7 +53,7 @@ a.file_name as fileName , a.file_code as fileCode, sys_code as sysCode, - a.remarks,a.conclusion + a.remarks,a.conclusion,a.status from biz_quality_target_evaluation_rep a diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java index cc4ce67..5377c65 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java @@ -51,11 +51,14 @@ private String createTimeStart; @ApiModelProperty(value = "创建时间结束", dataType = "Date") private String createTimeEnd; + @ApiModelProperty(value = "草稿状态", dataType = "Integer") + private Integer status; /** * 导出ids */ - @ApiModelProperty(value = "导出ids",dataType = "List") + @ApiModelProperty(value = "导出ids", dataType = "List") private List ids; + public QueryWrapper genQuery() { QueryWrapper query = new QueryWrapper<>(); if (StrUtil.isNotEmpty(bizLabCode)) { @@ -79,6 +82,9 @@ if (StrUtil.isNotEmpty(createTimeEnd)) { query.le("create_time", createTimeEnd); } + if (status != null) { + query.eq("status", status); + } return query; } } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java index 56c1cd6..c2953b4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java @@ -95,7 +95,9 @@ @ApiModelProperty(value = "结论", dataType = "String") @TableField("conclusion") private String conclusion; - + @ApiModelProperty(value = "状态(0 草稿)", dataType = "String") + @TableField("status") + private Integer status; @ApiModelProperty(value = "报告内容", dataType = "String") @TableField(exist = false) private List targetEvaluationContents; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 95b6b11..1e5a4d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -112,6 +112,14 @@ this.correctiveRectifFileMapper = correctiveRectifFileMapper; } + @Override + public String genCode(String id) { + BizQualityCorrectiveRecord entity = getById(id); + entity.setUpdateTime(DateUtil.now()); + saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + @Transactional @Override public boolean save(BizQualityCorrectiveRecord entity) { @@ -123,8 +131,9 @@ entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + saveZeroCodeEntity(entity, null, QualityTableEnum.CORRECTIVE_RECORD); +// saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); return true; @@ -133,10 +142,9 @@ @Transactional @Override public boolean updateById(BizQualityCorrectiveRecord entity) { - BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(DateUtil.now()); - updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + +// updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); @@ -212,7 +220,7 @@ @Override public ReturnDTO submit(BaseApprovalSubmitRequest request) { - ReturnDTO returnDTO = super.submit(request); + ReturnDTO returnDTO = super.submit(request); if (ResponseData.DEFAULT_SUCCESS_CODE != returnDTO.getCode()) { return returnDTO; } @@ -428,6 +436,7 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index b436037..395f010 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -170,6 +170,8 @@ } } + + @Resource private IBizLabRelDeptService labRelDeptService; @@ -226,10 +228,11 @@ entity.setCommanderName(user.getName()); //生成文件编码 - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); + getNewCode(entity); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); //生成年度编码 @@ -238,17 +241,32 @@ super.save(entity); return true; } + @Override + public String genCode(String id) { + BizQualityManagementReviewPlan entity = getById(id); + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + return entity.getSysCode(); + } + private void getNewCode(BizQualityManagementReviewPlan entity) { + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genZeroMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + } @Transactional @Override public boolean updateById(BizQualityManagementReviewPlan entity) { - BizQualityManagementReviewPlan oldInfo = getById(entity.getId()); - if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); - } + +// if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); +// } entity.setUpdateTime(DateUtil.now()); checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_PLAN); super.updateById(entity); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index fa087a6..1f45214 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -148,6 +148,16 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public String genCode(String id) { + BizQualityManagementReviewRep entity = getById(id); + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + return entity.getSysCode(); + } + @Transactional @Override public boolean save(BizQualityManagementReviewRep entity) { @@ -158,33 +168,40 @@ entity.setCreatorName(user.getName()); //生成文件编码 - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); + getZeroCode(entity); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); //生成年度编码 entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); super.save(entity); //整改内容保存 itemService.saveList(entity.getRepItems(), entity.getId()); return true; } + private void getZeroCode(BizQualityManagementReviewRep entity) { + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genZeroMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + } @Transactional @Override public boolean updateById(BizQualityManagementReviewRep entity) { - BizQualityManagementReviewRep oldInfo = getById(entity.getId()); - if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); - } - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); + +// if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); +// } + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 5efbfe2..c79899b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -133,7 +133,7 @@ updateWrapper.set("sub_time", new Date()); this.update(updateWrapper); - ReturnDTO returnDTO = super.submit(request); + ReturnDTO returnDTO = super.submit(request); if (ResponseData.DEFAULT_SUCCESS_CODE != returnDTO.getCode()) { return returnDTO; } @@ -193,6 +193,13 @@ record.setRectificationSituationFiles(preventFiles); } + @Override + public String genCode(String id) { + BizQualityPreventRecord entity = getById(id); + saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + @Transactional @Override public boolean save(BizQualityPreventRecord entity) { @@ -205,8 +212,9 @@ entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); entity.setUpdateTime(DateUtil.now()); //设置系统编码 - saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + saveZeroCodeEntity(entity, null, QualityTableEnum.PREVENT_RECORD); +// saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); @@ -235,10 +243,10 @@ @Transactional @Override public boolean updateById(BizQualityPreventRecord entity) { - BizQualityPreventRecord oldEntity = getById(entity.getId()); + //更新系统编码 - updateEntity(entity, oldEntity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// updateEntity(entity, oldEntity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); @@ -357,7 +365,7 @@ String currentFileName = rootFileName + File.separator + record.getFileCode() + record.getFileName(); Map map = BeanUtil.beanToMap(record); List fileRelList = bizQualityPreventFileRelMapper.selectList(new QueryWrapper().eq("prevent_id", record.getId())); - if (CollectionUtils.isNotEmpty(fileRelList)){ + if (CollectionUtils.isNotEmpty(fileRelList)) { for (BizQualityPreventFileRel fileRel : fileRelList) { switch (fileRel.getFileType()) { case 1: @@ -406,6 +414,7 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override public void setBizName(BizQualityPreventRecord obj) { obj.setBizName(obj.getFileName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityCorrectiveRepEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityCorrectiveRepEventPostProcessor.java index f080fe7..cc9cb4f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityCorrectiveRepEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityCorrectiveRepEventPostProcessor.java @@ -32,9 +32,14 @@ Long id = Long.valueOf(notifyEventStatusDTO.getId()); Assert.isFalse(Objects.isNull(id), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityCorrectiveRecordService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityCorrectiveRecordService.class); + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityCorrectiveRecord::getApprovalStatus, ApprovalStatusEnum.PASSED); + update.set(BizQualityCorrectiveRecord::getSysCode,code); + update.set(BizQualityCorrectiveRecord::getFileCode,code); + update.eq(BizQualityCorrectiveRecord::getId, notifyEventStatusDTO.getId()); + boolean updateFlag = supervisionRepMapper.update(update); if (!updateFlag) { log.error("纠正措施处理单审批处理失败"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewPlanEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewPlanEventPostProcessor.java index 42c263f..e09abbd 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewPlanEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewPlanEventPostProcessor.java @@ -35,9 +35,15 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityManagementReviewPlanService service = SpringContextUtil.getBean(IBizQualityManagementReviewPlanService.class); + String code = service.genCode(notifyEventStatusDTO.getId()); + LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityManagementReviewPlan::getApprovalStatus, ApprovalStatusEnum.PASSED); + update.set(BizQualityManagementReviewPlan::getSysCode, code); + update.set(BizQualityManagementReviewPlan::getFileCode, code); + update.eq(BizQualityManagementReviewPlan::getId, notifyEventStatusDTO.getId()); + boolean updateFlag = service.update(update); if (!updateFlag) { diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml index 551a3df..3329c24 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml @@ -53,7 +53,7 @@ a.file_name as fileName , a.file_code as fileCode, sys_code as sysCode, - a.remarks,a.conclusion + a.remarks,a.conclusion,a.status from biz_quality_target_evaluation_rep a diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java index cc4ce67..5377c65 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java @@ -51,11 +51,14 @@ private String createTimeStart; @ApiModelProperty(value = "创建时间结束", dataType = "Date") private String createTimeEnd; + @ApiModelProperty(value = "草稿状态", dataType = "Integer") + private Integer status; /** * 导出ids */ - @ApiModelProperty(value = "导出ids",dataType = "List") + @ApiModelProperty(value = "导出ids", dataType = "List") private List ids; + public QueryWrapper genQuery() { QueryWrapper query = new QueryWrapper<>(); if (StrUtil.isNotEmpty(bizLabCode)) { @@ -79,6 +82,9 @@ if (StrUtil.isNotEmpty(createTimeEnd)) { query.le("create_time", createTimeEnd); } + if (status != null) { + query.eq("status", status); + } return query; } } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java index 56c1cd6..c2953b4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java @@ -95,7 +95,9 @@ @ApiModelProperty(value = "结论", dataType = "String") @TableField("conclusion") private String conclusion; - + @ApiModelProperty(value = "状态(0 草稿)", dataType = "String") + @TableField("status") + private Integer status; @ApiModelProperty(value = "报告内容", dataType = "String") @TableField(exist = false) private List targetEvaluationContents; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 95b6b11..1e5a4d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -112,6 +112,14 @@ this.correctiveRectifFileMapper = correctiveRectifFileMapper; } + @Override + public String genCode(String id) { + BizQualityCorrectiveRecord entity = getById(id); + entity.setUpdateTime(DateUtil.now()); + saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + @Transactional @Override public boolean save(BizQualityCorrectiveRecord entity) { @@ -123,8 +131,9 @@ entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + saveZeroCodeEntity(entity, null, QualityTableEnum.CORRECTIVE_RECORD); +// saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); return true; @@ -133,10 +142,9 @@ @Transactional @Override public boolean updateById(BizQualityCorrectiveRecord entity) { - BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(DateUtil.now()); - updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + +// updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); @@ -212,7 +220,7 @@ @Override public ReturnDTO submit(BaseApprovalSubmitRequest request) { - ReturnDTO returnDTO = super.submit(request); + ReturnDTO returnDTO = super.submit(request); if (ResponseData.DEFAULT_SUCCESS_CODE != returnDTO.getCode()) { return returnDTO; } @@ -428,6 +436,7 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index b436037..395f010 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -170,6 +170,8 @@ } } + + @Resource private IBizLabRelDeptService labRelDeptService; @@ -226,10 +228,11 @@ entity.setCommanderName(user.getName()); //生成文件编码 - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); + getNewCode(entity); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); //生成年度编码 @@ -238,17 +241,32 @@ super.save(entity); return true; } + @Override + public String genCode(String id) { + BizQualityManagementReviewPlan entity = getById(id); + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + return entity.getSysCode(); + } + private void getNewCode(BizQualityManagementReviewPlan entity) { + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genZeroMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + } @Transactional @Override public boolean updateById(BizQualityManagementReviewPlan entity) { - BizQualityManagementReviewPlan oldInfo = getById(entity.getId()); - if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); - } + +// if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); +// } entity.setUpdateTime(DateUtil.now()); checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_PLAN); super.updateById(entity); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index fa087a6..1f45214 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -148,6 +148,16 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public String genCode(String id) { + BizQualityManagementReviewRep entity = getById(id); + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + return entity.getSysCode(); + } + @Transactional @Override public boolean save(BizQualityManagementReviewRep entity) { @@ -158,33 +168,40 @@ entity.setCreatorName(user.getName()); //生成文件编码 - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); + getZeroCode(entity); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); //生成年度编码 entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); super.save(entity); //整改内容保存 itemService.saveList(entity.getRepItems(), entity.getId()); return true; } + private void getZeroCode(BizQualityManagementReviewRep entity) { + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genZeroMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + } @Transactional @Override public boolean updateById(BizQualityManagementReviewRep entity) { - BizQualityManagementReviewRep oldInfo = getById(entity.getId()); - if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); - } - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); + +// if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); +// } + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 5efbfe2..c79899b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -133,7 +133,7 @@ updateWrapper.set("sub_time", new Date()); this.update(updateWrapper); - ReturnDTO returnDTO = super.submit(request); + ReturnDTO returnDTO = super.submit(request); if (ResponseData.DEFAULT_SUCCESS_CODE != returnDTO.getCode()) { return returnDTO; } @@ -193,6 +193,13 @@ record.setRectificationSituationFiles(preventFiles); } + @Override + public String genCode(String id) { + BizQualityPreventRecord entity = getById(id); + saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + @Transactional @Override public boolean save(BizQualityPreventRecord entity) { @@ -205,8 +212,9 @@ entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); entity.setUpdateTime(DateUtil.now()); //设置系统编码 - saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + saveZeroCodeEntity(entity, null, QualityTableEnum.PREVENT_RECORD); +// saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); @@ -235,10 +243,10 @@ @Transactional @Override public boolean updateById(BizQualityPreventRecord entity) { - BizQualityPreventRecord oldEntity = getById(entity.getId()); + //更新系统编码 - updateEntity(entity, oldEntity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// updateEntity(entity, oldEntity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); @@ -357,7 +365,7 @@ String currentFileName = rootFileName + File.separator + record.getFileCode() + record.getFileName(); Map map = BeanUtil.beanToMap(record); List fileRelList = bizQualityPreventFileRelMapper.selectList(new QueryWrapper().eq("prevent_id", record.getId())); - if (CollectionUtils.isNotEmpty(fileRelList)){ + if (CollectionUtils.isNotEmpty(fileRelList)) { for (BizQualityPreventFileRel fileRel : fileRelList) { switch (fileRel.getFileType()) { case 1: @@ -406,6 +414,7 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override public void setBizName(BizQualityPreventRecord obj) { obj.setBizName(obj.getFileName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityCorrectiveRepEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityCorrectiveRepEventPostProcessor.java index f080fe7..cc9cb4f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityCorrectiveRepEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityCorrectiveRepEventPostProcessor.java @@ -32,9 +32,14 @@ Long id = Long.valueOf(notifyEventStatusDTO.getId()); Assert.isFalse(Objects.isNull(id), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityCorrectiveRecordService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityCorrectiveRecordService.class); + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityCorrectiveRecord::getApprovalStatus, ApprovalStatusEnum.PASSED); + update.set(BizQualityCorrectiveRecord::getSysCode,code); + update.set(BizQualityCorrectiveRecord::getFileCode,code); + update.eq(BizQualityCorrectiveRecord::getId, notifyEventStatusDTO.getId()); + boolean updateFlag = supervisionRepMapper.update(update); if (!updateFlag) { log.error("纠正措施处理单审批处理失败"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewPlanEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewPlanEventPostProcessor.java index 42c263f..e09abbd 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewPlanEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewPlanEventPostProcessor.java @@ -35,9 +35,15 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityManagementReviewPlanService service = SpringContextUtil.getBean(IBizQualityManagementReviewPlanService.class); + String code = service.genCode(notifyEventStatusDTO.getId()); + LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityManagementReviewPlan::getApprovalStatus, ApprovalStatusEnum.PASSED); + update.set(BizQualityManagementReviewPlan::getSysCode, code); + update.set(BizQualityManagementReviewPlan::getFileCode, code); + update.eq(BizQualityManagementReviewPlan::getId, notifyEventStatusDTO.getId()); + boolean updateFlag = service.update(update); if (!updateFlag) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewRepEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewRepEventPostProcessor.java index fc48ec4..4565ac5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewRepEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewRepEventPostProcessor.java @@ -39,9 +39,11 @@ }); IBizQualityManagementReviewRepService service = SpringContextUtil.getBean(IBizQualityManagementReviewRepService.class); ApprovalOperateService approvalOperateService = SpringContextUtil.getBean(ApprovalOperateService.class); + String code = service.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityManagementReviewRep::getApprovalStatus, ApprovalStatusEnum.PASSED); - + update.set(BizQualityManagementReviewRep::getSysCode,code); + update.set(BizQualityManagementReviewRep::getFileCode,code); //更新批准人 BizQualityManagementReviewRep reviewRep = service.getById(id); String processId = reviewRep.getProcessId(); diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml index 551a3df..3329c24 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml @@ -53,7 +53,7 @@ a.file_name as fileName , a.file_code as fileCode, sys_code as sysCode, - a.remarks,a.conclusion + a.remarks,a.conclusion,a.status from biz_quality_target_evaluation_rep a diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java index cc4ce67..5377c65 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java @@ -51,11 +51,14 @@ private String createTimeStart; @ApiModelProperty(value = "创建时间结束", dataType = "Date") private String createTimeEnd; + @ApiModelProperty(value = "草稿状态", dataType = "Integer") + private Integer status; /** * 导出ids */ - @ApiModelProperty(value = "导出ids",dataType = "List") + @ApiModelProperty(value = "导出ids", dataType = "List") private List ids; + public QueryWrapper genQuery() { QueryWrapper query = new QueryWrapper<>(); if (StrUtil.isNotEmpty(bizLabCode)) { @@ -79,6 +82,9 @@ if (StrUtil.isNotEmpty(createTimeEnd)) { query.le("create_time", createTimeEnd); } + if (status != null) { + query.eq("status", status); + } return query; } } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java index 56c1cd6..c2953b4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java @@ -95,7 +95,9 @@ @ApiModelProperty(value = "结论", dataType = "String") @TableField("conclusion") private String conclusion; - + @ApiModelProperty(value = "状态(0 草稿)", dataType = "String") + @TableField("status") + private Integer status; @ApiModelProperty(value = "报告内容", dataType = "String") @TableField(exist = false) private List targetEvaluationContents; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 95b6b11..1e5a4d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -112,6 +112,14 @@ this.correctiveRectifFileMapper = correctiveRectifFileMapper; } + @Override + public String genCode(String id) { + BizQualityCorrectiveRecord entity = getById(id); + entity.setUpdateTime(DateUtil.now()); + saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + @Transactional @Override public boolean save(BizQualityCorrectiveRecord entity) { @@ -123,8 +131,9 @@ entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + saveZeroCodeEntity(entity, null, QualityTableEnum.CORRECTIVE_RECORD); +// saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); return true; @@ -133,10 +142,9 @@ @Transactional @Override public boolean updateById(BizQualityCorrectiveRecord entity) { - BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(DateUtil.now()); - updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + +// updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); @@ -212,7 +220,7 @@ @Override public ReturnDTO submit(BaseApprovalSubmitRequest request) { - ReturnDTO returnDTO = super.submit(request); + ReturnDTO returnDTO = super.submit(request); if (ResponseData.DEFAULT_SUCCESS_CODE != returnDTO.getCode()) { return returnDTO; } @@ -428,6 +436,7 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index b436037..395f010 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -170,6 +170,8 @@ } } + + @Resource private IBizLabRelDeptService labRelDeptService; @@ -226,10 +228,11 @@ entity.setCommanderName(user.getName()); //生成文件编码 - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); + getNewCode(entity); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); //生成年度编码 @@ -238,17 +241,32 @@ super.save(entity); return true; } + @Override + public String genCode(String id) { + BizQualityManagementReviewPlan entity = getById(id); + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + return entity.getSysCode(); + } + private void getNewCode(BizQualityManagementReviewPlan entity) { + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genZeroMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + } @Transactional @Override public boolean updateById(BizQualityManagementReviewPlan entity) { - BizQualityManagementReviewPlan oldInfo = getById(entity.getId()); - if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); - } + +// if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); +// } entity.setUpdateTime(DateUtil.now()); checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_PLAN); super.updateById(entity); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index fa087a6..1f45214 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -148,6 +148,16 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public String genCode(String id) { + BizQualityManagementReviewRep entity = getById(id); + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + return entity.getSysCode(); + } + @Transactional @Override public boolean save(BizQualityManagementReviewRep entity) { @@ -158,33 +168,40 @@ entity.setCreatorName(user.getName()); //生成文件编码 - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); + getZeroCode(entity); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); //生成年度编码 entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); super.save(entity); //整改内容保存 itemService.saveList(entity.getRepItems(), entity.getId()); return true; } + private void getZeroCode(BizQualityManagementReviewRep entity) { + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genZeroMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + } @Transactional @Override public boolean updateById(BizQualityManagementReviewRep entity) { - BizQualityManagementReviewRep oldInfo = getById(entity.getId()); - if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); - } - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); + +// if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); +// } + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 5efbfe2..c79899b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -133,7 +133,7 @@ updateWrapper.set("sub_time", new Date()); this.update(updateWrapper); - ReturnDTO returnDTO = super.submit(request); + ReturnDTO returnDTO = super.submit(request); if (ResponseData.DEFAULT_SUCCESS_CODE != returnDTO.getCode()) { return returnDTO; } @@ -193,6 +193,13 @@ record.setRectificationSituationFiles(preventFiles); } + @Override + public String genCode(String id) { + BizQualityPreventRecord entity = getById(id); + saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + @Transactional @Override public boolean save(BizQualityPreventRecord entity) { @@ -205,8 +212,9 @@ entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); entity.setUpdateTime(DateUtil.now()); //设置系统编码 - saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + saveZeroCodeEntity(entity, null, QualityTableEnum.PREVENT_RECORD); +// saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); @@ -235,10 +243,10 @@ @Transactional @Override public boolean updateById(BizQualityPreventRecord entity) { - BizQualityPreventRecord oldEntity = getById(entity.getId()); + //更新系统编码 - updateEntity(entity, oldEntity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// updateEntity(entity, oldEntity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); @@ -357,7 +365,7 @@ String currentFileName = rootFileName + File.separator + record.getFileCode() + record.getFileName(); Map map = BeanUtil.beanToMap(record); List fileRelList = bizQualityPreventFileRelMapper.selectList(new QueryWrapper().eq("prevent_id", record.getId())); - if (CollectionUtils.isNotEmpty(fileRelList)){ + if (CollectionUtils.isNotEmpty(fileRelList)) { for (BizQualityPreventFileRel fileRel : fileRelList) { switch (fileRel.getFileType()) { case 1: @@ -406,6 +414,7 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override public void setBizName(BizQualityPreventRecord obj) { obj.setBizName(obj.getFileName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityCorrectiveRepEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityCorrectiveRepEventPostProcessor.java index f080fe7..cc9cb4f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityCorrectiveRepEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityCorrectiveRepEventPostProcessor.java @@ -32,9 +32,14 @@ Long id = Long.valueOf(notifyEventStatusDTO.getId()); Assert.isFalse(Objects.isNull(id), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityCorrectiveRecordService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityCorrectiveRecordService.class); + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityCorrectiveRecord::getApprovalStatus, ApprovalStatusEnum.PASSED); + update.set(BizQualityCorrectiveRecord::getSysCode,code); + update.set(BizQualityCorrectiveRecord::getFileCode,code); + update.eq(BizQualityCorrectiveRecord::getId, notifyEventStatusDTO.getId()); + boolean updateFlag = supervisionRepMapper.update(update); if (!updateFlag) { log.error("纠正措施处理单审批处理失败"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewPlanEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewPlanEventPostProcessor.java index 42c263f..e09abbd 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewPlanEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewPlanEventPostProcessor.java @@ -35,9 +35,15 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityManagementReviewPlanService service = SpringContextUtil.getBean(IBizQualityManagementReviewPlanService.class); + String code = service.genCode(notifyEventStatusDTO.getId()); + LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityManagementReviewPlan::getApprovalStatus, ApprovalStatusEnum.PASSED); + update.set(BizQualityManagementReviewPlan::getSysCode, code); + update.set(BizQualityManagementReviewPlan::getFileCode, code); + update.eq(BizQualityManagementReviewPlan::getId, notifyEventStatusDTO.getId()); + boolean updateFlag = service.update(update); if (!updateFlag) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewRepEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewRepEventPostProcessor.java index fc48ec4..4565ac5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewRepEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewRepEventPostProcessor.java @@ -39,9 +39,11 @@ }); IBizQualityManagementReviewRepService service = SpringContextUtil.getBean(IBizQualityManagementReviewRepService.class); ApprovalOperateService approvalOperateService = SpringContextUtil.getBean(ApprovalOperateService.class); + String code = service.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityManagementReviewRep::getApprovalStatus, ApprovalStatusEnum.PASSED); - + update.set(BizQualityManagementReviewRep::getSysCode,code); + update.set(BizQualityManagementReviewRep::getFileCode,code); //更新批准人 BizQualityManagementReviewRep reviewRep = service.getById(id); String processId = reviewRep.getProcessId(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityPreventRepEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityPreventRepEventPostProcessor.java index 51dee15..5d6abcc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityPreventRepEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityPreventRepEventPostProcessor.java @@ -34,8 +34,12 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityPreventRecordService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityPreventRecordService.class); + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityPreventRecord::getApprovalStatus, ApprovalStatusEnum.PASSED); + update.set(BizQualityPreventRecord::getSysCode,code); + update.set(BizQualityPreventRecord::getFileCode,code); + update.eq(BizQualityPreventRecord::getId, notifyEventStatusDTO.getId()); boolean updateFlag = supervisionRepMapper.update(update); diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml index 551a3df..3329c24 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml @@ -53,7 +53,7 @@ a.file_name as fileName , a.file_code as fileCode, sys_code as sysCode, - a.remarks,a.conclusion + a.remarks,a.conclusion,a.status from biz_quality_target_evaluation_rep a diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java index cc4ce67..5377c65 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java @@ -51,11 +51,14 @@ private String createTimeStart; @ApiModelProperty(value = "创建时间结束", dataType = "Date") private String createTimeEnd; + @ApiModelProperty(value = "草稿状态", dataType = "Integer") + private Integer status; /** * 导出ids */ - @ApiModelProperty(value = "导出ids",dataType = "List") + @ApiModelProperty(value = "导出ids", dataType = "List") private List ids; + public QueryWrapper genQuery() { QueryWrapper query = new QueryWrapper<>(); if (StrUtil.isNotEmpty(bizLabCode)) { @@ -79,6 +82,9 @@ if (StrUtil.isNotEmpty(createTimeEnd)) { query.le("create_time", createTimeEnd); } + if (status != null) { + query.eq("status", status); + } return query; } } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java index 56c1cd6..c2953b4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java @@ -95,7 +95,9 @@ @ApiModelProperty(value = "结论", dataType = "String") @TableField("conclusion") private String conclusion; - + @ApiModelProperty(value = "状态(0 草稿)", dataType = "String") + @TableField("status") + private Integer status; @ApiModelProperty(value = "报告内容", dataType = "String") @TableField(exist = false) private List targetEvaluationContents; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 95b6b11..1e5a4d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -112,6 +112,14 @@ this.correctiveRectifFileMapper = correctiveRectifFileMapper; } + @Override + public String genCode(String id) { + BizQualityCorrectiveRecord entity = getById(id); + entity.setUpdateTime(DateUtil.now()); + saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + @Transactional @Override public boolean save(BizQualityCorrectiveRecord entity) { @@ -123,8 +131,9 @@ entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + saveZeroCodeEntity(entity, null, QualityTableEnum.CORRECTIVE_RECORD); +// saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); return true; @@ -133,10 +142,9 @@ @Transactional @Override public boolean updateById(BizQualityCorrectiveRecord entity) { - BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(DateUtil.now()); - updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + +// updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); @@ -212,7 +220,7 @@ @Override public ReturnDTO submit(BaseApprovalSubmitRequest request) { - ReturnDTO returnDTO = super.submit(request); + ReturnDTO returnDTO = super.submit(request); if (ResponseData.DEFAULT_SUCCESS_CODE != returnDTO.getCode()) { return returnDTO; } @@ -428,6 +436,7 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index b436037..395f010 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -170,6 +170,8 @@ } } + + @Resource private IBizLabRelDeptService labRelDeptService; @@ -226,10 +228,11 @@ entity.setCommanderName(user.getName()); //生成文件编码 - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); + getNewCode(entity); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); //生成年度编码 @@ -238,17 +241,32 @@ super.save(entity); return true; } + @Override + public String genCode(String id) { + BizQualityManagementReviewPlan entity = getById(id); + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + return entity.getSysCode(); + } + private void getNewCode(BizQualityManagementReviewPlan entity) { + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genZeroMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + } @Transactional @Override public boolean updateById(BizQualityManagementReviewPlan entity) { - BizQualityManagementReviewPlan oldInfo = getById(entity.getId()); - if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); - } + +// if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); +// } entity.setUpdateTime(DateUtil.now()); checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_PLAN); super.updateById(entity); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index fa087a6..1f45214 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -148,6 +148,16 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public String genCode(String id) { + BizQualityManagementReviewRep entity = getById(id); + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + return entity.getSysCode(); + } + @Transactional @Override public boolean save(BizQualityManagementReviewRep entity) { @@ -158,33 +168,40 @@ entity.setCreatorName(user.getName()); //生成文件编码 - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); + getZeroCode(entity); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); //生成年度编码 entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); super.save(entity); //整改内容保存 itemService.saveList(entity.getRepItems(), entity.getId()); return true; } + private void getZeroCode(BizQualityManagementReviewRep entity) { + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genZeroMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + } @Transactional @Override public boolean updateById(BizQualityManagementReviewRep entity) { - BizQualityManagementReviewRep oldInfo = getById(entity.getId()); - if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); - } - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); + +// if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); +// } + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 5efbfe2..c79899b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -133,7 +133,7 @@ updateWrapper.set("sub_time", new Date()); this.update(updateWrapper); - ReturnDTO returnDTO = super.submit(request); + ReturnDTO returnDTO = super.submit(request); if (ResponseData.DEFAULT_SUCCESS_CODE != returnDTO.getCode()) { return returnDTO; } @@ -193,6 +193,13 @@ record.setRectificationSituationFiles(preventFiles); } + @Override + public String genCode(String id) { + BizQualityPreventRecord entity = getById(id); + saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + @Transactional @Override public boolean save(BizQualityPreventRecord entity) { @@ -205,8 +212,9 @@ entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); entity.setUpdateTime(DateUtil.now()); //设置系统编码 - saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + saveZeroCodeEntity(entity, null, QualityTableEnum.PREVENT_RECORD); +// saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); @@ -235,10 +243,10 @@ @Transactional @Override public boolean updateById(BizQualityPreventRecord entity) { - BizQualityPreventRecord oldEntity = getById(entity.getId()); + //更新系统编码 - updateEntity(entity, oldEntity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// updateEntity(entity, oldEntity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); @@ -357,7 +365,7 @@ String currentFileName = rootFileName + File.separator + record.getFileCode() + record.getFileName(); Map map = BeanUtil.beanToMap(record); List fileRelList = bizQualityPreventFileRelMapper.selectList(new QueryWrapper().eq("prevent_id", record.getId())); - if (CollectionUtils.isNotEmpty(fileRelList)){ + if (CollectionUtils.isNotEmpty(fileRelList)) { for (BizQualityPreventFileRel fileRel : fileRelList) { switch (fileRel.getFileType()) { case 1: @@ -406,6 +414,7 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override public void setBizName(BizQualityPreventRecord obj) { obj.setBizName(obj.getFileName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityCorrectiveRepEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityCorrectiveRepEventPostProcessor.java index f080fe7..cc9cb4f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityCorrectiveRepEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityCorrectiveRepEventPostProcessor.java @@ -32,9 +32,14 @@ Long id = Long.valueOf(notifyEventStatusDTO.getId()); Assert.isFalse(Objects.isNull(id), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityCorrectiveRecordService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityCorrectiveRecordService.class); + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityCorrectiveRecord::getApprovalStatus, ApprovalStatusEnum.PASSED); + update.set(BizQualityCorrectiveRecord::getSysCode,code); + update.set(BizQualityCorrectiveRecord::getFileCode,code); + update.eq(BizQualityCorrectiveRecord::getId, notifyEventStatusDTO.getId()); + boolean updateFlag = supervisionRepMapper.update(update); if (!updateFlag) { log.error("纠正措施处理单审批处理失败"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewPlanEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewPlanEventPostProcessor.java index 42c263f..e09abbd 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewPlanEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewPlanEventPostProcessor.java @@ -35,9 +35,15 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityManagementReviewPlanService service = SpringContextUtil.getBean(IBizQualityManagementReviewPlanService.class); + String code = service.genCode(notifyEventStatusDTO.getId()); + LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityManagementReviewPlan::getApprovalStatus, ApprovalStatusEnum.PASSED); + update.set(BizQualityManagementReviewPlan::getSysCode, code); + update.set(BizQualityManagementReviewPlan::getFileCode, code); + update.eq(BizQualityManagementReviewPlan::getId, notifyEventStatusDTO.getId()); + boolean updateFlag = service.update(update); if (!updateFlag) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewRepEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewRepEventPostProcessor.java index fc48ec4..4565ac5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewRepEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewRepEventPostProcessor.java @@ -39,9 +39,11 @@ }); IBizQualityManagementReviewRepService service = SpringContextUtil.getBean(IBizQualityManagementReviewRepService.class); ApprovalOperateService approvalOperateService = SpringContextUtil.getBean(ApprovalOperateService.class); + String code = service.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityManagementReviewRep::getApprovalStatus, ApprovalStatusEnum.PASSED); - + update.set(BizQualityManagementReviewRep::getSysCode,code); + update.set(BizQualityManagementReviewRep::getFileCode,code); //更新批准人 BizQualityManagementReviewRep reviewRep = service.getById(id); String processId = reviewRep.getProcessId(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityPreventRepEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityPreventRepEventPostProcessor.java index 51dee15..5d6abcc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityPreventRepEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityPreventRepEventPostProcessor.java @@ -34,8 +34,12 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityPreventRecordService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityPreventRecordService.class); + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityPreventRecord::getApprovalStatus, ApprovalStatusEnum.PASSED); + update.set(BizQualityPreventRecord::getSysCode,code); + update.set(BizQualityPreventRecord::getFileCode,code); + update.eq(BizQualityPreventRecord::getId, notifyEventStatusDTO.getId()); boolean updateFlag = supervisionRepMapper.update(update); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java index 065da5f..c33f623 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java @@ -59,4 +59,6 @@ void exportFile(ExportDTO exportDTO, HttpServletResponse response); void exportZip(List recordList, HttpServletResponse response) throws Exception; + + String genCode(String id); } diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml index 551a3df..3329c24 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml @@ -53,7 +53,7 @@ a.file_name as fileName , a.file_code as fileCode, sys_code as sysCode, - a.remarks,a.conclusion + a.remarks,a.conclusion,a.status from biz_quality_target_evaluation_rep a diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java index cc4ce67..5377c65 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java @@ -51,11 +51,14 @@ private String createTimeStart; @ApiModelProperty(value = "创建时间结束", dataType = "Date") private String createTimeEnd; + @ApiModelProperty(value = "草稿状态", dataType = "Integer") + private Integer status; /** * 导出ids */ - @ApiModelProperty(value = "导出ids",dataType = "List") + @ApiModelProperty(value = "导出ids", dataType = "List") private List ids; + public QueryWrapper genQuery() { QueryWrapper query = new QueryWrapper<>(); if (StrUtil.isNotEmpty(bizLabCode)) { @@ -79,6 +82,9 @@ if (StrUtil.isNotEmpty(createTimeEnd)) { query.le("create_time", createTimeEnd); } + if (status != null) { + query.eq("status", status); + } return query; } } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java index 56c1cd6..c2953b4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java @@ -95,7 +95,9 @@ @ApiModelProperty(value = "结论", dataType = "String") @TableField("conclusion") private String conclusion; - + @ApiModelProperty(value = "状态(0 草稿)", dataType = "String") + @TableField("status") + private Integer status; @ApiModelProperty(value = "报告内容", dataType = "String") @TableField(exist = false) private List targetEvaluationContents; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 95b6b11..1e5a4d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -112,6 +112,14 @@ this.correctiveRectifFileMapper = correctiveRectifFileMapper; } + @Override + public String genCode(String id) { + BizQualityCorrectiveRecord entity = getById(id); + entity.setUpdateTime(DateUtil.now()); + saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + @Transactional @Override public boolean save(BizQualityCorrectiveRecord entity) { @@ -123,8 +131,9 @@ entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + saveZeroCodeEntity(entity, null, QualityTableEnum.CORRECTIVE_RECORD); +// saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); return true; @@ -133,10 +142,9 @@ @Transactional @Override public boolean updateById(BizQualityCorrectiveRecord entity) { - BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(DateUtil.now()); - updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + +// updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); @@ -212,7 +220,7 @@ @Override public ReturnDTO submit(BaseApprovalSubmitRequest request) { - ReturnDTO returnDTO = super.submit(request); + ReturnDTO returnDTO = super.submit(request); if (ResponseData.DEFAULT_SUCCESS_CODE != returnDTO.getCode()) { return returnDTO; } @@ -428,6 +436,7 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index b436037..395f010 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -170,6 +170,8 @@ } } + + @Resource private IBizLabRelDeptService labRelDeptService; @@ -226,10 +228,11 @@ entity.setCommanderName(user.getName()); //生成文件编码 - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); + getNewCode(entity); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); //生成年度编码 @@ -238,17 +241,32 @@ super.save(entity); return true; } + @Override + public String genCode(String id) { + BizQualityManagementReviewPlan entity = getById(id); + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + return entity.getSysCode(); + } + private void getNewCode(BizQualityManagementReviewPlan entity) { + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genZeroMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + } @Transactional @Override public boolean updateById(BizQualityManagementReviewPlan entity) { - BizQualityManagementReviewPlan oldInfo = getById(entity.getId()); - if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); - } + +// if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); +// } entity.setUpdateTime(DateUtil.now()); checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_PLAN); super.updateById(entity); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index fa087a6..1f45214 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -148,6 +148,16 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public String genCode(String id) { + BizQualityManagementReviewRep entity = getById(id); + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + return entity.getSysCode(); + } + @Transactional @Override public boolean save(BizQualityManagementReviewRep entity) { @@ -158,33 +168,40 @@ entity.setCreatorName(user.getName()); //生成文件编码 - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); + getZeroCode(entity); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); //生成年度编码 entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); super.save(entity); //整改内容保存 itemService.saveList(entity.getRepItems(), entity.getId()); return true; } + private void getZeroCode(BizQualityManagementReviewRep entity) { + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genZeroMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + } @Transactional @Override public boolean updateById(BizQualityManagementReviewRep entity) { - BizQualityManagementReviewRep oldInfo = getById(entity.getId()); - if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); - } - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); + +// if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); +// } + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 5efbfe2..c79899b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -133,7 +133,7 @@ updateWrapper.set("sub_time", new Date()); this.update(updateWrapper); - ReturnDTO returnDTO = super.submit(request); + ReturnDTO returnDTO = super.submit(request); if (ResponseData.DEFAULT_SUCCESS_CODE != returnDTO.getCode()) { return returnDTO; } @@ -193,6 +193,13 @@ record.setRectificationSituationFiles(preventFiles); } + @Override + public String genCode(String id) { + BizQualityPreventRecord entity = getById(id); + saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + @Transactional @Override public boolean save(BizQualityPreventRecord entity) { @@ -205,8 +212,9 @@ entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); entity.setUpdateTime(DateUtil.now()); //设置系统编码 - saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + saveZeroCodeEntity(entity, null, QualityTableEnum.PREVENT_RECORD); +// saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); @@ -235,10 +243,10 @@ @Transactional @Override public boolean updateById(BizQualityPreventRecord entity) { - BizQualityPreventRecord oldEntity = getById(entity.getId()); + //更新系统编码 - updateEntity(entity, oldEntity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// updateEntity(entity, oldEntity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); @@ -357,7 +365,7 @@ String currentFileName = rootFileName + File.separator + record.getFileCode() + record.getFileName(); Map map = BeanUtil.beanToMap(record); List fileRelList = bizQualityPreventFileRelMapper.selectList(new QueryWrapper().eq("prevent_id", record.getId())); - if (CollectionUtils.isNotEmpty(fileRelList)){ + if (CollectionUtils.isNotEmpty(fileRelList)) { for (BizQualityPreventFileRel fileRel : fileRelList) { switch (fileRel.getFileType()) { case 1: @@ -406,6 +414,7 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override public void setBizName(BizQualityPreventRecord obj) { obj.setBizName(obj.getFileName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityCorrectiveRepEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityCorrectiveRepEventPostProcessor.java index f080fe7..cc9cb4f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityCorrectiveRepEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityCorrectiveRepEventPostProcessor.java @@ -32,9 +32,14 @@ Long id = Long.valueOf(notifyEventStatusDTO.getId()); Assert.isFalse(Objects.isNull(id), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityCorrectiveRecordService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityCorrectiveRecordService.class); + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityCorrectiveRecord::getApprovalStatus, ApprovalStatusEnum.PASSED); + update.set(BizQualityCorrectiveRecord::getSysCode,code); + update.set(BizQualityCorrectiveRecord::getFileCode,code); + update.eq(BizQualityCorrectiveRecord::getId, notifyEventStatusDTO.getId()); + boolean updateFlag = supervisionRepMapper.update(update); if (!updateFlag) { log.error("纠正措施处理单审批处理失败"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewPlanEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewPlanEventPostProcessor.java index 42c263f..e09abbd 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewPlanEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewPlanEventPostProcessor.java @@ -35,9 +35,15 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityManagementReviewPlanService service = SpringContextUtil.getBean(IBizQualityManagementReviewPlanService.class); + String code = service.genCode(notifyEventStatusDTO.getId()); + LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityManagementReviewPlan::getApprovalStatus, ApprovalStatusEnum.PASSED); + update.set(BizQualityManagementReviewPlan::getSysCode, code); + update.set(BizQualityManagementReviewPlan::getFileCode, code); + update.eq(BizQualityManagementReviewPlan::getId, notifyEventStatusDTO.getId()); + boolean updateFlag = service.update(update); if (!updateFlag) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewRepEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewRepEventPostProcessor.java index fc48ec4..4565ac5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewRepEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewRepEventPostProcessor.java @@ -39,9 +39,11 @@ }); IBizQualityManagementReviewRepService service = SpringContextUtil.getBean(IBizQualityManagementReviewRepService.class); ApprovalOperateService approvalOperateService = SpringContextUtil.getBean(ApprovalOperateService.class); + String code = service.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityManagementReviewRep::getApprovalStatus, ApprovalStatusEnum.PASSED); - + update.set(BizQualityManagementReviewRep::getSysCode,code); + update.set(BizQualityManagementReviewRep::getFileCode,code); //更新批准人 BizQualityManagementReviewRep reviewRep = service.getById(id); String processId = reviewRep.getProcessId(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityPreventRepEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityPreventRepEventPostProcessor.java index 51dee15..5d6abcc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityPreventRepEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityPreventRepEventPostProcessor.java @@ -34,8 +34,12 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityPreventRecordService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityPreventRecordService.class); + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityPreventRecord::getApprovalStatus, ApprovalStatusEnum.PASSED); + update.set(BizQualityPreventRecord::getSysCode,code); + update.set(BizQualityPreventRecord::getFileCode,code); + update.eq(BizQualityPreventRecord::getId, notifyEventStatusDTO.getId()); boolean updateFlag = supervisionRepMapper.update(update); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java index 065da5f..c33f623 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java @@ -59,4 +59,6 @@ void exportFile(ExportDTO exportDTO, HttpServletResponse response); void exportZip(List recordList, HttpServletResponse response) throws Exception; + + String genCode(String id); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityManagementReviewPlanService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityManagementReviewPlanService.java index 8eb63dd..70a5605 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityManagementReviewPlanService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityManagementReviewPlanService.java @@ -32,4 +32,6 @@ void exportZip(List list, HttpServletResponse response); void workReminder(Long id); + + String genCode(String id); } diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml index 551a3df..3329c24 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml @@ -53,7 +53,7 @@ a.file_name as fileName , a.file_code as fileCode, sys_code as sysCode, - a.remarks,a.conclusion + a.remarks,a.conclusion,a.status from biz_quality_target_evaluation_rep a diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java index cc4ce67..5377c65 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java @@ -51,11 +51,14 @@ private String createTimeStart; @ApiModelProperty(value = "创建时间结束", dataType = "Date") private String createTimeEnd; + @ApiModelProperty(value = "草稿状态", dataType = "Integer") + private Integer status; /** * 导出ids */ - @ApiModelProperty(value = "导出ids",dataType = "List") + @ApiModelProperty(value = "导出ids", dataType = "List") private List ids; + public QueryWrapper genQuery() { QueryWrapper query = new QueryWrapper<>(); if (StrUtil.isNotEmpty(bizLabCode)) { @@ -79,6 +82,9 @@ if (StrUtil.isNotEmpty(createTimeEnd)) { query.le("create_time", createTimeEnd); } + if (status != null) { + query.eq("status", status); + } return query; } } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java index 56c1cd6..c2953b4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java @@ -95,7 +95,9 @@ @ApiModelProperty(value = "结论", dataType = "String") @TableField("conclusion") private String conclusion; - + @ApiModelProperty(value = "状态(0 草稿)", dataType = "String") + @TableField("status") + private Integer status; @ApiModelProperty(value = "报告内容", dataType = "String") @TableField(exist = false) private List targetEvaluationContents; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 95b6b11..1e5a4d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -112,6 +112,14 @@ this.correctiveRectifFileMapper = correctiveRectifFileMapper; } + @Override + public String genCode(String id) { + BizQualityCorrectiveRecord entity = getById(id); + entity.setUpdateTime(DateUtil.now()); + saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + @Transactional @Override public boolean save(BizQualityCorrectiveRecord entity) { @@ -123,8 +131,9 @@ entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + saveZeroCodeEntity(entity, null, QualityTableEnum.CORRECTIVE_RECORD); +// saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); return true; @@ -133,10 +142,9 @@ @Transactional @Override public boolean updateById(BizQualityCorrectiveRecord entity) { - BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(DateUtil.now()); - updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + +// updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); @@ -212,7 +220,7 @@ @Override public ReturnDTO submit(BaseApprovalSubmitRequest request) { - ReturnDTO returnDTO = super.submit(request); + ReturnDTO returnDTO = super.submit(request); if (ResponseData.DEFAULT_SUCCESS_CODE != returnDTO.getCode()) { return returnDTO; } @@ -428,6 +436,7 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index b436037..395f010 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -170,6 +170,8 @@ } } + + @Resource private IBizLabRelDeptService labRelDeptService; @@ -226,10 +228,11 @@ entity.setCommanderName(user.getName()); //生成文件编码 - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); + getNewCode(entity); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); //生成年度编码 @@ -238,17 +241,32 @@ super.save(entity); return true; } + @Override + public String genCode(String id) { + BizQualityManagementReviewPlan entity = getById(id); + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + return entity.getSysCode(); + } + private void getNewCode(BizQualityManagementReviewPlan entity) { + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genZeroMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + } @Transactional @Override public boolean updateById(BizQualityManagementReviewPlan entity) { - BizQualityManagementReviewPlan oldInfo = getById(entity.getId()); - if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); - } + +// if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); +// } entity.setUpdateTime(DateUtil.now()); checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_PLAN); super.updateById(entity); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index fa087a6..1f45214 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -148,6 +148,16 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public String genCode(String id) { + BizQualityManagementReviewRep entity = getById(id); + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + return entity.getSysCode(); + } + @Transactional @Override public boolean save(BizQualityManagementReviewRep entity) { @@ -158,33 +168,40 @@ entity.setCreatorName(user.getName()); //生成文件编码 - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); + getZeroCode(entity); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); //生成年度编码 entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); super.save(entity); //整改内容保存 itemService.saveList(entity.getRepItems(), entity.getId()); return true; } + private void getZeroCode(BizQualityManagementReviewRep entity) { + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genZeroMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + } @Transactional @Override public boolean updateById(BizQualityManagementReviewRep entity) { - BizQualityManagementReviewRep oldInfo = getById(entity.getId()); - if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); - } - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); + +// if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); +// } + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 5efbfe2..c79899b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -133,7 +133,7 @@ updateWrapper.set("sub_time", new Date()); this.update(updateWrapper); - ReturnDTO returnDTO = super.submit(request); + ReturnDTO returnDTO = super.submit(request); if (ResponseData.DEFAULT_SUCCESS_CODE != returnDTO.getCode()) { return returnDTO; } @@ -193,6 +193,13 @@ record.setRectificationSituationFiles(preventFiles); } + @Override + public String genCode(String id) { + BizQualityPreventRecord entity = getById(id); + saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + @Transactional @Override public boolean save(BizQualityPreventRecord entity) { @@ -205,8 +212,9 @@ entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); entity.setUpdateTime(DateUtil.now()); //设置系统编码 - saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + saveZeroCodeEntity(entity, null, QualityTableEnum.PREVENT_RECORD); +// saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); @@ -235,10 +243,10 @@ @Transactional @Override public boolean updateById(BizQualityPreventRecord entity) { - BizQualityPreventRecord oldEntity = getById(entity.getId()); + //更新系统编码 - updateEntity(entity, oldEntity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// updateEntity(entity, oldEntity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); @@ -357,7 +365,7 @@ String currentFileName = rootFileName + File.separator + record.getFileCode() + record.getFileName(); Map map = BeanUtil.beanToMap(record); List fileRelList = bizQualityPreventFileRelMapper.selectList(new QueryWrapper().eq("prevent_id", record.getId())); - if (CollectionUtils.isNotEmpty(fileRelList)){ + if (CollectionUtils.isNotEmpty(fileRelList)) { for (BizQualityPreventFileRel fileRel : fileRelList) { switch (fileRel.getFileType()) { case 1: @@ -406,6 +414,7 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override public void setBizName(BizQualityPreventRecord obj) { obj.setBizName(obj.getFileName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityCorrectiveRepEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityCorrectiveRepEventPostProcessor.java index f080fe7..cc9cb4f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityCorrectiveRepEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityCorrectiveRepEventPostProcessor.java @@ -32,9 +32,14 @@ Long id = Long.valueOf(notifyEventStatusDTO.getId()); Assert.isFalse(Objects.isNull(id), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityCorrectiveRecordService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityCorrectiveRecordService.class); + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityCorrectiveRecord::getApprovalStatus, ApprovalStatusEnum.PASSED); + update.set(BizQualityCorrectiveRecord::getSysCode,code); + update.set(BizQualityCorrectiveRecord::getFileCode,code); + update.eq(BizQualityCorrectiveRecord::getId, notifyEventStatusDTO.getId()); + boolean updateFlag = supervisionRepMapper.update(update); if (!updateFlag) { log.error("纠正措施处理单审批处理失败"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewPlanEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewPlanEventPostProcessor.java index 42c263f..e09abbd 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewPlanEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewPlanEventPostProcessor.java @@ -35,9 +35,15 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityManagementReviewPlanService service = SpringContextUtil.getBean(IBizQualityManagementReviewPlanService.class); + String code = service.genCode(notifyEventStatusDTO.getId()); + LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityManagementReviewPlan::getApprovalStatus, ApprovalStatusEnum.PASSED); + update.set(BizQualityManagementReviewPlan::getSysCode, code); + update.set(BizQualityManagementReviewPlan::getFileCode, code); + update.eq(BizQualityManagementReviewPlan::getId, notifyEventStatusDTO.getId()); + boolean updateFlag = service.update(update); if (!updateFlag) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewRepEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewRepEventPostProcessor.java index fc48ec4..4565ac5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewRepEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewRepEventPostProcessor.java @@ -39,9 +39,11 @@ }); IBizQualityManagementReviewRepService service = SpringContextUtil.getBean(IBizQualityManagementReviewRepService.class); ApprovalOperateService approvalOperateService = SpringContextUtil.getBean(ApprovalOperateService.class); + String code = service.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityManagementReviewRep::getApprovalStatus, ApprovalStatusEnum.PASSED); - + update.set(BizQualityManagementReviewRep::getSysCode,code); + update.set(BizQualityManagementReviewRep::getFileCode,code); //更新批准人 BizQualityManagementReviewRep reviewRep = service.getById(id); String processId = reviewRep.getProcessId(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityPreventRepEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityPreventRepEventPostProcessor.java index 51dee15..5d6abcc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityPreventRepEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityPreventRepEventPostProcessor.java @@ -34,8 +34,12 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityPreventRecordService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityPreventRecordService.class); + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityPreventRecord::getApprovalStatus, ApprovalStatusEnum.PASSED); + update.set(BizQualityPreventRecord::getSysCode,code); + update.set(BizQualityPreventRecord::getFileCode,code); + update.eq(BizQualityPreventRecord::getId, notifyEventStatusDTO.getId()); boolean updateFlag = supervisionRepMapper.update(update); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java index 065da5f..c33f623 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java @@ -59,4 +59,6 @@ void exportFile(ExportDTO exportDTO, HttpServletResponse response); void exportZip(List recordList, HttpServletResponse response) throws Exception; + + String genCode(String id); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityManagementReviewPlanService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityManagementReviewPlanService.java index 8eb63dd..70a5605 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityManagementReviewPlanService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityManagementReviewPlanService.java @@ -32,4 +32,6 @@ void exportZip(List list, HttpServletResponse response); void workReminder(Long id); + + String genCode(String id); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityManagementReviewRepService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityManagementReviewRepService.java index eef06ec..77248e7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityManagementReviewRepService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityManagementReviewRepService.java @@ -32,4 +32,6 @@ void exportFile(ExportDTO exportDTO, HttpServletResponse response); void exportZip(List repList, HttpServletResponse response); + + String genCode(String id); } diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml index 551a3df..3329c24 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityTargetEvaluationRepMapper.xml @@ -53,7 +53,7 @@ a.file_name as fileName , a.file_code as fileCode, sys_code as sysCode, - a.remarks,a.conclusion + a.remarks,a.conclusion,a.status from biz_quality_target_evaluation_rep a diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java index cc4ce67..5377c65 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/quality/BizQualityTargetEvaluationRepVO.java @@ -51,11 +51,14 @@ private String createTimeStart; @ApiModelProperty(value = "创建时间结束", dataType = "Date") private String createTimeEnd; + @ApiModelProperty(value = "草稿状态", dataType = "Integer") + private Integer status; /** * 导出ids */ - @ApiModelProperty(value = "导出ids",dataType = "List") + @ApiModelProperty(value = "导出ids", dataType = "List") private List ids; + public QueryWrapper genQuery() { QueryWrapper query = new QueryWrapper<>(); if (StrUtil.isNotEmpty(bizLabCode)) { @@ -79,6 +82,9 @@ if (StrUtil.isNotEmpty(createTimeEnd)) { query.le("create_time", createTimeEnd); } + if (status != null) { + query.eq("status", status); + } return query; } } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java index 56c1cd6..c2953b4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityTargetEvaluationRep.java @@ -95,7 +95,9 @@ @ApiModelProperty(value = "结论", dataType = "String") @TableField("conclusion") private String conclusion; - + @ApiModelProperty(value = "状态(0 草稿)", dataType = "String") + @TableField("status") + private Integer status; @ApiModelProperty(value = "报告内容", dataType = "String") @TableField(exist = false) private List targetEvaluationContents; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java index 95b6b11..1e5a4d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityCorrectiveRecordServiceImpl.java @@ -112,6 +112,14 @@ this.correctiveRectifFileMapper = correctiveRectifFileMapper; } + @Override + public String genCode(String id) { + BizQualityCorrectiveRecord entity = getById(id); + entity.setUpdateTime(DateUtil.now()); + saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + @Transactional @Override public boolean save(BizQualityCorrectiveRecord entity) { @@ -123,8 +131,9 @@ entity.setUpdateTime(DateUtil.now()); entity.setCreatorName(user.getName()); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); - saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + saveZeroCodeEntity(entity, null, QualityTableEnum.CORRECTIVE_RECORD); +// saveEntity(entity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); return true; @@ -133,10 +142,9 @@ @Transactional @Override public boolean updateById(BizQualityCorrectiveRecord entity) { - BizQualityCorrectiveRecord oldEntity = getById(entity.getId()); - entity.setUpdateTime(DateUtil.now()); - updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + +// updateEntity(entity, oldEntity, QualityTableEnum.CORRECTIVE_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); @@ -212,7 +220,7 @@ @Override public ReturnDTO submit(BaseApprovalSubmitRequest request) { - ReturnDTO returnDTO = super.submit(request); + ReturnDTO returnDTO = super.submit(request); if (ResponseData.DEFAULT_SUCCESS_CODE != returnDTO.getCode()) { return returnDTO; } @@ -428,6 +436,7 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + private Map getReviewMap(BizQualityTargetEvaluationRep targetEvaluationRep) { //查询报告内容 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java index b436037..395f010 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewPlanServiceImpl.java @@ -170,6 +170,8 @@ } } + + @Resource private IBizLabRelDeptService labRelDeptService; @@ -226,10 +228,11 @@ entity.setCommanderName(user.getName()); //生成文件编码 - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); + getNewCode(entity); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); //生成年度编码 @@ -238,17 +241,32 @@ super.save(entity); return true; } + @Override + public String genCode(String id) { + BizQualityManagementReviewPlan entity = getById(id); + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + return entity.getSysCode(); + } + private void getNewCode(BizQualityManagementReviewPlan entity) { + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genZeroMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + } @Transactional @Override public boolean updateById(BizQualityManagementReviewPlan entity) { - BizQualityManagementReviewPlan oldInfo = getById(entity.getId()); - if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); - } + +// if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_PLAN, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); +// } entity.setUpdateTime(DateUtil.now()); checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_PLAN); super.updateById(entity); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java index fa087a6..1f45214 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityManagementReviewRepServiceImpl.java @@ -148,6 +148,16 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override + public String genCode(String id) { + BizQualityManagementReviewRep entity = getById(id); + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + return entity.getSysCode(); + } + @Transactional @Override public boolean save(BizQualityManagementReviewRep entity) { @@ -158,33 +168,40 @@ entity.setCreatorName(user.getName()); //生成文件编码 - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); + getZeroCode(entity); entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); //生成年度编码 entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); super.save(entity); //整改内容保存 itemService.saveList(entity.getRepItems(), entity.getId()); return true; } + private void getZeroCode(BizQualityManagementReviewRep entity) { + String labCode = entity.getBizLabCode(); + String newCode = QualityNoUtil.genZeroMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP); + entity.setFileCode(newCode); + entity.setSysCode(newCode); + } @Transactional @Override public boolean updateById(BizQualityManagementReviewRep entity) { - BizQualityManagementReviewRep oldInfo = getById(entity.getId()); - if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { - String labCode = entity.getBizLabCode(); - String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - entity.setFileCode(newCode); - entity.setSysCode(newCode); - } - checkYearNo(baseMapper,entity.getYearNo(),entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); + +// if (!oldInfo.getBizLabCode().equals(entity.getBizLabCode())) { +// String labCode = entity.getBizLabCode(); +// String newCode = QualityNoUtil.genMaxNo(labCode, null, QualityTableEnum.MANAGEMENT_REVIEW_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// entity.setFileCode(newCode); +// entity.setSysCode(newCode); +// } + checkYearNo(baseMapper, entity.getYearNo(), entity.getId(), QualityManagementReviewCheckEnum.MANAGEMENT_REVIEW_REP); entity.setUpdateTime(DateUtil.now()); super.updateById(entity); bizQualityManagementReviewService.updateManagementReviewByBaseManagement(entity); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 5efbfe2..c79899b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -133,7 +133,7 @@ updateWrapper.set("sub_time", new Date()); this.update(updateWrapper); - ReturnDTO returnDTO = super.submit(request); + ReturnDTO returnDTO = super.submit(request); if (ResponseData.DEFAULT_SUCCESS_CODE != returnDTO.getCode()) { return returnDTO; } @@ -193,6 +193,13 @@ record.setRectificationSituationFiles(preventFiles); } + @Override + public String genCode(String id) { + BizQualityPreventRecord entity = getById(id); + saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); + return entity.getSysCode(); + } + @Transactional @Override public boolean save(BizQualityPreventRecord entity) { @@ -205,8 +212,9 @@ entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); entity.setUpdateTime(DateUtil.now()); //设置系统编码 - saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); + saveZeroCodeEntity(entity, null, QualityTableEnum.PREVENT_RECORD); +// saveEntity(entity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.save(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); @@ -235,10 +243,10 @@ @Transactional @Override public boolean updateById(BizQualityPreventRecord entity) { - BizQualityPreventRecord oldEntity = getById(entity.getId()); + //更新系统编码 - updateEntity(entity, oldEntity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); - checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); +// updateEntity(entity, oldEntity, QualityTableEnum.PREVENT_RECORD, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode)); +// checkFileCodeExists(baseMapper, entity.getFileCode(), entity.getId()); super.updateById(entity); fileRelService.saveOrUpdateList(entity, entity.getId()); @@ -357,7 +365,7 @@ String currentFileName = rootFileName + File.separator + record.getFileCode() + record.getFileName(); Map map = BeanUtil.beanToMap(record); List fileRelList = bizQualityPreventFileRelMapper.selectList(new QueryWrapper().eq("prevent_id", record.getId())); - if (CollectionUtils.isNotEmpty(fileRelList)){ + if (CollectionUtils.isNotEmpty(fileRelList)) { for (BizQualityPreventFileRel fileRel : fileRelList) { switch (fileRel.getFileType()) { case 1: @@ -406,6 +414,7 @@ ZipUtils.batchDownloadFiles(rootFileName, response, localFileDir); } + @Override public void setBizName(BizQualityPreventRecord obj) { obj.setBizName(obj.getFileName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityCorrectiveRepEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityCorrectiveRepEventPostProcessor.java index f080fe7..cc9cb4f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityCorrectiveRepEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityCorrectiveRepEventPostProcessor.java @@ -32,9 +32,14 @@ Long id = Long.valueOf(notifyEventStatusDTO.getId()); Assert.isFalse(Objects.isNull(id), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityCorrectiveRecordService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityCorrectiveRecordService.class); + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityCorrectiveRecord::getApprovalStatus, ApprovalStatusEnum.PASSED); + update.set(BizQualityCorrectiveRecord::getSysCode,code); + update.set(BizQualityCorrectiveRecord::getFileCode,code); + update.eq(BizQualityCorrectiveRecord::getId, notifyEventStatusDTO.getId()); + boolean updateFlag = supervisionRepMapper.update(update); if (!updateFlag) { log.error("纠正措施处理单审批处理失败"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewPlanEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewPlanEventPostProcessor.java index 42c263f..e09abbd 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewPlanEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewPlanEventPostProcessor.java @@ -35,9 +35,15 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityManagementReviewPlanService service = SpringContextUtil.getBean(IBizQualityManagementReviewPlanService.class); + String code = service.genCode(notifyEventStatusDTO.getId()); + LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityManagementReviewPlan::getApprovalStatus, ApprovalStatusEnum.PASSED); + update.set(BizQualityManagementReviewPlan::getSysCode, code); + update.set(BizQualityManagementReviewPlan::getFileCode, code); + update.eq(BizQualityManagementReviewPlan::getId, notifyEventStatusDTO.getId()); + boolean updateFlag = service.update(update); if (!updateFlag) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewRepEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewRepEventPostProcessor.java index fc48ec4..4565ac5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewRepEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityManagementReviewRepEventPostProcessor.java @@ -39,9 +39,11 @@ }); IBizQualityManagementReviewRepService service = SpringContextUtil.getBean(IBizQualityManagementReviewRepService.class); ApprovalOperateService approvalOperateService = SpringContextUtil.getBean(ApprovalOperateService.class); + String code = service.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityManagementReviewRep::getApprovalStatus, ApprovalStatusEnum.PASSED); - + update.set(BizQualityManagementReviewRep::getSysCode,code); + update.set(BizQualityManagementReviewRep::getFileCode,code); //更新批准人 BizQualityManagementReviewRep reviewRep = service.getById(id); String processId = reviewRep.getProcessId(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityPreventRepEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityPreventRepEventPostProcessor.java index 51dee15..5d6abcc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityPreventRepEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/QualityPreventRepEventPostProcessor.java @@ -34,8 +34,12 @@ throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); IBizQualityPreventRecordService supervisionRepMapper = SpringContextUtil.getBean(IBizQualityPreventRecordService.class); + String code = supervisionRepMapper.genCode(notifyEventStatusDTO.getId()); LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); update.set(BizQualityPreventRecord::getApprovalStatus, ApprovalStatusEnum.PASSED); + update.set(BizQualityPreventRecord::getSysCode,code); + update.set(BizQualityPreventRecord::getFileCode,code); + update.eq(BizQualityPreventRecord::getId, notifyEventStatusDTO.getId()); boolean updateFlag = supervisionRepMapper.update(update); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java index 065da5f..c33f623 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityCorrectiveRecordService.java @@ -59,4 +59,6 @@ void exportFile(ExportDTO exportDTO, HttpServletResponse response); void exportZip(List recordList, HttpServletResponse response) throws Exception; + + String genCode(String id); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityManagementReviewPlanService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityManagementReviewPlanService.java index 8eb63dd..70a5605 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityManagementReviewPlanService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityManagementReviewPlanService.java @@ -32,4 +32,6 @@ void exportZip(List list, HttpServletResponse response); void workReminder(Long id); + + String genCode(String id); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityManagementReviewRepService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityManagementReviewRepService.java index eef06ec..77248e7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityManagementReviewRepService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityManagementReviewRepService.java @@ -32,4 +32,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/IBizQualityPreventRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityPreventRecordService.java index 741f1b1..4909782 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityPreventRecordService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityPreventRecordService.java @@ -61,4 +61,5 @@ void exportZip(List recordList, HttpServletResponse response) throws Exception; + String genCode(String id); }