diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java index ee27ba6..dc8bab0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java @@ -9,10 +9,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.outsource.OutsourceProjectApplyListRequest; -import com.casic.missiles.dto.business.outsource.OutsourceProjectApprovalListRequest; -import com.casic.missiles.dto.business.outsource.OutsourceProjectApprovalListResponse; -import com.casic.missiles.dto.business.outsource.OutsourceProjectSaveResponse; +import com.casic.missiles.dto.business.outsource.*; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; @@ -109,11 +106,11 @@ @ApiOperation("分包项目申请详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO supplierDetail(@RequestBody @Valid IdDTO idDTO) throws Exception { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + public ReturnDTO detail(@RequestBody @Valid OutsourceProjectDetailRequest request) throws Exception { + Assert.isFalse(Objects.isNull(request.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return projectService.projectDetail(idDTO.getId()); + return projectService.projectApplyDetail(request); } @ApiOperation("分包项目申请审批操作-删除") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java index ee27ba6..dc8bab0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java @@ -9,10 +9,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.outsource.OutsourceProjectApplyListRequest; -import com.casic.missiles.dto.business.outsource.OutsourceProjectApprovalListRequest; -import com.casic.missiles.dto.business.outsource.OutsourceProjectApprovalListResponse; -import com.casic.missiles.dto.business.outsource.OutsourceProjectSaveResponse; +import com.casic.missiles.dto.business.outsource.*; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; @@ -109,11 +106,11 @@ @ApiOperation("分包项目申请详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO supplierDetail(@RequestBody @Valid IdDTO idDTO) throws Exception { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + public ReturnDTO detail(@RequestBody @Valid OutsourceProjectDetailRequest request) throws Exception { + Assert.isFalse(Objects.isNull(request.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return projectService.projectDetail(idDTO.getId()); + return projectService.projectApplyDetail(request); } @ApiOperation("分包项目申请审批操作-删除") diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOutsourceProjectSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOutsourceProjectSampleRelationMapper.java index 732e30b..2010410 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOutsourceProjectSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOutsourceProjectSampleRelationMapper.java @@ -18,4 +18,7 @@ public interface BusinessOutsourceProjectSampleRelationMapper extends BaseMapper { List selectSampleList(@Param("projectId") Long projectId); + + List selectSampleList2(@Param("projectId") Long projectId, @Param("sampleNo") String sampleNo, @Param("sampleName") String sampleName); + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java index ee27ba6..dc8bab0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java @@ -9,10 +9,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.outsource.OutsourceProjectApplyListRequest; -import com.casic.missiles.dto.business.outsource.OutsourceProjectApprovalListRequest; -import com.casic.missiles.dto.business.outsource.OutsourceProjectApprovalListResponse; -import com.casic.missiles.dto.business.outsource.OutsourceProjectSaveResponse; +import com.casic.missiles.dto.business.outsource.*; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; @@ -109,11 +106,11 @@ @ApiOperation("分包项目申请详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO supplierDetail(@RequestBody @Valid IdDTO idDTO) throws Exception { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + public ReturnDTO detail(@RequestBody @Valid OutsourceProjectDetailRequest request) throws Exception { + Assert.isFalse(Objects.isNull(request.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return projectService.projectDetail(idDTO.getId()); + return projectService.projectApplyDetail(request); } @ApiOperation("分包项目申请审批操作-删除") diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOutsourceProjectSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOutsourceProjectSampleRelationMapper.java index 732e30b..2010410 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOutsourceProjectSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOutsourceProjectSampleRelationMapper.java @@ -18,4 +18,7 @@ public interface BusinessOutsourceProjectSampleRelationMapper extends BaseMapper { List selectSampleList(@Param("projectId") Long projectId); + + List selectSampleList2(@Param("projectId") Long projectId, @Param("sampleNo") String sampleNo, @Param("sampleName") String sampleName); + } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml index fe78f91..2a3ce50 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml @@ -24,4 +24,18 @@ LEFT JOIN business_order bo ON bo.id = bopsr.order_id WHERE bopsr.project_id = #{projectId} + + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java index ee27ba6..dc8bab0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java @@ -9,10 +9,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.outsource.OutsourceProjectApplyListRequest; -import com.casic.missiles.dto.business.outsource.OutsourceProjectApprovalListRequest; -import com.casic.missiles.dto.business.outsource.OutsourceProjectApprovalListResponse; -import com.casic.missiles.dto.business.outsource.OutsourceProjectSaveResponse; +import com.casic.missiles.dto.business.outsource.*; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; @@ -109,11 +106,11 @@ @ApiOperation("分包项目申请详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO supplierDetail(@RequestBody @Valid IdDTO idDTO) throws Exception { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + public ReturnDTO detail(@RequestBody @Valid OutsourceProjectDetailRequest request) throws Exception { + Assert.isFalse(Objects.isNull(request.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return projectService.projectDetail(idDTO.getId()); + return projectService.projectApplyDetail(request); } @ApiOperation("分包项目申请审批操作-删除") diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOutsourceProjectSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOutsourceProjectSampleRelationMapper.java index 732e30b..2010410 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOutsourceProjectSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOutsourceProjectSampleRelationMapper.java @@ -18,4 +18,7 @@ public interface BusinessOutsourceProjectSampleRelationMapper extends BaseMapper { List selectSampleList(@Param("projectId") Long projectId); + + List selectSampleList2(@Param("projectId") Long projectId, @Param("sampleNo") String sampleNo, @Param("sampleName") String sampleName); + } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml index fe78f91..2a3ce50 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml @@ -24,4 +24,18 @@ LEFT JOIN business_order bo ON bo.id = bopsr.order_id WHERE bopsr.project_id = #{projectId} + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectDetailRequest.java new file mode 100644 index 0000000..96c2bee --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectDetailRequest.java @@ -0,0 +1,26 @@ +package com.casic.missiles.dto.business.outsource; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/4/25 9:30 + */ +@ApiModel +@Data +public class OutsourceProjectDetailRequest { + @NotNull(message = "主键ID不能为空") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java index ee27ba6..dc8bab0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java @@ -9,10 +9,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.outsource.OutsourceProjectApplyListRequest; -import com.casic.missiles.dto.business.outsource.OutsourceProjectApprovalListRequest; -import com.casic.missiles.dto.business.outsource.OutsourceProjectApprovalListResponse; -import com.casic.missiles.dto.business.outsource.OutsourceProjectSaveResponse; +import com.casic.missiles.dto.business.outsource.*; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; @@ -109,11 +106,11 @@ @ApiOperation("分包项目申请详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO supplierDetail(@RequestBody @Valid IdDTO idDTO) throws Exception { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + public ReturnDTO detail(@RequestBody @Valid OutsourceProjectDetailRequest request) throws Exception { + Assert.isFalse(Objects.isNull(request.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return projectService.projectDetail(idDTO.getId()); + return projectService.projectApplyDetail(request); } @ApiOperation("分包项目申请审批操作-删除") diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOutsourceProjectSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOutsourceProjectSampleRelationMapper.java index 732e30b..2010410 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOutsourceProjectSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOutsourceProjectSampleRelationMapper.java @@ -18,4 +18,7 @@ public interface BusinessOutsourceProjectSampleRelationMapper extends BaseMapper { List selectSampleList(@Param("projectId") Long projectId); + + List selectSampleList2(@Param("projectId") Long projectId, @Param("sampleNo") String sampleNo, @Param("sampleName") String sampleName); + } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml index fe78f91..2a3ce50 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml @@ -24,4 +24,18 @@ LEFT JOIN business_order bo ON bo.id = bopsr.order_id WHERE bopsr.project_id = #{projectId} + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectDetailRequest.java new file mode 100644 index 0000000..96c2bee --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectDetailRequest.java @@ -0,0 +1,26 @@ +package com.casic.missiles.dto.business.outsource; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/4/25 9:30 + */ +@ApiModel +@Data +public class OutsourceProjectDetailRequest { + @NotNull(message = "主键ID不能为空") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectSampleRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectSampleRelationServiceImpl.java index 85ac8d6..772b8c0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectSampleRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectSampleRelationServiceImpl.java @@ -27,4 +27,9 @@ public List selectSampleList(Long projectId) { return relationMapper.selectSampleList(projectId); } + + @Override + public List selectSampleList2(Long projectId, String sampleNo, String sampleName) { + return relationMapper.selectSampleList2(projectId, sampleNo, sampleName); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java index ee27ba6..dc8bab0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java @@ -9,10 +9,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.outsource.OutsourceProjectApplyListRequest; -import com.casic.missiles.dto.business.outsource.OutsourceProjectApprovalListRequest; -import com.casic.missiles.dto.business.outsource.OutsourceProjectApprovalListResponse; -import com.casic.missiles.dto.business.outsource.OutsourceProjectSaveResponse; +import com.casic.missiles.dto.business.outsource.*; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; @@ -109,11 +106,11 @@ @ApiOperation("分包项目申请详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO supplierDetail(@RequestBody @Valid IdDTO idDTO) throws Exception { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + public ReturnDTO detail(@RequestBody @Valid OutsourceProjectDetailRequest request) throws Exception { + Assert.isFalse(Objects.isNull(request.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return projectService.projectDetail(idDTO.getId()); + return projectService.projectApplyDetail(request); } @ApiOperation("分包项目申请审批操作-删除") diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOutsourceProjectSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOutsourceProjectSampleRelationMapper.java index 732e30b..2010410 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOutsourceProjectSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOutsourceProjectSampleRelationMapper.java @@ -18,4 +18,7 @@ public interface BusinessOutsourceProjectSampleRelationMapper extends BaseMapper { List selectSampleList(@Param("projectId") Long projectId); + + List selectSampleList2(@Param("projectId") Long projectId, @Param("sampleNo") String sampleNo, @Param("sampleName") String sampleName); + } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml index fe78f91..2a3ce50 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml @@ -24,4 +24,18 @@ LEFT JOIN business_order bo ON bo.id = bopsr.order_id WHERE bopsr.project_id = #{projectId} + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectDetailRequest.java new file mode 100644 index 0000000..96c2bee --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectDetailRequest.java @@ -0,0 +1,26 @@ +package com.casic.missiles.dto.business.outsource; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/4/25 9:30 + */ +@ApiModel +@Data +public class OutsourceProjectDetailRequest { + @NotNull(message = "主键ID不能为空") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectSampleRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectSampleRelationServiceImpl.java index 85ac8d6..772b8c0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectSampleRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectSampleRelationServiceImpl.java @@ -27,4 +27,9 @@ public List selectSampleList(Long projectId) { return relationMapper.selectSampleList(projectId); } + + @Override + public List selectSampleList2(Long projectId, String sampleNo, String sampleName) { + return relationMapper.selectSampleList2(projectId, sampleNo, sampleName); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java index 30e0fd7..3ff71ab 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java @@ -175,6 +175,16 @@ } @Override + public ReturnDTO projectApplyDetail(OutsourceProjectDetailRequest request) throws Exception { + BusinessOutsourceProject detailResponse = projectMapper.selectProjectById(request.getId()); + DictCodeUtils.convertDictCodeToName(detailResponse); + //关联样品查询 + List sampleList = projectSampleRelationService.selectSampleList2(request.getId(), request.getSampleNo(), request.getSampleName()); + detailResponse.setSampleList(sampleList); + return ReturnUtil.success(detailResponse); + } + + @Override public ReturnDTO projectApplyApprovalDelete(ApprovalDeleteRequest request) { ReturnDTO returnDTO = approvalOperateService.delete(request); if (ResponseData.DEFAULT_SUCCESS_CODE == returnDTO.getCode()) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java index ee27ba6..dc8bab0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java @@ -9,10 +9,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.outsource.OutsourceProjectApplyListRequest; -import com.casic.missiles.dto.business.outsource.OutsourceProjectApprovalListRequest; -import com.casic.missiles.dto.business.outsource.OutsourceProjectApprovalListResponse; -import com.casic.missiles.dto.business.outsource.OutsourceProjectSaveResponse; +import com.casic.missiles.dto.business.outsource.*; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; @@ -109,11 +106,11 @@ @ApiOperation("分包项目申请详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO supplierDetail(@RequestBody @Valid IdDTO idDTO) throws Exception { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + public ReturnDTO detail(@RequestBody @Valid OutsourceProjectDetailRequest request) throws Exception { + Assert.isFalse(Objects.isNull(request.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return projectService.projectDetail(idDTO.getId()); + return projectService.projectApplyDetail(request); } @ApiOperation("分包项目申请审批操作-删除") diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOutsourceProjectSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOutsourceProjectSampleRelationMapper.java index 732e30b..2010410 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOutsourceProjectSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOutsourceProjectSampleRelationMapper.java @@ -18,4 +18,7 @@ public interface BusinessOutsourceProjectSampleRelationMapper extends BaseMapper { List selectSampleList(@Param("projectId") Long projectId); + + List selectSampleList2(@Param("projectId") Long projectId, @Param("sampleNo") String sampleNo, @Param("sampleName") String sampleName); + } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml index fe78f91..2a3ce50 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml @@ -24,4 +24,18 @@ LEFT JOIN business_order bo ON bo.id = bopsr.order_id WHERE bopsr.project_id = #{projectId} + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectDetailRequest.java new file mode 100644 index 0000000..96c2bee --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectDetailRequest.java @@ -0,0 +1,26 @@ +package com.casic.missiles.dto.business.outsource; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/4/25 9:30 + */ +@ApiModel +@Data +public class OutsourceProjectDetailRequest { + @NotNull(message = "主键ID不能为空") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectSampleRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectSampleRelationServiceImpl.java index 85ac8d6..772b8c0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectSampleRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectSampleRelationServiceImpl.java @@ -27,4 +27,9 @@ public List selectSampleList(Long projectId) { return relationMapper.selectSampleList(projectId); } + + @Override + public List selectSampleList2(Long projectId, String sampleNo, String sampleName) { + return relationMapper.selectSampleList2(projectId, sampleNo, sampleName); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java index 30e0fd7..3ff71ab 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java @@ -175,6 +175,16 @@ } @Override + public ReturnDTO projectApplyDetail(OutsourceProjectDetailRequest request) throws Exception { + BusinessOutsourceProject detailResponse = projectMapper.selectProjectById(request.getId()); + DictCodeUtils.convertDictCodeToName(detailResponse); + //关联样品查询 + List sampleList = projectSampleRelationService.selectSampleList2(request.getId(), request.getSampleNo(), request.getSampleName()); + detailResponse.setSampleList(sampleList); + return ReturnUtil.success(detailResponse); + } + + @Override public ReturnDTO projectApplyApprovalDelete(ApprovalDeleteRequest request) { ReturnDTO returnDTO = approvalOperateService.delete(request); if (ResponseData.DEFAULT_SUCCESS_CODE == returnDTO.getCode()) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOutsourceProjectSampleRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOutsourceProjectSampleRelationService.java index e455218..70b042d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOutsourceProjectSampleRelationService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOutsourceProjectSampleRelationService.java @@ -17,4 +17,6 @@ public interface IBusinessOutsourceProjectSampleRelationService extends IService { List selectSampleList(Long projectId); + + List selectSampleList2(Long projectId, String sampleNo, String sampleName); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java index ee27ba6..dc8bab0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java @@ -9,10 +9,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.outsource.OutsourceProjectApplyListRequest; -import com.casic.missiles.dto.business.outsource.OutsourceProjectApprovalListRequest; -import com.casic.missiles.dto.business.outsource.OutsourceProjectApprovalListResponse; -import com.casic.missiles.dto.business.outsource.OutsourceProjectSaveResponse; +import com.casic.missiles.dto.business.outsource.*; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; @@ -109,11 +106,11 @@ @ApiOperation("分包项目申请详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO supplierDetail(@RequestBody @Valid IdDTO idDTO) throws Exception { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + public ReturnDTO detail(@RequestBody @Valid OutsourceProjectDetailRequest request) throws Exception { + Assert.isFalse(Objects.isNull(request.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return projectService.projectDetail(idDTO.getId()); + return projectService.projectApplyDetail(request); } @ApiOperation("分包项目申请审批操作-删除") diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOutsourceProjectSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOutsourceProjectSampleRelationMapper.java index 732e30b..2010410 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOutsourceProjectSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOutsourceProjectSampleRelationMapper.java @@ -18,4 +18,7 @@ public interface BusinessOutsourceProjectSampleRelationMapper extends BaseMapper { List selectSampleList(@Param("projectId") Long projectId); + + List selectSampleList2(@Param("projectId") Long projectId, @Param("sampleNo") String sampleNo, @Param("sampleName") String sampleName); + } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml index fe78f91..2a3ce50 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml @@ -24,4 +24,18 @@ LEFT JOIN business_order bo ON bo.id = bopsr.order_id WHERE bopsr.project_id = #{projectId} + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectDetailRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectDetailRequest.java new file mode 100644 index 0000000..96c2bee --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectDetailRequest.java @@ -0,0 +1,26 @@ +package com.casic.missiles.dto.business.outsource; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/4/25 9:30 + */ +@ApiModel +@Data +public class OutsourceProjectDetailRequest { + @NotNull(message = "主键ID不能为空") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; + + @ApiModelProperty(value = "样品编号", dataType = "String") + private String sampleNo; + + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectSampleRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectSampleRelationServiceImpl.java index 85ac8d6..772b8c0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectSampleRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectSampleRelationServiceImpl.java @@ -27,4 +27,9 @@ public List selectSampleList(Long projectId) { return relationMapper.selectSampleList(projectId); } + + @Override + public List selectSampleList2(Long projectId, String sampleNo, String sampleName) { + return relationMapper.selectSampleList2(projectId, sampleNo, sampleName); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java index 30e0fd7..3ff71ab 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java @@ -175,6 +175,16 @@ } @Override + public ReturnDTO projectApplyDetail(OutsourceProjectDetailRequest request) throws Exception { + BusinessOutsourceProject detailResponse = projectMapper.selectProjectById(request.getId()); + DictCodeUtils.convertDictCodeToName(detailResponse); + //关联样品查询 + List sampleList = projectSampleRelationService.selectSampleList2(request.getId(), request.getSampleNo(), request.getSampleName()); + detailResponse.setSampleList(sampleList); + return ReturnUtil.success(detailResponse); + } + + @Override public ReturnDTO projectApplyApprovalDelete(ApprovalDeleteRequest request) { ReturnDTO returnDTO = approvalOperateService.delete(request); if (ResponseData.DEFAULT_SUCCESS_CODE == returnDTO.getCode()) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOutsourceProjectSampleRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOutsourceProjectSampleRelationService.java index e455218..70b042d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOutsourceProjectSampleRelationService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOutsourceProjectSampleRelationService.java @@ -17,4 +17,6 @@ public interface IBusinessOutsourceProjectSampleRelationService extends IService { List selectSampleList(Long projectId); + + List selectSampleList2(Long projectId, String sampleNo, String sampleName); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOutsourceProjectService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOutsourceProjectService.java index d19245f..f08107c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOutsourceProjectService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOutsourceProjectService.java @@ -32,6 +32,8 @@ ReturnDTO projectDetail(Long id) throws Exception; + ReturnDTO projectApplyDetail(OutsourceProjectDetailRequest request) throws Exception; + ReturnDTO projectApplyApprovalDelete(ApprovalDeleteRequest request); ReturnDTO projectApplyFailUpdate(BusinessOutsourceProject outsourceProject);