diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditFileController.java index 4b16d37..7aa516e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditFileController.java @@ -1,4 +1,4 @@ -package com.casic.missiles.quality; +package com.casic.missiles.controller.quality; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -22,7 +22,7 @@ * @author lwh * @date 2023-11-15 */ -@Api(tags = "外审工作关联文件") +@Api(tags = "外审文件管理") @RestController @RequestMapping("/quality/auditFile") public class BizQualityExternalAuditFileController extends BaseController { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditFileController.java index 4b16d37..7aa516e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditFileController.java @@ -1,4 +1,4 @@ -package com.casic.missiles.quality; +package com.casic.missiles.controller.quality; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -22,7 +22,7 @@ * @author lwh * @date 2023-11-15 */ -@Api(tags = "外审工作关联文件") +@Api(tags = "外审文件管理") @RestController @RequestMapping("/quality/auditFile") public class BizQualityExternalAuditFileController extends BaseController { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityExternalFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityExternalFileTypeEnum.java index 2b3bd0f..73308a6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityExternalFileTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityExternalFileTypeEnum.java @@ -6,7 +6,9 @@ * @Date: 2023/8/10 19:40 */ public enum QualityExternalFileTypeEnum { - NON_COM(1, "不符合要求情况分析表"); + AUDIT_MATERIALS(1, "待审材料"), + AUDIT_RESULTS(2, "外审结果"), + RECTIFICATION_MATERIALS(3, "问题整改材料"); private Integer code; private String value; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditFileController.java index 4b16d37..7aa516e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditFileController.java @@ -1,4 +1,4 @@ -package com.casic.missiles.quality; +package com.casic.missiles.controller.quality; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -22,7 +22,7 @@ * @author lwh * @date 2023-11-15 */ -@Api(tags = "外审工作关联文件") +@Api(tags = "外审文件管理") @RestController @RequestMapping("/quality/auditFile") public class BizQualityExternalAuditFileController extends BaseController { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityExternalFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityExternalFileTypeEnum.java index 2b3bd0f..73308a6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityExternalFileTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityExternalFileTypeEnum.java @@ -6,7 +6,9 @@ * @Date: 2023/8/10 19:40 */ public enum QualityExternalFileTypeEnum { - NON_COM(1, "不符合要求情况分析表"); + AUDIT_MATERIALS(1, "待审材料"), + AUDIT_RESULTS(2, "外审结果"), + RECTIFICATION_MATERIALS(3, "问题整改材料"); private Integer code; private String value; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 45be08e..3083c02 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -28,4 +28,13 @@ return this.baseMapper.selectBizQualityExternalAuditFilePage(page,query); } + @Override + public boolean save(BizQualityExternalAuditFile entity) { + return super.save(entity); + } + + @Override + public boolean updateById(BizQualityExternalAuditFile entity) { + return super.updateById(entity); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditFileController.java index 4b16d37..7aa516e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityExternalAuditFileController.java @@ -1,4 +1,4 @@ -package com.casic.missiles.quality; +package com.casic.missiles.controller.quality; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -22,7 +22,7 @@ * @author lwh * @date 2023-11-15 */ -@Api(tags = "外审工作关联文件") +@Api(tags = "外审文件管理") @RestController @RequestMapping("/quality/auditFile") public class BizQualityExternalAuditFileController extends BaseController { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityExternalFileTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityExternalFileTypeEnum.java index 2b3bd0f..73308a6 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityExternalFileTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/file/QualityExternalFileTypeEnum.java @@ -6,7 +6,9 @@ * @Date: 2023/8/10 19:40 */ public enum QualityExternalFileTypeEnum { - NON_COM(1, "不符合要求情况分析表"); + AUDIT_MATERIALS(1, "待审材料"), + AUDIT_RESULTS(2, "外审结果"), + RECTIFICATION_MATERIALS(3, "问题整改材料"); private Integer code; private String value; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java index 45be08e..3083c02 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditFileServiceImpl.java @@ -28,4 +28,13 @@ return this.baseMapper.selectBizQualityExternalAuditFilePage(page,query); } + @Override + public boolean save(BizQualityExternalAuditFile entity) { + return super.save(entity); + } + + @Override + public boolean updateById(BizQualityExternalAuditFile entity) { + return super.updateById(entity); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java index d459806..ffbdeaf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityExternalAuditServiceImpl.java @@ -9,10 +9,13 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityExternalAuditMapper; import com.casic.missiles.model.quality.BizQualityExternalAudit; +import com.casic.missiles.model.quality.BizQualityExternalAuditFile; +import com.casic.missiles.service.quality.IBizQualityExternalAuditFileService; import com.casic.missiles.service.quality.IBizQualityExternalAuditService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.io.Serializable; import java.util.Date; import java.util.List; @@ -27,6 +30,11 @@ */ @Service public class BizQualityExternalAuditServiceImpl extends ServiceImpl implements IBizQualityExternalAuditService { + private final IBizQualityExternalAuditFileService auditFileService; + + public BizQualityExternalAuditServiceImpl(IBizQualityExternalAuditFileService auditFileService) { + this.auditFileService = auditFileService; + } @Override public List selectBizQualityExternalAuditPage(Page page, QueryWrapper query) { @@ -49,14 +57,19 @@ @Transactional @Override - public boolean updateById(BizQualityExternalAudit entity) { + public boolean removeById(Serializable id) { + auditFileService.remove(new LambdaQueryWrapper().eq(BizQualityExternalAuditFile::getExternalAuditId, id)); + return super.removeById(id); + } - long count = count(new LambdaQueryWrapper().eq(BizQualityExternalAudit::getWorkName, entity.getWorkName()).ne(BizQualityExternalAudit::getId,entity.getId())); + @Transactional + @Override + public boolean updateById(BizQualityExternalAudit entity) { + long count = count(new LambdaQueryWrapper().eq(BizQualityExternalAudit::getWorkName, entity.getWorkName()).ne(BizQualityExternalAudit::getId, entity.getId())); Assert.isFalse(count > 0, () -> { throw new BusinessException(BusinessExceptionEnum.ENTITY_REPEAT); }); entity.setUpdateTime(new Date()); return super.updateById(entity); } - -} +} \ No newline at end of file