diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java index d05a41c..7b4c9ba 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -126,7 +126,7 @@ bizQualitySupervisionRecord.setCreator(user.getId()); bizQualitySupervisionRecord.setCreateName(user.getName()); bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); - return ReturnUtil.success(); + return ReturnUtil.success(bizQualitySupervisionRecord.getId()); } /** @@ -138,6 +138,7 @@ bizQualitySupervisionRecordService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java index d05a41c..7b4c9ba 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -126,7 +126,7 @@ bizQualitySupervisionRecord.setCreator(user.getId()); bizQualitySupervisionRecord.setCreateName(user.getName()); bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); - return ReturnUtil.success(); + return ReturnUtil.success(bizQualitySupervisionRecord.getId()); } /** @@ -138,6 +138,7 @@ bizQualitySupervisionRecordService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java index 3a6c2bb..c3d7d8c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -120,5 +120,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); } - } \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java index d05a41c..7b4c9ba 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -126,7 +126,7 @@ bizQualitySupervisionRecord.setCreator(user.getId()); bizQualitySupervisionRecord.setCreateName(user.getName()); bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); - return ReturnUtil.success(); + return ReturnUtil.success(bizQualitySupervisionRecord.getId()); } /** @@ -138,6 +138,7 @@ bizQualitySupervisionRecordService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java index 3a6c2bb..c3d7d8c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -120,5 +120,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); } - } \ No newline at end of file diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml index 98911dd..4deb086 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -83,6 +83,8 @@ a.file_code as fileCode, a.file_name as fileName, a.creator, + a.creator_name as creatorName, + a.sub_time as subTime, a.approval_status as approvalStatus, a.process_id as processId, a.process_info as processInfo, diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java index d05a41c..7b4c9ba 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -126,7 +126,7 @@ bizQualitySupervisionRecord.setCreator(user.getId()); bizQualitySupervisionRecord.setCreateName(user.getName()); bizQualitySupervisionRecordService.save(bizQualitySupervisionRecord); - return ReturnUtil.success(); + return ReturnUtil.success(bizQualitySupervisionRecord.getId()); } /** @@ -138,6 +138,7 @@ bizQualitySupervisionRecordService.removeById(id); return ReturnUtil.success(); } + @ApiOperation("批量删除") @PostMapping("/batchDelete") public ReturnDTO batchDelete(@RequestBody @Valid IdsDTO idsDTO) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java index 3a6c2bb..c3d7d8c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRepController.java @@ -120,5 +120,4 @@ public ReturnDTO detail(String id) { return ReturnUtil.success(bizQualitySupervisionRepService.getById(id)); } - } \ No newline at end of file diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml index 98911dd..4deb086 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml @@ -83,6 +83,8 @@ a.file_code as fileCode, a.file_name as fileName, a.creator, + a.creator_name as creatorName, + a.sub_time as subTime, a.approval_status as approvalStatus, a.process_id as processId, a.process_info as processInfo, diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java index 997d4ce..113d7bb 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java @@ -19,6 +19,7 @@ import com.casic.missiles.enums.quality.QualityFileTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.resource.LabCodeDictEnum; +import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper; import com.casic.missiles.model.quality.*; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; @@ -161,6 +162,8 @@ entity.setCreator(user.getId()); entity.setCreatorName(user.getName()); entity.setIsNonConformance(0); + + entity.setApprovalStatus(ApprovalStatusEnum.DRAFT); super.save(entity); saveBatchBizQualityRepRels(entity); return true;