diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 832517f..f1c90e8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -12,6 +12,7 @@ import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.business.OrderStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessDealRecordMapper; import com.casic.missiles.model.business.BusinessDealRecord; @@ -44,7 +45,7 @@ @Api(tags = "委托书模块") @RequestMapping("/business/order") @AllArgsConstructor -public class BusinessOrderController extends ExportController { +public class BusinessOrderController extends ExportController implements OrderStatusEnum { private final IBusinessOrderService businessOrderService; @@ -119,7 +120,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "2"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_RECEIVED); } @ApiOperation("委托书退回") @@ -128,7 +129,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "3"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 832517f..f1c90e8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -12,6 +12,7 @@ import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.business.OrderStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessDealRecordMapper; import com.casic.missiles.model.business.BusinessDealRecord; @@ -44,7 +45,7 @@ @Api(tags = "委托书模块") @RequestMapping("/business/order") @AllArgsConstructor -public class BusinessOrderController extends ExportController { +public class BusinessOrderController extends ExportController implements OrderStatusEnum { private final IBusinessOrderService businessOrderService; @@ -119,7 +120,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "2"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_RECEIVED); } @ApiOperation("委托书退回") @@ -128,7 +129,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "3"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java index 7591c07..ae7a28d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -10,7 +10,6 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; import com.casic.missiles.dto.customer.Info.*; -import com.casic.missiles.dto.customer.MesureRecordsResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerInfo; @@ -102,19 +101,9 @@ return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); } - @ApiOperation("根据客户id查询检定记录-分页") - @PostMapping("/mesureRecords") - public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); - } - - @ApiOperation("客户删除") @PostMapping("/delete") - public ReturnDTO deleteCsutomer(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO deleteCustomer(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 832517f..f1c90e8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -12,6 +12,7 @@ import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.business.OrderStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessDealRecordMapper; import com.casic.missiles.model.business.BusinessDealRecord; @@ -44,7 +45,7 @@ @Api(tags = "委托书模块") @RequestMapping("/business/order") @AllArgsConstructor -public class BusinessOrderController extends ExportController { +public class BusinessOrderController extends ExportController implements OrderStatusEnum { private final IBusinessOrderService businessOrderService; @@ -119,7 +120,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "2"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_RECEIVED); } @ApiOperation("委托书退回") @@ -128,7 +129,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "3"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java index 7591c07..ae7a28d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -10,7 +10,6 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; import com.casic.missiles.dto.customer.Info.*; -import com.casic.missiles.dto.customer.MesureRecordsResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerInfo; @@ -102,19 +101,9 @@ return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); } - @ApiOperation("根据客户id查询检定记录-分页") - @PostMapping("/mesureRecords") - public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); - } - - @ApiOperation("客户删除") @PostMapping("/delete") - public ReturnDTO deleteCsutomer(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO deleteCustomer(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java index 9ae077e..c7d6b3f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -9,9 +9,10 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; -import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerSampleInfo; @@ -93,15 +94,13 @@ customerSampleService.sampleExport(request, response); } - @ApiOperation("根据样品id查询检定记录") - @PostMapping("/mesureRecordsBySampleId") - public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(idDTO.getId()))); + @ApiOperation("根据样品id或客户id查询检定记录") + @PostMapping("/measureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) { + return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest))); } + @ApiOperation("根据样品id查询检定证书") @PostMapping("/certificationBySampleId") public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { @@ -111,13 +110,4 @@ return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); } -// @ApiOperation("样品批量导入") -// @PostMapping("/batchImport") -// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return null; -// } - } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 832517f..f1c90e8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -12,6 +12,7 @@ import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.business.OrderStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessDealRecordMapper; import com.casic.missiles.model.business.BusinessDealRecord; @@ -44,7 +45,7 @@ @Api(tags = "委托书模块") @RequestMapping("/business/order") @AllArgsConstructor -public class BusinessOrderController extends ExportController { +public class BusinessOrderController extends ExportController implements OrderStatusEnum { private final IBusinessOrderService businessOrderService; @@ -119,7 +120,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "2"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_RECEIVED); } @ApiOperation("委托书退回") @@ -128,7 +129,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "3"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java index 7591c07..ae7a28d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -10,7 +10,6 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; import com.casic.missiles.dto.customer.Info.*; -import com.casic.missiles.dto.customer.MesureRecordsResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerInfo; @@ -102,19 +101,9 @@ return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); } - @ApiOperation("根据客户id查询检定记录-分页") - @PostMapping("/mesureRecords") - public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); - } - - @ApiOperation("客户删除") @PostMapping("/delete") - public ReturnDTO deleteCsutomer(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO deleteCustomer(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java index 9ae077e..c7d6b3f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -9,9 +9,10 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; -import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerSampleInfo; @@ -93,15 +94,13 @@ customerSampleService.sampleExport(request, response); } - @ApiOperation("根据样品id查询检定记录") - @PostMapping("/mesureRecordsBySampleId") - public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(idDTO.getId()))); + @ApiOperation("根据样品id或客户id查询检定记录") + @PostMapping("/measureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) { + return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest))); } + @ApiOperation("根据样品id查询检定证书") @PostMapping("/certificationBySampleId") public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { @@ -111,13 +110,4 @@ return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); } -// @ApiOperation("样品批量导入") -// @PostMapping("/batchImport") -// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return null; -// } - } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index 6b109a2..fbe403d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -1,5 +1,7 @@ package com.casic.missiles.enums; +import org.apache.xmlbeans.impl.xb.xsdschema.Public; + /** * @Description: 生成编号前缀枚举 * @Author: zt @@ -7,9 +9,31 @@ */ public interface PrefixCodeEnum { - //环境记录单编号生成前缀 - String ENVIRONMENT_PREFIX = "hjld"; - //原始记录单编号生成前缀 - String ORIGIN_PREFIX = "ysld"; + //环境记录单编号生成前缀 + String ENVIRONMENT_PREFIX = "hjld"; + //原始记录单编号生成前缀 + String ORIGIN_PREFIX = "ysld"; + + + /*************客户资源模块，tt notice**************/ + //样品编号 + String SAMPLE_PREFIX = "khyp"; + + //客户编号 + String CUSTOMER_PREFIX = "khxx"; + + //客户建议编号 + String CUSTOMER_ADVICE_PREFIX = "khjy"; + + //客户用户编号 + String CUSTOMER_USER_PREFIX = "khyh"; + + //委托书编号 + String ORDER_PREFIX = "wtsc"; + + /*************委托书调度，tt notice**************/ + //交接单编号 + String INTER_CHANGE_PREFIX = "jjdh"; + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 832517f..f1c90e8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -12,6 +12,7 @@ import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.business.OrderStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessDealRecordMapper; import com.casic.missiles.model.business.BusinessDealRecord; @@ -44,7 +45,7 @@ @Api(tags = "委托书模块") @RequestMapping("/business/order") @AllArgsConstructor -public class BusinessOrderController extends ExportController { +public class BusinessOrderController extends ExportController implements OrderStatusEnum { private final IBusinessOrderService businessOrderService; @@ -119,7 +120,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "2"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_RECEIVED); } @ApiOperation("委托书退回") @@ -128,7 +129,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "3"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java index 7591c07..ae7a28d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -10,7 +10,6 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; import com.casic.missiles.dto.customer.Info.*; -import com.casic.missiles.dto.customer.MesureRecordsResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerInfo; @@ -102,19 +101,9 @@ return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); } - @ApiOperation("根据客户id查询检定记录-分页") - @PostMapping("/mesureRecords") - public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); - } - - @ApiOperation("客户删除") @PostMapping("/delete") - public ReturnDTO deleteCsutomer(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO deleteCustomer(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java index 9ae077e..c7d6b3f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -9,9 +9,10 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; -import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerSampleInfo; @@ -93,15 +94,13 @@ customerSampleService.sampleExport(request, response); } - @ApiOperation("根据样品id查询检定记录") - @PostMapping("/mesureRecordsBySampleId") - public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(idDTO.getId()))); + @ApiOperation("根据样品id或客户id查询检定记录") + @PostMapping("/measureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) { + return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest))); } + @ApiOperation("根据样品id查询检定证书") @PostMapping("/certificationBySampleId") public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { @@ -111,13 +110,4 @@ return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); } -// @ApiOperation("样品批量导入") -// @PostMapping("/batchImport") -// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return null; -// } - } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index 6b109a2..fbe403d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -1,5 +1,7 @@ package com.casic.missiles.enums; +import org.apache.xmlbeans.impl.xb.xsdschema.Public; + /** * @Description: 生成编号前缀枚举 * @Author: zt @@ -7,9 +9,31 @@ */ public interface PrefixCodeEnum { - //环境记录单编号生成前缀 - String ENVIRONMENT_PREFIX = "hjld"; - //原始记录单编号生成前缀 - String ORIGIN_PREFIX = "ysld"; + //环境记录单编号生成前缀 + String ENVIRONMENT_PREFIX = "hjld"; + //原始记录单编号生成前缀 + String ORIGIN_PREFIX = "ysld"; + + + /*************客户资源模块，tt notice**************/ + //样品编号 + String SAMPLE_PREFIX = "khyp"; + + //客户编号 + String CUSTOMER_PREFIX = "khxx"; + + //客户建议编号 + String CUSTOMER_ADVICE_PREFIX = "khjy"; + + //客户用户编号 + String CUSTOMER_USER_PREFIX = "khyh"; + + //委托书编号 + String ORDER_PREFIX = "wtsc"; + + /*************委托书调度，tt notice**************/ + //交接单编号 + String INTER_CHANGE_PREFIX = "jjdh"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java new file mode 100644 index 0000000..a013d67 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java @@ -0,0 +1,19 @@ +package com.casic.missiles.enums.business; + +public interface CertificatePrintStatusEnum { + + /** + * 不可打印 + */ + String PRINTABLE = "1"; + + /** + * 不可打印 + */ + String NON_PRINTABLE = "2"; + + /** + * 审批中 + */ + String IN_APPROVAL = "3"; +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 832517f..f1c90e8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -12,6 +12,7 @@ import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.business.OrderStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessDealRecordMapper; import com.casic.missiles.model.business.BusinessDealRecord; @@ -44,7 +45,7 @@ @Api(tags = "委托书模块") @RequestMapping("/business/order") @AllArgsConstructor -public class BusinessOrderController extends ExportController { +public class BusinessOrderController extends ExportController implements OrderStatusEnum { private final IBusinessOrderService businessOrderService; @@ -119,7 +120,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "2"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_RECEIVED); } @ApiOperation("委托书退回") @@ -128,7 +129,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "3"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java index 7591c07..ae7a28d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -10,7 +10,6 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; import com.casic.missiles.dto.customer.Info.*; -import com.casic.missiles.dto.customer.MesureRecordsResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerInfo; @@ -102,19 +101,9 @@ return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); } - @ApiOperation("根据客户id查询检定记录-分页") - @PostMapping("/mesureRecords") - public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); - } - - @ApiOperation("客户删除") @PostMapping("/delete") - public ReturnDTO deleteCsutomer(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO deleteCustomer(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java index 9ae077e..c7d6b3f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -9,9 +9,10 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; -import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerSampleInfo; @@ -93,15 +94,13 @@ customerSampleService.sampleExport(request, response); } - @ApiOperation("根据样品id查询检定记录") - @PostMapping("/mesureRecordsBySampleId") - public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(idDTO.getId()))); + @ApiOperation("根据样品id或客户id查询检定记录") + @PostMapping("/measureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) { + return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest))); } + @ApiOperation("根据样品id查询检定证书") @PostMapping("/certificationBySampleId") public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { @@ -111,13 +110,4 @@ return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); } -// @ApiOperation("样品批量导入") -// @PostMapping("/batchImport") -// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return null; -// } - } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index 6b109a2..fbe403d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -1,5 +1,7 @@ package com.casic.missiles.enums; +import org.apache.xmlbeans.impl.xb.xsdschema.Public; + /** * @Description: 生成编号前缀枚举 * @Author: zt @@ -7,9 +9,31 @@ */ public interface PrefixCodeEnum { - //环境记录单编号生成前缀 - String ENVIRONMENT_PREFIX = "hjld"; - //原始记录单编号生成前缀 - String ORIGIN_PREFIX = "ysld"; + //环境记录单编号生成前缀 + String ENVIRONMENT_PREFIX = "hjld"; + //原始记录单编号生成前缀 + String ORIGIN_PREFIX = "ysld"; + + + /*************客户资源模块，tt notice**************/ + //样品编号 + String SAMPLE_PREFIX = "khyp"; + + //客户编号 + String CUSTOMER_PREFIX = "khxx"; + + //客户建议编号 + String CUSTOMER_ADVICE_PREFIX = "khjy"; + + //客户用户编号 + String CUSTOMER_USER_PREFIX = "khyh"; + + //委托书编号 + String ORDER_PREFIX = "wtsc"; + + /*************委托书调度，tt notice**************/ + //交接单编号 + String INTER_CHANGE_PREFIX = "jjdh"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java new file mode 100644 index 0000000..a013d67 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java @@ -0,0 +1,19 @@ +package com.casic.missiles.enums.business; + +public interface CertificatePrintStatusEnum { + + /** + * 不可打印 + */ + String PRINTABLE = "1"; + + /** + * 不可打印 + */ + String NON_PRINTABLE = "2"; + + /** + * 审批中 + */ + String IN_APPROVAL = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java new file mode 100644 index 0000000..a0b0274 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +/** + * @author cz + */ +public interface MeasureTypeEnum { + /** + * 自检 + */ + String INSIDE_MEASURE = "1"; + + /** + * 外包 + */ + String OTHERS_UNDERTAKE = "2"; + + /** + * 外检 + */ + String OUTSIDE_MEASURE = "3"; + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 832517f..f1c90e8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -12,6 +12,7 @@ import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.business.OrderStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessDealRecordMapper; import com.casic.missiles.model.business.BusinessDealRecord; @@ -44,7 +45,7 @@ @Api(tags = "委托书模块") @RequestMapping("/business/order") @AllArgsConstructor -public class BusinessOrderController extends ExportController { +public class BusinessOrderController extends ExportController implements OrderStatusEnum { private final IBusinessOrderService businessOrderService; @@ -119,7 +120,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "2"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_RECEIVED); } @ApiOperation("委托书退回") @@ -128,7 +129,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "3"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java index 7591c07..ae7a28d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -10,7 +10,6 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; import com.casic.missiles.dto.customer.Info.*; -import com.casic.missiles.dto.customer.MesureRecordsResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerInfo; @@ -102,19 +101,9 @@ return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); } - @ApiOperation("根据客户id查询检定记录-分页") - @PostMapping("/mesureRecords") - public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); - } - - @ApiOperation("客户删除") @PostMapping("/delete") - public ReturnDTO deleteCsutomer(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO deleteCustomer(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java index 9ae077e..c7d6b3f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -9,9 +9,10 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; -import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerSampleInfo; @@ -93,15 +94,13 @@ customerSampleService.sampleExport(request, response); } - @ApiOperation("根据样品id查询检定记录") - @PostMapping("/mesureRecordsBySampleId") - public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(idDTO.getId()))); + @ApiOperation("根据样品id或客户id查询检定记录") + @PostMapping("/measureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) { + return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest))); } + @ApiOperation("根据样品id查询检定证书") @PostMapping("/certificationBySampleId") public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { @@ -111,13 +110,4 @@ return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); } -// @ApiOperation("样品批量导入") -// @PostMapping("/batchImport") -// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return null; -// } - } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index 6b109a2..fbe403d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -1,5 +1,7 @@ package com.casic.missiles.enums; +import org.apache.xmlbeans.impl.xb.xsdschema.Public; + /** * @Description: 生成编号前缀枚举 * @Author: zt @@ -7,9 +9,31 @@ */ public interface PrefixCodeEnum { - //环境记录单编号生成前缀 - String ENVIRONMENT_PREFIX = "hjld"; - //原始记录单编号生成前缀 - String ORIGIN_PREFIX = "ysld"; + //环境记录单编号生成前缀 + String ENVIRONMENT_PREFIX = "hjld"; + //原始记录单编号生成前缀 + String ORIGIN_PREFIX = "ysld"; + + + /*************客户资源模块，tt notice**************/ + //样品编号 + String SAMPLE_PREFIX = "khyp"; + + //客户编号 + String CUSTOMER_PREFIX = "khxx"; + + //客户建议编号 + String CUSTOMER_ADVICE_PREFIX = "khjy"; + + //客户用户编号 + String CUSTOMER_USER_PREFIX = "khyh"; + + //委托书编号 + String ORDER_PREFIX = "wtsc"; + + /*************委托书调度，tt notice**************/ + //交接单编号 + String INTER_CHANGE_PREFIX = "jjdh"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java new file mode 100644 index 0000000..a013d67 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java @@ -0,0 +1,19 @@ +package com.casic.missiles.enums.business; + +public interface CertificatePrintStatusEnum { + + /** + * 不可打印 + */ + String PRINTABLE = "1"; + + /** + * 不可打印 + */ + String NON_PRINTABLE = "2"; + + /** + * 审批中 + */ + String IN_APPROVAL = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java new file mode 100644 index 0000000..a0b0274 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +/** + * @author cz + */ +public interface MeasureTypeEnum { + /** + * 自检 + */ + String INSIDE_MEASURE = "1"; + + /** + * 外包 + */ + String OTHERS_UNDERTAKE = "2"; + + /** + * 外检 + */ + String OUTSIDE_MEASURE = "3"; + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java new file mode 100644 index 0000000..83371aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +public interface OrderStatusEnum { + + /** + * 未接收 + */ + String NOT_RECEIVED = "1"; + /** + * 已接收 + */ + String ALREADY_RECEIVED = "2"; + /** + * 已取消 + */ + String ALREADY_CANCEL = "3"; + + /** + * 检测完成 + */ + String MEASURE_SUCCESS = "3"; +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 832517f..f1c90e8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -12,6 +12,7 @@ import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.business.OrderStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessDealRecordMapper; import com.casic.missiles.model.business.BusinessDealRecord; @@ -44,7 +45,7 @@ @Api(tags = "委托书模块") @RequestMapping("/business/order") @AllArgsConstructor -public class BusinessOrderController extends ExportController { +public class BusinessOrderController extends ExportController implements OrderStatusEnum { private final IBusinessOrderService businessOrderService; @@ -119,7 +120,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "2"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_RECEIVED); } @ApiOperation("委托书退回") @@ -128,7 +129,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "3"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java index 7591c07..ae7a28d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -10,7 +10,6 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; import com.casic.missiles.dto.customer.Info.*; -import com.casic.missiles.dto.customer.MesureRecordsResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerInfo; @@ -102,19 +101,9 @@ return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); } - @ApiOperation("根据客户id查询检定记录-分页") - @PostMapping("/mesureRecords") - public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); - } - - @ApiOperation("客户删除") @PostMapping("/delete") - public ReturnDTO deleteCsutomer(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO deleteCustomer(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java index 9ae077e..c7d6b3f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -9,9 +9,10 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; -import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerSampleInfo; @@ -93,15 +94,13 @@ customerSampleService.sampleExport(request, response); } - @ApiOperation("根据样品id查询检定记录") - @PostMapping("/mesureRecordsBySampleId") - public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(idDTO.getId()))); + @ApiOperation("根据样品id或客户id查询检定记录") + @PostMapping("/measureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) { + return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest))); } + @ApiOperation("根据样品id查询检定证书") @PostMapping("/certificationBySampleId") public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { @@ -111,13 +110,4 @@ return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); } -// @ApiOperation("样品批量导入") -// @PostMapping("/batchImport") -// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return null; -// } - } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index 6b109a2..fbe403d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -1,5 +1,7 @@ package com.casic.missiles.enums; +import org.apache.xmlbeans.impl.xb.xsdschema.Public; + /** * @Description: 生成编号前缀枚举 * @Author: zt @@ -7,9 +9,31 @@ */ public interface PrefixCodeEnum { - //环境记录单编号生成前缀 - String ENVIRONMENT_PREFIX = "hjld"; - //原始记录单编号生成前缀 - String ORIGIN_PREFIX = "ysld"; + //环境记录单编号生成前缀 + String ENVIRONMENT_PREFIX = "hjld"; + //原始记录单编号生成前缀 + String ORIGIN_PREFIX = "ysld"; + + + /*************客户资源模块，tt notice**************/ + //样品编号 + String SAMPLE_PREFIX = "khyp"; + + //客户编号 + String CUSTOMER_PREFIX = "khxx"; + + //客户建议编号 + String CUSTOMER_ADVICE_PREFIX = "khjy"; + + //客户用户编号 + String CUSTOMER_USER_PREFIX = "khyh"; + + //委托书编号 + String ORDER_PREFIX = "wtsc"; + + /*************委托书调度，tt notice**************/ + //交接单编号 + String INTER_CHANGE_PREFIX = "jjdh"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java new file mode 100644 index 0000000..a013d67 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java @@ -0,0 +1,19 @@ +package com.casic.missiles.enums.business; + +public interface CertificatePrintStatusEnum { + + /** + * 不可打印 + */ + String PRINTABLE = "1"; + + /** + * 不可打印 + */ + String NON_PRINTABLE = "2"; + + /** + * 审批中 + */ + String IN_APPROVAL = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java new file mode 100644 index 0000000..a0b0274 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +/** + * @author cz + */ +public interface MeasureTypeEnum { + /** + * 自检 + */ + String INSIDE_MEASURE = "1"; + + /** + * 外包 + */ + String OTHERS_UNDERTAKE = "2"; + + /** + * 外检 + */ + String OUTSIDE_MEASURE = "3"; + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java new file mode 100644 index 0000000..83371aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +public interface OrderStatusEnum { + + /** + * 未接收 + */ + String NOT_RECEIVED = "1"; + /** + * 已接收 + */ + String ALREADY_RECEIVED = "2"; + /** + * 已取消 + */ + String ALREADY_CANCEL = "3"; + + /** + * 检测完成 + */ + String MEASURE_SUCCESS = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java new file mode 100644 index 0000000..d32da8d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java @@ -0,0 +1,23 @@ +package com.casic.missiles.enums.sample; + +/** + * @author cz + */ +public interface CertificationExpireStatusEnum { + + /** + * 未超期 + */ + String NORMAL = "0"; + + /** + * 即将超期，距离结束即将到30天 + */ + String ALMOST_EXPIRE = "1"; + + /** + * 已经超期 + */ + String ALREADY_EXPIRE = "2"; + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 832517f..f1c90e8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -12,6 +12,7 @@ import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.business.OrderStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessDealRecordMapper; import com.casic.missiles.model.business.BusinessDealRecord; @@ -44,7 +45,7 @@ @Api(tags = "委托书模块") @RequestMapping("/business/order") @AllArgsConstructor -public class BusinessOrderController extends ExportController { +public class BusinessOrderController extends ExportController implements OrderStatusEnum { private final IBusinessOrderService businessOrderService; @@ -119,7 +120,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "2"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_RECEIVED); } @ApiOperation("委托书退回") @@ -128,7 +129,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "3"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java index 7591c07..ae7a28d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -10,7 +10,6 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; import com.casic.missiles.dto.customer.Info.*; -import com.casic.missiles.dto.customer.MesureRecordsResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerInfo; @@ -102,19 +101,9 @@ return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); } - @ApiOperation("根据客户id查询检定记录-分页") - @PostMapping("/mesureRecords") - public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); - } - - @ApiOperation("客户删除") @PostMapping("/delete") - public ReturnDTO deleteCsutomer(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO deleteCustomer(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java index 9ae077e..c7d6b3f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -9,9 +9,10 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; -import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerSampleInfo; @@ -93,15 +94,13 @@ customerSampleService.sampleExport(request, response); } - @ApiOperation("根据样品id查询检定记录") - @PostMapping("/mesureRecordsBySampleId") - public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(idDTO.getId()))); + @ApiOperation("根据样品id或客户id查询检定记录") + @PostMapping("/measureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) { + return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest))); } + @ApiOperation("根据样品id查询检定证书") @PostMapping("/certificationBySampleId") public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { @@ -111,13 +110,4 @@ return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); } -// @ApiOperation("样品批量导入") -// @PostMapping("/batchImport") -// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return null; -// } - } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index 6b109a2..fbe403d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -1,5 +1,7 @@ package com.casic.missiles.enums; +import org.apache.xmlbeans.impl.xb.xsdschema.Public; + /** * @Description: 生成编号前缀枚举 * @Author: zt @@ -7,9 +9,31 @@ */ public interface PrefixCodeEnum { - //环境记录单编号生成前缀 - String ENVIRONMENT_PREFIX = "hjld"; - //原始记录单编号生成前缀 - String ORIGIN_PREFIX = "ysld"; + //环境记录单编号生成前缀 + String ENVIRONMENT_PREFIX = "hjld"; + //原始记录单编号生成前缀 + String ORIGIN_PREFIX = "ysld"; + + + /*************客户资源模块，tt notice**************/ + //样品编号 + String SAMPLE_PREFIX = "khyp"; + + //客户编号 + String CUSTOMER_PREFIX = "khxx"; + + //客户建议编号 + String CUSTOMER_ADVICE_PREFIX = "khjy"; + + //客户用户编号 + String CUSTOMER_USER_PREFIX = "khyh"; + + //委托书编号 + String ORDER_PREFIX = "wtsc"; + + /*************委托书调度，tt notice**************/ + //交接单编号 + String INTER_CHANGE_PREFIX = "jjdh"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java new file mode 100644 index 0000000..a013d67 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java @@ -0,0 +1,19 @@ +package com.casic.missiles.enums.business; + +public interface CertificatePrintStatusEnum { + + /** + * 不可打印 + */ + String PRINTABLE = "1"; + + /** + * 不可打印 + */ + String NON_PRINTABLE = "2"; + + /** + * 审批中 + */ + String IN_APPROVAL = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java new file mode 100644 index 0000000..a0b0274 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +/** + * @author cz + */ +public interface MeasureTypeEnum { + /** + * 自检 + */ + String INSIDE_MEASURE = "1"; + + /** + * 外包 + */ + String OTHERS_UNDERTAKE = "2"; + + /** + * 外检 + */ + String OUTSIDE_MEASURE = "3"; + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java new file mode 100644 index 0000000..83371aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +public interface OrderStatusEnum { + + /** + * 未接收 + */ + String NOT_RECEIVED = "1"; + /** + * 已接收 + */ + String ALREADY_RECEIVED = "2"; + /** + * 已取消 + */ + String ALREADY_CANCEL = "3"; + + /** + * 检测完成 + */ + String MEASURE_SUCCESS = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java new file mode 100644 index 0000000..d32da8d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java @@ -0,0 +1,23 @@ +package com.casic.missiles.enums.sample; + +/** + * @author cz + */ +public interface CertificationExpireStatusEnum { + + /** + * 未超期 + */ + String NORMAL = "0"; + + /** + * 即将超期，距离结束即将到30天 + */ + String ALMOST_EXPIRE = "1"; + + /** + * 已经超期 + */ + String ALREADY_EXPIRE = "2"; + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java index fde0627..8b73201 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.model.customer.CustomerSampleInfo; import org.apache.ibatis.annotations.Param; @@ -10,6 +12,8 @@ Long selectMaxSampleNo(); + Page measureRecordsBySampleId(Page page, @Param("request") MeasureRecordsIdRequest recordsIdRequest); + Page samplesByOderId(Page page, @Param("orderId") Long orderId, diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 832517f..f1c90e8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -12,6 +12,7 @@ import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.business.OrderStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessDealRecordMapper; import com.casic.missiles.model.business.BusinessDealRecord; @@ -44,7 +45,7 @@ @Api(tags = "委托书模块") @RequestMapping("/business/order") @AllArgsConstructor -public class BusinessOrderController extends ExportController { +public class BusinessOrderController extends ExportController implements OrderStatusEnum { private final IBusinessOrderService businessOrderService; @@ -119,7 +120,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "2"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_RECEIVED); } @ApiOperation("委托书退回") @@ -128,7 +129,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "3"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java index 7591c07..ae7a28d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -10,7 +10,6 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; import com.casic.missiles.dto.customer.Info.*; -import com.casic.missiles.dto.customer.MesureRecordsResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerInfo; @@ -102,19 +101,9 @@ return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); } - @ApiOperation("根据客户id查询检定记录-分页") - @PostMapping("/mesureRecords") - public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); - } - - @ApiOperation("客户删除") @PostMapping("/delete") - public ReturnDTO deleteCsutomer(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO deleteCustomer(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java index 9ae077e..c7d6b3f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -9,9 +9,10 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; -import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerSampleInfo; @@ -93,15 +94,13 @@ customerSampleService.sampleExport(request, response); } - @ApiOperation("根据样品id查询检定记录") - @PostMapping("/mesureRecordsBySampleId") - public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(idDTO.getId()))); + @ApiOperation("根据样品id或客户id查询检定记录") + @PostMapping("/measureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) { + return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest))); } + @ApiOperation("根据样品id查询检定证书") @PostMapping("/certificationBySampleId") public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { @@ -111,13 +110,4 @@ return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); } -// @ApiOperation("样品批量导入") -// @PostMapping("/batchImport") -// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return null; -// } - } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index 6b109a2..fbe403d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -1,5 +1,7 @@ package com.casic.missiles.enums; +import org.apache.xmlbeans.impl.xb.xsdschema.Public; + /** * @Description: 生成编号前缀枚举 * @Author: zt @@ -7,9 +9,31 @@ */ public interface PrefixCodeEnum { - //环境记录单编号生成前缀 - String ENVIRONMENT_PREFIX = "hjld"; - //原始记录单编号生成前缀 - String ORIGIN_PREFIX = "ysld"; + //环境记录单编号生成前缀 + String ENVIRONMENT_PREFIX = "hjld"; + //原始记录单编号生成前缀 + String ORIGIN_PREFIX = "ysld"; + + + /*************客户资源模块，tt notice**************/ + //样品编号 + String SAMPLE_PREFIX = "khyp"; + + //客户编号 + String CUSTOMER_PREFIX = "khxx"; + + //客户建议编号 + String CUSTOMER_ADVICE_PREFIX = "khjy"; + + //客户用户编号 + String CUSTOMER_USER_PREFIX = "khyh"; + + //委托书编号 + String ORDER_PREFIX = "wtsc"; + + /*************委托书调度，tt notice**************/ + //交接单编号 + String INTER_CHANGE_PREFIX = "jjdh"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java new file mode 100644 index 0000000..a013d67 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java @@ -0,0 +1,19 @@ +package com.casic.missiles.enums.business; + +public interface CertificatePrintStatusEnum { + + /** + * 不可打印 + */ + String PRINTABLE = "1"; + + /** + * 不可打印 + */ + String NON_PRINTABLE = "2"; + + /** + * 审批中 + */ + String IN_APPROVAL = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java new file mode 100644 index 0000000..a0b0274 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +/** + * @author cz + */ +public interface MeasureTypeEnum { + /** + * 自检 + */ + String INSIDE_MEASURE = "1"; + + /** + * 外包 + */ + String OTHERS_UNDERTAKE = "2"; + + /** + * 外检 + */ + String OUTSIDE_MEASURE = "3"; + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java new file mode 100644 index 0000000..83371aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +public interface OrderStatusEnum { + + /** + * 未接收 + */ + String NOT_RECEIVED = "1"; + /** + * 已接收 + */ + String ALREADY_RECEIVED = "2"; + /** + * 已取消 + */ + String ALREADY_CANCEL = "3"; + + /** + * 检测完成 + */ + String MEASURE_SUCCESS = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java new file mode 100644 index 0000000..d32da8d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java @@ -0,0 +1,23 @@ +package com.casic.missiles.enums.sample; + +/** + * @author cz + */ +public interface CertificationExpireStatusEnum { + + /** + * 未超期 + */ + String NORMAL = "0"; + + /** + * 即将超期，距离结束即将到30天 + */ + String ALMOST_EXPIRE = "1"; + + /** + * 已经超期 + */ + String ALREADY_EXPIRE = "2"; + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java index fde0627..8b73201 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.model.customer.CustomerSampleInfo; import org.apache.ibatis.annotations.Param; @@ -10,6 +12,8 @@ Long selectMaxSampleNo(); + Page measureRecordsBySampleId(Page page, @Param("request") MeasureRecordsIdRequest recordsIdRequest); + Page samplesByOderId(Page page, @Param("orderId") Long orderId, diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java deleted file mode 100644 index a086b38..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.missiles.mapper.customer.customize; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.customer.MesureRecordsResponse; - -public interface MesureRecordsResponseMapper extends BaseMapper { -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 832517f..f1c90e8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -12,6 +12,7 @@ import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.business.OrderStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessDealRecordMapper; import com.casic.missiles.model.business.BusinessDealRecord; @@ -44,7 +45,7 @@ @Api(tags = "委托书模块") @RequestMapping("/business/order") @AllArgsConstructor -public class BusinessOrderController extends ExportController { +public class BusinessOrderController extends ExportController implements OrderStatusEnum { private final IBusinessOrderService businessOrderService; @@ -119,7 +120,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "2"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_RECEIVED); } @ApiOperation("委托书退回") @@ -128,7 +129,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "3"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java index 7591c07..ae7a28d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -10,7 +10,6 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; import com.casic.missiles.dto.customer.Info.*; -import com.casic.missiles.dto.customer.MesureRecordsResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerInfo; @@ -102,19 +101,9 @@ return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); } - @ApiOperation("根据客户id查询检定记录-分页") - @PostMapping("/mesureRecords") - public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); - } - - @ApiOperation("客户删除") @PostMapping("/delete") - public ReturnDTO deleteCsutomer(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO deleteCustomer(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java index 9ae077e..c7d6b3f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -9,9 +9,10 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; -import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerSampleInfo; @@ -93,15 +94,13 @@ customerSampleService.sampleExport(request, response); } - @ApiOperation("根据样品id查询检定记录") - @PostMapping("/mesureRecordsBySampleId") - public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(idDTO.getId()))); + @ApiOperation("根据样品id或客户id查询检定记录") + @PostMapping("/measureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) { + return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest))); } + @ApiOperation("根据样品id查询检定证书") @PostMapping("/certificationBySampleId") public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { @@ -111,13 +110,4 @@ return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); } -// @ApiOperation("样品批量导入") -// @PostMapping("/batchImport") -// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return null; -// } - } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index 6b109a2..fbe403d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -1,5 +1,7 @@ package com.casic.missiles.enums; +import org.apache.xmlbeans.impl.xb.xsdschema.Public; + /** * @Description: 生成编号前缀枚举 * @Author: zt @@ -7,9 +9,31 @@ */ public interface PrefixCodeEnum { - //环境记录单编号生成前缀 - String ENVIRONMENT_PREFIX = "hjld"; - //原始记录单编号生成前缀 - String ORIGIN_PREFIX = "ysld"; + //环境记录单编号生成前缀 + String ENVIRONMENT_PREFIX = "hjld"; + //原始记录单编号生成前缀 + String ORIGIN_PREFIX = "ysld"; + + + /*************客户资源模块，tt notice**************/ + //样品编号 + String SAMPLE_PREFIX = "khyp"; + + //客户编号 + String CUSTOMER_PREFIX = "khxx"; + + //客户建议编号 + String CUSTOMER_ADVICE_PREFIX = "khjy"; + + //客户用户编号 + String CUSTOMER_USER_PREFIX = "khyh"; + + //委托书编号 + String ORDER_PREFIX = "wtsc"; + + /*************委托书调度，tt notice**************/ + //交接单编号 + String INTER_CHANGE_PREFIX = "jjdh"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java new file mode 100644 index 0000000..a013d67 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java @@ -0,0 +1,19 @@ +package com.casic.missiles.enums.business; + +public interface CertificatePrintStatusEnum { + + /** + * 不可打印 + */ + String PRINTABLE = "1"; + + /** + * 不可打印 + */ + String NON_PRINTABLE = "2"; + + /** + * 审批中 + */ + String IN_APPROVAL = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java new file mode 100644 index 0000000..a0b0274 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +/** + * @author cz + */ +public interface MeasureTypeEnum { + /** + * 自检 + */ + String INSIDE_MEASURE = "1"; + + /** + * 外包 + */ + String OTHERS_UNDERTAKE = "2"; + + /** + * 外检 + */ + String OUTSIDE_MEASURE = "3"; + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java new file mode 100644 index 0000000..83371aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +public interface OrderStatusEnum { + + /** + * 未接收 + */ + String NOT_RECEIVED = "1"; + /** + * 已接收 + */ + String ALREADY_RECEIVED = "2"; + /** + * 已取消 + */ + String ALREADY_CANCEL = "3"; + + /** + * 检测完成 + */ + String MEASURE_SUCCESS = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java new file mode 100644 index 0000000..d32da8d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java @@ -0,0 +1,23 @@ +package com.casic.missiles.enums.sample; + +/** + * @author cz + */ +public interface CertificationExpireStatusEnum { + + /** + * 未超期 + */ + String NORMAL = "0"; + + /** + * 即将超期，距离结束即将到30天 + */ + String ALMOST_EXPIRE = "1"; + + /** + * 已经超期 + */ + String ALREADY_EXPIRE = "2"; + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java index fde0627..8b73201 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.model.customer.CustomerSampleInfo; import org.apache.ibatis.annotations.Param; @@ -10,6 +12,8 @@ Long selectMaxSampleNo(); + Page measureRecordsBySampleId(Page page, @Param("request") MeasureRecordsIdRequest recordsIdRequest); + Page samplesByOderId(Page page, @Param("orderId") Long orderId, diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java deleted file mode 100644 index a086b38..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.missiles.mapper.customer.customize; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.customer.MesureRecordsResponse; - -public interface MesureRecordsResponseMapper extends BaseMapper { -} diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index f10fbb3..e7f5950 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -7,22 +7,56 @@ FROM customer_sample_info + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 832517f..f1c90e8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -12,6 +12,7 @@ import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.business.OrderStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessDealRecordMapper; import com.casic.missiles.model.business.BusinessDealRecord; @@ -44,7 +45,7 @@ @Api(tags = "委托书模块") @RequestMapping("/business/order") @AllArgsConstructor -public class BusinessOrderController extends ExportController { +public class BusinessOrderController extends ExportController implements OrderStatusEnum { private final IBusinessOrderService businessOrderService; @@ -119,7 +120,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "2"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_RECEIVED); } @ApiOperation("委托书退回") @@ -128,7 +129,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "3"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java index 7591c07..ae7a28d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -10,7 +10,6 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; import com.casic.missiles.dto.customer.Info.*; -import com.casic.missiles.dto.customer.MesureRecordsResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerInfo; @@ -102,19 +101,9 @@ return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); } - @ApiOperation("根据客户id查询检定记录-分页") - @PostMapping("/mesureRecords") - public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); - } - - @ApiOperation("客户删除") @PostMapping("/delete") - public ReturnDTO deleteCsutomer(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO deleteCustomer(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java index 9ae077e..c7d6b3f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -9,9 +9,10 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; -import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerSampleInfo; @@ -93,15 +94,13 @@ customerSampleService.sampleExport(request, response); } - @ApiOperation("根据样品id查询检定记录") - @PostMapping("/mesureRecordsBySampleId") - public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(idDTO.getId()))); + @ApiOperation("根据样品id或客户id查询检定记录") + @PostMapping("/measureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) { + return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest))); } + @ApiOperation("根据样品id查询检定证书") @PostMapping("/certificationBySampleId") public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { @@ -111,13 +110,4 @@ return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); } -// @ApiOperation("样品批量导入") -// @PostMapping("/batchImport") -// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return null; -// } - } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index 6b109a2..fbe403d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -1,5 +1,7 @@ package com.casic.missiles.enums; +import org.apache.xmlbeans.impl.xb.xsdschema.Public; + /** * @Description: 生成编号前缀枚举 * @Author: zt @@ -7,9 +9,31 @@ */ public interface PrefixCodeEnum { - //环境记录单编号生成前缀 - String ENVIRONMENT_PREFIX = "hjld"; - //原始记录单编号生成前缀 - String ORIGIN_PREFIX = "ysld"; + //环境记录单编号生成前缀 + String ENVIRONMENT_PREFIX = "hjld"; + //原始记录单编号生成前缀 + String ORIGIN_PREFIX = "ysld"; + + + /*************客户资源模块，tt notice**************/ + //样品编号 + String SAMPLE_PREFIX = "khyp"; + + //客户编号 + String CUSTOMER_PREFIX = "khxx"; + + //客户建议编号 + String CUSTOMER_ADVICE_PREFIX = "khjy"; + + //客户用户编号 + String CUSTOMER_USER_PREFIX = "khyh"; + + //委托书编号 + String ORDER_PREFIX = "wtsc"; + + /*************委托书调度，tt notice**************/ + //交接单编号 + String INTER_CHANGE_PREFIX = "jjdh"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java new file mode 100644 index 0000000..a013d67 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java @@ -0,0 +1,19 @@ +package com.casic.missiles.enums.business; + +public interface CertificatePrintStatusEnum { + + /** + * 不可打印 + */ + String PRINTABLE = "1"; + + /** + * 不可打印 + */ + String NON_PRINTABLE = "2"; + + /** + * 审批中 + */ + String IN_APPROVAL = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java new file mode 100644 index 0000000..a0b0274 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +/** + * @author cz + */ +public interface MeasureTypeEnum { + /** + * 自检 + */ + String INSIDE_MEASURE = "1"; + + /** + * 外包 + */ + String OTHERS_UNDERTAKE = "2"; + + /** + * 外检 + */ + String OUTSIDE_MEASURE = "3"; + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java new file mode 100644 index 0000000..83371aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +public interface OrderStatusEnum { + + /** + * 未接收 + */ + String NOT_RECEIVED = "1"; + /** + * 已接收 + */ + String ALREADY_RECEIVED = "2"; + /** + * 已取消 + */ + String ALREADY_CANCEL = "3"; + + /** + * 检测完成 + */ + String MEASURE_SUCCESS = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java new file mode 100644 index 0000000..d32da8d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java @@ -0,0 +1,23 @@ +package com.casic.missiles.enums.sample; + +/** + * @author cz + */ +public interface CertificationExpireStatusEnum { + + /** + * 未超期 + */ + String NORMAL = "0"; + + /** + * 即将超期，距离结束即将到30天 + */ + String ALMOST_EXPIRE = "1"; + + /** + * 已经超期 + */ + String ALREADY_EXPIRE = "2"; + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java index fde0627..8b73201 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.model.customer.CustomerSampleInfo; import org.apache.ibatis.annotations.Param; @@ -10,6 +12,8 @@ Long selectMaxSampleNo(); + Page measureRecordsBySampleId(Page page, @Param("request") MeasureRecordsIdRequest recordsIdRequest); + Page samplesByOderId(Page page, @Param("orderId") Long orderId, diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java deleted file mode 100644 index a086b38..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.missiles.mapper.customer.customize; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.customer.MesureRecordsResponse; - -public interface MesureRecordsResponseMapper extends BaseMapper { -} diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index f10fbb3..e7f5950 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -7,22 +7,56 @@ FROM customer_sample_info + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java new file mode 100644 index 0000000..ec13e19 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MeasureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 832517f..f1c90e8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -12,6 +12,7 @@ import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.business.OrderStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessDealRecordMapper; import com.casic.missiles.model.business.BusinessDealRecord; @@ -44,7 +45,7 @@ @Api(tags = "委托书模块") @RequestMapping("/business/order") @AllArgsConstructor -public class BusinessOrderController extends ExportController { +public class BusinessOrderController extends ExportController implements OrderStatusEnum { private final IBusinessOrderService businessOrderService; @@ -119,7 +120,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "2"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_RECEIVED); } @ApiOperation("委托书退回") @@ -128,7 +129,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "3"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java index 7591c07..ae7a28d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -10,7 +10,6 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; import com.casic.missiles.dto.customer.Info.*; -import com.casic.missiles.dto.customer.MesureRecordsResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerInfo; @@ -102,19 +101,9 @@ return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); } - @ApiOperation("根据客户id查询检定记录-分页") - @PostMapping("/mesureRecords") - public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); - } - - @ApiOperation("客户删除") @PostMapping("/delete") - public ReturnDTO deleteCsutomer(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO deleteCustomer(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java index 9ae077e..c7d6b3f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -9,9 +9,10 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; -import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerSampleInfo; @@ -93,15 +94,13 @@ customerSampleService.sampleExport(request, response); } - @ApiOperation("根据样品id查询检定记录") - @PostMapping("/mesureRecordsBySampleId") - public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(idDTO.getId()))); + @ApiOperation("根据样品id或客户id查询检定记录") + @PostMapping("/measureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) { + return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest))); } + @ApiOperation("根据样品id查询检定证书") @PostMapping("/certificationBySampleId") public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { @@ -111,13 +110,4 @@ return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); } -// @ApiOperation("样品批量导入") -// @PostMapping("/batchImport") -// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return null; -// } - } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index 6b109a2..fbe403d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -1,5 +1,7 @@ package com.casic.missiles.enums; +import org.apache.xmlbeans.impl.xb.xsdschema.Public; + /** * @Description: 生成编号前缀枚举 * @Author: zt @@ -7,9 +9,31 @@ */ public interface PrefixCodeEnum { - //环境记录单编号生成前缀 - String ENVIRONMENT_PREFIX = "hjld"; - //原始记录单编号生成前缀 - String ORIGIN_PREFIX = "ysld"; + //环境记录单编号生成前缀 + String ENVIRONMENT_PREFIX = "hjld"; + //原始记录单编号生成前缀 + String ORIGIN_PREFIX = "ysld"; + + + /*************客户资源模块，tt notice**************/ + //样品编号 + String SAMPLE_PREFIX = "khyp"; + + //客户编号 + String CUSTOMER_PREFIX = "khxx"; + + //客户建议编号 + String CUSTOMER_ADVICE_PREFIX = "khjy"; + + //客户用户编号 + String CUSTOMER_USER_PREFIX = "khyh"; + + //委托书编号 + String ORDER_PREFIX = "wtsc"; + + /*************委托书调度，tt notice**************/ + //交接单编号 + String INTER_CHANGE_PREFIX = "jjdh"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java new file mode 100644 index 0000000..a013d67 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java @@ -0,0 +1,19 @@ +package com.casic.missiles.enums.business; + +public interface CertificatePrintStatusEnum { + + /** + * 不可打印 + */ + String PRINTABLE = "1"; + + /** + * 不可打印 + */ + String NON_PRINTABLE = "2"; + + /** + * 审批中 + */ + String IN_APPROVAL = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java new file mode 100644 index 0000000..a0b0274 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +/** + * @author cz + */ +public interface MeasureTypeEnum { + /** + * 自检 + */ + String INSIDE_MEASURE = "1"; + + /** + * 外包 + */ + String OTHERS_UNDERTAKE = "2"; + + /** + * 外检 + */ + String OUTSIDE_MEASURE = "3"; + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java new file mode 100644 index 0000000..83371aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +public interface OrderStatusEnum { + + /** + * 未接收 + */ + String NOT_RECEIVED = "1"; + /** + * 已接收 + */ + String ALREADY_RECEIVED = "2"; + /** + * 已取消 + */ + String ALREADY_CANCEL = "3"; + + /** + * 检测完成 + */ + String MEASURE_SUCCESS = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java new file mode 100644 index 0000000..d32da8d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java @@ -0,0 +1,23 @@ +package com.casic.missiles.enums.sample; + +/** + * @author cz + */ +public interface CertificationExpireStatusEnum { + + /** + * 未超期 + */ + String NORMAL = "0"; + + /** + * 即将超期，距离结束即将到30天 + */ + String ALMOST_EXPIRE = "1"; + + /** + * 已经超期 + */ + String ALREADY_EXPIRE = "2"; + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java index fde0627..8b73201 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.model.customer.CustomerSampleInfo; import org.apache.ibatis.annotations.Param; @@ -10,6 +12,8 @@ Long selectMaxSampleNo(); + Page measureRecordsBySampleId(Page page, @Param("request") MeasureRecordsIdRequest recordsIdRequest); + Page samplesByOderId(Page page, @Param("orderId") Long orderId, diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java deleted file mode 100644 index a086b38..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.missiles.mapper.customer.customize; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.customer.MesureRecordsResponse; - -public interface MesureRecordsResponseMapper extends BaseMapper { -} diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index f10fbb3..e7f5950 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -7,22 +7,56 @@ FROM customer_sample_info + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java new file mode 100644 index 0000000..ec13e19 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MeasureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java deleted file mode 100644 index f13b5d4..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.dto.customer; - -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author cz - * @date 2023-02-01 - */ -@Data -@ApiModel -public class MesureRecordsResponse { - - @ApiModelProperty(value = "委托书id", dataType = "Long") - private Long orderId; - - @ApiModelProperty(value = "委托单编号", dataType = "String") - private String orderCode; - - @ApiModelProperty(value = "委托单日期", dataType = "String") - private String orderTime; - - @ApiModelProperty(value = "委托人代码", dataType = "String") - private String customerCode; - - @ApiModelProperty(value = "委托人名称", dataType = "String") - private String customerName; - - @ApiModelProperty(value = "送检人", dataType = "String") - private String deliverer; - - @ApiModelProperty(value = "送检日期", dataType = "String") - private String deliverTime; - -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 832517f..f1c90e8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -12,6 +12,7 @@ import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.business.OrderStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessDealRecordMapper; import com.casic.missiles.model.business.BusinessDealRecord; @@ -44,7 +45,7 @@ @Api(tags = "委托书模块") @RequestMapping("/business/order") @AllArgsConstructor -public class BusinessOrderController extends ExportController { +public class BusinessOrderController extends ExportController implements OrderStatusEnum { private final IBusinessOrderService businessOrderService; @@ -119,7 +120,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "2"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_RECEIVED); } @ApiOperation("委托书退回") @@ -128,7 +129,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "3"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java index 7591c07..ae7a28d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -10,7 +10,6 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; import com.casic.missiles.dto.customer.Info.*; -import com.casic.missiles.dto.customer.MesureRecordsResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerInfo; @@ -102,19 +101,9 @@ return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); } - @ApiOperation("根据客户id查询检定记录-分页") - @PostMapping("/mesureRecords") - public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); - } - - @ApiOperation("客户删除") @PostMapping("/delete") - public ReturnDTO deleteCsutomer(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO deleteCustomer(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java index 9ae077e..c7d6b3f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -9,9 +9,10 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; -import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerSampleInfo; @@ -93,15 +94,13 @@ customerSampleService.sampleExport(request, response); } - @ApiOperation("根据样品id查询检定记录") - @PostMapping("/mesureRecordsBySampleId") - public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(idDTO.getId()))); + @ApiOperation("根据样品id或客户id查询检定记录") + @PostMapping("/measureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) { + return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest))); } + @ApiOperation("根据样品id查询检定证书") @PostMapping("/certificationBySampleId") public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { @@ -111,13 +110,4 @@ return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); } -// @ApiOperation("样品批量导入") -// @PostMapping("/batchImport") -// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return null; -// } - } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index 6b109a2..fbe403d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -1,5 +1,7 @@ package com.casic.missiles.enums; +import org.apache.xmlbeans.impl.xb.xsdschema.Public; + /** * @Description: 生成编号前缀枚举 * @Author: zt @@ -7,9 +9,31 @@ */ public interface PrefixCodeEnum { - //环境记录单编号生成前缀 - String ENVIRONMENT_PREFIX = "hjld"; - //原始记录单编号生成前缀 - String ORIGIN_PREFIX = "ysld"; + //环境记录单编号生成前缀 + String ENVIRONMENT_PREFIX = "hjld"; + //原始记录单编号生成前缀 + String ORIGIN_PREFIX = "ysld"; + + + /*************客户资源模块，tt notice**************/ + //样品编号 + String SAMPLE_PREFIX = "khyp"; + + //客户编号 + String CUSTOMER_PREFIX = "khxx"; + + //客户建议编号 + String CUSTOMER_ADVICE_PREFIX = "khjy"; + + //客户用户编号 + String CUSTOMER_USER_PREFIX = "khyh"; + + //委托书编号 + String ORDER_PREFIX = "wtsc"; + + /*************委托书调度，tt notice**************/ + //交接单编号 + String INTER_CHANGE_PREFIX = "jjdh"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java new file mode 100644 index 0000000..a013d67 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java @@ -0,0 +1,19 @@ +package com.casic.missiles.enums.business; + +public interface CertificatePrintStatusEnum { + + /** + * 不可打印 + */ + String PRINTABLE = "1"; + + /** + * 不可打印 + */ + String NON_PRINTABLE = "2"; + + /** + * 审批中 + */ + String IN_APPROVAL = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java new file mode 100644 index 0000000..a0b0274 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +/** + * @author cz + */ +public interface MeasureTypeEnum { + /** + * 自检 + */ + String INSIDE_MEASURE = "1"; + + /** + * 外包 + */ + String OTHERS_UNDERTAKE = "2"; + + /** + * 外检 + */ + String OUTSIDE_MEASURE = "3"; + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java new file mode 100644 index 0000000..83371aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +public interface OrderStatusEnum { + + /** + * 未接收 + */ + String NOT_RECEIVED = "1"; + /** + * 已接收 + */ + String ALREADY_RECEIVED = "2"; + /** + * 已取消 + */ + String ALREADY_CANCEL = "3"; + + /** + * 检测完成 + */ + String MEASURE_SUCCESS = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java new file mode 100644 index 0000000..d32da8d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java @@ -0,0 +1,23 @@ +package com.casic.missiles.enums.sample; + +/** + * @author cz + */ +public interface CertificationExpireStatusEnum { + + /** + * 未超期 + */ + String NORMAL = "0"; + + /** + * 即将超期，距离结束即将到30天 + */ + String ALMOST_EXPIRE = "1"; + + /** + * 已经超期 + */ + String ALREADY_EXPIRE = "2"; + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java index fde0627..8b73201 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.model.customer.CustomerSampleInfo; import org.apache.ibatis.annotations.Param; @@ -10,6 +12,8 @@ Long selectMaxSampleNo(); + Page measureRecordsBySampleId(Page page, @Param("request") MeasureRecordsIdRequest recordsIdRequest); + Page samplesByOderId(Page page, @Param("orderId") Long orderId, diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java deleted file mode 100644 index a086b38..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.missiles.mapper.customer.customize; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.customer.MesureRecordsResponse; - -public interface MesureRecordsResponseMapper extends BaseMapper { -} diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index f10fbb3..e7f5950 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -7,22 +7,56 @@ FROM customer_sample_info + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java new file mode 100644 index 0000000..ec13e19 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MeasureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java deleted file mode 100644 index f13b5d4..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.dto.customer; - -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author cz - * @date 2023-02-01 - */ -@Data -@ApiModel -public class MesureRecordsResponse { - - @ApiModelProperty(value = "委托书id", dataType = "Long") - private Long orderId; - - @ApiModelProperty(value = "委托单编号", dataType = "String") - private String orderCode; - - @ApiModelProperty(value = "委托单日期", dataType = "String") - private String orderTime; - - @ApiModelProperty(value = "委托人代码", dataType = "String") - private String customerCode; - - @ApiModelProperty(value = "委托人名称", dataType = "String") - private String customerName; - - @ApiModelProperty(value = "送检人", dataType = "String") - private String deliverer; - - @ApiModelProperty(value = "送检日期", dataType = "String") - private String deliverTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java index 2e8657f..c0a9a99 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -53,12 +53,12 @@ @TableField(exist = false) @ApiModelProperty(value = "样品状态", dataType = "String") @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.SAMPLE_STATUS) - private String sampleSatus; + private String sampleStatus; @TableField(exist = false) @ApiModelProperty(value = "样品状态", dataType = "String") @ExcelProperty(value = "样品状态", order = 5) - private String sampleSatusName; + private String sampleStatusName; @ApiModelProperty(value = "委托方名称", dataType = "String") @ExcelProperty(value = "委托方名称", order = 6) diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 832517f..f1c90e8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -12,6 +12,7 @@ import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.business.OrderStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessDealRecordMapper; import com.casic.missiles.model.business.BusinessDealRecord; @@ -44,7 +45,7 @@ @Api(tags = "委托书模块") @RequestMapping("/business/order") @AllArgsConstructor -public class BusinessOrderController extends ExportController { +public class BusinessOrderController extends ExportController implements OrderStatusEnum { private final IBusinessOrderService businessOrderService; @@ -119,7 +120,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "2"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_RECEIVED); } @ApiOperation("委托书退回") @@ -128,7 +129,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "3"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java index 7591c07..ae7a28d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -10,7 +10,6 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; import com.casic.missiles.dto.customer.Info.*; -import com.casic.missiles.dto.customer.MesureRecordsResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerInfo; @@ -102,19 +101,9 @@ return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); } - @ApiOperation("根据客户id查询检定记录-分页") - @PostMapping("/mesureRecords") - public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); - } - - @ApiOperation("客户删除") @PostMapping("/delete") - public ReturnDTO deleteCsutomer(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO deleteCustomer(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java index 9ae077e..c7d6b3f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -9,9 +9,10 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; -import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerSampleInfo; @@ -93,15 +94,13 @@ customerSampleService.sampleExport(request, response); } - @ApiOperation("根据样品id查询检定记录") - @PostMapping("/mesureRecordsBySampleId") - public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(idDTO.getId()))); + @ApiOperation("根据样品id或客户id查询检定记录") + @PostMapping("/measureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) { + return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest))); } + @ApiOperation("根据样品id查询检定证书") @PostMapping("/certificationBySampleId") public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { @@ -111,13 +110,4 @@ return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); } -// @ApiOperation("样品批量导入") -// @PostMapping("/batchImport") -// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return null; -// } - } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index 6b109a2..fbe403d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -1,5 +1,7 @@ package com.casic.missiles.enums; +import org.apache.xmlbeans.impl.xb.xsdschema.Public; + /** * @Description: 生成编号前缀枚举 * @Author: zt @@ -7,9 +9,31 @@ */ public interface PrefixCodeEnum { - //环境记录单编号生成前缀 - String ENVIRONMENT_PREFIX = "hjld"; - //原始记录单编号生成前缀 - String ORIGIN_PREFIX = "ysld"; + //环境记录单编号生成前缀 + String ENVIRONMENT_PREFIX = "hjld"; + //原始记录单编号生成前缀 + String ORIGIN_PREFIX = "ysld"; + + + /*************客户资源模块，tt notice**************/ + //样品编号 + String SAMPLE_PREFIX = "khyp"; + + //客户编号 + String CUSTOMER_PREFIX = "khxx"; + + //客户建议编号 + String CUSTOMER_ADVICE_PREFIX = "khjy"; + + //客户用户编号 + String CUSTOMER_USER_PREFIX = "khyh"; + + //委托书编号 + String ORDER_PREFIX = "wtsc"; + + /*************委托书调度，tt notice**************/ + //交接单编号 + String INTER_CHANGE_PREFIX = "jjdh"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java new file mode 100644 index 0000000..a013d67 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java @@ -0,0 +1,19 @@ +package com.casic.missiles.enums.business; + +public interface CertificatePrintStatusEnum { + + /** + * 不可打印 + */ + String PRINTABLE = "1"; + + /** + * 不可打印 + */ + String NON_PRINTABLE = "2"; + + /** + * 审批中 + */ + String IN_APPROVAL = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java new file mode 100644 index 0000000..a0b0274 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +/** + * @author cz + */ +public interface MeasureTypeEnum { + /** + * 自检 + */ + String INSIDE_MEASURE = "1"; + + /** + * 外包 + */ + String OTHERS_UNDERTAKE = "2"; + + /** + * 外检 + */ + String OUTSIDE_MEASURE = "3"; + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java new file mode 100644 index 0000000..83371aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +public interface OrderStatusEnum { + + /** + * 未接收 + */ + String NOT_RECEIVED = "1"; + /** + * 已接收 + */ + String ALREADY_RECEIVED = "2"; + /** + * 已取消 + */ + String ALREADY_CANCEL = "3"; + + /** + * 检测完成 + */ + String MEASURE_SUCCESS = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java new file mode 100644 index 0000000..d32da8d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java @@ -0,0 +1,23 @@ +package com.casic.missiles.enums.sample; + +/** + * @author cz + */ +public interface CertificationExpireStatusEnum { + + /** + * 未超期 + */ + String NORMAL = "0"; + + /** + * 即将超期，距离结束即将到30天 + */ + String ALMOST_EXPIRE = "1"; + + /** + * 已经超期 + */ + String ALREADY_EXPIRE = "2"; + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java index fde0627..8b73201 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.model.customer.CustomerSampleInfo; import org.apache.ibatis.annotations.Param; @@ -10,6 +12,8 @@ Long selectMaxSampleNo(); + Page measureRecordsBySampleId(Page page, @Param("request") MeasureRecordsIdRequest recordsIdRequest); + Page samplesByOderId(Page page, @Param("orderId") Long orderId, diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java deleted file mode 100644 index a086b38..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.missiles.mapper.customer.customize; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.customer.MesureRecordsResponse; - -public interface MesureRecordsResponseMapper extends BaseMapper { -} diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index f10fbb3..e7f5950 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -7,22 +7,56 @@ FROM customer_sample_info + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java new file mode 100644 index 0000000..ec13e19 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MeasureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java deleted file mode 100644 index f13b5d4..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.dto.customer; - -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author cz - * @date 2023-02-01 - */ -@Data -@ApiModel -public class MesureRecordsResponse { - - @ApiModelProperty(value = "委托书id", dataType = "Long") - private Long orderId; - - @ApiModelProperty(value = "委托单编号", dataType = "String") - private String orderCode; - - @ApiModelProperty(value = "委托单日期", dataType = "String") - private String orderTime; - - @ApiModelProperty(value = "委托人代码", dataType = "String") - private String customerCode; - - @ApiModelProperty(value = "委托人名称", dataType = "String") - private String customerName; - - @ApiModelProperty(value = "送检人", dataType = "String") - private String deliverer; - - @ApiModelProperty(value = "送检日期", dataType = "String") - private String deliverTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java index 2e8657f..c0a9a99 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -53,12 +53,12 @@ @TableField(exist = false) @ApiModelProperty(value = "样品状态", dataType = "String") @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.SAMPLE_STATUS) - private String sampleSatus; + private String sampleStatus; @TableField(exist = false) @ApiModelProperty(value = "样品状态", dataType = "String") @ExcelProperty(value = "样品状态", order = 5) - private String sampleSatusName; + private String sampleStatusName; @ApiModelProperty(value = "委托方名称", dataType = "String") @ExcelProperty(value = "委托方名称", order = 6) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java new file mode 100644 index 0000000..7bcf105 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java @@ -0,0 +1,22 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + */ + +@Data +@ApiModel("检测记录查询id") +public class MeasureRecordsIdRequest { + + @ApiModelProperty("样品Id") + private Long sampleId; + + @ApiModelProperty("客户id") + private Long customerId; + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 832517f..f1c90e8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -12,6 +12,7 @@ import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.business.OrderStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessDealRecordMapper; import com.casic.missiles.model.business.BusinessDealRecord; @@ -44,7 +45,7 @@ @Api(tags = "委托书模块") @RequestMapping("/business/order") @AllArgsConstructor -public class BusinessOrderController extends ExportController { +public class BusinessOrderController extends ExportController implements OrderStatusEnum { private final IBusinessOrderService businessOrderService; @@ -119,7 +120,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "2"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_RECEIVED); } @ApiOperation("委托书退回") @@ -128,7 +129,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "3"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java index 7591c07..ae7a28d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -10,7 +10,6 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; import com.casic.missiles.dto.customer.Info.*; -import com.casic.missiles.dto.customer.MesureRecordsResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerInfo; @@ -102,19 +101,9 @@ return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); } - @ApiOperation("根据客户id查询检定记录-分页") - @PostMapping("/mesureRecords") - public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); - } - - @ApiOperation("客户删除") @PostMapping("/delete") - public ReturnDTO deleteCsutomer(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO deleteCustomer(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java index 9ae077e..c7d6b3f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -9,9 +9,10 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; -import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerSampleInfo; @@ -93,15 +94,13 @@ customerSampleService.sampleExport(request, response); } - @ApiOperation("根据样品id查询检定记录") - @PostMapping("/mesureRecordsBySampleId") - public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(idDTO.getId()))); + @ApiOperation("根据样品id或客户id查询检定记录") + @PostMapping("/measureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) { + return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest))); } + @ApiOperation("根据样品id查询检定证书") @PostMapping("/certificationBySampleId") public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { @@ -111,13 +110,4 @@ return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); } -// @ApiOperation("样品批量导入") -// @PostMapping("/batchImport") -// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return null; -// } - } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index 6b109a2..fbe403d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -1,5 +1,7 @@ package com.casic.missiles.enums; +import org.apache.xmlbeans.impl.xb.xsdschema.Public; + /** * @Description: 生成编号前缀枚举 * @Author: zt @@ -7,9 +9,31 @@ */ public interface PrefixCodeEnum { - //环境记录单编号生成前缀 - String ENVIRONMENT_PREFIX = "hjld"; - //原始记录单编号生成前缀 - String ORIGIN_PREFIX = "ysld"; + //环境记录单编号生成前缀 + String ENVIRONMENT_PREFIX = "hjld"; + //原始记录单编号生成前缀 + String ORIGIN_PREFIX = "ysld"; + + + /*************客户资源模块，tt notice**************/ + //样品编号 + String SAMPLE_PREFIX = "khyp"; + + //客户编号 + String CUSTOMER_PREFIX = "khxx"; + + //客户建议编号 + String CUSTOMER_ADVICE_PREFIX = "khjy"; + + //客户用户编号 + String CUSTOMER_USER_PREFIX = "khyh"; + + //委托书编号 + String ORDER_PREFIX = "wtsc"; + + /*************委托书调度，tt notice**************/ + //交接单编号 + String INTER_CHANGE_PREFIX = "jjdh"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java new file mode 100644 index 0000000..a013d67 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java @@ -0,0 +1,19 @@ +package com.casic.missiles.enums.business; + +public interface CertificatePrintStatusEnum { + + /** + * 不可打印 + */ + String PRINTABLE = "1"; + + /** + * 不可打印 + */ + String NON_PRINTABLE = "2"; + + /** + * 审批中 + */ + String IN_APPROVAL = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java new file mode 100644 index 0000000..a0b0274 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +/** + * @author cz + */ +public interface MeasureTypeEnum { + /** + * 自检 + */ + String INSIDE_MEASURE = "1"; + + /** + * 外包 + */ + String OTHERS_UNDERTAKE = "2"; + + /** + * 外检 + */ + String OUTSIDE_MEASURE = "3"; + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java new file mode 100644 index 0000000..83371aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +public interface OrderStatusEnum { + + /** + * 未接收 + */ + String NOT_RECEIVED = "1"; + /** + * 已接收 + */ + String ALREADY_RECEIVED = "2"; + /** + * 已取消 + */ + String ALREADY_CANCEL = "3"; + + /** + * 检测完成 + */ + String MEASURE_SUCCESS = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java new file mode 100644 index 0000000..d32da8d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java @@ -0,0 +1,23 @@ +package com.casic.missiles.enums.sample; + +/** + * @author cz + */ +public interface CertificationExpireStatusEnum { + + /** + * 未超期 + */ + String NORMAL = "0"; + + /** + * 即将超期，距离结束即将到30天 + */ + String ALMOST_EXPIRE = "1"; + + /** + * 已经超期 + */ + String ALREADY_EXPIRE = "2"; + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java index fde0627..8b73201 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.model.customer.CustomerSampleInfo; import org.apache.ibatis.annotations.Param; @@ -10,6 +12,8 @@ Long selectMaxSampleNo(); + Page measureRecordsBySampleId(Page page, @Param("request") MeasureRecordsIdRequest recordsIdRequest); + Page samplesByOderId(Page page, @Param("orderId") Long orderId, diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java deleted file mode 100644 index a086b38..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.missiles.mapper.customer.customize; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.customer.MesureRecordsResponse; - -public interface MesureRecordsResponseMapper extends BaseMapper { -} diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index f10fbb3..e7f5950 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -7,22 +7,56 @@ FROM customer_sample_info + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java new file mode 100644 index 0000000..ec13e19 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MeasureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java deleted file mode 100644 index f13b5d4..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.dto.customer; - -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author cz - * @date 2023-02-01 - */ -@Data -@ApiModel -public class MesureRecordsResponse { - - @ApiModelProperty(value = "委托书id", dataType = "Long") - private Long orderId; - - @ApiModelProperty(value = "委托单编号", dataType = "String") - private String orderCode; - - @ApiModelProperty(value = "委托单日期", dataType = "String") - private String orderTime; - - @ApiModelProperty(value = "委托人代码", dataType = "String") - private String customerCode; - - @ApiModelProperty(value = "委托人名称", dataType = "String") - private String customerName; - - @ApiModelProperty(value = "送检人", dataType = "String") - private String deliverer; - - @ApiModelProperty(value = "送检日期", dataType = "String") - private String deliverTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java index 2e8657f..c0a9a99 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -53,12 +53,12 @@ @TableField(exist = false) @ApiModelProperty(value = "样品状态", dataType = "String") @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.SAMPLE_STATUS) - private String sampleSatus; + private String sampleStatus; @TableField(exist = false) @ApiModelProperty(value = "样品状态", dataType = "String") @ExcelProperty(value = "样品状态", order = 5) - private String sampleSatusName; + private String sampleStatusName; @ApiModelProperty(value = "委托方名称", dataType = "String") @ExcelProperty(value = "委托方名称", order = 6) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java new file mode 100644 index 0000000..7bcf105 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java @@ -0,0 +1,22 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + */ + +@Data +@ApiModel("检测记录查询id") +public class MeasureRecordsIdRequest { + + @ApiModelProperty("样品Id") + private Long sampleId; + + @ApiModelProperty("客户id") + private Long customerId; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java index 2f97cb3..542f5ca 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.base.service.IBaseExportService; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; @@ -20,6 +19,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.business.CertificatePrintStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; import com.casic.missiles.model.business.BusinessCertificateReport; @@ -42,10 +42,9 @@ */ @Service @AllArgsConstructor -public class BusinessCertificatePrintServiceImpl extends ServiceImpl implements IBusinessCertificatePrintService { +public class BusinessCertificatePrintServiceImpl extends ServiceImpl implements IBusinessCertificatePrintService, CertificatePrintStatusEnum { private final IBaseApprovalService baseApprovalService; - private final AbstractDictService dictService; private final IBaseExportService iBaseExportService; private final ApprovalOperateService approvalOperateService; @@ -86,7 +85,7 @@ } /** - * 更新工作流审批状态为拒绝，当返回值成功时，进行打印状态置为不可打印，审批状态为不通过 + * 更新工作流审批状态为拒绝，当返回值成功时，进行打印状态置为不可打印，审批状态为不通过 * * @return */ @@ -103,7 +102,7 @@ BusinessCertificateReport certificateReport = new BusinessCertificateReport(); certificateReport.setId(request.getId()); //设置为不能打印 - certificateReport.setPrintStatus("2"); + certificateReport.setPrintStatus(NON_PRINTABLE); certificateReport.setApprovalStatus(ApprovalStatusEnum.FAILED); int row = this.baseMapper.updateById(certificateReport); if (row <= 0) { @@ -113,7 +112,7 @@ } /** - * 提交审批流程，修改证书审批状态为待审批，打印状态为审批中 + * 提交审批流程，修改证书审批状态为待审批，打印状态为审批中 */ @Transactional @Override @@ -128,7 +127,7 @@ //审批状态为审批中 certificateReport.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED); //打印状态审批中 - certificateReport.setPrintStatus("3"); + certificateReport.setPrintStatus(IN_APPROVAL); int row = this.baseMapper.updateById(certificateReport); if (row <= 0) { throw new BusinessException(BusinessExceptionEnum.AGAIN_PRINT_SUBMIT_FAILED.getCode(), BusinessExceptionEnum.AGAIN_PRINT_SUBMIT_FAILED.getMessage()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 832517f..f1c90e8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -12,6 +12,7 @@ import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.business.OrderStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessDealRecordMapper; import com.casic.missiles.model.business.BusinessDealRecord; @@ -44,7 +45,7 @@ @Api(tags = "委托书模块") @RequestMapping("/business/order") @AllArgsConstructor -public class BusinessOrderController extends ExportController { +public class BusinessOrderController extends ExportController implements OrderStatusEnum { private final IBusinessOrderService businessOrderService; @@ -119,7 +120,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "2"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_RECEIVED); } @ApiOperation("委托书退回") @@ -128,7 +129,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "3"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java index 7591c07..ae7a28d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -10,7 +10,6 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; import com.casic.missiles.dto.customer.Info.*; -import com.casic.missiles.dto.customer.MesureRecordsResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerInfo; @@ -102,19 +101,9 @@ return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); } - @ApiOperation("根据客户id查询检定记录-分页") - @PostMapping("/mesureRecords") - public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); - } - - @ApiOperation("客户删除") @PostMapping("/delete") - public ReturnDTO deleteCsutomer(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO deleteCustomer(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java index 9ae077e..c7d6b3f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -9,9 +9,10 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; -import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerSampleInfo; @@ -93,15 +94,13 @@ customerSampleService.sampleExport(request, response); } - @ApiOperation("根据样品id查询检定记录") - @PostMapping("/mesureRecordsBySampleId") - public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(idDTO.getId()))); + @ApiOperation("根据样品id或客户id查询检定记录") + @PostMapping("/measureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) { + return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest))); } + @ApiOperation("根据样品id查询检定证书") @PostMapping("/certificationBySampleId") public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { @@ -111,13 +110,4 @@ return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); } -// @ApiOperation("样品批量导入") -// @PostMapping("/batchImport") -// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return null; -// } - } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index 6b109a2..fbe403d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -1,5 +1,7 @@ package com.casic.missiles.enums; +import org.apache.xmlbeans.impl.xb.xsdschema.Public; + /** * @Description: 生成编号前缀枚举 * @Author: zt @@ -7,9 +9,31 @@ */ public interface PrefixCodeEnum { - //环境记录单编号生成前缀 - String ENVIRONMENT_PREFIX = "hjld"; - //原始记录单编号生成前缀 - String ORIGIN_PREFIX = "ysld"; + //环境记录单编号生成前缀 + String ENVIRONMENT_PREFIX = "hjld"; + //原始记录单编号生成前缀 + String ORIGIN_PREFIX = "ysld"; + + + /*************客户资源模块，tt notice**************/ + //样品编号 + String SAMPLE_PREFIX = "khyp"; + + //客户编号 + String CUSTOMER_PREFIX = "khxx"; + + //客户建议编号 + String CUSTOMER_ADVICE_PREFIX = "khjy"; + + //客户用户编号 + String CUSTOMER_USER_PREFIX = "khyh"; + + //委托书编号 + String ORDER_PREFIX = "wtsc"; + + /*************委托书调度，tt notice**************/ + //交接单编号 + String INTER_CHANGE_PREFIX = "jjdh"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java new file mode 100644 index 0000000..a013d67 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java @@ -0,0 +1,19 @@ +package com.casic.missiles.enums.business; + +public interface CertificatePrintStatusEnum { + + /** + * 不可打印 + */ + String PRINTABLE = "1"; + + /** + * 不可打印 + */ + String NON_PRINTABLE = "2"; + + /** + * 审批中 + */ + String IN_APPROVAL = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java new file mode 100644 index 0000000..a0b0274 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +/** + * @author cz + */ +public interface MeasureTypeEnum { + /** + * 自检 + */ + String INSIDE_MEASURE = "1"; + + /** + * 外包 + */ + String OTHERS_UNDERTAKE = "2"; + + /** + * 外检 + */ + String OUTSIDE_MEASURE = "3"; + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java new file mode 100644 index 0000000..83371aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +public interface OrderStatusEnum { + + /** + * 未接收 + */ + String NOT_RECEIVED = "1"; + /** + * 已接收 + */ + String ALREADY_RECEIVED = "2"; + /** + * 已取消 + */ + String ALREADY_CANCEL = "3"; + + /** + * 检测完成 + */ + String MEASURE_SUCCESS = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java new file mode 100644 index 0000000..d32da8d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java @@ -0,0 +1,23 @@ +package com.casic.missiles.enums.sample; + +/** + * @author cz + */ +public interface CertificationExpireStatusEnum { + + /** + * 未超期 + */ + String NORMAL = "0"; + + /** + * 即将超期，距离结束即将到30天 + */ + String ALMOST_EXPIRE = "1"; + + /** + * 已经超期 + */ + String ALREADY_EXPIRE = "2"; + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java index fde0627..8b73201 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.model.customer.CustomerSampleInfo; import org.apache.ibatis.annotations.Param; @@ -10,6 +12,8 @@ Long selectMaxSampleNo(); + Page measureRecordsBySampleId(Page page, @Param("request") MeasureRecordsIdRequest recordsIdRequest); + Page samplesByOderId(Page page, @Param("orderId") Long orderId, diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java deleted file mode 100644 index a086b38..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.missiles.mapper.customer.customize; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.customer.MesureRecordsResponse; - -public interface MesureRecordsResponseMapper extends BaseMapper { -} diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index f10fbb3..e7f5950 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -7,22 +7,56 @@ FROM customer_sample_info + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java new file mode 100644 index 0000000..ec13e19 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MeasureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java deleted file mode 100644 index f13b5d4..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.dto.customer; - -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author cz - * @date 2023-02-01 - */ -@Data -@ApiModel -public class MesureRecordsResponse { - - @ApiModelProperty(value = "委托书id", dataType = "Long") - private Long orderId; - - @ApiModelProperty(value = "委托单编号", dataType = "String") - private String orderCode; - - @ApiModelProperty(value = "委托单日期", dataType = "String") - private String orderTime; - - @ApiModelProperty(value = "委托人代码", dataType = "String") - private String customerCode; - - @ApiModelProperty(value = "委托人名称", dataType = "String") - private String customerName; - - @ApiModelProperty(value = "送检人", dataType = "String") - private String deliverer; - - @ApiModelProperty(value = "送检日期", dataType = "String") - private String deliverTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java index 2e8657f..c0a9a99 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -53,12 +53,12 @@ @TableField(exist = false) @ApiModelProperty(value = "样品状态", dataType = "String") @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.SAMPLE_STATUS) - private String sampleSatus; + private String sampleStatus; @TableField(exist = false) @ApiModelProperty(value = "样品状态", dataType = "String") @ExcelProperty(value = "样品状态", order = 5) - private String sampleSatusName; + private String sampleStatusName; @ApiModelProperty(value = "委托方名称", dataType = "String") @ExcelProperty(value = "委托方名称", order = 6) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java new file mode 100644 index 0000000..7bcf105 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java @@ -0,0 +1,22 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + */ + +@Data +@ApiModel("检测记录查询id") +public class MeasureRecordsIdRequest { + + @ApiModelProperty("样品Id") + private Long sampleId; + + @ApiModelProperty("客户id") + private Long customerId; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java index 2f97cb3..542f5ca 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.base.service.IBaseExportService; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; @@ -20,6 +19,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.business.CertificatePrintStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; import com.casic.missiles.model.business.BusinessCertificateReport; @@ -42,10 +42,9 @@ */ @Service @AllArgsConstructor -public class BusinessCertificatePrintServiceImpl extends ServiceImpl implements IBusinessCertificatePrintService { +public class BusinessCertificatePrintServiceImpl extends ServiceImpl implements IBusinessCertificatePrintService, CertificatePrintStatusEnum { private final IBaseApprovalService baseApprovalService; - private final AbstractDictService dictService; private final IBaseExportService iBaseExportService; private final ApprovalOperateService approvalOperateService; @@ -86,7 +85,7 @@ } /** - * 更新工作流审批状态为拒绝，当返回值成功时，进行打印状态置为不可打印，审批状态为不通过 + * 更新工作流审批状态为拒绝，当返回值成功时，进行打印状态置为不可打印，审批状态为不通过 * * @return */ @@ -103,7 +102,7 @@ BusinessCertificateReport certificateReport = new BusinessCertificateReport(); certificateReport.setId(request.getId()); //设置为不能打印 - certificateReport.setPrintStatus("2"); + certificateReport.setPrintStatus(NON_PRINTABLE); certificateReport.setApprovalStatus(ApprovalStatusEnum.FAILED); int row = this.baseMapper.updateById(certificateReport); if (row <= 0) { @@ -113,7 +112,7 @@ } /** - * 提交审批流程，修改证书审批状态为待审批，打印状态为审批中 + * 提交审批流程，修改证书审批状态为待审批，打印状态为审批中 */ @Transactional @Override @@ -128,7 +127,7 @@ //审批状态为审批中 certificateReport.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED); //打印状态审批中 - certificateReport.setPrintStatus("3"); + certificateReport.setPrintStatus(IN_APPROVAL); int row = this.baseMapper.updateById(certificateReport); if (row <= 0) { throw new BusinessException(BusinessExceptionEnum.AGAIN_PRINT_SUBMIT_FAILED.getCode(), BusinessExceptionEnum.AGAIN_PRINT_SUBMIT_FAILED.getMessage()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java index 859010b..0d847a0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.dto.customer.sample.CustomerSampleListVO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessInterchangeMapper; import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; @@ -35,7 +36,7 @@ * 业务管理-设备交接单 服务实现类 *

* - * @author wangpeng + * @author cz * @since 2023-02-02 */ @Service @@ -83,7 +84,7 @@ } /** - * 更新不对样品有任何操作 + * 更新只是交接单的变更，没有任何其他单位的变化 */ @Override public ReturnDTO updateExchange(BusinessInterchange businessInterchange) { @@ -94,6 +95,9 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + /** + * 交接单新增，同时在样品委托书管理表中新增交接单记录id + */ @Override @Transactional public ReturnDTO addExchange(BusinessInterchange businessInterchange) { @@ -111,6 +115,9 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + /** + * 选中判断ids存在，进行其他条件的清空 + */ @Override public void exportExchange(InterchangeListRequest request, HttpServletResponse response) { try { @@ -153,7 +160,7 @@ private void populationExchange(BusinessInterchange businessInterchange) { Long maxNo = this.baseMapper.selectMaxExchangeNo(); - String orderNo = NumberGeneratorUtil.getContactNo("jjdh", maxNo); + String orderNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.INTER_CHANGE_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); businessInterchange.setCreateUser(authUser.getId()); businessInterchange.setInterchangeCode(orderNo); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 832517f..f1c90e8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -12,6 +12,7 @@ import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.business.OrderStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessDealRecordMapper; import com.casic.missiles.model.business.BusinessDealRecord; @@ -44,7 +45,7 @@ @Api(tags = "委托书模块") @RequestMapping("/business/order") @AllArgsConstructor -public class BusinessOrderController extends ExportController { +public class BusinessOrderController extends ExportController implements OrderStatusEnum { private final IBusinessOrderService businessOrderService; @@ -119,7 +120,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "2"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_RECEIVED); } @ApiOperation("委托书退回") @@ -128,7 +129,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "3"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java index 7591c07..ae7a28d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -10,7 +10,6 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; import com.casic.missiles.dto.customer.Info.*; -import com.casic.missiles.dto.customer.MesureRecordsResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerInfo; @@ -102,19 +101,9 @@ return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); } - @ApiOperation("根据客户id查询检定记录-分页") - @PostMapping("/mesureRecords") - public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); - } - - @ApiOperation("客户删除") @PostMapping("/delete") - public ReturnDTO deleteCsutomer(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO deleteCustomer(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java index 9ae077e..c7d6b3f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -9,9 +9,10 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; -import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerSampleInfo; @@ -93,15 +94,13 @@ customerSampleService.sampleExport(request, response); } - @ApiOperation("根据样品id查询检定记录") - @PostMapping("/mesureRecordsBySampleId") - public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(idDTO.getId()))); + @ApiOperation("根据样品id或客户id查询检定记录") + @PostMapping("/measureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) { + return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest))); } + @ApiOperation("根据样品id查询检定证书") @PostMapping("/certificationBySampleId") public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { @@ -111,13 +110,4 @@ return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); } -// @ApiOperation("样品批量导入") -// @PostMapping("/batchImport") -// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return null; -// } - } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index 6b109a2..fbe403d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -1,5 +1,7 @@ package com.casic.missiles.enums; +import org.apache.xmlbeans.impl.xb.xsdschema.Public; + /** * @Description: 生成编号前缀枚举 * @Author: zt @@ -7,9 +9,31 @@ */ public interface PrefixCodeEnum { - //环境记录单编号生成前缀 - String ENVIRONMENT_PREFIX = "hjld"; - //原始记录单编号生成前缀 - String ORIGIN_PREFIX = "ysld"; + //环境记录单编号生成前缀 + String ENVIRONMENT_PREFIX = "hjld"; + //原始记录单编号生成前缀 + String ORIGIN_PREFIX = "ysld"; + + + /*************客户资源模块，tt notice**************/ + //样品编号 + String SAMPLE_PREFIX = "khyp"; + + //客户编号 + String CUSTOMER_PREFIX = "khxx"; + + //客户建议编号 + String CUSTOMER_ADVICE_PREFIX = "khjy"; + + //客户用户编号 + String CUSTOMER_USER_PREFIX = "khyh"; + + //委托书编号 + String ORDER_PREFIX = "wtsc"; + + /*************委托书调度，tt notice**************/ + //交接单编号 + String INTER_CHANGE_PREFIX = "jjdh"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java new file mode 100644 index 0000000..a013d67 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java @@ -0,0 +1,19 @@ +package com.casic.missiles.enums.business; + +public interface CertificatePrintStatusEnum { + + /** + * 不可打印 + */ + String PRINTABLE = "1"; + + /** + * 不可打印 + */ + String NON_PRINTABLE = "2"; + + /** + * 审批中 + */ + String IN_APPROVAL = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java new file mode 100644 index 0000000..a0b0274 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +/** + * @author cz + */ +public interface MeasureTypeEnum { + /** + * 自检 + */ + String INSIDE_MEASURE = "1"; + + /** + * 外包 + */ + String OTHERS_UNDERTAKE = "2"; + + /** + * 外检 + */ + String OUTSIDE_MEASURE = "3"; + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java new file mode 100644 index 0000000..83371aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +public interface OrderStatusEnum { + + /** + * 未接收 + */ + String NOT_RECEIVED = "1"; + /** + * 已接收 + */ + String ALREADY_RECEIVED = "2"; + /** + * 已取消 + */ + String ALREADY_CANCEL = "3"; + + /** + * 检测完成 + */ + String MEASURE_SUCCESS = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java new file mode 100644 index 0000000..d32da8d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java @@ -0,0 +1,23 @@ +package com.casic.missiles.enums.sample; + +/** + * @author cz + */ +public interface CertificationExpireStatusEnum { + + /** + * 未超期 + */ + String NORMAL = "0"; + + /** + * 即将超期，距离结束即将到30天 + */ + String ALMOST_EXPIRE = "1"; + + /** + * 已经超期 + */ + String ALREADY_EXPIRE = "2"; + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java index fde0627..8b73201 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.model.customer.CustomerSampleInfo; import org.apache.ibatis.annotations.Param; @@ -10,6 +12,8 @@ Long selectMaxSampleNo(); + Page measureRecordsBySampleId(Page page, @Param("request") MeasureRecordsIdRequest recordsIdRequest); + Page samplesByOderId(Page page, @Param("orderId") Long orderId, diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java deleted file mode 100644 index a086b38..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.missiles.mapper.customer.customize; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.customer.MesureRecordsResponse; - -public interface MesureRecordsResponseMapper extends BaseMapper { -} diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index f10fbb3..e7f5950 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -7,22 +7,56 @@ FROM customer_sample_info + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java new file mode 100644 index 0000000..ec13e19 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MeasureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java deleted file mode 100644 index f13b5d4..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.dto.customer; - -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author cz - * @date 2023-02-01 - */ -@Data -@ApiModel -public class MesureRecordsResponse { - - @ApiModelProperty(value = "委托书id", dataType = "Long") - private Long orderId; - - @ApiModelProperty(value = "委托单编号", dataType = "String") - private String orderCode; - - @ApiModelProperty(value = "委托单日期", dataType = "String") - private String orderTime; - - @ApiModelProperty(value = "委托人代码", dataType = "String") - private String customerCode; - - @ApiModelProperty(value = "委托人名称", dataType = "String") - private String customerName; - - @ApiModelProperty(value = "送检人", dataType = "String") - private String deliverer; - - @ApiModelProperty(value = "送检日期", dataType = "String") - private String deliverTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java index 2e8657f..c0a9a99 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -53,12 +53,12 @@ @TableField(exist = false) @ApiModelProperty(value = "样品状态", dataType = "String") @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.SAMPLE_STATUS) - private String sampleSatus; + private String sampleStatus; @TableField(exist = false) @ApiModelProperty(value = "样品状态", dataType = "String") @ExcelProperty(value = "样品状态", order = 5) - private String sampleSatusName; + private String sampleStatusName; @ApiModelProperty(value = "委托方名称", dataType = "String") @ExcelProperty(value = "委托方名称", order = 6) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java new file mode 100644 index 0000000..7bcf105 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java @@ -0,0 +1,22 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + */ + +@Data +@ApiModel("检测记录查询id") +public class MeasureRecordsIdRequest { + + @ApiModelProperty("样品Id") + private Long sampleId; + + @ApiModelProperty("客户id") + private Long customerId; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java index 2f97cb3..542f5ca 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.base.service.IBaseExportService; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; @@ -20,6 +19,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.business.CertificatePrintStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; import com.casic.missiles.model.business.BusinessCertificateReport; @@ -42,10 +42,9 @@ */ @Service @AllArgsConstructor -public class BusinessCertificatePrintServiceImpl extends ServiceImpl implements IBusinessCertificatePrintService { +public class BusinessCertificatePrintServiceImpl extends ServiceImpl implements IBusinessCertificatePrintService, CertificatePrintStatusEnum { private final IBaseApprovalService baseApprovalService; - private final AbstractDictService dictService; private final IBaseExportService iBaseExportService; private final ApprovalOperateService approvalOperateService; @@ -86,7 +85,7 @@ } /** - * 更新工作流审批状态为拒绝，当返回值成功时，进行打印状态置为不可打印，审批状态为不通过 + * 更新工作流审批状态为拒绝，当返回值成功时，进行打印状态置为不可打印，审批状态为不通过 * * @return */ @@ -103,7 +102,7 @@ BusinessCertificateReport certificateReport = new BusinessCertificateReport(); certificateReport.setId(request.getId()); //设置为不能打印 - certificateReport.setPrintStatus("2"); + certificateReport.setPrintStatus(NON_PRINTABLE); certificateReport.setApprovalStatus(ApprovalStatusEnum.FAILED); int row = this.baseMapper.updateById(certificateReport); if (row <= 0) { @@ -113,7 +112,7 @@ } /** - * 提交审批流程，修改证书审批状态为待审批，打印状态为审批中 + * 提交审批流程，修改证书审批状态为待审批，打印状态为审批中 */ @Transactional @Override @@ -128,7 +127,7 @@ //审批状态为审批中 certificateReport.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED); //打印状态审批中 - certificateReport.setPrintStatus("3"); + certificateReport.setPrintStatus(IN_APPROVAL); int row = this.baseMapper.updateById(certificateReport); if (row <= 0) { throw new BusinessException(BusinessExceptionEnum.AGAIN_PRINT_SUBMIT_FAILED.getCode(), BusinessExceptionEnum.AGAIN_PRINT_SUBMIT_FAILED.getMessage()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java index 859010b..0d847a0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.dto.customer.sample.CustomerSampleListVO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessInterchangeMapper; import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; @@ -35,7 +36,7 @@ * 业务管理-设备交接单 服务实现类 *

* - * @author wangpeng + * @author cz * @since 2023-02-02 */ @Service @@ -83,7 +84,7 @@ } /** - * 更新不对样品有任何操作 + * 更新只是交接单的变更，没有任何其他单位的变化 */ @Override public ReturnDTO updateExchange(BusinessInterchange businessInterchange) { @@ -94,6 +95,9 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + /** + * 交接单新增，同时在样品委托书管理表中新增交接单记录id + */ @Override @Transactional public ReturnDTO addExchange(BusinessInterchange businessInterchange) { @@ -111,6 +115,9 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + /** + * 选中判断ids存在，进行其他条件的清空 + */ @Override public void exportExchange(InterchangeListRequest request, HttpServletResponse response) { try { @@ -153,7 +160,7 @@ private void populationExchange(BusinessInterchange businessInterchange) { Long maxNo = this.baseMapper.selectMaxExchangeNo(); - String orderNo = NumberGeneratorUtil.getContactNo("jjdh", maxNo); + String orderNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.INTER_CHANGE_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); businessInterchange.setCreateUser(authUser.getId()); businessInterchange.setInterchangeCode(orderNo); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java index 138a1e2..d6bb339 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -14,6 +14,10 @@ import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.PrefixCodeEnum; +import com.casic.missiles.enums.business.MeasureTypeEnum; +import com.casic.missiles.enums.business.OrderStatusEnum; +import com.casic.missiles.enums.sample.SampleStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessDealRecordMapper; import com.casic.missiles.mapper.business.BusinessOrderListReponseMapper; @@ -35,7 +39,6 @@ import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -50,7 +53,7 @@ */ @Service @AllArgsConstructor -public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService { +public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService,PrefixCodeEnum, OrderStatusEnum,SampleStatusEnum, MeasureTypeEnum { private final BusinessOrderListReponseMapper orderListResponseMapper; private final IBaseExportService iBaseExportService; @@ -203,9 +206,9 @@ public ReturnDTO updateStatusById(OrderCancelRequest orderCancelRequest, String status) { int updateFlag = doUpdateStatusById(orderCancelRequest.getId(), status); String dealType = ""; - if (status.equals("2")) { + if (status.equals(ALREADY_RECEIVED)) { dealType = "委托书接收" ; - doUpdateSampleStatus(orderCancelRequest.getId(),"1"); + doUpdateSampleStatus(orderCancelRequest.getId(),TO_RECEIVE); } else { dealType = "委托书退回"; } @@ -222,7 +225,7 @@ @Override @Transactional public ReturnDTO cancelOrder(OrderCancelRequest orderCancelRequest) { - int updateFlag = this.doUpdateStatusById(orderCancelRequest.getId(), "3"); + int updateFlag = this.doUpdateStatusById(orderCancelRequest.getId(), ALREADY_CANCEL); int addDealRecordFlag = addDealRecord(orderCancelRequest, "委托书取消"); if (updateFlag > 0 && addDealRecordFlag > 0) { return ReturnUtil.success(); @@ -287,12 +290,12 @@ private void initOrderInfo(BusinessOrder businessOrder) { Long maxNo = this.baseMapper.selectMaxCOrderNo(); - String orderNo = NumberGeneratorUtil.getContactNo("wtsc", maxNo); + String orderNo = NumberGeneratorUtil.getContactNo(ORDER_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); businessOrder.setCreateUser(authUser.getId()); businessOrder.setUpdateUser(authUser.getId()); businessOrder.setOrderCode(orderNo); - businessOrder.setStatus("1"); + businessOrder.setStatus(NOT_RECEIVED); } /** @@ -327,7 +330,7 @@ sampleStatusPopulation.setOrderId(orderId); sampleStatusPopulation.setSampleId(sampleId); sampleStatusPopulation.setMeasureContent(measureContent); - sampleStatusPopulation.setMeasureType("1"); + sampleStatusPopulation.setMeasureType(INSIDE_MEASURE); return this.sampleRelationMapper.insert(sampleStatusPopulation); } @@ -337,7 +340,6 @@ private int doUpdateSampleStatus(Long orderId, String sampleStatus) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("order_id", orderId); -// queryWrapper.isNull("sampleStatus"); BusinessOrderSampleRelation orderSample = new BusinessOrderSampleRelation(); orderSample.setId(orderId); orderSample.setSampleStatus(sampleStatus); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 832517f..f1c90e8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -12,6 +12,7 @@ import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.business.OrderStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessDealRecordMapper; import com.casic.missiles.model.business.BusinessDealRecord; @@ -44,7 +45,7 @@ @Api(tags = "委托书模块") @RequestMapping("/business/order") @AllArgsConstructor -public class BusinessOrderController extends ExportController { +public class BusinessOrderController extends ExportController implements OrderStatusEnum { private final IBusinessOrderService businessOrderService; @@ -119,7 +120,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "2"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_RECEIVED); } @ApiOperation("委托书退回") @@ -128,7 +129,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "3"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java index 7591c07..ae7a28d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -10,7 +10,6 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; import com.casic.missiles.dto.customer.Info.*; -import com.casic.missiles.dto.customer.MesureRecordsResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerInfo; @@ -102,19 +101,9 @@ return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); } - @ApiOperation("根据客户id查询检定记录-分页") - @PostMapping("/mesureRecords") - public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); - } - - @ApiOperation("客户删除") @PostMapping("/delete") - public ReturnDTO deleteCsutomer(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO deleteCustomer(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java index 9ae077e..c7d6b3f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -9,9 +9,10 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; -import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerSampleInfo; @@ -93,15 +94,13 @@ customerSampleService.sampleExport(request, response); } - @ApiOperation("根据样品id查询检定记录") - @PostMapping("/mesureRecordsBySampleId") - public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(idDTO.getId()))); + @ApiOperation("根据样品id或客户id查询检定记录") + @PostMapping("/measureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) { + return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest))); } + @ApiOperation("根据样品id查询检定证书") @PostMapping("/certificationBySampleId") public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { @@ -111,13 +110,4 @@ return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); } -// @ApiOperation("样品批量导入") -// @PostMapping("/batchImport") -// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return null; -// } - } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index 6b109a2..fbe403d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -1,5 +1,7 @@ package com.casic.missiles.enums; +import org.apache.xmlbeans.impl.xb.xsdschema.Public; + /** * @Description: 生成编号前缀枚举 * @Author: zt @@ -7,9 +9,31 @@ */ public interface PrefixCodeEnum { - //环境记录单编号生成前缀 - String ENVIRONMENT_PREFIX = "hjld"; - //原始记录单编号生成前缀 - String ORIGIN_PREFIX = "ysld"; + //环境记录单编号生成前缀 + String ENVIRONMENT_PREFIX = "hjld"; + //原始记录单编号生成前缀 + String ORIGIN_PREFIX = "ysld"; + + + /*************客户资源模块，tt notice**************/ + //样品编号 + String SAMPLE_PREFIX = "khyp"; + + //客户编号 + String CUSTOMER_PREFIX = "khxx"; + + //客户建议编号 + String CUSTOMER_ADVICE_PREFIX = "khjy"; + + //客户用户编号 + String CUSTOMER_USER_PREFIX = "khyh"; + + //委托书编号 + String ORDER_PREFIX = "wtsc"; + + /*************委托书调度，tt notice**************/ + //交接单编号 + String INTER_CHANGE_PREFIX = "jjdh"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java new file mode 100644 index 0000000..a013d67 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java @@ -0,0 +1,19 @@ +package com.casic.missiles.enums.business; + +public interface CertificatePrintStatusEnum { + + /** + * 不可打印 + */ + String PRINTABLE = "1"; + + /** + * 不可打印 + */ + String NON_PRINTABLE = "2"; + + /** + * 审批中 + */ + String IN_APPROVAL = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java new file mode 100644 index 0000000..a0b0274 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +/** + * @author cz + */ +public interface MeasureTypeEnum { + /** + * 自检 + */ + String INSIDE_MEASURE = "1"; + + /** + * 外包 + */ + String OTHERS_UNDERTAKE = "2"; + + /** + * 外检 + */ + String OUTSIDE_MEASURE = "3"; + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java new file mode 100644 index 0000000..83371aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +public interface OrderStatusEnum { + + /** + * 未接收 + */ + String NOT_RECEIVED = "1"; + /** + * 已接收 + */ + String ALREADY_RECEIVED = "2"; + /** + * 已取消 + */ + String ALREADY_CANCEL = "3"; + + /** + * 检测完成 + */ + String MEASURE_SUCCESS = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java new file mode 100644 index 0000000..d32da8d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java @@ -0,0 +1,23 @@ +package com.casic.missiles.enums.sample; + +/** + * @author cz + */ +public interface CertificationExpireStatusEnum { + + /** + * 未超期 + */ + String NORMAL = "0"; + + /** + * 即将超期，距离结束即将到30天 + */ + String ALMOST_EXPIRE = "1"; + + /** + * 已经超期 + */ + String ALREADY_EXPIRE = "2"; + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java index fde0627..8b73201 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.model.customer.CustomerSampleInfo; import org.apache.ibatis.annotations.Param; @@ -10,6 +12,8 @@ Long selectMaxSampleNo(); + Page measureRecordsBySampleId(Page page, @Param("request") MeasureRecordsIdRequest recordsIdRequest); + Page samplesByOderId(Page page, @Param("orderId") Long orderId, diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java deleted file mode 100644 index a086b38..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.missiles.mapper.customer.customize; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.customer.MesureRecordsResponse; - -public interface MesureRecordsResponseMapper extends BaseMapper { -} diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index f10fbb3..e7f5950 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -7,22 +7,56 @@ FROM customer_sample_info + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java new file mode 100644 index 0000000..ec13e19 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MeasureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java deleted file mode 100644 index f13b5d4..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.dto.customer; - -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author cz - * @date 2023-02-01 - */ -@Data -@ApiModel -public class MesureRecordsResponse { - - @ApiModelProperty(value = "委托书id", dataType = "Long") - private Long orderId; - - @ApiModelProperty(value = "委托单编号", dataType = "String") - private String orderCode; - - @ApiModelProperty(value = "委托单日期", dataType = "String") - private String orderTime; - - @ApiModelProperty(value = "委托人代码", dataType = "String") - private String customerCode; - - @ApiModelProperty(value = "委托人名称", dataType = "String") - private String customerName; - - @ApiModelProperty(value = "送检人", dataType = "String") - private String deliverer; - - @ApiModelProperty(value = "送检日期", dataType = "String") - private String deliverTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java index 2e8657f..c0a9a99 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -53,12 +53,12 @@ @TableField(exist = false) @ApiModelProperty(value = "样品状态", dataType = "String") @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.SAMPLE_STATUS) - private String sampleSatus; + private String sampleStatus; @TableField(exist = false) @ApiModelProperty(value = "样品状态", dataType = "String") @ExcelProperty(value = "样品状态", order = 5) - private String sampleSatusName; + private String sampleStatusName; @ApiModelProperty(value = "委托方名称", dataType = "String") @ExcelProperty(value = "委托方名称", order = 6) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java new file mode 100644 index 0000000..7bcf105 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java @@ -0,0 +1,22 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + */ + +@Data +@ApiModel("检测记录查询id") +public class MeasureRecordsIdRequest { + + @ApiModelProperty("样品Id") + private Long sampleId; + + @ApiModelProperty("客户id") + private Long customerId; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java index 2f97cb3..542f5ca 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.base.service.IBaseExportService; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; @@ -20,6 +19,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.business.CertificatePrintStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; import com.casic.missiles.model.business.BusinessCertificateReport; @@ -42,10 +42,9 @@ */ @Service @AllArgsConstructor -public class BusinessCertificatePrintServiceImpl extends ServiceImpl implements IBusinessCertificatePrintService { +public class BusinessCertificatePrintServiceImpl extends ServiceImpl implements IBusinessCertificatePrintService, CertificatePrintStatusEnum { private final IBaseApprovalService baseApprovalService; - private final AbstractDictService dictService; private final IBaseExportService iBaseExportService; private final ApprovalOperateService approvalOperateService; @@ -86,7 +85,7 @@ } /** - * 更新工作流审批状态为拒绝，当返回值成功时，进行打印状态置为不可打印，审批状态为不通过 + * 更新工作流审批状态为拒绝，当返回值成功时，进行打印状态置为不可打印，审批状态为不通过 * * @return */ @@ -103,7 +102,7 @@ BusinessCertificateReport certificateReport = new BusinessCertificateReport(); certificateReport.setId(request.getId()); //设置为不能打印 - certificateReport.setPrintStatus("2"); + certificateReport.setPrintStatus(NON_PRINTABLE); certificateReport.setApprovalStatus(ApprovalStatusEnum.FAILED); int row = this.baseMapper.updateById(certificateReport); if (row <= 0) { @@ -113,7 +112,7 @@ } /** - * 提交审批流程，修改证书审批状态为待审批，打印状态为审批中 + * 提交审批流程，修改证书审批状态为待审批，打印状态为审批中 */ @Transactional @Override @@ -128,7 +127,7 @@ //审批状态为审批中 certificateReport.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED); //打印状态审批中 - certificateReport.setPrintStatus("3"); + certificateReport.setPrintStatus(IN_APPROVAL); int row = this.baseMapper.updateById(certificateReport); if (row <= 0) { throw new BusinessException(BusinessExceptionEnum.AGAIN_PRINT_SUBMIT_FAILED.getCode(), BusinessExceptionEnum.AGAIN_PRINT_SUBMIT_FAILED.getMessage()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java index 859010b..0d847a0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.dto.customer.sample.CustomerSampleListVO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessInterchangeMapper; import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; @@ -35,7 +36,7 @@ * 业务管理-设备交接单 服务实现类 *

* - * @author wangpeng + * @author cz * @since 2023-02-02 */ @Service @@ -83,7 +84,7 @@ } /** - * 更新不对样品有任何操作 + * 更新只是交接单的变更，没有任何其他单位的变化 */ @Override public ReturnDTO updateExchange(BusinessInterchange businessInterchange) { @@ -94,6 +95,9 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + /** + * 交接单新增，同时在样品委托书管理表中新增交接单记录id + */ @Override @Transactional public ReturnDTO addExchange(BusinessInterchange businessInterchange) { @@ -111,6 +115,9 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + /** + * 选中判断ids存在，进行其他条件的清空 + */ @Override public void exportExchange(InterchangeListRequest request, HttpServletResponse response) { try { @@ -153,7 +160,7 @@ private void populationExchange(BusinessInterchange businessInterchange) { Long maxNo = this.baseMapper.selectMaxExchangeNo(); - String orderNo = NumberGeneratorUtil.getContactNo("jjdh", maxNo); + String orderNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.INTER_CHANGE_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); businessInterchange.setCreateUser(authUser.getId()); businessInterchange.setInterchangeCode(orderNo); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java index 138a1e2..d6bb339 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -14,6 +14,10 @@ import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.PrefixCodeEnum; +import com.casic.missiles.enums.business.MeasureTypeEnum; +import com.casic.missiles.enums.business.OrderStatusEnum; +import com.casic.missiles.enums.sample.SampleStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessDealRecordMapper; import com.casic.missiles.mapper.business.BusinessOrderListReponseMapper; @@ -35,7 +39,6 @@ import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -50,7 +53,7 @@ */ @Service @AllArgsConstructor -public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService { +public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService,PrefixCodeEnum, OrderStatusEnum,SampleStatusEnum, MeasureTypeEnum { private final BusinessOrderListReponseMapper orderListResponseMapper; private final IBaseExportService iBaseExportService; @@ -203,9 +206,9 @@ public ReturnDTO updateStatusById(OrderCancelRequest orderCancelRequest, String status) { int updateFlag = doUpdateStatusById(orderCancelRequest.getId(), status); String dealType = ""; - if (status.equals("2")) { + if (status.equals(ALREADY_RECEIVED)) { dealType = "委托书接收" ; - doUpdateSampleStatus(orderCancelRequest.getId(),"1"); + doUpdateSampleStatus(orderCancelRequest.getId(),TO_RECEIVE); } else { dealType = "委托书退回"; } @@ -222,7 +225,7 @@ @Override @Transactional public ReturnDTO cancelOrder(OrderCancelRequest orderCancelRequest) { - int updateFlag = this.doUpdateStatusById(orderCancelRequest.getId(), "3"); + int updateFlag = this.doUpdateStatusById(orderCancelRequest.getId(), ALREADY_CANCEL); int addDealRecordFlag = addDealRecord(orderCancelRequest, "委托书取消"); if (updateFlag > 0 && addDealRecordFlag > 0) { return ReturnUtil.success(); @@ -287,12 +290,12 @@ private void initOrderInfo(BusinessOrder businessOrder) { Long maxNo = this.baseMapper.selectMaxCOrderNo(); - String orderNo = NumberGeneratorUtil.getContactNo("wtsc", maxNo); + String orderNo = NumberGeneratorUtil.getContactNo(ORDER_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); businessOrder.setCreateUser(authUser.getId()); businessOrder.setUpdateUser(authUser.getId()); businessOrder.setOrderCode(orderNo); - businessOrder.setStatus("1"); + businessOrder.setStatus(NOT_RECEIVED); } /** @@ -327,7 +330,7 @@ sampleStatusPopulation.setOrderId(orderId); sampleStatusPopulation.setSampleId(sampleId); sampleStatusPopulation.setMeasureContent(measureContent); - sampleStatusPopulation.setMeasureType("1"); + sampleStatusPopulation.setMeasureType(INSIDE_MEASURE); return this.sampleRelationMapper.insert(sampleStatusPopulation); } @@ -337,7 +340,6 @@ private int doUpdateSampleStatus(Long orderId, String sampleStatus) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("order_id", orderId); -// queryWrapper.isNull("sampleStatus"); BusinessOrderSampleRelation orderSample = new BusinessOrderSampleRelation(); orderSample.setId(orderId); orderSample.setSampleStatus(sampleStatus); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java index 07c88e9..c2e8995 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java @@ -14,6 +14,7 @@ import com.casic.missiles.dto.business.dispatch.DeviceStatusChangeDTO; import com.casic.missiles.enums.*; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.business.MeasureTypeEnum; import com.casic.missiles.enums.sample.CurrentSegmentEnum; import com.casic.missiles.enums.sample.SampleStatusEnum; import com.casic.missiles.exception.BusinessException; @@ -39,7 +40,7 @@ @Service @Slf4j @AllArgsConstructor -public class IBusinessDispatchServiceImpl extends ServiceImpl implements IBusinessDispatchService { +public class IBusinessDispatchServiceImpl extends ServiceImpl implements IBusinessDispatchService, SampleStatusEnum, CurrentSegmentEnum, MeasureTypeEnum { private final BusinessOrderSampleRelationMapper orderSampleRelationMapper; private final BusinessCertificateReportMapper certificateReportMapper; @@ -73,20 +74,20 @@ Long sampleId = dispatchVO.getSampleId(); String sampleStatus = dispatchVO.getSampleStatus(); //先过滤超期状态下的外检外包 - if (!StringUtils.isEmpty(request.getSampleStatus()) && SampleStatusEnum.BE_OVERDUE.equals(request.getSampleStatus()) && notSelfMeasure(dispatchVO)) { + if (!StringUtils.isEmpty(request.getSampleStatus()) && BE_OVERDUE.equals(request.getSampleStatus()) && notSelfMeasure(dispatchVO)) { return; } switch (sampleStatus) { //待分发状态，当前检定环节:待分配，已出具证书：无，出具证书总数:无 - case SampleStatusEnum.TO_HANDOUT: + case TO_HANDOUT: //检测中状态，当前检定环节:具体实验室，已出具证书：查询证书报告表，证书总数：具体实验室 - case SampleStatusEnum.IN_MEASURE: + case IN_MEASURE: //检测完状态，当前检定环节:完成，已出具证书：无，出具证书总数:无 - case SampleStatusEnum.MEASURE_COMPLETE: + case MEASURE_COMPLETE: doDispatchVoPopulation(dispatchVO, sampleId, orderId); return; //超期样品(即检测超期，未在应检完时间检完),当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室 - case SampleStatusEnum.BE_OVERDUE: + case BE_OVERDUE: HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId); Long deptId = Optional.of(overLabExecutiveDTO.getMeasureDeptId()).orElse(null); dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, deptId)); @@ -126,7 +127,7 @@ /** - * 状态更新 + * 根据sampleId，orderId,进行状态更新 */ @Override public ReturnDTO statusChange(DeviceStatusChangeDTO deviceStatusChangeDTO) { @@ -214,6 +215,9 @@ return handOutLabExecutiveDTOOptional.orElse(null); } + /** + * 构建证书的查询条件 + */ private QueryWrapper getCertificateReportWrapper(DeviceDispatchVO dispatchVO, Long deptId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("order_id", dispatchVO.getOrderId()); @@ -230,7 +234,8 @@ queryWrapper.eq("order_id", statusChangeDTO.getOrderId()); queryWrapper.eq("sample_id", statusChangeDTO.getSampleId()); if (terminateFlag) { - queryWrapper.eq("sample_status", "2").or().eq("sample_status", "3").or().eq("sample_status", "4"); + //若是终止，需要对应待分发、检测中、检测完三个状态的变更 + queryWrapper.eq("sample_status", TO_HANDOUT).or().eq("sample_status", IN_MEASURE).or().eq("sample_status", MEASURE_COMPLETE); } BusinessOrderSampleRelation businessOrderSampleRelation = new BusinessOrderSampleRelation(); businessOrderSampleRelation.setSampleStatus(statusChangeDTO.getStatus()); @@ -238,12 +243,12 @@ } /** - * 判断不是自检 + * 判断不是自检,即外包和外检，进行环节设定 */ private boolean notSelfMeasure(DeviceDispatchVO dispatchVO) { if (!ObjectUtils.isEmpty(dispatchVO.getMeasureType())) { - if (MeasureStatusEnum.TO_ALLOCATE.equals(String.valueOf(dispatchVO.getMeasureType())) || MeasureStatusEnum.TO_MEASURE.equals(String.valueOf(dispatchVO.getMeasureType()))) { - String currentSegment = MeasureStatusEnum.TO_ALLOCATE.equals(dispatchVO.getMeasureType()) ? CurrentSegmentEnum.OUT_UNDERTAKE : CurrentSegmentEnum.OUT_MESASUR; + if (OTHERS_UNDERTAKE.equals(String.valueOf(dispatchVO.getMeasureType())) || OUTSIDE_MEASURE.equals(String.valueOf(dispatchVO.getMeasureType()))) { + String currentSegment = OTHERS_UNDERTAKE.equals(dispatchVO.getMeasureType()) ? OUT_UNDERTAKE : OUT_MESASUR; dispatchVO.setCurrentSegment(currentSegment); return true; } @@ -251,6 +256,9 @@ return false; } + /** + * 其他条件的置为空 + */ private void initDeviceDispatchDTOEmpty(DeviceDispatchDTO request) { request.setSampleName(null); request.setSampleNo(null); @@ -264,15 +272,15 @@ } /** - * 判断样品是完成或接收状态，直接显示即可 + * 判断样品是完成或接收状态，进行当前阶段环节的设置 */ private Boolean checkSampleFinishStatus(DeviceDispatchVO dispatchVO) { - if (SampleStatusEnum.TO_RECEIVE.equals(dispatchVO.getSampleStatus())) { - dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_INCOME); + if (TO_RECEIVE.equals(dispatchVO.getSampleStatus())) { + dispatchVO.setCurrentSegment(TO_INCOME); return true; } - if (SampleStatusEnum.TO_HANDOUT.equals(dispatchVO.getSampleStatus())) { - dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE); + if (TO_HANDOUT.equals(dispatchVO.getSampleStatus())) { + dispatchVO.setCurrentSegment(TO_ALLOCATE); return true; } return false; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 832517f..f1c90e8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -12,6 +12,7 @@ import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.business.OrderStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessDealRecordMapper; import com.casic.missiles.model.business.BusinessDealRecord; @@ -44,7 +45,7 @@ @Api(tags = "委托书模块") @RequestMapping("/business/order") @AllArgsConstructor -public class BusinessOrderController extends ExportController { +public class BusinessOrderController extends ExportController implements OrderStatusEnum { private final IBusinessOrderService businessOrderService; @@ -119,7 +120,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "2"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_RECEIVED); } @ApiOperation("委托书退回") @@ -128,7 +129,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "3"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java index 7591c07..ae7a28d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -10,7 +10,6 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; import com.casic.missiles.dto.customer.Info.*; -import com.casic.missiles.dto.customer.MesureRecordsResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerInfo; @@ -102,19 +101,9 @@ return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); } - @ApiOperation("根据客户id查询检定记录-分页") - @PostMapping("/mesureRecords") - public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); - } - - @ApiOperation("客户删除") @PostMapping("/delete") - public ReturnDTO deleteCsutomer(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO deleteCustomer(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java index 9ae077e..c7d6b3f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -9,9 +9,10 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; -import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerSampleInfo; @@ -93,15 +94,13 @@ customerSampleService.sampleExport(request, response); } - @ApiOperation("根据样品id查询检定记录") - @PostMapping("/mesureRecordsBySampleId") - public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(idDTO.getId()))); + @ApiOperation("根据样品id或客户id查询检定记录") + @PostMapping("/measureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) { + return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest))); } + @ApiOperation("根据样品id查询检定证书") @PostMapping("/certificationBySampleId") public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { @@ -111,13 +110,4 @@ return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); } -// @ApiOperation("样品批量导入") -// @PostMapping("/batchImport") -// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return null; -// } - } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index 6b109a2..fbe403d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -1,5 +1,7 @@ package com.casic.missiles.enums; +import org.apache.xmlbeans.impl.xb.xsdschema.Public; + /** * @Description: 生成编号前缀枚举 * @Author: zt @@ -7,9 +9,31 @@ */ public interface PrefixCodeEnum { - //环境记录单编号生成前缀 - String ENVIRONMENT_PREFIX = "hjld"; - //原始记录单编号生成前缀 - String ORIGIN_PREFIX = "ysld"; + //环境记录单编号生成前缀 + String ENVIRONMENT_PREFIX = "hjld"; + //原始记录单编号生成前缀 + String ORIGIN_PREFIX = "ysld"; + + + /*************客户资源模块，tt notice**************/ + //样品编号 + String SAMPLE_PREFIX = "khyp"; + + //客户编号 + String CUSTOMER_PREFIX = "khxx"; + + //客户建议编号 + String CUSTOMER_ADVICE_PREFIX = "khjy"; + + //客户用户编号 + String CUSTOMER_USER_PREFIX = "khyh"; + + //委托书编号 + String ORDER_PREFIX = "wtsc"; + + /*************委托书调度，tt notice**************/ + //交接单编号 + String INTER_CHANGE_PREFIX = "jjdh"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java new file mode 100644 index 0000000..a013d67 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java @@ -0,0 +1,19 @@ +package com.casic.missiles.enums.business; + +public interface CertificatePrintStatusEnum { + + /** + * 不可打印 + */ + String PRINTABLE = "1"; + + /** + * 不可打印 + */ + String NON_PRINTABLE = "2"; + + /** + * 审批中 + */ + String IN_APPROVAL = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java new file mode 100644 index 0000000..a0b0274 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +/** + * @author cz + */ +public interface MeasureTypeEnum { + /** + * 自检 + */ + String INSIDE_MEASURE = "1"; + + /** + * 外包 + */ + String OTHERS_UNDERTAKE = "2"; + + /** + * 外检 + */ + String OUTSIDE_MEASURE = "3"; + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java new file mode 100644 index 0000000..83371aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +public interface OrderStatusEnum { + + /** + * 未接收 + */ + String NOT_RECEIVED = "1"; + /** + * 已接收 + */ + String ALREADY_RECEIVED = "2"; + /** + * 已取消 + */ + String ALREADY_CANCEL = "3"; + + /** + * 检测完成 + */ + String MEASURE_SUCCESS = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java new file mode 100644 index 0000000..d32da8d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java @@ -0,0 +1,23 @@ +package com.casic.missiles.enums.sample; + +/** + * @author cz + */ +public interface CertificationExpireStatusEnum { + + /** + * 未超期 + */ + String NORMAL = "0"; + + /** + * 即将超期，距离结束即将到30天 + */ + String ALMOST_EXPIRE = "1"; + + /** + * 已经超期 + */ + String ALREADY_EXPIRE = "2"; + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java index fde0627..8b73201 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.model.customer.CustomerSampleInfo; import org.apache.ibatis.annotations.Param; @@ -10,6 +12,8 @@ Long selectMaxSampleNo(); + Page measureRecordsBySampleId(Page page, @Param("request") MeasureRecordsIdRequest recordsIdRequest); + Page samplesByOderId(Page page, @Param("orderId") Long orderId, diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java deleted file mode 100644 index a086b38..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.missiles.mapper.customer.customize; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.customer.MesureRecordsResponse; - -public interface MesureRecordsResponseMapper extends BaseMapper { -} diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index f10fbb3..e7f5950 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -7,22 +7,56 @@ FROM customer_sample_info + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java new file mode 100644 index 0000000..ec13e19 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MeasureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java deleted file mode 100644 index f13b5d4..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.dto.customer; - -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author cz - * @date 2023-02-01 - */ -@Data -@ApiModel -public class MesureRecordsResponse { - - @ApiModelProperty(value = "委托书id", dataType = "Long") - private Long orderId; - - @ApiModelProperty(value = "委托单编号", dataType = "String") - private String orderCode; - - @ApiModelProperty(value = "委托单日期", dataType = "String") - private String orderTime; - - @ApiModelProperty(value = "委托人代码", dataType = "String") - private String customerCode; - - @ApiModelProperty(value = "委托人名称", dataType = "String") - private String customerName; - - @ApiModelProperty(value = "送检人", dataType = "String") - private String deliverer; - - @ApiModelProperty(value = "送检日期", dataType = "String") - private String deliverTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java index 2e8657f..c0a9a99 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -53,12 +53,12 @@ @TableField(exist = false) @ApiModelProperty(value = "样品状态", dataType = "String") @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.SAMPLE_STATUS) - private String sampleSatus; + private String sampleStatus; @TableField(exist = false) @ApiModelProperty(value = "样品状态", dataType = "String") @ExcelProperty(value = "样品状态", order = 5) - private String sampleSatusName; + private String sampleStatusName; @ApiModelProperty(value = "委托方名称", dataType = "String") @ExcelProperty(value = "委托方名称", order = 6) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java new file mode 100644 index 0000000..7bcf105 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java @@ -0,0 +1,22 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + */ + +@Data +@ApiModel("检测记录查询id") +public class MeasureRecordsIdRequest { + + @ApiModelProperty("样品Id") + private Long sampleId; + + @ApiModelProperty("客户id") + private Long customerId; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java index 2f97cb3..542f5ca 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.base.service.IBaseExportService; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; @@ -20,6 +19,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.business.CertificatePrintStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; import com.casic.missiles.model.business.BusinessCertificateReport; @@ -42,10 +42,9 @@ */ @Service @AllArgsConstructor -public class BusinessCertificatePrintServiceImpl extends ServiceImpl implements IBusinessCertificatePrintService { +public class BusinessCertificatePrintServiceImpl extends ServiceImpl implements IBusinessCertificatePrintService, CertificatePrintStatusEnum { private final IBaseApprovalService baseApprovalService; - private final AbstractDictService dictService; private final IBaseExportService iBaseExportService; private final ApprovalOperateService approvalOperateService; @@ -86,7 +85,7 @@ } /** - * 更新工作流审批状态为拒绝，当返回值成功时，进行打印状态置为不可打印，审批状态为不通过 + * 更新工作流审批状态为拒绝，当返回值成功时，进行打印状态置为不可打印，审批状态为不通过 * * @return */ @@ -103,7 +102,7 @@ BusinessCertificateReport certificateReport = new BusinessCertificateReport(); certificateReport.setId(request.getId()); //设置为不能打印 - certificateReport.setPrintStatus("2"); + certificateReport.setPrintStatus(NON_PRINTABLE); certificateReport.setApprovalStatus(ApprovalStatusEnum.FAILED); int row = this.baseMapper.updateById(certificateReport); if (row <= 0) { @@ -113,7 +112,7 @@ } /** - * 提交审批流程，修改证书审批状态为待审批，打印状态为审批中 + * 提交审批流程，修改证书审批状态为待审批，打印状态为审批中 */ @Transactional @Override @@ -128,7 +127,7 @@ //审批状态为审批中 certificateReport.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED); //打印状态审批中 - certificateReport.setPrintStatus("3"); + certificateReport.setPrintStatus(IN_APPROVAL); int row = this.baseMapper.updateById(certificateReport); if (row <= 0) { throw new BusinessException(BusinessExceptionEnum.AGAIN_PRINT_SUBMIT_FAILED.getCode(), BusinessExceptionEnum.AGAIN_PRINT_SUBMIT_FAILED.getMessage()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java index 859010b..0d847a0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.dto.customer.sample.CustomerSampleListVO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessInterchangeMapper; import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; @@ -35,7 +36,7 @@ * 业务管理-设备交接单 服务实现类 *

* - * @author wangpeng + * @author cz * @since 2023-02-02 */ @Service @@ -83,7 +84,7 @@ } /** - * 更新不对样品有任何操作 + * 更新只是交接单的变更，没有任何其他单位的变化 */ @Override public ReturnDTO updateExchange(BusinessInterchange businessInterchange) { @@ -94,6 +95,9 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + /** + * 交接单新增，同时在样品委托书管理表中新增交接单记录id + */ @Override @Transactional public ReturnDTO addExchange(BusinessInterchange businessInterchange) { @@ -111,6 +115,9 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + /** + * 选中判断ids存在，进行其他条件的清空 + */ @Override public void exportExchange(InterchangeListRequest request, HttpServletResponse response) { try { @@ -153,7 +160,7 @@ private void populationExchange(BusinessInterchange businessInterchange) { Long maxNo = this.baseMapper.selectMaxExchangeNo(); - String orderNo = NumberGeneratorUtil.getContactNo("jjdh", maxNo); + String orderNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.INTER_CHANGE_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); businessInterchange.setCreateUser(authUser.getId()); businessInterchange.setInterchangeCode(orderNo); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java index 138a1e2..d6bb339 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -14,6 +14,10 @@ import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.PrefixCodeEnum; +import com.casic.missiles.enums.business.MeasureTypeEnum; +import com.casic.missiles.enums.business.OrderStatusEnum; +import com.casic.missiles.enums.sample.SampleStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessDealRecordMapper; import com.casic.missiles.mapper.business.BusinessOrderListReponseMapper; @@ -35,7 +39,6 @@ import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -50,7 +53,7 @@ */ @Service @AllArgsConstructor -public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService { +public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService,PrefixCodeEnum, OrderStatusEnum,SampleStatusEnum, MeasureTypeEnum { private final BusinessOrderListReponseMapper orderListResponseMapper; private final IBaseExportService iBaseExportService; @@ -203,9 +206,9 @@ public ReturnDTO updateStatusById(OrderCancelRequest orderCancelRequest, String status) { int updateFlag = doUpdateStatusById(orderCancelRequest.getId(), status); String dealType = ""; - if (status.equals("2")) { + if (status.equals(ALREADY_RECEIVED)) { dealType = "委托书接收" ; - doUpdateSampleStatus(orderCancelRequest.getId(),"1"); + doUpdateSampleStatus(orderCancelRequest.getId(),TO_RECEIVE); } else { dealType = "委托书退回"; } @@ -222,7 +225,7 @@ @Override @Transactional public ReturnDTO cancelOrder(OrderCancelRequest orderCancelRequest) { - int updateFlag = this.doUpdateStatusById(orderCancelRequest.getId(), "3"); + int updateFlag = this.doUpdateStatusById(orderCancelRequest.getId(), ALREADY_CANCEL); int addDealRecordFlag = addDealRecord(orderCancelRequest, "委托书取消"); if (updateFlag > 0 && addDealRecordFlag > 0) { return ReturnUtil.success(); @@ -287,12 +290,12 @@ private void initOrderInfo(BusinessOrder businessOrder) { Long maxNo = this.baseMapper.selectMaxCOrderNo(); - String orderNo = NumberGeneratorUtil.getContactNo("wtsc", maxNo); + String orderNo = NumberGeneratorUtil.getContactNo(ORDER_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); businessOrder.setCreateUser(authUser.getId()); businessOrder.setUpdateUser(authUser.getId()); businessOrder.setOrderCode(orderNo); - businessOrder.setStatus("1"); + businessOrder.setStatus(NOT_RECEIVED); } /** @@ -327,7 +330,7 @@ sampleStatusPopulation.setOrderId(orderId); sampleStatusPopulation.setSampleId(sampleId); sampleStatusPopulation.setMeasureContent(measureContent); - sampleStatusPopulation.setMeasureType("1"); + sampleStatusPopulation.setMeasureType(INSIDE_MEASURE); return this.sampleRelationMapper.insert(sampleStatusPopulation); } @@ -337,7 +340,6 @@ private int doUpdateSampleStatus(Long orderId, String sampleStatus) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("order_id", orderId); -// queryWrapper.isNull("sampleStatus"); BusinessOrderSampleRelation orderSample = new BusinessOrderSampleRelation(); orderSample.setId(orderId); orderSample.setSampleStatus(sampleStatus); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java index 07c88e9..c2e8995 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java @@ -14,6 +14,7 @@ import com.casic.missiles.dto.business.dispatch.DeviceStatusChangeDTO; import com.casic.missiles.enums.*; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.business.MeasureTypeEnum; import com.casic.missiles.enums.sample.CurrentSegmentEnum; import com.casic.missiles.enums.sample.SampleStatusEnum; import com.casic.missiles.exception.BusinessException; @@ -39,7 +40,7 @@ @Service @Slf4j @AllArgsConstructor -public class IBusinessDispatchServiceImpl extends ServiceImpl implements IBusinessDispatchService { +public class IBusinessDispatchServiceImpl extends ServiceImpl implements IBusinessDispatchService, SampleStatusEnum, CurrentSegmentEnum, MeasureTypeEnum { private final BusinessOrderSampleRelationMapper orderSampleRelationMapper; private final BusinessCertificateReportMapper certificateReportMapper; @@ -73,20 +74,20 @@ Long sampleId = dispatchVO.getSampleId(); String sampleStatus = dispatchVO.getSampleStatus(); //先过滤超期状态下的外检外包 - if (!StringUtils.isEmpty(request.getSampleStatus()) && SampleStatusEnum.BE_OVERDUE.equals(request.getSampleStatus()) && notSelfMeasure(dispatchVO)) { + if (!StringUtils.isEmpty(request.getSampleStatus()) && BE_OVERDUE.equals(request.getSampleStatus()) && notSelfMeasure(dispatchVO)) { return; } switch (sampleStatus) { //待分发状态，当前检定环节:待分配，已出具证书：无，出具证书总数:无 - case SampleStatusEnum.TO_HANDOUT: + case TO_HANDOUT: //检测中状态，当前检定环节:具体实验室，已出具证书：查询证书报告表，证书总数：具体实验室 - case SampleStatusEnum.IN_MEASURE: + case IN_MEASURE: //检测完状态，当前检定环节:完成，已出具证书：无，出具证书总数:无 - case SampleStatusEnum.MEASURE_COMPLETE: + case MEASURE_COMPLETE: doDispatchVoPopulation(dispatchVO, sampleId, orderId); return; //超期样品(即检测超期，未在应检完时间检完),当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室 - case SampleStatusEnum.BE_OVERDUE: + case BE_OVERDUE: HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId); Long deptId = Optional.of(overLabExecutiveDTO.getMeasureDeptId()).orElse(null); dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, deptId)); @@ -126,7 +127,7 @@ /** - * 状态更新 + * 根据sampleId，orderId,进行状态更新 */ @Override public ReturnDTO statusChange(DeviceStatusChangeDTO deviceStatusChangeDTO) { @@ -214,6 +215,9 @@ return handOutLabExecutiveDTOOptional.orElse(null); } + /** + * 构建证书的查询条件 + */ private QueryWrapper getCertificateReportWrapper(DeviceDispatchVO dispatchVO, Long deptId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("order_id", dispatchVO.getOrderId()); @@ -230,7 +234,8 @@ queryWrapper.eq("order_id", statusChangeDTO.getOrderId()); queryWrapper.eq("sample_id", statusChangeDTO.getSampleId()); if (terminateFlag) { - queryWrapper.eq("sample_status", "2").or().eq("sample_status", "3").or().eq("sample_status", "4"); + //若是终止，需要对应待分发、检测中、检测完三个状态的变更 + queryWrapper.eq("sample_status", TO_HANDOUT).or().eq("sample_status", IN_MEASURE).or().eq("sample_status", MEASURE_COMPLETE); } BusinessOrderSampleRelation businessOrderSampleRelation = new BusinessOrderSampleRelation(); businessOrderSampleRelation.setSampleStatus(statusChangeDTO.getStatus()); @@ -238,12 +243,12 @@ } /** - * 判断不是自检 + * 判断不是自检,即外包和外检，进行环节设定 */ private boolean notSelfMeasure(DeviceDispatchVO dispatchVO) { if (!ObjectUtils.isEmpty(dispatchVO.getMeasureType())) { - if (MeasureStatusEnum.TO_ALLOCATE.equals(String.valueOf(dispatchVO.getMeasureType())) || MeasureStatusEnum.TO_MEASURE.equals(String.valueOf(dispatchVO.getMeasureType()))) { - String currentSegment = MeasureStatusEnum.TO_ALLOCATE.equals(dispatchVO.getMeasureType()) ? CurrentSegmentEnum.OUT_UNDERTAKE : CurrentSegmentEnum.OUT_MESASUR; + if (OTHERS_UNDERTAKE.equals(String.valueOf(dispatchVO.getMeasureType())) || OUTSIDE_MEASURE.equals(String.valueOf(dispatchVO.getMeasureType()))) { + String currentSegment = OTHERS_UNDERTAKE.equals(dispatchVO.getMeasureType()) ? OUT_UNDERTAKE : OUT_MESASUR; dispatchVO.setCurrentSegment(currentSegment); return true; } @@ -251,6 +256,9 @@ return false; } + /** + * 其他条件的置为空 + */ private void initDeviceDispatchDTOEmpty(DeviceDispatchDTO request) { request.setSampleName(null); request.setSampleNo(null); @@ -264,15 +272,15 @@ } /** - * 判断样品是完成或接收状态，直接显示即可 + * 判断样品是完成或接收状态，进行当前阶段环节的设置 */ private Boolean checkSampleFinishStatus(DeviceDispatchVO dispatchVO) { - if (SampleStatusEnum.TO_RECEIVE.equals(dispatchVO.getSampleStatus())) { - dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_INCOME); + if (TO_RECEIVE.equals(dispatchVO.getSampleStatus())) { + dispatchVO.setCurrentSegment(TO_INCOME); return true; } - if (SampleStatusEnum.TO_HANDOUT.equals(dispatchVO.getSampleStatus())) { - dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE); + if (TO_HANDOUT.equals(dispatchVO.getSampleStatus())) { + dispatchVO.setCurrentSegment(TO_ALLOCATE); return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java index 4f06678..e2fea21 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.customer.CustomerAdviceMapper; import com.casic.missiles.mapper.customer.CustomerMapper; @@ -34,7 +35,7 @@ @Service @Slf4j @AllArgsConstructor -public class CustomerAdviceServiceImpl implements CustomerAdviceService { +public class CustomerAdviceServiceImpl implements CustomerAdviceService,PrefixCodeEnum { private final CustomerAdviceMapper customerAdviceMapper; private final IBaseExportService iBaseExportService; @@ -122,7 +123,7 @@ private void initCustomerAdviceInfo(CustomerAdviceInfo customerAdviceInfo) { Long maxNo = customerAdviceMapper.selectMaxAdviceNo(); - String adviceNo = NumberGeneratorUtil.getContactNo("khjy", maxNo); + String adviceNo = NumberGeneratorUtil.getContactNo(CUSTOMER_ADVICE_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); customerAdviceInfo.setCreateUser(authUser.getId()); customerAdviceInfo.setUpdateUser(authUser.getId()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 832517f..f1c90e8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -12,6 +12,7 @@ import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.business.OrderStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessDealRecordMapper; import com.casic.missiles.model.business.BusinessDealRecord; @@ -44,7 +45,7 @@ @Api(tags = "委托书模块") @RequestMapping("/business/order") @AllArgsConstructor -public class BusinessOrderController extends ExportController { +public class BusinessOrderController extends ExportController implements OrderStatusEnum { private final IBusinessOrderService businessOrderService; @@ -119,7 +120,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "2"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_RECEIVED); } @ApiOperation("委托书退回") @@ -128,7 +129,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "3"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java index 7591c07..ae7a28d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -10,7 +10,6 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; import com.casic.missiles.dto.customer.Info.*; -import com.casic.missiles.dto.customer.MesureRecordsResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerInfo; @@ -102,19 +101,9 @@ return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); } - @ApiOperation("根据客户id查询检定记录-分页") - @PostMapping("/mesureRecords") - public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); - } - - @ApiOperation("客户删除") @PostMapping("/delete") - public ReturnDTO deleteCsutomer(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO deleteCustomer(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java index 9ae077e..c7d6b3f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -9,9 +9,10 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; -import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerSampleInfo; @@ -93,15 +94,13 @@ customerSampleService.sampleExport(request, response); } - @ApiOperation("根据样品id查询检定记录") - @PostMapping("/mesureRecordsBySampleId") - public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(idDTO.getId()))); + @ApiOperation("根据样品id或客户id查询检定记录") + @PostMapping("/measureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) { + return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest))); } + @ApiOperation("根据样品id查询检定证书") @PostMapping("/certificationBySampleId") public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { @@ -111,13 +110,4 @@ return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); } -// @ApiOperation("样品批量导入") -// @PostMapping("/batchImport") -// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return null; -// } - } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index 6b109a2..fbe403d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -1,5 +1,7 @@ package com.casic.missiles.enums; +import org.apache.xmlbeans.impl.xb.xsdschema.Public; + /** * @Description: 生成编号前缀枚举 * @Author: zt @@ -7,9 +9,31 @@ */ public interface PrefixCodeEnum { - //环境记录单编号生成前缀 - String ENVIRONMENT_PREFIX = "hjld"; - //原始记录单编号生成前缀 - String ORIGIN_PREFIX = "ysld"; + //环境记录单编号生成前缀 + String ENVIRONMENT_PREFIX = "hjld"; + //原始记录单编号生成前缀 + String ORIGIN_PREFIX = "ysld"; + + + /*************客户资源模块，tt notice**************/ + //样品编号 + String SAMPLE_PREFIX = "khyp"; + + //客户编号 + String CUSTOMER_PREFIX = "khxx"; + + //客户建议编号 + String CUSTOMER_ADVICE_PREFIX = "khjy"; + + //客户用户编号 + String CUSTOMER_USER_PREFIX = "khyh"; + + //委托书编号 + String ORDER_PREFIX = "wtsc"; + + /*************委托书调度，tt notice**************/ + //交接单编号 + String INTER_CHANGE_PREFIX = "jjdh"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java new file mode 100644 index 0000000..a013d67 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java @@ -0,0 +1,19 @@ +package com.casic.missiles.enums.business; + +public interface CertificatePrintStatusEnum { + + /** + * 不可打印 + */ + String PRINTABLE = "1"; + + /** + * 不可打印 + */ + String NON_PRINTABLE = "2"; + + /** + * 审批中 + */ + String IN_APPROVAL = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java new file mode 100644 index 0000000..a0b0274 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +/** + * @author cz + */ +public interface MeasureTypeEnum { + /** + * 自检 + */ + String INSIDE_MEASURE = "1"; + + /** + * 外包 + */ + String OTHERS_UNDERTAKE = "2"; + + /** + * 外检 + */ + String OUTSIDE_MEASURE = "3"; + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java new file mode 100644 index 0000000..83371aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +public interface OrderStatusEnum { + + /** + * 未接收 + */ + String NOT_RECEIVED = "1"; + /** + * 已接收 + */ + String ALREADY_RECEIVED = "2"; + /** + * 已取消 + */ + String ALREADY_CANCEL = "3"; + + /** + * 检测完成 + */ + String MEASURE_SUCCESS = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java new file mode 100644 index 0000000..d32da8d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java @@ -0,0 +1,23 @@ +package com.casic.missiles.enums.sample; + +/** + * @author cz + */ +public interface CertificationExpireStatusEnum { + + /** + * 未超期 + */ + String NORMAL = "0"; + + /** + * 即将超期，距离结束即将到30天 + */ + String ALMOST_EXPIRE = "1"; + + /** + * 已经超期 + */ + String ALREADY_EXPIRE = "2"; + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java index fde0627..8b73201 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.model.customer.CustomerSampleInfo; import org.apache.ibatis.annotations.Param; @@ -10,6 +12,8 @@ Long selectMaxSampleNo(); + Page measureRecordsBySampleId(Page page, @Param("request") MeasureRecordsIdRequest recordsIdRequest); + Page samplesByOderId(Page page, @Param("orderId") Long orderId, diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java deleted file mode 100644 index a086b38..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.missiles.mapper.customer.customize; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.customer.MesureRecordsResponse; - -public interface MesureRecordsResponseMapper extends BaseMapper { -} diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index f10fbb3..e7f5950 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -7,22 +7,56 @@ FROM customer_sample_info + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java new file mode 100644 index 0000000..ec13e19 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MeasureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java deleted file mode 100644 index f13b5d4..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.dto.customer; - -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author cz - * @date 2023-02-01 - */ -@Data -@ApiModel -public class MesureRecordsResponse { - - @ApiModelProperty(value = "委托书id", dataType = "Long") - private Long orderId; - - @ApiModelProperty(value = "委托单编号", dataType = "String") - private String orderCode; - - @ApiModelProperty(value = "委托单日期", dataType = "String") - private String orderTime; - - @ApiModelProperty(value = "委托人代码", dataType = "String") - private String customerCode; - - @ApiModelProperty(value = "委托人名称", dataType = "String") - private String customerName; - - @ApiModelProperty(value = "送检人", dataType = "String") - private String deliverer; - - @ApiModelProperty(value = "送检日期", dataType = "String") - private String deliverTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java index 2e8657f..c0a9a99 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -53,12 +53,12 @@ @TableField(exist = false) @ApiModelProperty(value = "样品状态", dataType = "String") @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.SAMPLE_STATUS) - private String sampleSatus; + private String sampleStatus; @TableField(exist = false) @ApiModelProperty(value = "样品状态", dataType = "String") @ExcelProperty(value = "样品状态", order = 5) - private String sampleSatusName; + private String sampleStatusName; @ApiModelProperty(value = "委托方名称", dataType = "String") @ExcelProperty(value = "委托方名称", order = 6) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java new file mode 100644 index 0000000..7bcf105 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java @@ -0,0 +1,22 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + */ + +@Data +@ApiModel("检测记录查询id") +public class MeasureRecordsIdRequest { + + @ApiModelProperty("样品Id") + private Long sampleId; + + @ApiModelProperty("客户id") + private Long customerId; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java index 2f97cb3..542f5ca 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.base.service.IBaseExportService; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; @@ -20,6 +19,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.business.CertificatePrintStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; import com.casic.missiles.model.business.BusinessCertificateReport; @@ -42,10 +42,9 @@ */ @Service @AllArgsConstructor -public class BusinessCertificatePrintServiceImpl extends ServiceImpl implements IBusinessCertificatePrintService { +public class BusinessCertificatePrintServiceImpl extends ServiceImpl implements IBusinessCertificatePrintService, CertificatePrintStatusEnum { private final IBaseApprovalService baseApprovalService; - private final AbstractDictService dictService; private final IBaseExportService iBaseExportService; private final ApprovalOperateService approvalOperateService; @@ -86,7 +85,7 @@ } /** - * 更新工作流审批状态为拒绝，当返回值成功时，进行打印状态置为不可打印，审批状态为不通过 + * 更新工作流审批状态为拒绝，当返回值成功时，进行打印状态置为不可打印，审批状态为不通过 * * @return */ @@ -103,7 +102,7 @@ BusinessCertificateReport certificateReport = new BusinessCertificateReport(); certificateReport.setId(request.getId()); //设置为不能打印 - certificateReport.setPrintStatus("2"); + certificateReport.setPrintStatus(NON_PRINTABLE); certificateReport.setApprovalStatus(ApprovalStatusEnum.FAILED); int row = this.baseMapper.updateById(certificateReport); if (row <= 0) { @@ -113,7 +112,7 @@ } /** - * 提交审批流程，修改证书审批状态为待审批，打印状态为审批中 + * 提交审批流程，修改证书审批状态为待审批，打印状态为审批中 */ @Transactional @Override @@ -128,7 +127,7 @@ //审批状态为审批中 certificateReport.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED); //打印状态审批中 - certificateReport.setPrintStatus("3"); + certificateReport.setPrintStatus(IN_APPROVAL); int row = this.baseMapper.updateById(certificateReport); if (row <= 0) { throw new BusinessException(BusinessExceptionEnum.AGAIN_PRINT_SUBMIT_FAILED.getCode(), BusinessExceptionEnum.AGAIN_PRINT_SUBMIT_FAILED.getMessage()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java index 859010b..0d847a0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.dto.customer.sample.CustomerSampleListVO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessInterchangeMapper; import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; @@ -35,7 +36,7 @@ * 业务管理-设备交接单 服务实现类 *

* - * @author wangpeng + * @author cz * @since 2023-02-02 */ @Service @@ -83,7 +84,7 @@ } /** - * 更新不对样品有任何操作 + * 更新只是交接单的变更，没有任何其他单位的变化 */ @Override public ReturnDTO updateExchange(BusinessInterchange businessInterchange) { @@ -94,6 +95,9 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + /** + * 交接单新增，同时在样品委托书管理表中新增交接单记录id + */ @Override @Transactional public ReturnDTO addExchange(BusinessInterchange businessInterchange) { @@ -111,6 +115,9 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + /** + * 选中判断ids存在，进行其他条件的清空 + */ @Override public void exportExchange(InterchangeListRequest request, HttpServletResponse response) { try { @@ -153,7 +160,7 @@ private void populationExchange(BusinessInterchange businessInterchange) { Long maxNo = this.baseMapper.selectMaxExchangeNo(); - String orderNo = NumberGeneratorUtil.getContactNo("jjdh", maxNo); + String orderNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.INTER_CHANGE_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); businessInterchange.setCreateUser(authUser.getId()); businessInterchange.setInterchangeCode(orderNo); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java index 138a1e2..d6bb339 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -14,6 +14,10 @@ import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.PrefixCodeEnum; +import com.casic.missiles.enums.business.MeasureTypeEnum; +import com.casic.missiles.enums.business.OrderStatusEnum; +import com.casic.missiles.enums.sample.SampleStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessDealRecordMapper; import com.casic.missiles.mapper.business.BusinessOrderListReponseMapper; @@ -35,7 +39,6 @@ import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -50,7 +53,7 @@ */ @Service @AllArgsConstructor -public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService { +public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService,PrefixCodeEnum, OrderStatusEnum,SampleStatusEnum, MeasureTypeEnum { private final BusinessOrderListReponseMapper orderListResponseMapper; private final IBaseExportService iBaseExportService; @@ -203,9 +206,9 @@ public ReturnDTO updateStatusById(OrderCancelRequest orderCancelRequest, String status) { int updateFlag = doUpdateStatusById(orderCancelRequest.getId(), status); String dealType = ""; - if (status.equals("2")) { + if (status.equals(ALREADY_RECEIVED)) { dealType = "委托书接收" ; - doUpdateSampleStatus(orderCancelRequest.getId(),"1"); + doUpdateSampleStatus(orderCancelRequest.getId(),TO_RECEIVE); } else { dealType = "委托书退回"; } @@ -222,7 +225,7 @@ @Override @Transactional public ReturnDTO cancelOrder(OrderCancelRequest orderCancelRequest) { - int updateFlag = this.doUpdateStatusById(orderCancelRequest.getId(), "3"); + int updateFlag = this.doUpdateStatusById(orderCancelRequest.getId(), ALREADY_CANCEL); int addDealRecordFlag = addDealRecord(orderCancelRequest, "委托书取消"); if (updateFlag > 0 && addDealRecordFlag > 0) { return ReturnUtil.success(); @@ -287,12 +290,12 @@ private void initOrderInfo(BusinessOrder businessOrder) { Long maxNo = this.baseMapper.selectMaxCOrderNo(); - String orderNo = NumberGeneratorUtil.getContactNo("wtsc", maxNo); + String orderNo = NumberGeneratorUtil.getContactNo(ORDER_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); businessOrder.setCreateUser(authUser.getId()); businessOrder.setUpdateUser(authUser.getId()); businessOrder.setOrderCode(orderNo); - businessOrder.setStatus("1"); + businessOrder.setStatus(NOT_RECEIVED); } /** @@ -327,7 +330,7 @@ sampleStatusPopulation.setOrderId(orderId); sampleStatusPopulation.setSampleId(sampleId); sampleStatusPopulation.setMeasureContent(measureContent); - sampleStatusPopulation.setMeasureType("1"); + sampleStatusPopulation.setMeasureType(INSIDE_MEASURE); return this.sampleRelationMapper.insert(sampleStatusPopulation); } @@ -337,7 +340,6 @@ private int doUpdateSampleStatus(Long orderId, String sampleStatus) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("order_id", orderId); -// queryWrapper.isNull("sampleStatus"); BusinessOrderSampleRelation orderSample = new BusinessOrderSampleRelation(); orderSample.setId(orderId); orderSample.setSampleStatus(sampleStatus); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java index 07c88e9..c2e8995 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java @@ -14,6 +14,7 @@ import com.casic.missiles.dto.business.dispatch.DeviceStatusChangeDTO; import com.casic.missiles.enums.*; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.business.MeasureTypeEnum; import com.casic.missiles.enums.sample.CurrentSegmentEnum; import com.casic.missiles.enums.sample.SampleStatusEnum; import com.casic.missiles.exception.BusinessException; @@ -39,7 +40,7 @@ @Service @Slf4j @AllArgsConstructor -public class IBusinessDispatchServiceImpl extends ServiceImpl implements IBusinessDispatchService { +public class IBusinessDispatchServiceImpl extends ServiceImpl implements IBusinessDispatchService, SampleStatusEnum, CurrentSegmentEnum, MeasureTypeEnum { private final BusinessOrderSampleRelationMapper orderSampleRelationMapper; private final BusinessCertificateReportMapper certificateReportMapper; @@ -73,20 +74,20 @@ Long sampleId = dispatchVO.getSampleId(); String sampleStatus = dispatchVO.getSampleStatus(); //先过滤超期状态下的外检外包 - if (!StringUtils.isEmpty(request.getSampleStatus()) && SampleStatusEnum.BE_OVERDUE.equals(request.getSampleStatus()) && notSelfMeasure(dispatchVO)) { + if (!StringUtils.isEmpty(request.getSampleStatus()) && BE_OVERDUE.equals(request.getSampleStatus()) && notSelfMeasure(dispatchVO)) { return; } switch (sampleStatus) { //待分发状态，当前检定环节:待分配，已出具证书：无，出具证书总数:无 - case SampleStatusEnum.TO_HANDOUT: + case TO_HANDOUT: //检测中状态，当前检定环节:具体实验室，已出具证书：查询证书报告表，证书总数：具体实验室 - case SampleStatusEnum.IN_MEASURE: + case IN_MEASURE: //检测完状态，当前检定环节:完成，已出具证书：无，出具证书总数:无 - case SampleStatusEnum.MEASURE_COMPLETE: + case MEASURE_COMPLETE: doDispatchVoPopulation(dispatchVO, sampleId, orderId); return; //超期样品(即检测超期，未在应检完时间检完),当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室 - case SampleStatusEnum.BE_OVERDUE: + case BE_OVERDUE: HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId); Long deptId = Optional.of(overLabExecutiveDTO.getMeasureDeptId()).orElse(null); dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, deptId)); @@ -126,7 +127,7 @@ /** - * 状态更新 + * 根据sampleId，orderId,进行状态更新 */ @Override public ReturnDTO statusChange(DeviceStatusChangeDTO deviceStatusChangeDTO) { @@ -214,6 +215,9 @@ return handOutLabExecutiveDTOOptional.orElse(null); } + /** + * 构建证书的查询条件 + */ private QueryWrapper getCertificateReportWrapper(DeviceDispatchVO dispatchVO, Long deptId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("order_id", dispatchVO.getOrderId()); @@ -230,7 +234,8 @@ queryWrapper.eq("order_id", statusChangeDTO.getOrderId()); queryWrapper.eq("sample_id", statusChangeDTO.getSampleId()); if (terminateFlag) { - queryWrapper.eq("sample_status", "2").or().eq("sample_status", "3").or().eq("sample_status", "4"); + //若是终止，需要对应待分发、检测中、检测完三个状态的变更 + queryWrapper.eq("sample_status", TO_HANDOUT).or().eq("sample_status", IN_MEASURE).or().eq("sample_status", MEASURE_COMPLETE); } BusinessOrderSampleRelation businessOrderSampleRelation = new BusinessOrderSampleRelation(); businessOrderSampleRelation.setSampleStatus(statusChangeDTO.getStatus()); @@ -238,12 +243,12 @@ } /** - * 判断不是自检 + * 判断不是自检,即外包和外检，进行环节设定 */ private boolean notSelfMeasure(DeviceDispatchVO dispatchVO) { if (!ObjectUtils.isEmpty(dispatchVO.getMeasureType())) { - if (MeasureStatusEnum.TO_ALLOCATE.equals(String.valueOf(dispatchVO.getMeasureType())) || MeasureStatusEnum.TO_MEASURE.equals(String.valueOf(dispatchVO.getMeasureType()))) { - String currentSegment = MeasureStatusEnum.TO_ALLOCATE.equals(dispatchVO.getMeasureType()) ? CurrentSegmentEnum.OUT_UNDERTAKE : CurrentSegmentEnum.OUT_MESASUR; + if (OTHERS_UNDERTAKE.equals(String.valueOf(dispatchVO.getMeasureType())) || OUTSIDE_MEASURE.equals(String.valueOf(dispatchVO.getMeasureType()))) { + String currentSegment = OTHERS_UNDERTAKE.equals(dispatchVO.getMeasureType()) ? OUT_UNDERTAKE : OUT_MESASUR; dispatchVO.setCurrentSegment(currentSegment); return true; } @@ -251,6 +256,9 @@ return false; } + /** + * 其他条件的置为空 + */ private void initDeviceDispatchDTOEmpty(DeviceDispatchDTO request) { request.setSampleName(null); request.setSampleNo(null); @@ -264,15 +272,15 @@ } /** - * 判断样品是完成或接收状态，直接显示即可 + * 判断样品是完成或接收状态，进行当前阶段环节的设置 */ private Boolean checkSampleFinishStatus(DeviceDispatchVO dispatchVO) { - if (SampleStatusEnum.TO_RECEIVE.equals(dispatchVO.getSampleStatus())) { - dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_INCOME); + if (TO_RECEIVE.equals(dispatchVO.getSampleStatus())) { + dispatchVO.setCurrentSegment(TO_INCOME); return true; } - if (SampleStatusEnum.TO_HANDOUT.equals(dispatchVO.getSampleStatus())) { - dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE); + if (TO_HANDOUT.equals(dispatchVO.getSampleStatus())) { + dispatchVO.setCurrentSegment(TO_ALLOCATE); return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java index 4f06678..e2fea21 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.customer.CustomerAdviceMapper; import com.casic.missiles.mapper.customer.CustomerMapper; @@ -34,7 +35,7 @@ @Service @Slf4j @AllArgsConstructor -public class CustomerAdviceServiceImpl implements CustomerAdviceService { +public class CustomerAdviceServiceImpl implements CustomerAdviceService,PrefixCodeEnum { private final CustomerAdviceMapper customerAdviceMapper; private final IBaseExportService iBaseExportService; @@ -122,7 +123,7 @@ private void initCustomerAdviceInfo(CustomerAdviceInfo customerAdviceInfo) { Long maxNo = customerAdviceMapper.selectMaxAdviceNo(); - String adviceNo = NumberGeneratorUtil.getContactNo("khjy", maxNo); + String adviceNo = NumberGeneratorUtil.getContactNo(CUSTOMER_ADVICE_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); customerAdviceInfo.setCreateUser(authUser.getId()); customerAdviceInfo.setUpdateUser(authUser.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java index e8922c0..dd299de 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java @@ -10,18 +10,20 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; -import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.PrefixCodeEnum; +import com.casic.missiles.enums.sample.CertificationExpireStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; import com.casic.missiles.mapper.customer.CustomerMapper; import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper; import com.casic.missiles.mapper.customer.CustomerSampleMapper; -import com.casic.missiles.mapper.customer.customize.MesureRecordsResponseMapper; import com.casic.missiles.model.business.BusinessOrderSampleRelation; import com.casic.missiles.model.customer.CustomerInfo; import com.casic.missiles.model.customer.CustomerSampleInfo; @@ -42,13 +44,12 @@ @Service @AllArgsConstructor -public class CustomerSampleServiceImpl extends ServiceImpl implements CustomerSampleService { +public class CustomerSampleServiceImpl extends ServiceImpl implements CustomerSampleService, CertificationExpireStatusEnum,PrefixCodeEnum{ private final CustomerSampleListResponseMapper customerSampleListResponseMapper; private final CustomerMapper customerMapper; private final IBaseExportService iBaseExportService; private final CertificationResponseMapper certificationResponseMapper; - private final MesureRecordsResponseMapper mesureResponseMapper; private final BusinessOrderSampleRelationMapper sampleRelationMapper; @Override @@ -60,12 +61,12 @@ BusinessOrderSampleRelation businessOrderSampleRelation = this.getSampleStatusById(customerSample.getId()); if (!ObjectUtils.isEmpty(businessOrderSampleRelation)) { customerSample.setOrderId(businessOrderSampleRelation.getOrderId()); - customerSample.setSampleSatus(businessOrderSampleRelation.getSampleStatus()); + customerSample.setSampleStatus(businessOrderSampleRelation.getSampleStatus()); customerSample.setCertificationStatus(calculateCertificationStatus(customerSample.getValidDeadline())); } }); for (CustomerSampleListResponse customerSampleListResponse : customerSamplePage.getRecords()) { - if (!StringUtils.isEmpty(customerSampleListResponse.getSampleSatus())) { + if (!StringUtils.isEmpty(customerSampleListResponse.getSampleStatus())) { DictCodeUtils.convertDictCodeToName(customerSampleListResponse); } } @@ -106,14 +107,13 @@ public CustomerSampleInfo sampleDetail(Long id) { CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id); if (!ObjectUtils.isEmpty(customerSampleInfo)) { - doCustomerSampleInfoPopulation(customerSampleInfo); + doPopulateCustomerSampleInfo(customerSampleInfo); } return customerSampleInfo; } /** * 只导出样品列表信息 - * */ @Override public void sampleExport(CustomerSampleListRequest request, HttpServletResponse response) { @@ -135,7 +135,7 @@ BusinessOrderSampleRelation businessOrderSampleRelation = businessOrderMap.get(customerSample.getId()); if (!ObjectUtils.isEmpty(businessOrderSampleRelation)) { customerSample.setOrderId(businessOrderSampleRelation.getOrderId()); - customerSample.setSampleSatus(businessOrderSampleRelation.getSampleStatus()); + customerSample.setSampleStatus(businessOrderSampleRelation.getSampleStatus()); customerSample.setCertificationStatus(calculateCertificationStatus(customerSample.getValidDeadline())); } } @@ -159,11 +159,9 @@ } @Override - public Page measureRecordsBySampleId(Long id) { - Page page = PageFactory.defaultPage(); - QueryWrapper wrapper = new QueryWrapper() - .eq("sample_id", id); - Page measureRecordsResponsePage = mesureResponseMapper.selectPage(page, wrapper); + public Page measureRecordsBySampleId(MeasureRecordsIdRequest recordsIdRequest) { + Page page = PageFactory.defaultPage(); + Page measureRecordsResponsePage = this.baseMapper.measureRecordsBySampleId(page, recordsIdRequest); return measureRecordsResponsePage; } @@ -177,8 +175,8 @@ } @Override - public Page samplesByOderId(Page page,Long orderId, String sampleNo, String sampleName) { - return this.baseMapper.samplesByOderId(page,orderId,sampleNo,sampleName); + public Page samplesByOderId(Page page, Long orderId, String sampleNo, String sampleName) { + return this.baseMapper.samplesByOderId(page, orderId, sampleNo, sampleName); } private BusinessOrderSampleRelation getSampleStatusById(Long sampleId) { @@ -192,7 +190,7 @@ private void initSample(CustomerSampleInfo customerSampleInfo) { Long maxNo = this.baseMapper.selectMaxSampleNo(); - String sampleNo = NumberGeneratorUtil.getContactNo("khyp", maxNo); + String sampleNo = NumberGeneratorUtil.getContactNo(SAMPLE_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); customerSampleInfo.setSampleNo(sampleNo); customerSampleInfo.setCreateUser(authUser.getId()); @@ -202,7 +200,6 @@ private QueryWrapper listParamWrapper(CustomerSampleListRequest request) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.select("id,sample_no,sample_name,sample_model,manufacturing_no,customer_id,measure_period,measure_last_time,remark,valid_deadline"); queryWrapper.like(StringUtils.isNotBlank(request.getSampleNo()), "sample_no", request.getSampleNo()); queryWrapper.like(StringUtils.isNotBlank(request.getSampleName()), "sample_name", request.getSampleName()); queryWrapper.like(StringUtils.isNotBlank(request.getSampleBelong()), "sample_belong", request.getSampleBelong()); @@ -224,24 +221,30 @@ return queryWrapper; } + /** + * 通过证书到期时间进行到期状态的计算 + */ private String calculateCertificationStatus(String validDeadline) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); if (StringUtils.isEmpty(validDeadline)) { - return "0"; + return NORMAL; } if (validDeadline.compareTo(sdf.format(new Date())) < 0) { - return "2"; + return ALREADY_EXPIRE; } Calendar date = Calendar.getInstance(); date.setTime(new Date()); date.add(Calendar.DAY_OF_MONTH, -30); if (validDeadline.compareTo(sdf.format(date.getTime())) < 0) { - return "1"; + return ALMOST_EXPIRE; } - return "0"; + return NORMAL; } - private void doCustomerSampleInfoPopulation(CustomerSampleInfo customerSampleInfo) { + /** + * 对样品列表的进行供应商联系方式的填充 + */ + private void doPopulateCustomerSampleInfo(CustomerSampleInfo customerSampleInfo) { CustomerInfo customerInfo = customerMapper.selectById(customerSampleInfo.getCustomerId()); if (!ObjectUtils.isEmpty(customerInfo)) { customerSampleInfo.setPhone(customerInfo.getPhone()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 832517f..f1c90e8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -12,6 +12,7 @@ import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.business.OrderStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessDealRecordMapper; import com.casic.missiles.model.business.BusinessDealRecord; @@ -44,7 +45,7 @@ @Api(tags = "委托书模块") @RequestMapping("/business/order") @AllArgsConstructor -public class BusinessOrderController extends ExportController { +public class BusinessOrderController extends ExportController implements OrderStatusEnum { private final IBusinessOrderService businessOrderService; @@ -119,7 +120,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "2"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_RECEIVED); } @ApiOperation("委托书退回") @@ -128,7 +129,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "3"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java index 7591c07..ae7a28d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -10,7 +10,6 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; import com.casic.missiles.dto.customer.Info.*; -import com.casic.missiles.dto.customer.MesureRecordsResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerInfo; @@ -102,19 +101,9 @@ return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); } - @ApiOperation("根据客户id查询检定记录-分页") - @PostMapping("/mesureRecords") - public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); - } - - @ApiOperation("客户删除") @PostMapping("/delete") - public ReturnDTO deleteCsutomer(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO deleteCustomer(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java index 9ae077e..c7d6b3f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -9,9 +9,10 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; -import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerSampleInfo; @@ -93,15 +94,13 @@ customerSampleService.sampleExport(request, response); } - @ApiOperation("根据样品id查询检定记录") - @PostMapping("/mesureRecordsBySampleId") - public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(idDTO.getId()))); + @ApiOperation("根据样品id或客户id查询检定记录") + @PostMapping("/measureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) { + return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest))); } + @ApiOperation("根据样品id查询检定证书") @PostMapping("/certificationBySampleId") public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { @@ -111,13 +110,4 @@ return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); } -// @ApiOperation("样品批量导入") -// @PostMapping("/batchImport") -// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return null; -// } - } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index 6b109a2..fbe403d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -1,5 +1,7 @@ package com.casic.missiles.enums; +import org.apache.xmlbeans.impl.xb.xsdschema.Public; + /** * @Description: 生成编号前缀枚举 * @Author: zt @@ -7,9 +9,31 @@ */ public interface PrefixCodeEnum { - //环境记录单编号生成前缀 - String ENVIRONMENT_PREFIX = "hjld"; - //原始记录单编号生成前缀 - String ORIGIN_PREFIX = "ysld"; + //环境记录单编号生成前缀 + String ENVIRONMENT_PREFIX = "hjld"; + //原始记录单编号生成前缀 + String ORIGIN_PREFIX = "ysld"; + + + /*************客户资源模块，tt notice**************/ + //样品编号 + String SAMPLE_PREFIX = "khyp"; + + //客户编号 + String CUSTOMER_PREFIX = "khxx"; + + //客户建议编号 + String CUSTOMER_ADVICE_PREFIX = "khjy"; + + //客户用户编号 + String CUSTOMER_USER_PREFIX = "khyh"; + + //委托书编号 + String ORDER_PREFIX = "wtsc"; + + /*************委托书调度，tt notice**************/ + //交接单编号 + String INTER_CHANGE_PREFIX = "jjdh"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java new file mode 100644 index 0000000..a013d67 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java @@ -0,0 +1,19 @@ +package com.casic.missiles.enums.business; + +public interface CertificatePrintStatusEnum { + + /** + * 不可打印 + */ + String PRINTABLE = "1"; + + /** + * 不可打印 + */ + String NON_PRINTABLE = "2"; + + /** + * 审批中 + */ + String IN_APPROVAL = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java new file mode 100644 index 0000000..a0b0274 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +/** + * @author cz + */ +public interface MeasureTypeEnum { + /** + * 自检 + */ + String INSIDE_MEASURE = "1"; + + /** + * 外包 + */ + String OTHERS_UNDERTAKE = "2"; + + /** + * 外检 + */ + String OUTSIDE_MEASURE = "3"; + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java new file mode 100644 index 0000000..83371aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +public interface OrderStatusEnum { + + /** + * 未接收 + */ + String NOT_RECEIVED = "1"; + /** + * 已接收 + */ + String ALREADY_RECEIVED = "2"; + /** + * 已取消 + */ + String ALREADY_CANCEL = "3"; + + /** + * 检测完成 + */ + String MEASURE_SUCCESS = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java new file mode 100644 index 0000000..d32da8d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java @@ -0,0 +1,23 @@ +package com.casic.missiles.enums.sample; + +/** + * @author cz + */ +public interface CertificationExpireStatusEnum { + + /** + * 未超期 + */ + String NORMAL = "0"; + + /** + * 即将超期，距离结束即将到30天 + */ + String ALMOST_EXPIRE = "1"; + + /** + * 已经超期 + */ + String ALREADY_EXPIRE = "2"; + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java index fde0627..8b73201 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.model.customer.CustomerSampleInfo; import org.apache.ibatis.annotations.Param; @@ -10,6 +12,8 @@ Long selectMaxSampleNo(); + Page measureRecordsBySampleId(Page page, @Param("request") MeasureRecordsIdRequest recordsIdRequest); + Page samplesByOderId(Page page, @Param("orderId") Long orderId, diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java deleted file mode 100644 index a086b38..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.missiles.mapper.customer.customize; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.customer.MesureRecordsResponse; - -public interface MesureRecordsResponseMapper extends BaseMapper { -} diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index f10fbb3..e7f5950 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -7,22 +7,56 @@ FROM customer_sample_info + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java new file mode 100644 index 0000000..ec13e19 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MeasureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java deleted file mode 100644 index f13b5d4..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.dto.customer; - -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author cz - * @date 2023-02-01 - */ -@Data -@ApiModel -public class MesureRecordsResponse { - - @ApiModelProperty(value = "委托书id", dataType = "Long") - private Long orderId; - - @ApiModelProperty(value = "委托单编号", dataType = "String") - private String orderCode; - - @ApiModelProperty(value = "委托单日期", dataType = "String") - private String orderTime; - - @ApiModelProperty(value = "委托人代码", dataType = "String") - private String customerCode; - - @ApiModelProperty(value = "委托人名称", dataType = "String") - private String customerName; - - @ApiModelProperty(value = "送检人", dataType = "String") - private String deliverer; - - @ApiModelProperty(value = "送检日期", dataType = "String") - private String deliverTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java index 2e8657f..c0a9a99 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -53,12 +53,12 @@ @TableField(exist = false) @ApiModelProperty(value = "样品状态", dataType = "String") @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.SAMPLE_STATUS) - private String sampleSatus; + private String sampleStatus; @TableField(exist = false) @ApiModelProperty(value = "样品状态", dataType = "String") @ExcelProperty(value = "样品状态", order = 5) - private String sampleSatusName; + private String sampleStatusName; @ApiModelProperty(value = "委托方名称", dataType = "String") @ExcelProperty(value = "委托方名称", order = 6) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java new file mode 100644 index 0000000..7bcf105 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java @@ -0,0 +1,22 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + */ + +@Data +@ApiModel("检测记录查询id") +public class MeasureRecordsIdRequest { + + @ApiModelProperty("样品Id") + private Long sampleId; + + @ApiModelProperty("客户id") + private Long customerId; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java index 2f97cb3..542f5ca 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.base.service.IBaseExportService; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; @@ -20,6 +19,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.business.CertificatePrintStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; import com.casic.missiles.model.business.BusinessCertificateReport; @@ -42,10 +42,9 @@ */ @Service @AllArgsConstructor -public class BusinessCertificatePrintServiceImpl extends ServiceImpl implements IBusinessCertificatePrintService { +public class BusinessCertificatePrintServiceImpl extends ServiceImpl implements IBusinessCertificatePrintService, CertificatePrintStatusEnum { private final IBaseApprovalService baseApprovalService; - private final AbstractDictService dictService; private final IBaseExportService iBaseExportService; private final ApprovalOperateService approvalOperateService; @@ -86,7 +85,7 @@ } /** - * 更新工作流审批状态为拒绝，当返回值成功时，进行打印状态置为不可打印，审批状态为不通过 + * 更新工作流审批状态为拒绝，当返回值成功时，进行打印状态置为不可打印，审批状态为不通过 * * @return */ @@ -103,7 +102,7 @@ BusinessCertificateReport certificateReport = new BusinessCertificateReport(); certificateReport.setId(request.getId()); //设置为不能打印 - certificateReport.setPrintStatus("2"); + certificateReport.setPrintStatus(NON_PRINTABLE); certificateReport.setApprovalStatus(ApprovalStatusEnum.FAILED); int row = this.baseMapper.updateById(certificateReport); if (row <= 0) { @@ -113,7 +112,7 @@ } /** - * 提交审批流程，修改证书审批状态为待审批，打印状态为审批中 + * 提交审批流程，修改证书审批状态为待审批，打印状态为审批中 */ @Transactional @Override @@ -128,7 +127,7 @@ //审批状态为审批中 certificateReport.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED); //打印状态审批中 - certificateReport.setPrintStatus("3"); + certificateReport.setPrintStatus(IN_APPROVAL); int row = this.baseMapper.updateById(certificateReport); if (row <= 0) { throw new BusinessException(BusinessExceptionEnum.AGAIN_PRINT_SUBMIT_FAILED.getCode(), BusinessExceptionEnum.AGAIN_PRINT_SUBMIT_FAILED.getMessage()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java index 859010b..0d847a0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.dto.customer.sample.CustomerSampleListVO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessInterchangeMapper; import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; @@ -35,7 +36,7 @@ * 业务管理-设备交接单 服务实现类 *

* - * @author wangpeng + * @author cz * @since 2023-02-02 */ @Service @@ -83,7 +84,7 @@ } /** - * 更新不对样品有任何操作 + * 更新只是交接单的变更，没有任何其他单位的变化 */ @Override public ReturnDTO updateExchange(BusinessInterchange businessInterchange) { @@ -94,6 +95,9 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + /** + * 交接单新增，同时在样品委托书管理表中新增交接单记录id + */ @Override @Transactional public ReturnDTO addExchange(BusinessInterchange businessInterchange) { @@ -111,6 +115,9 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + /** + * 选中判断ids存在，进行其他条件的清空 + */ @Override public void exportExchange(InterchangeListRequest request, HttpServletResponse response) { try { @@ -153,7 +160,7 @@ private void populationExchange(BusinessInterchange businessInterchange) { Long maxNo = this.baseMapper.selectMaxExchangeNo(); - String orderNo = NumberGeneratorUtil.getContactNo("jjdh", maxNo); + String orderNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.INTER_CHANGE_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); businessInterchange.setCreateUser(authUser.getId()); businessInterchange.setInterchangeCode(orderNo); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java index 138a1e2..d6bb339 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -14,6 +14,10 @@ import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.PrefixCodeEnum; +import com.casic.missiles.enums.business.MeasureTypeEnum; +import com.casic.missiles.enums.business.OrderStatusEnum; +import com.casic.missiles.enums.sample.SampleStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessDealRecordMapper; import com.casic.missiles.mapper.business.BusinessOrderListReponseMapper; @@ -35,7 +39,6 @@ import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -50,7 +53,7 @@ */ @Service @AllArgsConstructor -public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService { +public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService,PrefixCodeEnum, OrderStatusEnum,SampleStatusEnum, MeasureTypeEnum { private final BusinessOrderListReponseMapper orderListResponseMapper; private final IBaseExportService iBaseExportService; @@ -203,9 +206,9 @@ public ReturnDTO updateStatusById(OrderCancelRequest orderCancelRequest, String status) { int updateFlag = doUpdateStatusById(orderCancelRequest.getId(), status); String dealType = ""; - if (status.equals("2")) { + if (status.equals(ALREADY_RECEIVED)) { dealType = "委托书接收" ; - doUpdateSampleStatus(orderCancelRequest.getId(),"1"); + doUpdateSampleStatus(orderCancelRequest.getId(),TO_RECEIVE); } else { dealType = "委托书退回"; } @@ -222,7 +225,7 @@ @Override @Transactional public ReturnDTO cancelOrder(OrderCancelRequest orderCancelRequest) { - int updateFlag = this.doUpdateStatusById(orderCancelRequest.getId(), "3"); + int updateFlag = this.doUpdateStatusById(orderCancelRequest.getId(), ALREADY_CANCEL); int addDealRecordFlag = addDealRecord(orderCancelRequest, "委托书取消"); if (updateFlag > 0 && addDealRecordFlag > 0) { return ReturnUtil.success(); @@ -287,12 +290,12 @@ private void initOrderInfo(BusinessOrder businessOrder) { Long maxNo = this.baseMapper.selectMaxCOrderNo(); - String orderNo = NumberGeneratorUtil.getContactNo("wtsc", maxNo); + String orderNo = NumberGeneratorUtil.getContactNo(ORDER_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); businessOrder.setCreateUser(authUser.getId()); businessOrder.setUpdateUser(authUser.getId()); businessOrder.setOrderCode(orderNo); - businessOrder.setStatus("1"); + businessOrder.setStatus(NOT_RECEIVED); } /** @@ -327,7 +330,7 @@ sampleStatusPopulation.setOrderId(orderId); sampleStatusPopulation.setSampleId(sampleId); sampleStatusPopulation.setMeasureContent(measureContent); - sampleStatusPopulation.setMeasureType("1"); + sampleStatusPopulation.setMeasureType(INSIDE_MEASURE); return this.sampleRelationMapper.insert(sampleStatusPopulation); } @@ -337,7 +340,6 @@ private int doUpdateSampleStatus(Long orderId, String sampleStatus) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("order_id", orderId); -// queryWrapper.isNull("sampleStatus"); BusinessOrderSampleRelation orderSample = new BusinessOrderSampleRelation(); orderSample.setId(orderId); orderSample.setSampleStatus(sampleStatus); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java index 07c88e9..c2e8995 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java @@ -14,6 +14,7 @@ import com.casic.missiles.dto.business.dispatch.DeviceStatusChangeDTO; import com.casic.missiles.enums.*; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.business.MeasureTypeEnum; import com.casic.missiles.enums.sample.CurrentSegmentEnum; import com.casic.missiles.enums.sample.SampleStatusEnum; import com.casic.missiles.exception.BusinessException; @@ -39,7 +40,7 @@ @Service @Slf4j @AllArgsConstructor -public class IBusinessDispatchServiceImpl extends ServiceImpl implements IBusinessDispatchService { +public class IBusinessDispatchServiceImpl extends ServiceImpl implements IBusinessDispatchService, SampleStatusEnum, CurrentSegmentEnum, MeasureTypeEnum { private final BusinessOrderSampleRelationMapper orderSampleRelationMapper; private final BusinessCertificateReportMapper certificateReportMapper; @@ -73,20 +74,20 @@ Long sampleId = dispatchVO.getSampleId(); String sampleStatus = dispatchVO.getSampleStatus(); //先过滤超期状态下的外检外包 - if (!StringUtils.isEmpty(request.getSampleStatus()) && SampleStatusEnum.BE_OVERDUE.equals(request.getSampleStatus()) && notSelfMeasure(dispatchVO)) { + if (!StringUtils.isEmpty(request.getSampleStatus()) && BE_OVERDUE.equals(request.getSampleStatus()) && notSelfMeasure(dispatchVO)) { return; } switch (sampleStatus) { //待分发状态，当前检定环节:待分配，已出具证书：无，出具证书总数:无 - case SampleStatusEnum.TO_HANDOUT: + case TO_HANDOUT: //检测中状态，当前检定环节:具体实验室，已出具证书：查询证书报告表，证书总数：具体实验室 - case SampleStatusEnum.IN_MEASURE: + case IN_MEASURE: //检测完状态，当前检定环节:完成，已出具证书：无，出具证书总数:无 - case SampleStatusEnum.MEASURE_COMPLETE: + case MEASURE_COMPLETE: doDispatchVoPopulation(dispatchVO, sampleId, orderId); return; //超期样品(即检测超期，未在应检完时间检完),当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室 - case SampleStatusEnum.BE_OVERDUE: + case BE_OVERDUE: HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId); Long deptId = Optional.of(overLabExecutiveDTO.getMeasureDeptId()).orElse(null); dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, deptId)); @@ -126,7 +127,7 @@ /** - * 状态更新 + * 根据sampleId，orderId,进行状态更新 */ @Override public ReturnDTO statusChange(DeviceStatusChangeDTO deviceStatusChangeDTO) { @@ -214,6 +215,9 @@ return handOutLabExecutiveDTOOptional.orElse(null); } + /** + * 构建证书的查询条件 + */ private QueryWrapper getCertificateReportWrapper(DeviceDispatchVO dispatchVO, Long deptId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("order_id", dispatchVO.getOrderId()); @@ -230,7 +234,8 @@ queryWrapper.eq("order_id", statusChangeDTO.getOrderId()); queryWrapper.eq("sample_id", statusChangeDTO.getSampleId()); if (terminateFlag) { - queryWrapper.eq("sample_status", "2").or().eq("sample_status", "3").or().eq("sample_status", "4"); + //若是终止，需要对应待分发、检测中、检测完三个状态的变更 + queryWrapper.eq("sample_status", TO_HANDOUT).or().eq("sample_status", IN_MEASURE).or().eq("sample_status", MEASURE_COMPLETE); } BusinessOrderSampleRelation businessOrderSampleRelation = new BusinessOrderSampleRelation(); businessOrderSampleRelation.setSampleStatus(statusChangeDTO.getStatus()); @@ -238,12 +243,12 @@ } /** - * 判断不是自检 + * 判断不是自检,即外包和外检，进行环节设定 */ private boolean notSelfMeasure(DeviceDispatchVO dispatchVO) { if (!ObjectUtils.isEmpty(dispatchVO.getMeasureType())) { - if (MeasureStatusEnum.TO_ALLOCATE.equals(String.valueOf(dispatchVO.getMeasureType())) || MeasureStatusEnum.TO_MEASURE.equals(String.valueOf(dispatchVO.getMeasureType()))) { - String currentSegment = MeasureStatusEnum.TO_ALLOCATE.equals(dispatchVO.getMeasureType()) ? CurrentSegmentEnum.OUT_UNDERTAKE : CurrentSegmentEnum.OUT_MESASUR; + if (OTHERS_UNDERTAKE.equals(String.valueOf(dispatchVO.getMeasureType())) || OUTSIDE_MEASURE.equals(String.valueOf(dispatchVO.getMeasureType()))) { + String currentSegment = OTHERS_UNDERTAKE.equals(dispatchVO.getMeasureType()) ? OUT_UNDERTAKE : OUT_MESASUR; dispatchVO.setCurrentSegment(currentSegment); return true; } @@ -251,6 +256,9 @@ return false; } + /** + * 其他条件的置为空 + */ private void initDeviceDispatchDTOEmpty(DeviceDispatchDTO request) { request.setSampleName(null); request.setSampleNo(null); @@ -264,15 +272,15 @@ } /** - * 判断样品是完成或接收状态，直接显示即可 + * 判断样品是完成或接收状态，进行当前阶段环节的设置 */ private Boolean checkSampleFinishStatus(DeviceDispatchVO dispatchVO) { - if (SampleStatusEnum.TO_RECEIVE.equals(dispatchVO.getSampleStatus())) { - dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_INCOME); + if (TO_RECEIVE.equals(dispatchVO.getSampleStatus())) { + dispatchVO.setCurrentSegment(TO_INCOME); return true; } - if (SampleStatusEnum.TO_HANDOUT.equals(dispatchVO.getSampleStatus())) { - dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE); + if (TO_HANDOUT.equals(dispatchVO.getSampleStatus())) { + dispatchVO.setCurrentSegment(TO_ALLOCATE); return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java index 4f06678..e2fea21 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.customer.CustomerAdviceMapper; import com.casic.missiles.mapper.customer.CustomerMapper; @@ -34,7 +35,7 @@ @Service @Slf4j @AllArgsConstructor -public class CustomerAdviceServiceImpl implements CustomerAdviceService { +public class CustomerAdviceServiceImpl implements CustomerAdviceService,PrefixCodeEnum { private final CustomerAdviceMapper customerAdviceMapper; private final IBaseExportService iBaseExportService; @@ -122,7 +123,7 @@ private void initCustomerAdviceInfo(CustomerAdviceInfo customerAdviceInfo) { Long maxNo = customerAdviceMapper.selectMaxAdviceNo(); - String adviceNo = NumberGeneratorUtil.getContactNo("khjy", maxNo); + String adviceNo = NumberGeneratorUtil.getContactNo(CUSTOMER_ADVICE_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); customerAdviceInfo.setCreateUser(authUser.getId()); customerAdviceInfo.setUpdateUser(authUser.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java index e8922c0..dd299de 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java @@ -10,18 +10,20 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; -import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.PrefixCodeEnum; +import com.casic.missiles.enums.sample.CertificationExpireStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; import com.casic.missiles.mapper.customer.CustomerMapper; import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper; import com.casic.missiles.mapper.customer.CustomerSampleMapper; -import com.casic.missiles.mapper.customer.customize.MesureRecordsResponseMapper; import com.casic.missiles.model.business.BusinessOrderSampleRelation; import com.casic.missiles.model.customer.CustomerInfo; import com.casic.missiles.model.customer.CustomerSampleInfo; @@ -42,13 +44,12 @@ @Service @AllArgsConstructor -public class CustomerSampleServiceImpl extends ServiceImpl implements CustomerSampleService { +public class CustomerSampleServiceImpl extends ServiceImpl implements CustomerSampleService, CertificationExpireStatusEnum,PrefixCodeEnum{ private final CustomerSampleListResponseMapper customerSampleListResponseMapper; private final CustomerMapper customerMapper; private final IBaseExportService iBaseExportService; private final CertificationResponseMapper certificationResponseMapper; - private final MesureRecordsResponseMapper mesureResponseMapper; private final BusinessOrderSampleRelationMapper sampleRelationMapper; @Override @@ -60,12 +61,12 @@ BusinessOrderSampleRelation businessOrderSampleRelation = this.getSampleStatusById(customerSample.getId()); if (!ObjectUtils.isEmpty(businessOrderSampleRelation)) { customerSample.setOrderId(businessOrderSampleRelation.getOrderId()); - customerSample.setSampleSatus(businessOrderSampleRelation.getSampleStatus()); + customerSample.setSampleStatus(businessOrderSampleRelation.getSampleStatus()); customerSample.setCertificationStatus(calculateCertificationStatus(customerSample.getValidDeadline())); } }); for (CustomerSampleListResponse customerSampleListResponse : customerSamplePage.getRecords()) { - if (!StringUtils.isEmpty(customerSampleListResponse.getSampleSatus())) { + if (!StringUtils.isEmpty(customerSampleListResponse.getSampleStatus())) { DictCodeUtils.convertDictCodeToName(customerSampleListResponse); } } @@ -106,14 +107,13 @@ public CustomerSampleInfo sampleDetail(Long id) { CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id); if (!ObjectUtils.isEmpty(customerSampleInfo)) { - doCustomerSampleInfoPopulation(customerSampleInfo); + doPopulateCustomerSampleInfo(customerSampleInfo); } return customerSampleInfo; } /** * 只导出样品列表信息 - * */ @Override public void sampleExport(CustomerSampleListRequest request, HttpServletResponse response) { @@ -135,7 +135,7 @@ BusinessOrderSampleRelation businessOrderSampleRelation = businessOrderMap.get(customerSample.getId()); if (!ObjectUtils.isEmpty(businessOrderSampleRelation)) { customerSample.setOrderId(businessOrderSampleRelation.getOrderId()); - customerSample.setSampleSatus(businessOrderSampleRelation.getSampleStatus()); + customerSample.setSampleStatus(businessOrderSampleRelation.getSampleStatus()); customerSample.setCertificationStatus(calculateCertificationStatus(customerSample.getValidDeadline())); } } @@ -159,11 +159,9 @@ } @Override - public Page measureRecordsBySampleId(Long id) { - Page page = PageFactory.defaultPage(); - QueryWrapper wrapper = new QueryWrapper() - .eq("sample_id", id); - Page measureRecordsResponsePage = mesureResponseMapper.selectPage(page, wrapper); + public Page measureRecordsBySampleId(MeasureRecordsIdRequest recordsIdRequest) { + Page page = PageFactory.defaultPage(); + Page measureRecordsResponsePage = this.baseMapper.measureRecordsBySampleId(page, recordsIdRequest); return measureRecordsResponsePage; } @@ -177,8 +175,8 @@ } @Override - public Page samplesByOderId(Page page,Long orderId, String sampleNo, String sampleName) { - return this.baseMapper.samplesByOderId(page,orderId,sampleNo,sampleName); + public Page samplesByOderId(Page page, Long orderId, String sampleNo, String sampleName) { + return this.baseMapper.samplesByOderId(page, orderId, sampleNo, sampleName); } private BusinessOrderSampleRelation getSampleStatusById(Long sampleId) { @@ -192,7 +190,7 @@ private void initSample(CustomerSampleInfo customerSampleInfo) { Long maxNo = this.baseMapper.selectMaxSampleNo(); - String sampleNo = NumberGeneratorUtil.getContactNo("khyp", maxNo); + String sampleNo = NumberGeneratorUtil.getContactNo(SAMPLE_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); customerSampleInfo.setSampleNo(sampleNo); customerSampleInfo.setCreateUser(authUser.getId()); @@ -202,7 +200,6 @@ private QueryWrapper listParamWrapper(CustomerSampleListRequest request) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.select("id,sample_no,sample_name,sample_model,manufacturing_no,customer_id,measure_period,measure_last_time,remark,valid_deadline"); queryWrapper.like(StringUtils.isNotBlank(request.getSampleNo()), "sample_no", request.getSampleNo()); queryWrapper.like(StringUtils.isNotBlank(request.getSampleName()), "sample_name", request.getSampleName()); queryWrapper.like(StringUtils.isNotBlank(request.getSampleBelong()), "sample_belong", request.getSampleBelong()); @@ -224,24 +221,30 @@ return queryWrapper; } + /** + * 通过证书到期时间进行到期状态的计算 + */ private String calculateCertificationStatus(String validDeadline) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); if (StringUtils.isEmpty(validDeadline)) { - return "0"; + return NORMAL; } if (validDeadline.compareTo(sdf.format(new Date())) < 0) { - return "2"; + return ALREADY_EXPIRE; } Calendar date = Calendar.getInstance(); date.setTime(new Date()); date.add(Calendar.DAY_OF_MONTH, -30); if (validDeadline.compareTo(sdf.format(date.getTime())) < 0) { - return "1"; + return ALMOST_EXPIRE; } - return "0"; + return NORMAL; } - private void doCustomerSampleInfoPopulation(CustomerSampleInfo customerSampleInfo) { + /** + * 对样品列表的进行供应商联系方式的填充 + */ + private void doPopulateCustomerSampleInfo(CustomerSampleInfo customerSampleInfo) { CustomerInfo customerInfo = customerMapper.selectById(customerSampleInfo.getCustomerId()); if (!ObjectUtils.isEmpty(customerInfo)) { customerSampleInfo.setPhone(customerInfo.getPhone()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java index 32d4dee..c418752 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java @@ -11,9 +11,9 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; import com.casic.missiles.dto.customer.Info.*; -import com.casic.missiles.dto.customer.MesureRecordsResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.customer.CustomerMapper; import com.casic.missiles.mapper.customer.CustomerUserMapper; @@ -38,7 +38,7 @@ @Service @Slf4j @AllArgsConstructor -public class CustomerServiceImpl extends ServiceImpl implements CustomerService { +public class CustomerServiceImpl extends ServiceImpl implements CustomerService,PrefixCodeEnum { private final SampleRecordsResponseMapper sampleRecordsResponseMapper; private final CustomerUserMapper customerUserMapper; @@ -126,18 +126,9 @@ return contractRecordsResponsePage; } - @Override//暂定不做 - public Page mesureRecordsByCustomerId(Long customerId) { - Page measureRecordsResponsePage = PageFactory.defaultPage(); - return measureRecordsResponsePage; - } - @Override public Page certificationByCustomerId(Long customerId) { - Page page = PageFactory.defaultPage(); - QueryWrapper wrapper = new QueryWrapper() - .eq("customer_id", customerId); - return certificationMapper.selectPage(page, wrapper); + return null; } @Override @@ -165,14 +156,13 @@ queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); queryWrapper.like(StringUtils.isNotBlank(request.getBusinessSize()), "bussiness_size", request.getBusinessSize()); queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade()); - queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade()); queryWrapper.eq("is_del", 0); return queryWrapper; } private void initCustomerInfo(CustomerInfo customerInfo) { Long maxNo = this.baseMapper.selectMaxCustomerNo(); - String customerNo = NumberGeneratorUtil.getContactNo("khxx", maxNo); + String customerNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.CUSTOMER_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); customerInfo.setCreateUser(authUser.getId()); customerInfo.setUpdateUser(authUser.getId()); @@ -196,7 +186,7 @@ boolean userUpdateFlag = true; for (CustomerUserInfo customerUserInfo : userInfoList) { customerUserInfo.setCustomerId(id); - String customerNo = NumberGeneratorUtil.getContactNo("khyh", maxUserNo++); + String customerNo = NumberGeneratorUtil.getContactNo(CUSTOMER_USER_PREFIX, maxUserNo++); customerUserInfo.setUserNo(customerNo); int userAddNum = customerUserMapper.insert(customerUserInfo); if (userAddNum <= 0) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 832517f..f1c90e8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -12,6 +12,7 @@ import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.business.OrderStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessDealRecordMapper; import com.casic.missiles.model.business.BusinessDealRecord; @@ -44,7 +45,7 @@ @Api(tags = "委托书模块") @RequestMapping("/business/order") @AllArgsConstructor -public class BusinessOrderController extends ExportController { +public class BusinessOrderController extends ExportController implements OrderStatusEnum { private final IBusinessOrderService businessOrderService; @@ -119,7 +120,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "2"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_RECEIVED); } @ApiOperation("委托书退回") @@ -128,7 +129,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "3"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java index 7591c07..ae7a28d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -10,7 +10,6 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; import com.casic.missiles.dto.customer.Info.*; -import com.casic.missiles.dto.customer.MesureRecordsResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerInfo; @@ -102,19 +101,9 @@ return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); } - @ApiOperation("根据客户id查询检定记录-分页") - @PostMapping("/mesureRecords") - public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); - } - - @ApiOperation("客户删除") @PostMapping("/delete") - public ReturnDTO deleteCsutomer(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO deleteCustomer(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java index 9ae077e..c7d6b3f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -9,9 +9,10 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; -import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerSampleInfo; @@ -93,15 +94,13 @@ customerSampleService.sampleExport(request, response); } - @ApiOperation("根据样品id查询检定记录") - @PostMapping("/mesureRecordsBySampleId") - public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(idDTO.getId()))); + @ApiOperation("根据样品id或客户id查询检定记录") + @PostMapping("/measureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) { + return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest))); } + @ApiOperation("根据样品id查询检定证书") @PostMapping("/certificationBySampleId") public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { @@ -111,13 +110,4 @@ return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); } -// @ApiOperation("样品批量导入") -// @PostMapping("/batchImport") -// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return null; -// } - } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index 6b109a2..fbe403d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -1,5 +1,7 @@ package com.casic.missiles.enums; +import org.apache.xmlbeans.impl.xb.xsdschema.Public; + /** * @Description: 生成编号前缀枚举 * @Author: zt @@ -7,9 +9,31 @@ */ public interface PrefixCodeEnum { - //环境记录单编号生成前缀 - String ENVIRONMENT_PREFIX = "hjld"; - //原始记录单编号生成前缀 - String ORIGIN_PREFIX = "ysld"; + //环境记录单编号生成前缀 + String ENVIRONMENT_PREFIX = "hjld"; + //原始记录单编号生成前缀 + String ORIGIN_PREFIX = "ysld"; + + + /*************客户资源模块，tt notice**************/ + //样品编号 + String SAMPLE_PREFIX = "khyp"; + + //客户编号 + String CUSTOMER_PREFIX = "khxx"; + + //客户建议编号 + String CUSTOMER_ADVICE_PREFIX = "khjy"; + + //客户用户编号 + String CUSTOMER_USER_PREFIX = "khyh"; + + //委托书编号 + String ORDER_PREFIX = "wtsc"; + + /*************委托书调度，tt notice**************/ + //交接单编号 + String INTER_CHANGE_PREFIX = "jjdh"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java new file mode 100644 index 0000000..a013d67 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java @@ -0,0 +1,19 @@ +package com.casic.missiles.enums.business; + +public interface CertificatePrintStatusEnum { + + /** + * 不可打印 + */ + String PRINTABLE = "1"; + + /** + * 不可打印 + */ + String NON_PRINTABLE = "2"; + + /** + * 审批中 + */ + String IN_APPROVAL = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java new file mode 100644 index 0000000..a0b0274 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +/** + * @author cz + */ +public interface MeasureTypeEnum { + /** + * 自检 + */ + String INSIDE_MEASURE = "1"; + + /** + * 外包 + */ + String OTHERS_UNDERTAKE = "2"; + + /** + * 外检 + */ + String OUTSIDE_MEASURE = "3"; + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java new file mode 100644 index 0000000..83371aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +public interface OrderStatusEnum { + + /** + * 未接收 + */ + String NOT_RECEIVED = "1"; + /** + * 已接收 + */ + String ALREADY_RECEIVED = "2"; + /** + * 已取消 + */ + String ALREADY_CANCEL = "3"; + + /** + * 检测完成 + */ + String MEASURE_SUCCESS = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java new file mode 100644 index 0000000..d32da8d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java @@ -0,0 +1,23 @@ +package com.casic.missiles.enums.sample; + +/** + * @author cz + */ +public interface CertificationExpireStatusEnum { + + /** + * 未超期 + */ + String NORMAL = "0"; + + /** + * 即将超期，距离结束即将到30天 + */ + String ALMOST_EXPIRE = "1"; + + /** + * 已经超期 + */ + String ALREADY_EXPIRE = "2"; + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java index fde0627..8b73201 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.model.customer.CustomerSampleInfo; import org.apache.ibatis.annotations.Param; @@ -10,6 +12,8 @@ Long selectMaxSampleNo(); + Page measureRecordsBySampleId(Page page, @Param("request") MeasureRecordsIdRequest recordsIdRequest); + Page samplesByOderId(Page page, @Param("orderId") Long orderId, diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java deleted file mode 100644 index a086b38..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.missiles.mapper.customer.customize; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.customer.MesureRecordsResponse; - -public interface MesureRecordsResponseMapper extends BaseMapper { -} diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index f10fbb3..e7f5950 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -7,22 +7,56 @@ FROM customer_sample_info + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java new file mode 100644 index 0000000..ec13e19 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MeasureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java deleted file mode 100644 index f13b5d4..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.dto.customer; - -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author cz - * @date 2023-02-01 - */ -@Data -@ApiModel -public class MesureRecordsResponse { - - @ApiModelProperty(value = "委托书id", dataType = "Long") - private Long orderId; - - @ApiModelProperty(value = "委托单编号", dataType = "String") - private String orderCode; - - @ApiModelProperty(value = "委托单日期", dataType = "String") - private String orderTime; - - @ApiModelProperty(value = "委托人代码", dataType = "String") - private String customerCode; - - @ApiModelProperty(value = "委托人名称", dataType = "String") - private String customerName; - - @ApiModelProperty(value = "送检人", dataType = "String") - private String deliverer; - - @ApiModelProperty(value = "送检日期", dataType = "String") - private String deliverTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java index 2e8657f..c0a9a99 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -53,12 +53,12 @@ @TableField(exist = false) @ApiModelProperty(value = "样品状态", dataType = "String") @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.SAMPLE_STATUS) - private String sampleSatus; + private String sampleStatus; @TableField(exist = false) @ApiModelProperty(value = "样品状态", dataType = "String") @ExcelProperty(value = "样品状态", order = 5) - private String sampleSatusName; + private String sampleStatusName; @ApiModelProperty(value = "委托方名称", dataType = "String") @ExcelProperty(value = "委托方名称", order = 6) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java new file mode 100644 index 0000000..7bcf105 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java @@ -0,0 +1,22 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + */ + +@Data +@ApiModel("检测记录查询id") +public class MeasureRecordsIdRequest { + + @ApiModelProperty("样品Id") + private Long sampleId; + + @ApiModelProperty("客户id") + private Long customerId; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java index 2f97cb3..542f5ca 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.base.service.IBaseExportService; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; @@ -20,6 +19,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.business.CertificatePrintStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; import com.casic.missiles.model.business.BusinessCertificateReport; @@ -42,10 +42,9 @@ */ @Service @AllArgsConstructor -public class BusinessCertificatePrintServiceImpl extends ServiceImpl implements IBusinessCertificatePrintService { +public class BusinessCertificatePrintServiceImpl extends ServiceImpl implements IBusinessCertificatePrintService, CertificatePrintStatusEnum { private final IBaseApprovalService baseApprovalService; - private final AbstractDictService dictService; private final IBaseExportService iBaseExportService; private final ApprovalOperateService approvalOperateService; @@ -86,7 +85,7 @@ } /** - * 更新工作流审批状态为拒绝，当返回值成功时，进行打印状态置为不可打印，审批状态为不通过 + * 更新工作流审批状态为拒绝，当返回值成功时，进行打印状态置为不可打印，审批状态为不通过 * * @return */ @@ -103,7 +102,7 @@ BusinessCertificateReport certificateReport = new BusinessCertificateReport(); certificateReport.setId(request.getId()); //设置为不能打印 - certificateReport.setPrintStatus("2"); + certificateReport.setPrintStatus(NON_PRINTABLE); certificateReport.setApprovalStatus(ApprovalStatusEnum.FAILED); int row = this.baseMapper.updateById(certificateReport); if (row <= 0) { @@ -113,7 +112,7 @@ } /** - * 提交审批流程，修改证书审批状态为待审批，打印状态为审批中 + * 提交审批流程，修改证书审批状态为待审批，打印状态为审批中 */ @Transactional @Override @@ -128,7 +127,7 @@ //审批状态为审批中 certificateReport.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED); //打印状态审批中 - certificateReport.setPrintStatus("3"); + certificateReport.setPrintStatus(IN_APPROVAL); int row = this.baseMapper.updateById(certificateReport); if (row <= 0) { throw new BusinessException(BusinessExceptionEnum.AGAIN_PRINT_SUBMIT_FAILED.getCode(), BusinessExceptionEnum.AGAIN_PRINT_SUBMIT_FAILED.getMessage()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java index 859010b..0d847a0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.dto.customer.sample.CustomerSampleListVO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessInterchangeMapper; import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; @@ -35,7 +36,7 @@ * 业务管理-设备交接单 服务实现类 *

* - * @author wangpeng + * @author cz * @since 2023-02-02 */ @Service @@ -83,7 +84,7 @@ } /** - * 更新不对样品有任何操作 + * 更新只是交接单的变更，没有任何其他单位的变化 */ @Override public ReturnDTO updateExchange(BusinessInterchange businessInterchange) { @@ -94,6 +95,9 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + /** + * 交接单新增，同时在样品委托书管理表中新增交接单记录id + */ @Override @Transactional public ReturnDTO addExchange(BusinessInterchange businessInterchange) { @@ -111,6 +115,9 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + /** + * 选中判断ids存在，进行其他条件的清空 + */ @Override public void exportExchange(InterchangeListRequest request, HttpServletResponse response) { try { @@ -153,7 +160,7 @@ private void populationExchange(BusinessInterchange businessInterchange) { Long maxNo = this.baseMapper.selectMaxExchangeNo(); - String orderNo = NumberGeneratorUtil.getContactNo("jjdh", maxNo); + String orderNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.INTER_CHANGE_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); businessInterchange.setCreateUser(authUser.getId()); businessInterchange.setInterchangeCode(orderNo); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java index 138a1e2..d6bb339 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -14,6 +14,10 @@ import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.PrefixCodeEnum; +import com.casic.missiles.enums.business.MeasureTypeEnum; +import com.casic.missiles.enums.business.OrderStatusEnum; +import com.casic.missiles.enums.sample.SampleStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessDealRecordMapper; import com.casic.missiles.mapper.business.BusinessOrderListReponseMapper; @@ -35,7 +39,6 @@ import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -50,7 +53,7 @@ */ @Service @AllArgsConstructor -public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService { +public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService,PrefixCodeEnum, OrderStatusEnum,SampleStatusEnum, MeasureTypeEnum { private final BusinessOrderListReponseMapper orderListResponseMapper; private final IBaseExportService iBaseExportService; @@ -203,9 +206,9 @@ public ReturnDTO updateStatusById(OrderCancelRequest orderCancelRequest, String status) { int updateFlag = doUpdateStatusById(orderCancelRequest.getId(), status); String dealType = ""; - if (status.equals("2")) { + if (status.equals(ALREADY_RECEIVED)) { dealType = "委托书接收" ; - doUpdateSampleStatus(orderCancelRequest.getId(),"1"); + doUpdateSampleStatus(orderCancelRequest.getId(),TO_RECEIVE); } else { dealType = "委托书退回"; } @@ -222,7 +225,7 @@ @Override @Transactional public ReturnDTO cancelOrder(OrderCancelRequest orderCancelRequest) { - int updateFlag = this.doUpdateStatusById(orderCancelRequest.getId(), "3"); + int updateFlag = this.doUpdateStatusById(orderCancelRequest.getId(), ALREADY_CANCEL); int addDealRecordFlag = addDealRecord(orderCancelRequest, "委托书取消"); if (updateFlag > 0 && addDealRecordFlag > 0) { return ReturnUtil.success(); @@ -287,12 +290,12 @@ private void initOrderInfo(BusinessOrder businessOrder) { Long maxNo = this.baseMapper.selectMaxCOrderNo(); - String orderNo = NumberGeneratorUtil.getContactNo("wtsc", maxNo); + String orderNo = NumberGeneratorUtil.getContactNo(ORDER_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); businessOrder.setCreateUser(authUser.getId()); businessOrder.setUpdateUser(authUser.getId()); businessOrder.setOrderCode(orderNo); - businessOrder.setStatus("1"); + businessOrder.setStatus(NOT_RECEIVED); } /** @@ -327,7 +330,7 @@ sampleStatusPopulation.setOrderId(orderId); sampleStatusPopulation.setSampleId(sampleId); sampleStatusPopulation.setMeasureContent(measureContent); - sampleStatusPopulation.setMeasureType("1"); + sampleStatusPopulation.setMeasureType(INSIDE_MEASURE); return this.sampleRelationMapper.insert(sampleStatusPopulation); } @@ -337,7 +340,6 @@ private int doUpdateSampleStatus(Long orderId, String sampleStatus) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("order_id", orderId); -// queryWrapper.isNull("sampleStatus"); BusinessOrderSampleRelation orderSample = new BusinessOrderSampleRelation(); orderSample.setId(orderId); orderSample.setSampleStatus(sampleStatus); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java index 07c88e9..c2e8995 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java @@ -14,6 +14,7 @@ import com.casic.missiles.dto.business.dispatch.DeviceStatusChangeDTO; import com.casic.missiles.enums.*; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.business.MeasureTypeEnum; import com.casic.missiles.enums.sample.CurrentSegmentEnum; import com.casic.missiles.enums.sample.SampleStatusEnum; import com.casic.missiles.exception.BusinessException; @@ -39,7 +40,7 @@ @Service @Slf4j @AllArgsConstructor -public class IBusinessDispatchServiceImpl extends ServiceImpl implements IBusinessDispatchService { +public class IBusinessDispatchServiceImpl extends ServiceImpl implements IBusinessDispatchService, SampleStatusEnum, CurrentSegmentEnum, MeasureTypeEnum { private final BusinessOrderSampleRelationMapper orderSampleRelationMapper; private final BusinessCertificateReportMapper certificateReportMapper; @@ -73,20 +74,20 @@ Long sampleId = dispatchVO.getSampleId(); String sampleStatus = dispatchVO.getSampleStatus(); //先过滤超期状态下的外检外包 - if (!StringUtils.isEmpty(request.getSampleStatus()) && SampleStatusEnum.BE_OVERDUE.equals(request.getSampleStatus()) && notSelfMeasure(dispatchVO)) { + if (!StringUtils.isEmpty(request.getSampleStatus()) && BE_OVERDUE.equals(request.getSampleStatus()) && notSelfMeasure(dispatchVO)) { return; } switch (sampleStatus) { //待分发状态，当前检定环节:待分配，已出具证书：无，出具证书总数:无 - case SampleStatusEnum.TO_HANDOUT: + case TO_HANDOUT: //检测中状态，当前检定环节:具体实验室，已出具证书：查询证书报告表，证书总数：具体实验室 - case SampleStatusEnum.IN_MEASURE: + case IN_MEASURE: //检测完状态，当前检定环节:完成，已出具证书：无，出具证书总数:无 - case SampleStatusEnum.MEASURE_COMPLETE: + case MEASURE_COMPLETE: doDispatchVoPopulation(dispatchVO, sampleId, orderId); return; //超期样品(即检测超期，未在应检完时间检完),当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室 - case SampleStatusEnum.BE_OVERDUE: + case BE_OVERDUE: HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId); Long deptId = Optional.of(overLabExecutiveDTO.getMeasureDeptId()).orElse(null); dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, deptId)); @@ -126,7 +127,7 @@ /** - * 状态更新 + * 根据sampleId，orderId,进行状态更新 */ @Override public ReturnDTO statusChange(DeviceStatusChangeDTO deviceStatusChangeDTO) { @@ -214,6 +215,9 @@ return handOutLabExecutiveDTOOptional.orElse(null); } + /** + * 构建证书的查询条件 + */ private QueryWrapper getCertificateReportWrapper(DeviceDispatchVO dispatchVO, Long deptId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("order_id", dispatchVO.getOrderId()); @@ -230,7 +234,8 @@ queryWrapper.eq("order_id", statusChangeDTO.getOrderId()); queryWrapper.eq("sample_id", statusChangeDTO.getSampleId()); if (terminateFlag) { - queryWrapper.eq("sample_status", "2").or().eq("sample_status", "3").or().eq("sample_status", "4"); + //若是终止，需要对应待分发、检测中、检测完三个状态的变更 + queryWrapper.eq("sample_status", TO_HANDOUT).or().eq("sample_status", IN_MEASURE).or().eq("sample_status", MEASURE_COMPLETE); } BusinessOrderSampleRelation businessOrderSampleRelation = new BusinessOrderSampleRelation(); businessOrderSampleRelation.setSampleStatus(statusChangeDTO.getStatus()); @@ -238,12 +243,12 @@ } /** - * 判断不是自检 + * 判断不是自检,即外包和外检，进行环节设定 */ private boolean notSelfMeasure(DeviceDispatchVO dispatchVO) { if (!ObjectUtils.isEmpty(dispatchVO.getMeasureType())) { - if (MeasureStatusEnum.TO_ALLOCATE.equals(String.valueOf(dispatchVO.getMeasureType())) || MeasureStatusEnum.TO_MEASURE.equals(String.valueOf(dispatchVO.getMeasureType()))) { - String currentSegment = MeasureStatusEnum.TO_ALLOCATE.equals(dispatchVO.getMeasureType()) ? CurrentSegmentEnum.OUT_UNDERTAKE : CurrentSegmentEnum.OUT_MESASUR; + if (OTHERS_UNDERTAKE.equals(String.valueOf(dispatchVO.getMeasureType())) || OUTSIDE_MEASURE.equals(String.valueOf(dispatchVO.getMeasureType()))) { + String currentSegment = OTHERS_UNDERTAKE.equals(dispatchVO.getMeasureType()) ? OUT_UNDERTAKE : OUT_MESASUR; dispatchVO.setCurrentSegment(currentSegment); return true; } @@ -251,6 +256,9 @@ return false; } + /** + * 其他条件的置为空 + */ private void initDeviceDispatchDTOEmpty(DeviceDispatchDTO request) { request.setSampleName(null); request.setSampleNo(null); @@ -264,15 +272,15 @@ } /** - * 判断样品是完成或接收状态，直接显示即可 + * 判断样品是完成或接收状态，进行当前阶段环节的设置 */ private Boolean checkSampleFinishStatus(DeviceDispatchVO dispatchVO) { - if (SampleStatusEnum.TO_RECEIVE.equals(dispatchVO.getSampleStatus())) { - dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_INCOME); + if (TO_RECEIVE.equals(dispatchVO.getSampleStatus())) { + dispatchVO.setCurrentSegment(TO_INCOME); return true; } - if (SampleStatusEnum.TO_HANDOUT.equals(dispatchVO.getSampleStatus())) { - dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE); + if (TO_HANDOUT.equals(dispatchVO.getSampleStatus())) { + dispatchVO.setCurrentSegment(TO_ALLOCATE); return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java index 4f06678..e2fea21 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.customer.CustomerAdviceMapper; import com.casic.missiles.mapper.customer.CustomerMapper; @@ -34,7 +35,7 @@ @Service @Slf4j @AllArgsConstructor -public class CustomerAdviceServiceImpl implements CustomerAdviceService { +public class CustomerAdviceServiceImpl implements CustomerAdviceService,PrefixCodeEnum { private final CustomerAdviceMapper customerAdviceMapper; private final IBaseExportService iBaseExportService; @@ -122,7 +123,7 @@ private void initCustomerAdviceInfo(CustomerAdviceInfo customerAdviceInfo) { Long maxNo = customerAdviceMapper.selectMaxAdviceNo(); - String adviceNo = NumberGeneratorUtil.getContactNo("khjy", maxNo); + String adviceNo = NumberGeneratorUtil.getContactNo(CUSTOMER_ADVICE_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); customerAdviceInfo.setCreateUser(authUser.getId()); customerAdviceInfo.setUpdateUser(authUser.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java index e8922c0..dd299de 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java @@ -10,18 +10,20 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; -import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.PrefixCodeEnum; +import com.casic.missiles.enums.sample.CertificationExpireStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; import com.casic.missiles.mapper.customer.CustomerMapper; import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper; import com.casic.missiles.mapper.customer.CustomerSampleMapper; -import com.casic.missiles.mapper.customer.customize.MesureRecordsResponseMapper; import com.casic.missiles.model.business.BusinessOrderSampleRelation; import com.casic.missiles.model.customer.CustomerInfo; import com.casic.missiles.model.customer.CustomerSampleInfo; @@ -42,13 +44,12 @@ @Service @AllArgsConstructor -public class CustomerSampleServiceImpl extends ServiceImpl implements CustomerSampleService { +public class CustomerSampleServiceImpl extends ServiceImpl implements CustomerSampleService, CertificationExpireStatusEnum,PrefixCodeEnum{ private final CustomerSampleListResponseMapper customerSampleListResponseMapper; private final CustomerMapper customerMapper; private final IBaseExportService iBaseExportService; private final CertificationResponseMapper certificationResponseMapper; - private final MesureRecordsResponseMapper mesureResponseMapper; private final BusinessOrderSampleRelationMapper sampleRelationMapper; @Override @@ -60,12 +61,12 @@ BusinessOrderSampleRelation businessOrderSampleRelation = this.getSampleStatusById(customerSample.getId()); if (!ObjectUtils.isEmpty(businessOrderSampleRelation)) { customerSample.setOrderId(businessOrderSampleRelation.getOrderId()); - customerSample.setSampleSatus(businessOrderSampleRelation.getSampleStatus()); + customerSample.setSampleStatus(businessOrderSampleRelation.getSampleStatus()); customerSample.setCertificationStatus(calculateCertificationStatus(customerSample.getValidDeadline())); } }); for (CustomerSampleListResponse customerSampleListResponse : customerSamplePage.getRecords()) { - if (!StringUtils.isEmpty(customerSampleListResponse.getSampleSatus())) { + if (!StringUtils.isEmpty(customerSampleListResponse.getSampleStatus())) { DictCodeUtils.convertDictCodeToName(customerSampleListResponse); } } @@ -106,14 +107,13 @@ public CustomerSampleInfo sampleDetail(Long id) { CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id); if (!ObjectUtils.isEmpty(customerSampleInfo)) { - doCustomerSampleInfoPopulation(customerSampleInfo); + doPopulateCustomerSampleInfo(customerSampleInfo); } return customerSampleInfo; } /** * 只导出样品列表信息 - * */ @Override public void sampleExport(CustomerSampleListRequest request, HttpServletResponse response) { @@ -135,7 +135,7 @@ BusinessOrderSampleRelation businessOrderSampleRelation = businessOrderMap.get(customerSample.getId()); if (!ObjectUtils.isEmpty(businessOrderSampleRelation)) { customerSample.setOrderId(businessOrderSampleRelation.getOrderId()); - customerSample.setSampleSatus(businessOrderSampleRelation.getSampleStatus()); + customerSample.setSampleStatus(businessOrderSampleRelation.getSampleStatus()); customerSample.setCertificationStatus(calculateCertificationStatus(customerSample.getValidDeadline())); } } @@ -159,11 +159,9 @@ } @Override - public Page measureRecordsBySampleId(Long id) { - Page page = PageFactory.defaultPage(); - QueryWrapper wrapper = new QueryWrapper() - .eq("sample_id", id); - Page measureRecordsResponsePage = mesureResponseMapper.selectPage(page, wrapper); + public Page measureRecordsBySampleId(MeasureRecordsIdRequest recordsIdRequest) { + Page page = PageFactory.defaultPage(); + Page measureRecordsResponsePage = this.baseMapper.measureRecordsBySampleId(page, recordsIdRequest); return measureRecordsResponsePage; } @@ -177,8 +175,8 @@ } @Override - public Page samplesByOderId(Page page,Long orderId, String sampleNo, String sampleName) { - return this.baseMapper.samplesByOderId(page,orderId,sampleNo,sampleName); + public Page samplesByOderId(Page page, Long orderId, String sampleNo, String sampleName) { + return this.baseMapper.samplesByOderId(page, orderId, sampleNo, sampleName); } private BusinessOrderSampleRelation getSampleStatusById(Long sampleId) { @@ -192,7 +190,7 @@ private void initSample(CustomerSampleInfo customerSampleInfo) { Long maxNo = this.baseMapper.selectMaxSampleNo(); - String sampleNo = NumberGeneratorUtil.getContactNo("khyp", maxNo); + String sampleNo = NumberGeneratorUtil.getContactNo(SAMPLE_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); customerSampleInfo.setSampleNo(sampleNo); customerSampleInfo.setCreateUser(authUser.getId()); @@ -202,7 +200,6 @@ private QueryWrapper listParamWrapper(CustomerSampleListRequest request) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.select("id,sample_no,sample_name,sample_model,manufacturing_no,customer_id,measure_period,measure_last_time,remark,valid_deadline"); queryWrapper.like(StringUtils.isNotBlank(request.getSampleNo()), "sample_no", request.getSampleNo()); queryWrapper.like(StringUtils.isNotBlank(request.getSampleName()), "sample_name", request.getSampleName()); queryWrapper.like(StringUtils.isNotBlank(request.getSampleBelong()), "sample_belong", request.getSampleBelong()); @@ -224,24 +221,30 @@ return queryWrapper; } + /** + * 通过证书到期时间进行到期状态的计算 + */ private String calculateCertificationStatus(String validDeadline) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); if (StringUtils.isEmpty(validDeadline)) { - return "0"; + return NORMAL; } if (validDeadline.compareTo(sdf.format(new Date())) < 0) { - return "2"; + return ALREADY_EXPIRE; } Calendar date = Calendar.getInstance(); date.setTime(new Date()); date.add(Calendar.DAY_OF_MONTH, -30); if (validDeadline.compareTo(sdf.format(date.getTime())) < 0) { - return "1"; + return ALMOST_EXPIRE; } - return "0"; + return NORMAL; } - private void doCustomerSampleInfoPopulation(CustomerSampleInfo customerSampleInfo) { + /** + * 对样品列表的进行供应商联系方式的填充 + */ + private void doPopulateCustomerSampleInfo(CustomerSampleInfo customerSampleInfo) { CustomerInfo customerInfo = customerMapper.selectById(customerSampleInfo.getCustomerId()); if (!ObjectUtils.isEmpty(customerInfo)) { customerSampleInfo.setPhone(customerInfo.getPhone()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java index 32d4dee..c418752 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java @@ -11,9 +11,9 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; import com.casic.missiles.dto.customer.Info.*; -import com.casic.missiles.dto.customer.MesureRecordsResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.customer.CustomerMapper; import com.casic.missiles.mapper.customer.CustomerUserMapper; @@ -38,7 +38,7 @@ @Service @Slf4j @AllArgsConstructor -public class CustomerServiceImpl extends ServiceImpl implements CustomerService { +public class CustomerServiceImpl extends ServiceImpl implements CustomerService,PrefixCodeEnum { private final SampleRecordsResponseMapper sampleRecordsResponseMapper; private final CustomerUserMapper customerUserMapper; @@ -126,18 +126,9 @@ return contractRecordsResponsePage; } - @Override//暂定不做 - public Page mesureRecordsByCustomerId(Long customerId) { - Page measureRecordsResponsePage = PageFactory.defaultPage(); - return measureRecordsResponsePage; - } - @Override public Page certificationByCustomerId(Long customerId) { - Page page = PageFactory.defaultPage(); - QueryWrapper wrapper = new QueryWrapper() - .eq("customer_id", customerId); - return certificationMapper.selectPage(page, wrapper); + return null; } @Override @@ -165,14 +156,13 @@ queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); queryWrapper.like(StringUtils.isNotBlank(request.getBusinessSize()), "bussiness_size", request.getBusinessSize()); queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade()); - queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade()); queryWrapper.eq("is_del", 0); return queryWrapper; } private void initCustomerInfo(CustomerInfo customerInfo) { Long maxNo = this.baseMapper.selectMaxCustomerNo(); - String customerNo = NumberGeneratorUtil.getContactNo("khxx", maxNo); + String customerNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.CUSTOMER_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); customerInfo.setCreateUser(authUser.getId()); customerInfo.setUpdateUser(authUser.getId()); @@ -196,7 +186,7 @@ boolean userUpdateFlag = true; for (CustomerUserInfo customerUserInfo : userInfoList) { customerUserInfo.setCustomerId(id); - String customerNo = NumberGeneratorUtil.getContactNo("khyh", maxUserNo++); + String customerNo = NumberGeneratorUtil.getContactNo(CUSTOMER_USER_PREFIX, maxUserNo++); customerUserInfo.setUserNo(customerNo); int userAddNum = customerUserMapper.insert(customerUserInfo); if (userAddNum <= 0) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index 535581f..594a748 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -106,7 +106,7 @@ //存储溯源供方人员信息 boolean saveBatchFlag = true; List traceSupplierPersonList = traceSupplier.getTraceSupplierPersonList(); - if(!CollectionUtils.isEmpty(traceSupplierPersonList)){ + if (!CollectionUtils.isEmpty(traceSupplierPersonList)) { traceSupplierPersonList.forEach(person -> { person.setSupplierId(traceSupplier.getId()); }); @@ -119,7 +119,7 @@ //存储溯源供方标准装置信息 boolean saveBatchFlag2 = true; List standardEquipmentIds = traceSupplier.getStandardEquipmentIds(); - if(!CollectionUtils.isEmpty(standardEquipmentIds)){ + if (!CollectionUtils.isEmpty(standardEquipmentIds)) { List equipmentList = new ArrayList<>(); standardEquipmentIds.forEach(id -> { MeterTraceSupplierStandardEquipment equipment = new MeterTraceSupplierStandardEquipment(); @@ -154,7 +154,7 @@ traceSupplierPersonService.remove(wrapper); boolean saveFlag = true; //溯源供方人员可能为空 - if(!CollectionUtils.isEmpty(traceSupplierPersonList)){ + if (!CollectionUtils.isEmpty(traceSupplierPersonList)) { //再增加 traceSupplierPersonList.forEach(person -> { person.setSupplierId(traceSupplier.getId()); @@ -169,7 +169,7 @@ meterTraceSupplierStandardEquipmentService.remove(wrapper1); boolean saveBatchFlag2 = true; List standardEquipmentIds = traceSupplier.getStandardEquipmentIds(); - if(!CollectionUtils.isEmpty(standardEquipmentIds)){ + if (!CollectionUtils.isEmpty(standardEquipmentIds)) { List equipmentList = new ArrayList<>(); standardEquipmentIds.forEach(id -> { MeterTraceSupplierStandardEquipment equipment = new MeterTraceSupplierStandardEquipment(); @@ -195,10 +195,10 @@ String formId = request.getFormId(); ReturnDTO returnDTO = baseApprovalService.processSubmit(formId, request.getId()); - if(ResponseData.DEFAULT_SUCCESS_CODE != returnDTO.getCode()){ + if (ResponseData.DEFAULT_SUCCESS_CODE != returnDTO.getCode()) { return returnDTO; } - ProcessInstance processInstance = (ProcessInstance)returnDTO.getData(); + ProcessInstance processInstance = (ProcessInstance) returnDTO.getData(); MeterTraceSupplier traceSupplier = new MeterTraceSupplier(); traceSupplier.setId(request.getId()); @@ -225,9 +225,9 @@ @Override public ReturnDTO approvalDelete(ApprovalDeleteRequest request) { ReturnDTO returnDTO = approvalOperateService.delete(request); - if(ResponseData.DEFAULT_SUCCESS_CODE == returnDTO.getCode()){ + if (ResponseData.DEFAULT_SUCCESS_CODE == returnDTO.getCode()) { //本地删除 - if(traceSupplierMapper.deleteById(request.getId()) > 0){ + if (traceSupplierMapper.deleteById(request.getId()) > 0) { return ReturnUtil.success(); } } @@ -267,16 +267,16 @@ //待审批，该状态维护在flowable中 case ApprovalStatusEnum.TO_BE_APPROVED: List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); - if(!CollectionUtils.isEmpty(toBeApprovedList)){ + if (!CollectionUtils.isEmpty(toBeApprovedList)) { businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); } - if(!CollectionUtils.isEmpty(businessKeys)){ + if (!CollectionUtils.isEmpty(businessKeys)) { list = traceSupplierMapper.selectBatchForApproval(page, request, businessKeys); approvalList = handleApprovalListResponse(approvalList, list, ApprovalStatusEnum.TO_BE_APPROVED); //DTO根据业务主键补全taskId approvalList.forEach(approval -> { toBeApprovedList.forEach(toBeApprovedDTO -> { - if(String.valueOf(approval.getId()).equals(toBeApprovedDTO.getBusinessKey())){ + if (String.valueOf(approval.getId()).equals(toBeApprovedDTO.getBusinessKey())) { approval.setTaskId(toBeApprovedDTO.getTaskId()); //补全可选决策项 approval.setDecisionItem(toBeApprovedDTO.getDecisionItem()); @@ -288,7 +288,7 @@ //审批中，该状态维护在flowable中 case ApprovalStatusEnum.IN_APPROVED: businessKeys = baseApprovalService.getInApprovedList(request.getFormId()); - if(!CollectionUtils.isEmpty(businessKeys)){ + if (!CollectionUtils.isEmpty(businessKeys)) { list = traceSupplierMapper.selectBatchForApproval(page, request, businessKeys); approvalList = handleApprovalListResponse(approvalList, list, ApprovalStatusEnum.IN_APPROVED); } @@ -296,7 +296,7 @@ //已通过，该状态维护在flowable case ApprovalStatusEnum.PASSED: businessKeys = baseApprovalService.getPassedList(request.getFormId()); - if(!CollectionUtils.isEmpty(businessKeys)){ + if (!CollectionUtils.isEmpty(businessKeys)) { list = traceSupplierMapper.selectBatchForApproval(page, request, businessKeys); approvalList = handleApprovalListResponse(approvalList, list, ApprovalStatusEnum.PASSED); } @@ -305,12 +305,12 @@ case ApprovalStatusEnum.FAILED: businessKeys = baseApprovalService.getFailedList(request.getFormId()); //未通过-拒绝 List rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回 - if(!CollectionUtils.isEmpty(businessKeys)){ + if (!CollectionUtils.isEmpty(businessKeys)) { list = traceSupplierMapper.selectBatchForApproval(page, request, businessKeys); approvalList = handleApprovalListResponse(approvalList, list, ApprovalStatusEnum.FAILED); } List rejectApprovalList = new ArrayList<>(); - if(!CollectionUtils.isEmpty(rejectBusinessKey)){ + if (!CollectionUtils.isEmpty(rejectBusinessKey)) { List rejectList = traceSupplierMapper.selectBatchForApproval(page, request, rejectBusinessKey); rejectApprovalList = handleApprovalListResponse(approvalList, rejectList, ApprovalStatusEnum.FAILED_REJECT); } @@ -320,7 +320,7 @@ //已取消（直接删除实例），该状态维护在flowable case ApprovalStatusEnum.CANCELED: businessKeys = baseApprovalService.getCanceledList(request.getFormId()); - if(!CollectionUtils.isEmpty(businessKeys)){ + if (!CollectionUtils.isEmpty(businessKeys)) { list = traceSupplierMapper.selectBatchForApproval(page, request, businessKeys); approvalList = handleApprovalListResponse(approvalList, list, ApprovalStatusEnum.CANCELED); } @@ -330,10 +330,10 @@ //普通用户获取自己发起的(审批中、已通过、未通过、已取消)，管理员获取全部(审批中、已通过、未通过、已取消) case ApprovalStatusEnum.ALL: List AllApproveList = baseApprovalService.getAllList(request.getFormId()); - if(!CollectionUtils.isEmpty(AllApproveList)){ + if (!CollectionUtils.isEmpty(AllApproveList)) { businessKeys = AllApproveList.stream().map(AllApproveDTO::getBusinessKey).collect(Collectors.toList()); } - if(!CollectionUtils.isEmpty(businessKeys)){ + if (!CollectionUtils.isEmpty(businessKeys)) { list = traceSupplierMapper.selectBatchForApproval(page, request, businessKeys); approvalList = handleAllApprovalListResponse(approvalList, list, AllApproveList); } @@ -343,9 +343,11 @@ } private List handleAllApprovalListResponse(List approvalList, List list, List allApproveList) { - Map taskMap = new HashMap<>(); + Map taskMap = new HashMap<>(); approvalList = ConvertUtils.sourceToTarget(list, TraceSupplierApprovalListResponse.class); - allApproveList.forEach(allApprove -> {taskMap.put(allApprove.getBusinessKey(),allApprove.getStatus());}); + allApproveList.forEach(allApprove -> { + taskMap.put(allApprove.getBusinessKey(), allApprove.getStatus()); + }); //状态补全 approvalList.forEach(approval -> { approval.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, taskMap.get(String.valueOf(approval.getId())))); @@ -369,7 +371,7 @@ @Override public ReturnDTO deleteTraceSupplier(Long id) { - if(traceSupplierMapper.deleteById(id) > 0){ + if (traceSupplierMapper.deleteById(id) > 0) { return ReturnUtil.success(); } return ReturnUtil.failed("刪除失败"); @@ -377,7 +379,7 @@ @Override public ReturnDTO deleteBatchTraceSupplier(List ids) { - if(traceSupplierMapper.deleteBatchIds(ids) > 0){ + if (traceSupplierMapper.deleteBatchIds(ids) > 0) { return ReturnUtil.success(); } return ReturnUtil.failed("删除失败"); @@ -400,6 +402,7 @@ wrapper.eq("id", 12344321); return wrapper; } + wrapper.like(StringUtils.isNotBlank(request.getSupplierNo()), "supplier_no", request.getSupplierNo()); wrapper.like(StringUtils.isNotBlank(request.getSupplierName()), "supplier_name", request.getSupplierName()); wrapper.like(StringUtils.isNotBlank(request.getBusinessContent()), "business_content", request.getBusinessContent()); @@ -409,7 +412,7 @@ return wrapper; } - private List handleApprovalListResponse(List approvalList, List list, String status){ + private List handleApprovalListResponse(List approvalList, List list, String status) { approvalList = ConvertUtils.sourceToTarget(list, TraceSupplierApprovalListResponse.class); approvalList.stream().forEach(result -> { //审批状态两种获取方式：1、在此处设置，2、在flowable中设置业务状态，暂采取1 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 832517f..f1c90e8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -12,6 +12,7 @@ import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.business.OrderStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessDealRecordMapper; import com.casic.missiles.model.business.BusinessDealRecord; @@ -44,7 +45,7 @@ @Api(tags = "委托书模块") @RequestMapping("/business/order") @AllArgsConstructor -public class BusinessOrderController extends ExportController { +public class BusinessOrderController extends ExportController implements OrderStatusEnum { private final IBusinessOrderService businessOrderService; @@ -119,7 +120,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "2"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_RECEIVED); } @ApiOperation("委托书退回") @@ -128,7 +129,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "3"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java index 7591c07..ae7a28d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -10,7 +10,6 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; import com.casic.missiles.dto.customer.Info.*; -import com.casic.missiles.dto.customer.MesureRecordsResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerInfo; @@ -102,19 +101,9 @@ return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); } - @ApiOperation("根据客户id查询检定记录-分页") - @PostMapping("/mesureRecords") - public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); - } - - @ApiOperation("客户删除") @PostMapping("/delete") - public ReturnDTO deleteCsutomer(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO deleteCustomer(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java index 9ae077e..c7d6b3f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -9,9 +9,10 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; -import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerSampleInfo; @@ -93,15 +94,13 @@ customerSampleService.sampleExport(request, response); } - @ApiOperation("根据样品id查询检定记录") - @PostMapping("/mesureRecordsBySampleId") - public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(idDTO.getId()))); + @ApiOperation("根据样品id或客户id查询检定记录") + @PostMapping("/measureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) { + return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest))); } + @ApiOperation("根据样品id查询检定证书") @PostMapping("/certificationBySampleId") public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { @@ -111,13 +110,4 @@ return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); } -// @ApiOperation("样品批量导入") -// @PostMapping("/batchImport") -// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return null; -// } - } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index 6b109a2..fbe403d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -1,5 +1,7 @@ package com.casic.missiles.enums; +import org.apache.xmlbeans.impl.xb.xsdschema.Public; + /** * @Description: 生成编号前缀枚举 * @Author: zt @@ -7,9 +9,31 @@ */ public interface PrefixCodeEnum { - //环境记录单编号生成前缀 - String ENVIRONMENT_PREFIX = "hjld"; - //原始记录单编号生成前缀 - String ORIGIN_PREFIX = "ysld"; + //环境记录单编号生成前缀 + String ENVIRONMENT_PREFIX = "hjld"; + //原始记录单编号生成前缀 + String ORIGIN_PREFIX = "ysld"; + + + /*************客户资源模块，tt notice**************/ + //样品编号 + String SAMPLE_PREFIX = "khyp"; + + //客户编号 + String CUSTOMER_PREFIX = "khxx"; + + //客户建议编号 + String CUSTOMER_ADVICE_PREFIX = "khjy"; + + //客户用户编号 + String CUSTOMER_USER_PREFIX = "khyh"; + + //委托书编号 + String ORDER_PREFIX = "wtsc"; + + /*************委托书调度，tt notice**************/ + //交接单编号 + String INTER_CHANGE_PREFIX = "jjdh"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java new file mode 100644 index 0000000..a013d67 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java @@ -0,0 +1,19 @@ +package com.casic.missiles.enums.business; + +public interface CertificatePrintStatusEnum { + + /** + * 不可打印 + */ + String PRINTABLE = "1"; + + /** + * 不可打印 + */ + String NON_PRINTABLE = "2"; + + /** + * 审批中 + */ + String IN_APPROVAL = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java new file mode 100644 index 0000000..a0b0274 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +/** + * @author cz + */ +public interface MeasureTypeEnum { + /** + * 自检 + */ + String INSIDE_MEASURE = "1"; + + /** + * 外包 + */ + String OTHERS_UNDERTAKE = "2"; + + /** + * 外检 + */ + String OUTSIDE_MEASURE = "3"; + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java new file mode 100644 index 0000000..83371aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +public interface OrderStatusEnum { + + /** + * 未接收 + */ + String NOT_RECEIVED = "1"; + /** + * 已接收 + */ + String ALREADY_RECEIVED = "2"; + /** + * 已取消 + */ + String ALREADY_CANCEL = "3"; + + /** + * 检测完成 + */ + String MEASURE_SUCCESS = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java new file mode 100644 index 0000000..d32da8d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java @@ -0,0 +1,23 @@ +package com.casic.missiles.enums.sample; + +/** + * @author cz + */ +public interface CertificationExpireStatusEnum { + + /** + * 未超期 + */ + String NORMAL = "0"; + + /** + * 即将超期，距离结束即将到30天 + */ + String ALMOST_EXPIRE = "1"; + + /** + * 已经超期 + */ + String ALREADY_EXPIRE = "2"; + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java index fde0627..8b73201 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.model.customer.CustomerSampleInfo; import org.apache.ibatis.annotations.Param; @@ -10,6 +12,8 @@ Long selectMaxSampleNo(); + Page measureRecordsBySampleId(Page page, @Param("request") MeasureRecordsIdRequest recordsIdRequest); + Page samplesByOderId(Page page, @Param("orderId") Long orderId, diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java deleted file mode 100644 index a086b38..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.missiles.mapper.customer.customize; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.customer.MesureRecordsResponse; - -public interface MesureRecordsResponseMapper extends BaseMapper { -} diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index f10fbb3..e7f5950 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -7,22 +7,56 @@ FROM customer_sample_info + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java new file mode 100644 index 0000000..ec13e19 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MeasureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java deleted file mode 100644 index f13b5d4..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.dto.customer; - -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author cz - * @date 2023-02-01 - */ -@Data -@ApiModel -public class MesureRecordsResponse { - - @ApiModelProperty(value = "委托书id", dataType = "Long") - private Long orderId; - - @ApiModelProperty(value = "委托单编号", dataType = "String") - private String orderCode; - - @ApiModelProperty(value = "委托单日期", dataType = "String") - private String orderTime; - - @ApiModelProperty(value = "委托人代码", dataType = "String") - private String customerCode; - - @ApiModelProperty(value = "委托人名称", dataType = "String") - private String customerName; - - @ApiModelProperty(value = "送检人", dataType = "String") - private String deliverer; - - @ApiModelProperty(value = "送检日期", dataType = "String") - private String deliverTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java index 2e8657f..c0a9a99 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -53,12 +53,12 @@ @TableField(exist = false) @ApiModelProperty(value = "样品状态", dataType = "String") @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.SAMPLE_STATUS) - private String sampleSatus; + private String sampleStatus; @TableField(exist = false) @ApiModelProperty(value = "样品状态", dataType = "String") @ExcelProperty(value = "样品状态", order = 5) - private String sampleSatusName; + private String sampleStatusName; @ApiModelProperty(value = "委托方名称", dataType = "String") @ExcelProperty(value = "委托方名称", order = 6) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java new file mode 100644 index 0000000..7bcf105 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java @@ -0,0 +1,22 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + */ + +@Data +@ApiModel("检测记录查询id") +public class MeasureRecordsIdRequest { + + @ApiModelProperty("样品Id") + private Long sampleId; + + @ApiModelProperty("客户id") + private Long customerId; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java index 2f97cb3..542f5ca 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.base.service.IBaseExportService; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; @@ -20,6 +19,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.business.CertificatePrintStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; import com.casic.missiles.model.business.BusinessCertificateReport; @@ -42,10 +42,9 @@ */ @Service @AllArgsConstructor -public class BusinessCertificatePrintServiceImpl extends ServiceImpl implements IBusinessCertificatePrintService { +public class BusinessCertificatePrintServiceImpl extends ServiceImpl implements IBusinessCertificatePrintService, CertificatePrintStatusEnum { private final IBaseApprovalService baseApprovalService; - private final AbstractDictService dictService; private final IBaseExportService iBaseExportService; private final ApprovalOperateService approvalOperateService; @@ -86,7 +85,7 @@ } /** - * 更新工作流审批状态为拒绝，当返回值成功时，进行打印状态置为不可打印，审批状态为不通过 + * 更新工作流审批状态为拒绝，当返回值成功时，进行打印状态置为不可打印，审批状态为不通过 * * @return */ @@ -103,7 +102,7 @@ BusinessCertificateReport certificateReport = new BusinessCertificateReport(); certificateReport.setId(request.getId()); //设置为不能打印 - certificateReport.setPrintStatus("2"); + certificateReport.setPrintStatus(NON_PRINTABLE); certificateReport.setApprovalStatus(ApprovalStatusEnum.FAILED); int row = this.baseMapper.updateById(certificateReport); if (row <= 0) { @@ -113,7 +112,7 @@ } /** - * 提交审批流程，修改证书审批状态为待审批，打印状态为审批中 + * 提交审批流程，修改证书审批状态为待审批，打印状态为审批中 */ @Transactional @Override @@ -128,7 +127,7 @@ //审批状态为审批中 certificateReport.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED); //打印状态审批中 - certificateReport.setPrintStatus("3"); + certificateReport.setPrintStatus(IN_APPROVAL); int row = this.baseMapper.updateById(certificateReport); if (row <= 0) { throw new BusinessException(BusinessExceptionEnum.AGAIN_PRINT_SUBMIT_FAILED.getCode(), BusinessExceptionEnum.AGAIN_PRINT_SUBMIT_FAILED.getMessage()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java index 859010b..0d847a0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.dto.customer.sample.CustomerSampleListVO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessInterchangeMapper; import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; @@ -35,7 +36,7 @@ * 业务管理-设备交接单 服务实现类 *

* - * @author wangpeng + * @author cz * @since 2023-02-02 */ @Service @@ -83,7 +84,7 @@ } /** - * 更新不对样品有任何操作 + * 更新只是交接单的变更，没有任何其他单位的变化 */ @Override public ReturnDTO updateExchange(BusinessInterchange businessInterchange) { @@ -94,6 +95,9 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + /** + * 交接单新增，同时在样品委托书管理表中新增交接单记录id + */ @Override @Transactional public ReturnDTO addExchange(BusinessInterchange businessInterchange) { @@ -111,6 +115,9 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + /** + * 选中判断ids存在，进行其他条件的清空 + */ @Override public void exportExchange(InterchangeListRequest request, HttpServletResponse response) { try { @@ -153,7 +160,7 @@ private void populationExchange(BusinessInterchange businessInterchange) { Long maxNo = this.baseMapper.selectMaxExchangeNo(); - String orderNo = NumberGeneratorUtil.getContactNo("jjdh", maxNo); + String orderNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.INTER_CHANGE_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); businessInterchange.setCreateUser(authUser.getId()); businessInterchange.setInterchangeCode(orderNo); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java index 138a1e2..d6bb339 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -14,6 +14,10 @@ import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.PrefixCodeEnum; +import com.casic.missiles.enums.business.MeasureTypeEnum; +import com.casic.missiles.enums.business.OrderStatusEnum; +import com.casic.missiles.enums.sample.SampleStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessDealRecordMapper; import com.casic.missiles.mapper.business.BusinessOrderListReponseMapper; @@ -35,7 +39,6 @@ import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -50,7 +53,7 @@ */ @Service @AllArgsConstructor -public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService { +public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService,PrefixCodeEnum, OrderStatusEnum,SampleStatusEnum, MeasureTypeEnum { private final BusinessOrderListReponseMapper orderListResponseMapper; private final IBaseExportService iBaseExportService; @@ -203,9 +206,9 @@ public ReturnDTO updateStatusById(OrderCancelRequest orderCancelRequest, String status) { int updateFlag = doUpdateStatusById(orderCancelRequest.getId(), status); String dealType = ""; - if (status.equals("2")) { + if (status.equals(ALREADY_RECEIVED)) { dealType = "委托书接收" ; - doUpdateSampleStatus(orderCancelRequest.getId(),"1"); + doUpdateSampleStatus(orderCancelRequest.getId(),TO_RECEIVE); } else { dealType = "委托书退回"; } @@ -222,7 +225,7 @@ @Override @Transactional public ReturnDTO cancelOrder(OrderCancelRequest orderCancelRequest) { - int updateFlag = this.doUpdateStatusById(orderCancelRequest.getId(), "3"); + int updateFlag = this.doUpdateStatusById(orderCancelRequest.getId(), ALREADY_CANCEL); int addDealRecordFlag = addDealRecord(orderCancelRequest, "委托书取消"); if (updateFlag > 0 && addDealRecordFlag > 0) { return ReturnUtil.success(); @@ -287,12 +290,12 @@ private void initOrderInfo(BusinessOrder businessOrder) { Long maxNo = this.baseMapper.selectMaxCOrderNo(); - String orderNo = NumberGeneratorUtil.getContactNo("wtsc", maxNo); + String orderNo = NumberGeneratorUtil.getContactNo(ORDER_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); businessOrder.setCreateUser(authUser.getId()); businessOrder.setUpdateUser(authUser.getId()); businessOrder.setOrderCode(orderNo); - businessOrder.setStatus("1"); + businessOrder.setStatus(NOT_RECEIVED); } /** @@ -327,7 +330,7 @@ sampleStatusPopulation.setOrderId(orderId); sampleStatusPopulation.setSampleId(sampleId); sampleStatusPopulation.setMeasureContent(measureContent); - sampleStatusPopulation.setMeasureType("1"); + sampleStatusPopulation.setMeasureType(INSIDE_MEASURE); return this.sampleRelationMapper.insert(sampleStatusPopulation); } @@ -337,7 +340,6 @@ private int doUpdateSampleStatus(Long orderId, String sampleStatus) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("order_id", orderId); -// queryWrapper.isNull("sampleStatus"); BusinessOrderSampleRelation orderSample = new BusinessOrderSampleRelation(); orderSample.setId(orderId); orderSample.setSampleStatus(sampleStatus); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java index 07c88e9..c2e8995 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java @@ -14,6 +14,7 @@ import com.casic.missiles.dto.business.dispatch.DeviceStatusChangeDTO; import com.casic.missiles.enums.*; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.business.MeasureTypeEnum; import com.casic.missiles.enums.sample.CurrentSegmentEnum; import com.casic.missiles.enums.sample.SampleStatusEnum; import com.casic.missiles.exception.BusinessException; @@ -39,7 +40,7 @@ @Service @Slf4j @AllArgsConstructor -public class IBusinessDispatchServiceImpl extends ServiceImpl implements IBusinessDispatchService { +public class IBusinessDispatchServiceImpl extends ServiceImpl implements IBusinessDispatchService, SampleStatusEnum, CurrentSegmentEnum, MeasureTypeEnum { private final BusinessOrderSampleRelationMapper orderSampleRelationMapper; private final BusinessCertificateReportMapper certificateReportMapper; @@ -73,20 +74,20 @@ Long sampleId = dispatchVO.getSampleId(); String sampleStatus = dispatchVO.getSampleStatus(); //先过滤超期状态下的外检外包 - if (!StringUtils.isEmpty(request.getSampleStatus()) && SampleStatusEnum.BE_OVERDUE.equals(request.getSampleStatus()) && notSelfMeasure(dispatchVO)) { + if (!StringUtils.isEmpty(request.getSampleStatus()) && BE_OVERDUE.equals(request.getSampleStatus()) && notSelfMeasure(dispatchVO)) { return; } switch (sampleStatus) { //待分发状态，当前检定环节:待分配，已出具证书：无，出具证书总数:无 - case SampleStatusEnum.TO_HANDOUT: + case TO_HANDOUT: //检测中状态，当前检定环节:具体实验室，已出具证书：查询证书报告表，证书总数：具体实验室 - case SampleStatusEnum.IN_MEASURE: + case IN_MEASURE: //检测完状态，当前检定环节:完成，已出具证书：无，出具证书总数:无 - case SampleStatusEnum.MEASURE_COMPLETE: + case MEASURE_COMPLETE: doDispatchVoPopulation(dispatchVO, sampleId, orderId); return; //超期样品(即检测超期，未在应检完时间检完),当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室 - case SampleStatusEnum.BE_OVERDUE: + case BE_OVERDUE: HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId); Long deptId = Optional.of(overLabExecutiveDTO.getMeasureDeptId()).orElse(null); dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, deptId)); @@ -126,7 +127,7 @@ /** - * 状态更新 + * 根据sampleId，orderId,进行状态更新 */ @Override public ReturnDTO statusChange(DeviceStatusChangeDTO deviceStatusChangeDTO) { @@ -214,6 +215,9 @@ return handOutLabExecutiveDTOOptional.orElse(null); } + /** + * 构建证书的查询条件 + */ private QueryWrapper getCertificateReportWrapper(DeviceDispatchVO dispatchVO, Long deptId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("order_id", dispatchVO.getOrderId()); @@ -230,7 +234,8 @@ queryWrapper.eq("order_id", statusChangeDTO.getOrderId()); queryWrapper.eq("sample_id", statusChangeDTO.getSampleId()); if (terminateFlag) { - queryWrapper.eq("sample_status", "2").or().eq("sample_status", "3").or().eq("sample_status", "4"); + //若是终止，需要对应待分发、检测中、检测完三个状态的变更 + queryWrapper.eq("sample_status", TO_HANDOUT).or().eq("sample_status", IN_MEASURE).or().eq("sample_status", MEASURE_COMPLETE); } BusinessOrderSampleRelation businessOrderSampleRelation = new BusinessOrderSampleRelation(); businessOrderSampleRelation.setSampleStatus(statusChangeDTO.getStatus()); @@ -238,12 +243,12 @@ } /** - * 判断不是自检 + * 判断不是自检,即外包和外检，进行环节设定 */ private boolean notSelfMeasure(DeviceDispatchVO dispatchVO) { if (!ObjectUtils.isEmpty(dispatchVO.getMeasureType())) { - if (MeasureStatusEnum.TO_ALLOCATE.equals(String.valueOf(dispatchVO.getMeasureType())) || MeasureStatusEnum.TO_MEASURE.equals(String.valueOf(dispatchVO.getMeasureType()))) { - String currentSegment = MeasureStatusEnum.TO_ALLOCATE.equals(dispatchVO.getMeasureType()) ? CurrentSegmentEnum.OUT_UNDERTAKE : CurrentSegmentEnum.OUT_MESASUR; + if (OTHERS_UNDERTAKE.equals(String.valueOf(dispatchVO.getMeasureType())) || OUTSIDE_MEASURE.equals(String.valueOf(dispatchVO.getMeasureType()))) { + String currentSegment = OTHERS_UNDERTAKE.equals(dispatchVO.getMeasureType()) ? OUT_UNDERTAKE : OUT_MESASUR; dispatchVO.setCurrentSegment(currentSegment); return true; } @@ -251,6 +256,9 @@ return false; } + /** + * 其他条件的置为空 + */ private void initDeviceDispatchDTOEmpty(DeviceDispatchDTO request) { request.setSampleName(null); request.setSampleNo(null); @@ -264,15 +272,15 @@ } /** - * 判断样品是完成或接收状态，直接显示即可 + * 判断样品是完成或接收状态，进行当前阶段环节的设置 */ private Boolean checkSampleFinishStatus(DeviceDispatchVO dispatchVO) { - if (SampleStatusEnum.TO_RECEIVE.equals(dispatchVO.getSampleStatus())) { - dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_INCOME); + if (TO_RECEIVE.equals(dispatchVO.getSampleStatus())) { + dispatchVO.setCurrentSegment(TO_INCOME); return true; } - if (SampleStatusEnum.TO_HANDOUT.equals(dispatchVO.getSampleStatus())) { - dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE); + if (TO_HANDOUT.equals(dispatchVO.getSampleStatus())) { + dispatchVO.setCurrentSegment(TO_ALLOCATE); return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java index 4f06678..e2fea21 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.customer.CustomerAdviceMapper; import com.casic.missiles.mapper.customer.CustomerMapper; @@ -34,7 +35,7 @@ @Service @Slf4j @AllArgsConstructor -public class CustomerAdviceServiceImpl implements CustomerAdviceService { +public class CustomerAdviceServiceImpl implements CustomerAdviceService,PrefixCodeEnum { private final CustomerAdviceMapper customerAdviceMapper; private final IBaseExportService iBaseExportService; @@ -122,7 +123,7 @@ private void initCustomerAdviceInfo(CustomerAdviceInfo customerAdviceInfo) { Long maxNo = customerAdviceMapper.selectMaxAdviceNo(); - String adviceNo = NumberGeneratorUtil.getContactNo("khjy", maxNo); + String adviceNo = NumberGeneratorUtil.getContactNo(CUSTOMER_ADVICE_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); customerAdviceInfo.setCreateUser(authUser.getId()); customerAdviceInfo.setUpdateUser(authUser.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java index e8922c0..dd299de 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java @@ -10,18 +10,20 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; -import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.PrefixCodeEnum; +import com.casic.missiles.enums.sample.CertificationExpireStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; import com.casic.missiles.mapper.customer.CustomerMapper; import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper; import com.casic.missiles.mapper.customer.CustomerSampleMapper; -import com.casic.missiles.mapper.customer.customize.MesureRecordsResponseMapper; import com.casic.missiles.model.business.BusinessOrderSampleRelation; import com.casic.missiles.model.customer.CustomerInfo; import com.casic.missiles.model.customer.CustomerSampleInfo; @@ -42,13 +44,12 @@ @Service @AllArgsConstructor -public class CustomerSampleServiceImpl extends ServiceImpl implements CustomerSampleService { +public class CustomerSampleServiceImpl extends ServiceImpl implements CustomerSampleService, CertificationExpireStatusEnum,PrefixCodeEnum{ private final CustomerSampleListResponseMapper customerSampleListResponseMapper; private final CustomerMapper customerMapper; private final IBaseExportService iBaseExportService; private final CertificationResponseMapper certificationResponseMapper; - private final MesureRecordsResponseMapper mesureResponseMapper; private final BusinessOrderSampleRelationMapper sampleRelationMapper; @Override @@ -60,12 +61,12 @@ BusinessOrderSampleRelation businessOrderSampleRelation = this.getSampleStatusById(customerSample.getId()); if (!ObjectUtils.isEmpty(businessOrderSampleRelation)) { customerSample.setOrderId(businessOrderSampleRelation.getOrderId()); - customerSample.setSampleSatus(businessOrderSampleRelation.getSampleStatus()); + customerSample.setSampleStatus(businessOrderSampleRelation.getSampleStatus()); customerSample.setCertificationStatus(calculateCertificationStatus(customerSample.getValidDeadline())); } }); for (CustomerSampleListResponse customerSampleListResponse : customerSamplePage.getRecords()) { - if (!StringUtils.isEmpty(customerSampleListResponse.getSampleSatus())) { + if (!StringUtils.isEmpty(customerSampleListResponse.getSampleStatus())) { DictCodeUtils.convertDictCodeToName(customerSampleListResponse); } } @@ -106,14 +107,13 @@ public CustomerSampleInfo sampleDetail(Long id) { CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id); if (!ObjectUtils.isEmpty(customerSampleInfo)) { - doCustomerSampleInfoPopulation(customerSampleInfo); + doPopulateCustomerSampleInfo(customerSampleInfo); } return customerSampleInfo; } /** * 只导出样品列表信息 - * */ @Override public void sampleExport(CustomerSampleListRequest request, HttpServletResponse response) { @@ -135,7 +135,7 @@ BusinessOrderSampleRelation businessOrderSampleRelation = businessOrderMap.get(customerSample.getId()); if (!ObjectUtils.isEmpty(businessOrderSampleRelation)) { customerSample.setOrderId(businessOrderSampleRelation.getOrderId()); - customerSample.setSampleSatus(businessOrderSampleRelation.getSampleStatus()); + customerSample.setSampleStatus(businessOrderSampleRelation.getSampleStatus()); customerSample.setCertificationStatus(calculateCertificationStatus(customerSample.getValidDeadline())); } } @@ -159,11 +159,9 @@ } @Override - public Page measureRecordsBySampleId(Long id) { - Page page = PageFactory.defaultPage(); - QueryWrapper wrapper = new QueryWrapper() - .eq("sample_id", id); - Page measureRecordsResponsePage = mesureResponseMapper.selectPage(page, wrapper); + public Page measureRecordsBySampleId(MeasureRecordsIdRequest recordsIdRequest) { + Page page = PageFactory.defaultPage(); + Page measureRecordsResponsePage = this.baseMapper.measureRecordsBySampleId(page, recordsIdRequest); return measureRecordsResponsePage; } @@ -177,8 +175,8 @@ } @Override - public Page samplesByOderId(Page page,Long orderId, String sampleNo, String sampleName) { - return this.baseMapper.samplesByOderId(page,orderId,sampleNo,sampleName); + public Page samplesByOderId(Page page, Long orderId, String sampleNo, String sampleName) { + return this.baseMapper.samplesByOderId(page, orderId, sampleNo, sampleName); } private BusinessOrderSampleRelation getSampleStatusById(Long sampleId) { @@ -192,7 +190,7 @@ private void initSample(CustomerSampleInfo customerSampleInfo) { Long maxNo = this.baseMapper.selectMaxSampleNo(); - String sampleNo = NumberGeneratorUtil.getContactNo("khyp", maxNo); + String sampleNo = NumberGeneratorUtil.getContactNo(SAMPLE_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); customerSampleInfo.setSampleNo(sampleNo); customerSampleInfo.setCreateUser(authUser.getId()); @@ -202,7 +200,6 @@ private QueryWrapper listParamWrapper(CustomerSampleListRequest request) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.select("id,sample_no,sample_name,sample_model,manufacturing_no,customer_id,measure_period,measure_last_time,remark,valid_deadline"); queryWrapper.like(StringUtils.isNotBlank(request.getSampleNo()), "sample_no", request.getSampleNo()); queryWrapper.like(StringUtils.isNotBlank(request.getSampleName()), "sample_name", request.getSampleName()); queryWrapper.like(StringUtils.isNotBlank(request.getSampleBelong()), "sample_belong", request.getSampleBelong()); @@ -224,24 +221,30 @@ return queryWrapper; } + /** + * 通过证书到期时间进行到期状态的计算 + */ private String calculateCertificationStatus(String validDeadline) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); if (StringUtils.isEmpty(validDeadline)) { - return "0"; + return NORMAL; } if (validDeadline.compareTo(sdf.format(new Date())) < 0) { - return "2"; + return ALREADY_EXPIRE; } Calendar date = Calendar.getInstance(); date.setTime(new Date()); date.add(Calendar.DAY_OF_MONTH, -30); if (validDeadline.compareTo(sdf.format(date.getTime())) < 0) { - return "1"; + return ALMOST_EXPIRE; } - return "0"; + return NORMAL; } - private void doCustomerSampleInfoPopulation(CustomerSampleInfo customerSampleInfo) { + /** + * 对样品列表的进行供应商联系方式的填充 + */ + private void doPopulateCustomerSampleInfo(CustomerSampleInfo customerSampleInfo) { CustomerInfo customerInfo = customerMapper.selectById(customerSampleInfo.getCustomerId()); if (!ObjectUtils.isEmpty(customerInfo)) { customerSampleInfo.setPhone(customerInfo.getPhone()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java index 32d4dee..c418752 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java @@ -11,9 +11,9 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; import com.casic.missiles.dto.customer.Info.*; -import com.casic.missiles.dto.customer.MesureRecordsResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.customer.CustomerMapper; import com.casic.missiles.mapper.customer.CustomerUserMapper; @@ -38,7 +38,7 @@ @Service @Slf4j @AllArgsConstructor -public class CustomerServiceImpl extends ServiceImpl implements CustomerService { +public class CustomerServiceImpl extends ServiceImpl implements CustomerService,PrefixCodeEnum { private final SampleRecordsResponseMapper sampleRecordsResponseMapper; private final CustomerUserMapper customerUserMapper; @@ -126,18 +126,9 @@ return contractRecordsResponsePage; } - @Override//暂定不做 - public Page mesureRecordsByCustomerId(Long customerId) { - Page measureRecordsResponsePage = PageFactory.defaultPage(); - return measureRecordsResponsePage; - } - @Override public Page certificationByCustomerId(Long customerId) { - Page page = PageFactory.defaultPage(); - QueryWrapper wrapper = new QueryWrapper() - .eq("customer_id", customerId); - return certificationMapper.selectPage(page, wrapper); + return null; } @Override @@ -165,14 +156,13 @@ queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); queryWrapper.like(StringUtils.isNotBlank(request.getBusinessSize()), "bussiness_size", request.getBusinessSize()); queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade()); - queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade()); queryWrapper.eq("is_del", 0); return queryWrapper; } private void initCustomerInfo(CustomerInfo customerInfo) { Long maxNo = this.baseMapper.selectMaxCustomerNo(); - String customerNo = NumberGeneratorUtil.getContactNo("khxx", maxNo); + String customerNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.CUSTOMER_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); customerInfo.setCreateUser(authUser.getId()); customerInfo.setUpdateUser(authUser.getId()); @@ -196,7 +186,7 @@ boolean userUpdateFlag = true; for (CustomerUserInfo customerUserInfo : userInfoList) { customerUserInfo.setCustomerId(id); - String customerNo = NumberGeneratorUtil.getContactNo("khyh", maxUserNo++); + String customerNo = NumberGeneratorUtil.getContactNo(CUSTOMER_USER_PREFIX, maxUserNo++); customerUserInfo.setUserNo(customerNo); int userAddNum = customerUserMapper.insert(customerUserInfo); if (userAddNum <= 0) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index 535581f..594a748 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -106,7 +106,7 @@ //存储溯源供方人员信息 boolean saveBatchFlag = true; List traceSupplierPersonList = traceSupplier.getTraceSupplierPersonList(); - if(!CollectionUtils.isEmpty(traceSupplierPersonList)){ + if (!CollectionUtils.isEmpty(traceSupplierPersonList)) { traceSupplierPersonList.forEach(person -> { person.setSupplierId(traceSupplier.getId()); }); @@ -119,7 +119,7 @@ //存储溯源供方标准装置信息 boolean saveBatchFlag2 = true; List standardEquipmentIds = traceSupplier.getStandardEquipmentIds(); - if(!CollectionUtils.isEmpty(standardEquipmentIds)){ + if (!CollectionUtils.isEmpty(standardEquipmentIds)) { List equipmentList = new ArrayList<>(); standardEquipmentIds.forEach(id -> { MeterTraceSupplierStandardEquipment equipment = new MeterTraceSupplierStandardEquipment(); @@ -154,7 +154,7 @@ traceSupplierPersonService.remove(wrapper); boolean saveFlag = true; //溯源供方人员可能为空 - if(!CollectionUtils.isEmpty(traceSupplierPersonList)){ + if (!CollectionUtils.isEmpty(traceSupplierPersonList)) { //再增加 traceSupplierPersonList.forEach(person -> { person.setSupplierId(traceSupplier.getId()); @@ -169,7 +169,7 @@ meterTraceSupplierStandardEquipmentService.remove(wrapper1); boolean saveBatchFlag2 = true; List standardEquipmentIds = traceSupplier.getStandardEquipmentIds(); - if(!CollectionUtils.isEmpty(standardEquipmentIds)){ + if (!CollectionUtils.isEmpty(standardEquipmentIds)) { List equipmentList = new ArrayList<>(); standardEquipmentIds.forEach(id -> { MeterTraceSupplierStandardEquipment equipment = new MeterTraceSupplierStandardEquipment(); @@ -195,10 +195,10 @@ String formId = request.getFormId(); ReturnDTO returnDTO = baseApprovalService.processSubmit(formId, request.getId()); - if(ResponseData.DEFAULT_SUCCESS_CODE != returnDTO.getCode()){ + if (ResponseData.DEFAULT_SUCCESS_CODE != returnDTO.getCode()) { return returnDTO; } - ProcessInstance processInstance = (ProcessInstance)returnDTO.getData(); + ProcessInstance processInstance = (ProcessInstance) returnDTO.getData(); MeterTraceSupplier traceSupplier = new MeterTraceSupplier(); traceSupplier.setId(request.getId()); @@ -225,9 +225,9 @@ @Override public ReturnDTO approvalDelete(ApprovalDeleteRequest request) { ReturnDTO returnDTO = approvalOperateService.delete(request); - if(ResponseData.DEFAULT_SUCCESS_CODE == returnDTO.getCode()){ + if (ResponseData.DEFAULT_SUCCESS_CODE == returnDTO.getCode()) { //本地删除 - if(traceSupplierMapper.deleteById(request.getId()) > 0){ + if (traceSupplierMapper.deleteById(request.getId()) > 0) { return ReturnUtil.success(); } } @@ -267,16 +267,16 @@ //待审批，该状态维护在flowable中 case ApprovalStatusEnum.TO_BE_APPROVED: List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); - if(!CollectionUtils.isEmpty(toBeApprovedList)){ + if (!CollectionUtils.isEmpty(toBeApprovedList)) { businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); } - if(!CollectionUtils.isEmpty(businessKeys)){ + if (!CollectionUtils.isEmpty(businessKeys)) { list = traceSupplierMapper.selectBatchForApproval(page, request, businessKeys); approvalList = handleApprovalListResponse(approvalList, list, ApprovalStatusEnum.TO_BE_APPROVED); //DTO根据业务主键补全taskId approvalList.forEach(approval -> { toBeApprovedList.forEach(toBeApprovedDTO -> { - if(String.valueOf(approval.getId()).equals(toBeApprovedDTO.getBusinessKey())){ + if (String.valueOf(approval.getId()).equals(toBeApprovedDTO.getBusinessKey())) { approval.setTaskId(toBeApprovedDTO.getTaskId()); //补全可选决策项 approval.setDecisionItem(toBeApprovedDTO.getDecisionItem()); @@ -288,7 +288,7 @@ //审批中，该状态维护在flowable中 case ApprovalStatusEnum.IN_APPROVED: businessKeys = baseApprovalService.getInApprovedList(request.getFormId()); - if(!CollectionUtils.isEmpty(businessKeys)){ + if (!CollectionUtils.isEmpty(businessKeys)) { list = traceSupplierMapper.selectBatchForApproval(page, request, businessKeys); approvalList = handleApprovalListResponse(approvalList, list, ApprovalStatusEnum.IN_APPROVED); } @@ -296,7 +296,7 @@ //已通过，该状态维护在flowable case ApprovalStatusEnum.PASSED: businessKeys = baseApprovalService.getPassedList(request.getFormId()); - if(!CollectionUtils.isEmpty(businessKeys)){ + if (!CollectionUtils.isEmpty(businessKeys)) { list = traceSupplierMapper.selectBatchForApproval(page, request, businessKeys); approvalList = handleApprovalListResponse(approvalList, list, ApprovalStatusEnum.PASSED); } @@ -305,12 +305,12 @@ case ApprovalStatusEnum.FAILED: businessKeys = baseApprovalService.getFailedList(request.getFormId()); //未通过-拒绝 List rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回 - if(!CollectionUtils.isEmpty(businessKeys)){ + if (!CollectionUtils.isEmpty(businessKeys)) { list = traceSupplierMapper.selectBatchForApproval(page, request, businessKeys); approvalList = handleApprovalListResponse(approvalList, list, ApprovalStatusEnum.FAILED); } List rejectApprovalList = new ArrayList<>(); - if(!CollectionUtils.isEmpty(rejectBusinessKey)){ + if (!CollectionUtils.isEmpty(rejectBusinessKey)) { List rejectList = traceSupplierMapper.selectBatchForApproval(page, request, rejectBusinessKey); rejectApprovalList = handleApprovalListResponse(approvalList, rejectList, ApprovalStatusEnum.FAILED_REJECT); } @@ -320,7 +320,7 @@ //已取消（直接删除实例），该状态维护在flowable case ApprovalStatusEnum.CANCELED: businessKeys = baseApprovalService.getCanceledList(request.getFormId()); - if(!CollectionUtils.isEmpty(businessKeys)){ + if (!CollectionUtils.isEmpty(businessKeys)) { list = traceSupplierMapper.selectBatchForApproval(page, request, businessKeys); approvalList = handleApprovalListResponse(approvalList, list, ApprovalStatusEnum.CANCELED); } @@ -330,10 +330,10 @@ //普通用户获取自己发起的(审批中、已通过、未通过、已取消)，管理员获取全部(审批中、已通过、未通过、已取消) case ApprovalStatusEnum.ALL: List AllApproveList = baseApprovalService.getAllList(request.getFormId()); - if(!CollectionUtils.isEmpty(AllApproveList)){ + if (!CollectionUtils.isEmpty(AllApproveList)) { businessKeys = AllApproveList.stream().map(AllApproveDTO::getBusinessKey).collect(Collectors.toList()); } - if(!CollectionUtils.isEmpty(businessKeys)){ + if (!CollectionUtils.isEmpty(businessKeys)) { list = traceSupplierMapper.selectBatchForApproval(page, request, businessKeys); approvalList = handleAllApprovalListResponse(approvalList, list, AllApproveList); } @@ -343,9 +343,11 @@ } private List handleAllApprovalListResponse(List approvalList, List list, List allApproveList) { - Map taskMap = new HashMap<>(); + Map taskMap = new HashMap<>(); approvalList = ConvertUtils.sourceToTarget(list, TraceSupplierApprovalListResponse.class); - allApproveList.forEach(allApprove -> {taskMap.put(allApprove.getBusinessKey(),allApprove.getStatus());}); + allApproveList.forEach(allApprove -> { + taskMap.put(allApprove.getBusinessKey(), allApprove.getStatus()); + }); //状态补全 approvalList.forEach(approval -> { approval.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, taskMap.get(String.valueOf(approval.getId())))); @@ -369,7 +371,7 @@ @Override public ReturnDTO deleteTraceSupplier(Long id) { - if(traceSupplierMapper.deleteById(id) > 0){ + if (traceSupplierMapper.deleteById(id) > 0) { return ReturnUtil.success(); } return ReturnUtil.failed("刪除失败"); @@ -377,7 +379,7 @@ @Override public ReturnDTO deleteBatchTraceSupplier(List ids) { - if(traceSupplierMapper.deleteBatchIds(ids) > 0){ + if (traceSupplierMapper.deleteBatchIds(ids) > 0) { return ReturnUtil.success(); } return ReturnUtil.failed("删除失败"); @@ -400,6 +402,7 @@ wrapper.eq("id", 12344321); return wrapper; } + wrapper.like(StringUtils.isNotBlank(request.getSupplierNo()), "supplier_no", request.getSupplierNo()); wrapper.like(StringUtils.isNotBlank(request.getSupplierName()), "supplier_name", request.getSupplierName()); wrapper.like(StringUtils.isNotBlank(request.getBusinessContent()), "business_content", request.getBusinessContent()); @@ -409,7 +412,7 @@ return wrapper; } - private List handleApprovalListResponse(List approvalList, List list, String status){ + private List handleApprovalListResponse(List approvalList, List list, String status) { approvalList = ConvertUtils.sourceToTarget(list, TraceSupplierApprovalListResponse.class); approvalList.stream().forEach(result -> { //审批状态两种获取方式：1、在此处设置，2、在flowable中设置业务状态，暂采取1 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerSampleService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerSampleService.java index 8b97619..19f84d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerSampleService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerSampleService.java @@ -3,9 +3,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.customer.CertificationResponse; -import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.model.customer.CustomerSampleInfo; import javax.servlet.http.HttpServletResponse; @@ -24,7 +25,7 @@ ReturnDTO deleteSample(Long id); - Page measureRecordsBySampleId(Long id); + Page measureRecordsBySampleId(MeasureRecordsIdRequest recordsIdRequest); Page certificationBySampleId(Long id); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 832517f..f1c90e8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -12,6 +12,7 @@ import com.casic.missiles.dto.business.order.OrderListReponse; import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.business.OrderStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessDealRecordMapper; import com.casic.missiles.model.business.BusinessDealRecord; @@ -44,7 +45,7 @@ @Api(tags = "委托书模块") @RequestMapping("/business/order") @AllArgsConstructor -public class BusinessOrderController extends ExportController { +public class BusinessOrderController extends ExportController implements OrderStatusEnum { private final IBusinessOrderService businessOrderService; @@ -119,7 +120,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "2"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_RECEIVED); } @ApiOperation("委托书退回") @@ -128,7 +129,7 @@ Assert.isFalse(Objects.isNull(orderCancelRequest.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return businessOrderService.updateStatusById(orderCancelRequest, "3"); + return businessOrderService.updateStatusById(orderCancelRequest, ALREADY_CANCEL); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java index 7591c07..ae7a28d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -10,7 +10,6 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; import com.casic.missiles.dto.customer.Info.*; -import com.casic.missiles.dto.customer.MesureRecordsResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerInfo; @@ -102,19 +101,9 @@ return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); } - @ApiOperation("根据客户id查询检定记录-分页") - @PostMapping("/mesureRecords") - public ReturnDTO> mesureRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerService.mesureRecordsByCustomerId(idDTO.getId()))); - } - - @ApiOperation("客户删除") @PostMapping("/delete") - public ReturnDTO deleteCsutomer(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO deleteCustomer(@RequestBody @Valid IdDTO idDTO) { Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java index 9ae077e..c7d6b3f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -9,9 +9,10 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; -import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerSampleInfo; @@ -93,15 +94,13 @@ customerSampleService.sampleExport(request, response); } - @ApiOperation("根据样品id查询检定记录") - @PostMapping("/mesureRecordsBySampleId") - public ReturnDTO> mesureRecordsBySampleId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(idDTO.getId()))); + @ApiOperation("根据样品id或客户id查询检定记录") + @PostMapping("/measureRecordsBySampleId") + public ReturnDTO> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) { + return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest))); } + @ApiOperation("根据样品id查询检定证书") @PostMapping("/certificationBySampleId") public ReturnDTO> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) { @@ -111,13 +110,4 @@ return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId()))); } -// @ApiOperation("样品批量导入") -// @PostMapping("/batchImport") -// public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return null; -// } - } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index 6b109a2..fbe403d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -1,5 +1,7 @@ package com.casic.missiles.enums; +import org.apache.xmlbeans.impl.xb.xsdschema.Public; + /** * @Description: 生成编号前缀枚举 * @Author: zt @@ -7,9 +9,31 @@ */ public interface PrefixCodeEnum { - //环境记录单编号生成前缀 - String ENVIRONMENT_PREFIX = "hjld"; - //原始记录单编号生成前缀 - String ORIGIN_PREFIX = "ysld"; + //环境记录单编号生成前缀 + String ENVIRONMENT_PREFIX = "hjld"; + //原始记录单编号生成前缀 + String ORIGIN_PREFIX = "ysld"; + + + /*************客户资源模块，tt notice**************/ + //样品编号 + String SAMPLE_PREFIX = "khyp"; + + //客户编号 + String CUSTOMER_PREFIX = "khxx"; + + //客户建议编号 + String CUSTOMER_ADVICE_PREFIX = "khjy"; + + //客户用户编号 + String CUSTOMER_USER_PREFIX = "khyh"; + + //委托书编号 + String ORDER_PREFIX = "wtsc"; + + /*************委托书调度，tt notice**************/ + //交接单编号 + String INTER_CHANGE_PREFIX = "jjdh"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java new file mode 100644 index 0000000..a013d67 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificatePrintStatusEnum.java @@ -0,0 +1,19 @@ +package com.casic.missiles.enums.business; + +public interface CertificatePrintStatusEnum { + + /** + * 不可打印 + */ + String PRINTABLE = "1"; + + /** + * 不可打印 + */ + String NON_PRINTABLE = "2"; + + /** + * 审批中 + */ + String IN_APPROVAL = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java new file mode 100644 index 0000000..a0b0274 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureTypeEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +/** + * @author cz + */ +public interface MeasureTypeEnum { + /** + * 自检 + */ + String INSIDE_MEASURE = "1"; + + /** + * 外包 + */ + String OTHERS_UNDERTAKE = "2"; + + /** + * 外检 + */ + String OUTSIDE_MEASURE = "3"; + +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java new file mode 100644 index 0000000..83371aa --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/OrderStatusEnum.java @@ -0,0 +1,22 @@ +package com.casic.missiles.enums.business; + +public interface OrderStatusEnum { + + /** + * 未接收 + */ + String NOT_RECEIVED = "1"; + /** + * 已接收 + */ + String ALREADY_RECEIVED = "2"; + /** + * 已取消 + */ + String ALREADY_CANCEL = "3"; + + /** + * 检测完成 + */ + String MEASURE_SUCCESS = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java new file mode 100644 index 0000000..d32da8d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java @@ -0,0 +1,23 @@ +package com.casic.missiles.enums.sample; + +/** + * @author cz + */ +public interface CertificationExpireStatusEnum { + + /** + * 未超期 + */ + String NORMAL = "0"; + + /** + * 即将超期，距离结束即将到30天 + */ + String ALMOST_EXPIRE = "1"; + + /** + * 已经超期 + */ + String ALREADY_EXPIRE = "2"; + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java index fde0627..8b73201 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.model.customer.CustomerSampleInfo; import org.apache.ibatis.annotations.Param; @@ -10,6 +12,8 @@ Long selectMaxSampleNo(); + Page measureRecordsBySampleId(Page page, @Param("request") MeasureRecordsIdRequest recordsIdRequest); + Page samplesByOderId(Page page, @Param("orderId") Long orderId, diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java deleted file mode 100644 index a086b38..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/MesureRecordsResponseMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.missiles.mapper.customer.customize; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.customer.MesureRecordsResponse; - -public interface MesureRecordsResponseMapper extends BaseMapper { -} diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index f10fbb3..e7f5950 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -7,22 +7,56 @@ FROM customer_sample_info + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java new file mode 100644 index 0000000..ec13e19 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MeasureRecordsResponse.java @@ -0,0 +1,37 @@ +package com.casic.missiles.dto.customer; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + * @date 2023-02-01 + */ +@Data +@ApiModel +public class MeasureRecordsResponse { + + @ApiModelProperty(value = "委托书id", dataType = "Long") + private Long orderId; + + @ApiModelProperty(value = "委托单编号", dataType = "String") + private String orderCode; + + @ApiModelProperty(value = "委托单日期", dataType = "String") + private String orderTime; + + @ApiModelProperty(value = "委托人代码", dataType = "String") + private String customerCode; + + @ApiModelProperty(value = "委托人名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "送检人", dataType = "String") + private String deliverer; + + @ApiModelProperty(value = "送检日期", dataType = "String") + private String deliverTime; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java deleted file mode 100644 index f13b5d4..0000000 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/MesureRecordsResponse.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.missiles.dto.customer; - -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author cz - * @date 2023-02-01 - */ -@Data -@ApiModel -public class MesureRecordsResponse { - - @ApiModelProperty(value = "委托书id", dataType = "Long") - private Long orderId; - - @ApiModelProperty(value = "委托单编号", dataType = "String") - private String orderCode; - - @ApiModelProperty(value = "委托单日期", dataType = "String") - private String orderTime; - - @ApiModelProperty(value = "委托人代码", dataType = "String") - private String customerCode; - - @ApiModelProperty(value = "委托人名称", dataType = "String") - private String customerName; - - @ApiModelProperty(value = "送检人", dataType = "String") - private String deliverer; - - @ApiModelProperty(value = "送检日期", dataType = "String") - private String deliverTime; - -} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java index 2e8657f..c0a9a99 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -53,12 +53,12 @@ @TableField(exist = false) @ApiModelProperty(value = "样品状态", dataType = "String") @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.SAMPLE_STATUS) - private String sampleSatus; + private String sampleStatus; @TableField(exist = false) @ApiModelProperty(value = "样品状态", dataType = "String") @ExcelProperty(value = "样品状态", order = 5) - private String sampleSatusName; + private String sampleStatusName; @ApiModelProperty(value = "委托方名称", dataType = "String") @ExcelProperty(value = "委托方名称", order = 6) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java new file mode 100644 index 0000000..7bcf105 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java @@ -0,0 +1,22 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author cz + */ + +@Data +@ApiModel("检测记录查询id") +public class MeasureRecordsIdRequest { + + @ApiModelProperty("样品Id") + private Long sampleId; + + @ApiModelProperty("客户id") + private Long customerId; + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java index 2f97cb3..542f5ca 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java @@ -3,7 +3,6 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.base.service.IBaseExportService; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.page.PageFactory; @@ -20,6 +19,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.business.CertificatePrintStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; import com.casic.missiles.model.business.BusinessCertificateReport; @@ -42,10 +42,9 @@ */ @Service @AllArgsConstructor -public class BusinessCertificatePrintServiceImpl extends ServiceImpl implements IBusinessCertificatePrintService { +public class BusinessCertificatePrintServiceImpl extends ServiceImpl implements IBusinessCertificatePrintService, CertificatePrintStatusEnum { private final IBaseApprovalService baseApprovalService; - private final AbstractDictService dictService; private final IBaseExportService iBaseExportService; private final ApprovalOperateService approvalOperateService; @@ -86,7 +85,7 @@ } /** - * 更新工作流审批状态为拒绝，当返回值成功时，进行打印状态置为不可打印，审批状态为不通过 + * 更新工作流审批状态为拒绝，当返回值成功时，进行打印状态置为不可打印，审批状态为不通过 * * @return */ @@ -103,7 +102,7 @@ BusinessCertificateReport certificateReport = new BusinessCertificateReport(); certificateReport.setId(request.getId()); //设置为不能打印 - certificateReport.setPrintStatus("2"); + certificateReport.setPrintStatus(NON_PRINTABLE); certificateReport.setApprovalStatus(ApprovalStatusEnum.FAILED); int row = this.baseMapper.updateById(certificateReport); if (row <= 0) { @@ -113,7 +112,7 @@ } /** - * 提交审批流程，修改证书审批状态为待审批，打印状态为审批中 + * 提交审批流程，修改证书审批状态为待审批，打印状态为审批中 */ @Transactional @Override @@ -128,7 +127,7 @@ //审批状态为审批中 certificateReport.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED); //打印状态审批中 - certificateReport.setPrintStatus("3"); + certificateReport.setPrintStatus(IN_APPROVAL); int row = this.baseMapper.updateById(certificateReport); if (row <= 0) { throw new BusinessException(BusinessExceptionEnum.AGAIN_PRINT_SUBMIT_FAILED.getCode(), BusinessExceptionEnum.AGAIN_PRINT_SUBMIT_FAILED.getMessage()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java index 859010b..0d847a0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.dto.customer.sample.CustomerSampleListVO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessInterchangeMapper; import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; @@ -35,7 +36,7 @@ * 业务管理-设备交接单 服务实现类 *

* - * @author wangpeng + * @author cz * @since 2023-02-02 */ @Service @@ -83,7 +84,7 @@ } /** - * 更新不对样品有任何操作 + * 更新只是交接单的变更，没有任何其他单位的变化 */ @Override public ReturnDTO updateExchange(BusinessInterchange businessInterchange) { @@ -94,6 +95,9 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + /** + * 交接单新增，同时在样品委托书管理表中新增交接单记录id + */ @Override @Transactional public ReturnDTO addExchange(BusinessInterchange businessInterchange) { @@ -111,6 +115,9 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + /** + * 选中判断ids存在，进行其他条件的清空 + */ @Override public void exportExchange(InterchangeListRequest request, HttpServletResponse response) { try { @@ -153,7 +160,7 @@ private void populationExchange(BusinessInterchange businessInterchange) { Long maxNo = this.baseMapper.selectMaxExchangeNo(); - String orderNo = NumberGeneratorUtil.getContactNo("jjdh", maxNo); + String orderNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.INTER_CHANGE_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); businessInterchange.setCreateUser(authUser.getId()); businessInterchange.setInterchangeCode(orderNo); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java index 138a1e2..d6bb339 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -14,6 +14,10 @@ import com.casic.missiles.dto.business.order.OrderListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.PrefixCodeEnum; +import com.casic.missiles.enums.business.MeasureTypeEnum; +import com.casic.missiles.enums.business.OrderStatusEnum; +import com.casic.missiles.enums.sample.SampleStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessDealRecordMapper; import com.casic.missiles.mapper.business.BusinessOrderListReponseMapper; @@ -35,7 +39,6 @@ import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -50,7 +53,7 @@ */ @Service @AllArgsConstructor -public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService { +public class BusinessOrderServiceImpl extends ServiceImpl implements IBusinessOrderService,PrefixCodeEnum, OrderStatusEnum,SampleStatusEnum, MeasureTypeEnum { private final BusinessOrderListReponseMapper orderListResponseMapper; private final IBaseExportService iBaseExportService; @@ -203,9 +206,9 @@ public ReturnDTO updateStatusById(OrderCancelRequest orderCancelRequest, String status) { int updateFlag = doUpdateStatusById(orderCancelRequest.getId(), status); String dealType = ""; - if (status.equals("2")) { + if (status.equals(ALREADY_RECEIVED)) { dealType = "委托书接收" ; - doUpdateSampleStatus(orderCancelRequest.getId(),"1"); + doUpdateSampleStatus(orderCancelRequest.getId(),TO_RECEIVE); } else { dealType = "委托书退回"; } @@ -222,7 +225,7 @@ @Override @Transactional public ReturnDTO cancelOrder(OrderCancelRequest orderCancelRequest) { - int updateFlag = this.doUpdateStatusById(orderCancelRequest.getId(), "3"); + int updateFlag = this.doUpdateStatusById(orderCancelRequest.getId(), ALREADY_CANCEL); int addDealRecordFlag = addDealRecord(orderCancelRequest, "委托书取消"); if (updateFlag > 0 && addDealRecordFlag > 0) { return ReturnUtil.success(); @@ -287,12 +290,12 @@ private void initOrderInfo(BusinessOrder businessOrder) { Long maxNo = this.baseMapper.selectMaxCOrderNo(); - String orderNo = NumberGeneratorUtil.getContactNo("wtsc", maxNo); + String orderNo = NumberGeneratorUtil.getContactNo(ORDER_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); businessOrder.setCreateUser(authUser.getId()); businessOrder.setUpdateUser(authUser.getId()); businessOrder.setOrderCode(orderNo); - businessOrder.setStatus("1"); + businessOrder.setStatus(NOT_RECEIVED); } /** @@ -327,7 +330,7 @@ sampleStatusPopulation.setOrderId(orderId); sampleStatusPopulation.setSampleId(sampleId); sampleStatusPopulation.setMeasureContent(measureContent); - sampleStatusPopulation.setMeasureType("1"); + sampleStatusPopulation.setMeasureType(INSIDE_MEASURE); return this.sampleRelationMapper.insert(sampleStatusPopulation); } @@ -337,7 +340,6 @@ private int doUpdateSampleStatus(Long orderId, String sampleStatus) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("order_id", orderId); -// queryWrapper.isNull("sampleStatus"); BusinessOrderSampleRelation orderSample = new BusinessOrderSampleRelation(); orderSample.setId(orderId); orderSample.setSampleStatus(sampleStatus); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java index 07c88e9..c2e8995 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java @@ -14,6 +14,7 @@ import com.casic.missiles.dto.business.dispatch.DeviceStatusChangeDTO; import com.casic.missiles.enums.*; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.business.MeasureTypeEnum; import com.casic.missiles.enums.sample.CurrentSegmentEnum; import com.casic.missiles.enums.sample.SampleStatusEnum; import com.casic.missiles.exception.BusinessException; @@ -39,7 +40,7 @@ @Service @Slf4j @AllArgsConstructor -public class IBusinessDispatchServiceImpl extends ServiceImpl implements IBusinessDispatchService { +public class IBusinessDispatchServiceImpl extends ServiceImpl implements IBusinessDispatchService, SampleStatusEnum, CurrentSegmentEnum, MeasureTypeEnum { private final BusinessOrderSampleRelationMapper orderSampleRelationMapper; private final BusinessCertificateReportMapper certificateReportMapper; @@ -73,20 +74,20 @@ Long sampleId = dispatchVO.getSampleId(); String sampleStatus = dispatchVO.getSampleStatus(); //先过滤超期状态下的外检外包 - if (!StringUtils.isEmpty(request.getSampleStatus()) && SampleStatusEnum.BE_OVERDUE.equals(request.getSampleStatus()) && notSelfMeasure(dispatchVO)) { + if (!StringUtils.isEmpty(request.getSampleStatus()) && BE_OVERDUE.equals(request.getSampleStatus()) && notSelfMeasure(dispatchVO)) { return; } switch (sampleStatus) { //待分发状态，当前检定环节:待分配，已出具证书：无，出具证书总数:无 - case SampleStatusEnum.TO_HANDOUT: + case TO_HANDOUT: //检测中状态，当前检定环节:具体实验室，已出具证书：查询证书报告表，证书总数：具体实验室 - case SampleStatusEnum.IN_MEASURE: + case IN_MEASURE: //检测完状态，当前检定环节:完成，已出具证书：无，出具证书总数:无 - case SampleStatusEnum.MEASURE_COMPLETE: + case MEASURE_COMPLETE: doDispatchVoPopulation(dispatchVO, sampleId, orderId); return; //超期样品(即检测超期，未在应检完时间检完),当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室 - case SampleStatusEnum.BE_OVERDUE: + case BE_OVERDUE: HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId); Long deptId = Optional.of(overLabExecutiveDTO.getMeasureDeptId()).orElse(null); dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, deptId)); @@ -126,7 +127,7 @@ /** - * 状态更新 + * 根据sampleId，orderId,进行状态更新 */ @Override public ReturnDTO statusChange(DeviceStatusChangeDTO deviceStatusChangeDTO) { @@ -214,6 +215,9 @@ return handOutLabExecutiveDTOOptional.orElse(null); } + /** + * 构建证书的查询条件 + */ private QueryWrapper getCertificateReportWrapper(DeviceDispatchVO dispatchVO, Long deptId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("order_id", dispatchVO.getOrderId()); @@ -230,7 +234,8 @@ queryWrapper.eq("order_id", statusChangeDTO.getOrderId()); queryWrapper.eq("sample_id", statusChangeDTO.getSampleId()); if (terminateFlag) { - queryWrapper.eq("sample_status", "2").or().eq("sample_status", "3").or().eq("sample_status", "4"); + //若是终止，需要对应待分发、检测中、检测完三个状态的变更 + queryWrapper.eq("sample_status", TO_HANDOUT).or().eq("sample_status", IN_MEASURE).or().eq("sample_status", MEASURE_COMPLETE); } BusinessOrderSampleRelation businessOrderSampleRelation = new BusinessOrderSampleRelation(); businessOrderSampleRelation.setSampleStatus(statusChangeDTO.getStatus()); @@ -238,12 +243,12 @@ } /** - * 判断不是自检 + * 判断不是自检,即外包和外检，进行环节设定 */ private boolean notSelfMeasure(DeviceDispatchVO dispatchVO) { if (!ObjectUtils.isEmpty(dispatchVO.getMeasureType())) { - if (MeasureStatusEnum.TO_ALLOCATE.equals(String.valueOf(dispatchVO.getMeasureType())) || MeasureStatusEnum.TO_MEASURE.equals(String.valueOf(dispatchVO.getMeasureType()))) { - String currentSegment = MeasureStatusEnum.TO_ALLOCATE.equals(dispatchVO.getMeasureType()) ? CurrentSegmentEnum.OUT_UNDERTAKE : CurrentSegmentEnum.OUT_MESASUR; + if (OTHERS_UNDERTAKE.equals(String.valueOf(dispatchVO.getMeasureType())) || OUTSIDE_MEASURE.equals(String.valueOf(dispatchVO.getMeasureType()))) { + String currentSegment = OTHERS_UNDERTAKE.equals(dispatchVO.getMeasureType()) ? OUT_UNDERTAKE : OUT_MESASUR; dispatchVO.setCurrentSegment(currentSegment); return true; } @@ -251,6 +256,9 @@ return false; } + /** + * 其他条件的置为空 + */ private void initDeviceDispatchDTOEmpty(DeviceDispatchDTO request) { request.setSampleName(null); request.setSampleNo(null); @@ -264,15 +272,15 @@ } /** - * 判断样品是完成或接收状态，直接显示即可 + * 判断样品是完成或接收状态，进行当前阶段环节的设置 */ private Boolean checkSampleFinishStatus(DeviceDispatchVO dispatchVO) { - if (SampleStatusEnum.TO_RECEIVE.equals(dispatchVO.getSampleStatus())) { - dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_INCOME); + if (TO_RECEIVE.equals(dispatchVO.getSampleStatus())) { + dispatchVO.setCurrentSegment(TO_INCOME); return true; } - if (SampleStatusEnum.TO_HANDOUT.equals(dispatchVO.getSampleStatus())) { - dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE); + if (TO_HANDOUT.equals(dispatchVO.getSampleStatus())) { + dispatchVO.setCurrentSegment(TO_ALLOCATE); return true; } return false; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java index 4f06678..e2fea21 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.customer.CustomerAdviceMapper; import com.casic.missiles.mapper.customer.CustomerMapper; @@ -34,7 +35,7 @@ @Service @Slf4j @AllArgsConstructor -public class CustomerAdviceServiceImpl implements CustomerAdviceService { +public class CustomerAdviceServiceImpl implements CustomerAdviceService,PrefixCodeEnum { private final CustomerAdviceMapper customerAdviceMapper; private final IBaseExportService iBaseExportService; @@ -122,7 +123,7 @@ private void initCustomerAdviceInfo(CustomerAdviceInfo customerAdviceInfo) { Long maxNo = customerAdviceMapper.selectMaxAdviceNo(); - String adviceNo = NumberGeneratorUtil.getContactNo("khjy", maxNo); + String adviceNo = NumberGeneratorUtil.getContactNo(CUSTOMER_ADVICE_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); customerAdviceInfo.setCreateUser(authUser.getId()); customerAdviceInfo.setUpdateUser(authUser.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java index e8922c0..dd299de 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java @@ -10,18 +10,20 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; -import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.PrefixCodeEnum; +import com.casic.missiles.enums.sample.CertificationExpireStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; import com.casic.missiles.mapper.customer.CustomerMapper; import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper; import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper; import com.casic.missiles.mapper.customer.CustomerSampleMapper; -import com.casic.missiles.mapper.customer.customize.MesureRecordsResponseMapper; import com.casic.missiles.model.business.BusinessOrderSampleRelation; import com.casic.missiles.model.customer.CustomerInfo; import com.casic.missiles.model.customer.CustomerSampleInfo; @@ -42,13 +44,12 @@ @Service @AllArgsConstructor -public class CustomerSampleServiceImpl extends ServiceImpl implements CustomerSampleService { +public class CustomerSampleServiceImpl extends ServiceImpl implements CustomerSampleService, CertificationExpireStatusEnum,PrefixCodeEnum{ private final CustomerSampleListResponseMapper customerSampleListResponseMapper; private final CustomerMapper customerMapper; private final IBaseExportService iBaseExportService; private final CertificationResponseMapper certificationResponseMapper; - private final MesureRecordsResponseMapper mesureResponseMapper; private final BusinessOrderSampleRelationMapper sampleRelationMapper; @Override @@ -60,12 +61,12 @@ BusinessOrderSampleRelation businessOrderSampleRelation = this.getSampleStatusById(customerSample.getId()); if (!ObjectUtils.isEmpty(businessOrderSampleRelation)) { customerSample.setOrderId(businessOrderSampleRelation.getOrderId()); - customerSample.setSampleSatus(businessOrderSampleRelation.getSampleStatus()); + customerSample.setSampleStatus(businessOrderSampleRelation.getSampleStatus()); customerSample.setCertificationStatus(calculateCertificationStatus(customerSample.getValidDeadline())); } }); for (CustomerSampleListResponse customerSampleListResponse : customerSamplePage.getRecords()) { - if (!StringUtils.isEmpty(customerSampleListResponse.getSampleSatus())) { + if (!StringUtils.isEmpty(customerSampleListResponse.getSampleStatus())) { DictCodeUtils.convertDictCodeToName(customerSampleListResponse); } } @@ -106,14 +107,13 @@ public CustomerSampleInfo sampleDetail(Long id) { CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id); if (!ObjectUtils.isEmpty(customerSampleInfo)) { - doCustomerSampleInfoPopulation(customerSampleInfo); + doPopulateCustomerSampleInfo(customerSampleInfo); } return customerSampleInfo; } /** * 只导出样品列表信息 - * */ @Override public void sampleExport(CustomerSampleListRequest request, HttpServletResponse response) { @@ -135,7 +135,7 @@ BusinessOrderSampleRelation businessOrderSampleRelation = businessOrderMap.get(customerSample.getId()); if (!ObjectUtils.isEmpty(businessOrderSampleRelation)) { customerSample.setOrderId(businessOrderSampleRelation.getOrderId()); - customerSample.setSampleSatus(businessOrderSampleRelation.getSampleStatus()); + customerSample.setSampleStatus(businessOrderSampleRelation.getSampleStatus()); customerSample.setCertificationStatus(calculateCertificationStatus(customerSample.getValidDeadline())); } } @@ -159,11 +159,9 @@ } @Override - public Page measureRecordsBySampleId(Long id) { - Page page = PageFactory.defaultPage(); - QueryWrapper wrapper = new QueryWrapper() - .eq("sample_id", id); - Page measureRecordsResponsePage = mesureResponseMapper.selectPage(page, wrapper); + public Page measureRecordsBySampleId(MeasureRecordsIdRequest recordsIdRequest) { + Page page = PageFactory.defaultPage(); + Page measureRecordsResponsePage = this.baseMapper.measureRecordsBySampleId(page, recordsIdRequest); return measureRecordsResponsePage; } @@ -177,8 +175,8 @@ } @Override - public Page samplesByOderId(Page page,Long orderId, String sampleNo, String sampleName) { - return this.baseMapper.samplesByOderId(page,orderId,sampleNo,sampleName); + public Page samplesByOderId(Page page, Long orderId, String sampleNo, String sampleName) { + return this.baseMapper.samplesByOderId(page, orderId, sampleNo, sampleName); } private BusinessOrderSampleRelation getSampleStatusById(Long sampleId) { @@ -192,7 +190,7 @@ private void initSample(CustomerSampleInfo customerSampleInfo) { Long maxNo = this.baseMapper.selectMaxSampleNo(); - String sampleNo = NumberGeneratorUtil.getContactNo("khyp", maxNo); + String sampleNo = NumberGeneratorUtil.getContactNo(SAMPLE_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); customerSampleInfo.setSampleNo(sampleNo); customerSampleInfo.setCreateUser(authUser.getId()); @@ -202,7 +200,6 @@ private QueryWrapper listParamWrapper(CustomerSampleListRequest request) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.select("id,sample_no,sample_name,sample_model,manufacturing_no,customer_id,measure_period,measure_last_time,remark,valid_deadline"); queryWrapper.like(StringUtils.isNotBlank(request.getSampleNo()), "sample_no", request.getSampleNo()); queryWrapper.like(StringUtils.isNotBlank(request.getSampleName()), "sample_name", request.getSampleName()); queryWrapper.like(StringUtils.isNotBlank(request.getSampleBelong()), "sample_belong", request.getSampleBelong()); @@ -224,24 +221,30 @@ return queryWrapper; } + /** + * 通过证书到期时间进行到期状态的计算 + */ private String calculateCertificationStatus(String validDeadline) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); if (StringUtils.isEmpty(validDeadline)) { - return "0"; + return NORMAL; } if (validDeadline.compareTo(sdf.format(new Date())) < 0) { - return "2"; + return ALREADY_EXPIRE; } Calendar date = Calendar.getInstance(); date.setTime(new Date()); date.add(Calendar.DAY_OF_MONTH, -30); if (validDeadline.compareTo(sdf.format(date.getTime())) < 0) { - return "1"; + return ALMOST_EXPIRE; } - return "0"; + return NORMAL; } - private void doCustomerSampleInfoPopulation(CustomerSampleInfo customerSampleInfo) { + /** + * 对样品列表的进行供应商联系方式的填充 + */ + private void doPopulateCustomerSampleInfo(CustomerSampleInfo customerSampleInfo) { CustomerInfo customerInfo = customerMapper.selectById(customerSampleInfo.getCustomerId()); if (!ObjectUtils.isEmpty(customerInfo)) { customerSampleInfo.setPhone(customerInfo.getPhone()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java index 32d4dee..c418752 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java @@ -11,9 +11,9 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.customer.CertificationResponse; import com.casic.missiles.dto.customer.Info.*; -import com.casic.missiles.dto.customer.MesureRecordsResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.customer.CustomerMapper; import com.casic.missiles.mapper.customer.CustomerUserMapper; @@ -38,7 +38,7 @@ @Service @Slf4j @AllArgsConstructor -public class CustomerServiceImpl extends ServiceImpl implements CustomerService { +public class CustomerServiceImpl extends ServiceImpl implements CustomerService,PrefixCodeEnum { private final SampleRecordsResponseMapper sampleRecordsResponseMapper; private final CustomerUserMapper customerUserMapper; @@ -126,18 +126,9 @@ return contractRecordsResponsePage; } - @Override//暂定不做 - public Page mesureRecordsByCustomerId(Long customerId) { - Page measureRecordsResponsePage = PageFactory.defaultPage(); - return measureRecordsResponsePage; - } - @Override public Page certificationByCustomerId(Long customerId) { - Page page = PageFactory.defaultPage(); - QueryWrapper wrapper = new QueryWrapper() - .eq("customer_id", customerId); - return certificationMapper.selectPage(page, wrapper); + return null; } @Override @@ -165,14 +156,13 @@ queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); queryWrapper.like(StringUtils.isNotBlank(request.getBusinessSize()), "bussiness_size", request.getBusinessSize()); queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade()); - queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade()); queryWrapper.eq("is_del", 0); return queryWrapper; } private void initCustomerInfo(CustomerInfo customerInfo) { Long maxNo = this.baseMapper.selectMaxCustomerNo(); - String customerNo = NumberGeneratorUtil.getContactNo("khxx", maxNo); + String customerNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.CUSTOMER_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); customerInfo.setCreateUser(authUser.getId()); customerInfo.setUpdateUser(authUser.getId()); @@ -196,7 +186,7 @@ boolean userUpdateFlag = true; for (CustomerUserInfo customerUserInfo : userInfoList) { customerUserInfo.setCustomerId(id); - String customerNo = NumberGeneratorUtil.getContactNo("khyh", maxUserNo++); + String customerNo = NumberGeneratorUtil.getContactNo(CUSTOMER_USER_PREFIX, maxUserNo++); customerUserInfo.setUserNo(customerNo); int userAddNum = customerUserMapper.insert(customerUserInfo); if (userAddNum <= 0) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java index 535581f..594a748 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java @@ -106,7 +106,7 @@ //存储溯源供方人员信息 boolean saveBatchFlag = true; List traceSupplierPersonList = traceSupplier.getTraceSupplierPersonList(); - if(!CollectionUtils.isEmpty(traceSupplierPersonList)){ + if (!CollectionUtils.isEmpty(traceSupplierPersonList)) { traceSupplierPersonList.forEach(person -> { person.setSupplierId(traceSupplier.getId()); }); @@ -119,7 +119,7 @@ //存储溯源供方标准装置信息 boolean saveBatchFlag2 = true; List standardEquipmentIds = traceSupplier.getStandardEquipmentIds(); - if(!CollectionUtils.isEmpty(standardEquipmentIds)){ + if (!CollectionUtils.isEmpty(standardEquipmentIds)) { List equipmentList = new ArrayList<>(); standardEquipmentIds.forEach(id -> { MeterTraceSupplierStandardEquipment equipment = new MeterTraceSupplierStandardEquipment(); @@ -154,7 +154,7 @@ traceSupplierPersonService.remove(wrapper); boolean saveFlag = true; //溯源供方人员可能为空 - if(!CollectionUtils.isEmpty(traceSupplierPersonList)){ + if (!CollectionUtils.isEmpty(traceSupplierPersonList)) { //再增加 traceSupplierPersonList.forEach(person -> { person.setSupplierId(traceSupplier.getId()); @@ -169,7 +169,7 @@ meterTraceSupplierStandardEquipmentService.remove(wrapper1); boolean saveBatchFlag2 = true; List standardEquipmentIds = traceSupplier.getStandardEquipmentIds(); - if(!CollectionUtils.isEmpty(standardEquipmentIds)){ + if (!CollectionUtils.isEmpty(standardEquipmentIds)) { List equipmentList = new ArrayList<>(); standardEquipmentIds.forEach(id -> { MeterTraceSupplierStandardEquipment equipment = new MeterTraceSupplierStandardEquipment(); @@ -195,10 +195,10 @@ String formId = request.getFormId(); ReturnDTO returnDTO = baseApprovalService.processSubmit(formId, request.getId()); - if(ResponseData.DEFAULT_SUCCESS_CODE != returnDTO.getCode()){ + if (ResponseData.DEFAULT_SUCCESS_CODE != returnDTO.getCode()) { return returnDTO; } - ProcessInstance processInstance = (ProcessInstance)returnDTO.getData(); + ProcessInstance processInstance = (ProcessInstance) returnDTO.getData(); MeterTraceSupplier traceSupplier = new MeterTraceSupplier(); traceSupplier.setId(request.getId()); @@ -225,9 +225,9 @@ @Override public ReturnDTO approvalDelete(ApprovalDeleteRequest request) { ReturnDTO returnDTO = approvalOperateService.delete(request); - if(ResponseData.DEFAULT_SUCCESS_CODE == returnDTO.getCode()){ + if (ResponseData.DEFAULT_SUCCESS_CODE == returnDTO.getCode()) { //本地删除 - if(traceSupplierMapper.deleteById(request.getId()) > 0){ + if (traceSupplierMapper.deleteById(request.getId()) > 0) { return ReturnUtil.success(); } } @@ -267,16 +267,16 @@ //待审批，该状态维护在flowable中 case ApprovalStatusEnum.TO_BE_APPROVED: List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); - if(!CollectionUtils.isEmpty(toBeApprovedList)){ + if (!CollectionUtils.isEmpty(toBeApprovedList)) { businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList()); } - if(!CollectionUtils.isEmpty(businessKeys)){ + if (!CollectionUtils.isEmpty(businessKeys)) { list = traceSupplierMapper.selectBatchForApproval(page, request, businessKeys); approvalList = handleApprovalListResponse(approvalList, list, ApprovalStatusEnum.TO_BE_APPROVED); //DTO根据业务主键补全taskId approvalList.forEach(approval -> { toBeApprovedList.forEach(toBeApprovedDTO -> { - if(String.valueOf(approval.getId()).equals(toBeApprovedDTO.getBusinessKey())){ + if (String.valueOf(approval.getId()).equals(toBeApprovedDTO.getBusinessKey())) { approval.setTaskId(toBeApprovedDTO.getTaskId()); //补全可选决策项 approval.setDecisionItem(toBeApprovedDTO.getDecisionItem()); @@ -288,7 +288,7 @@ //审批中，该状态维护在flowable中 case ApprovalStatusEnum.IN_APPROVED: businessKeys = baseApprovalService.getInApprovedList(request.getFormId()); - if(!CollectionUtils.isEmpty(businessKeys)){ + if (!CollectionUtils.isEmpty(businessKeys)) { list = traceSupplierMapper.selectBatchForApproval(page, request, businessKeys); approvalList = handleApprovalListResponse(approvalList, list, ApprovalStatusEnum.IN_APPROVED); } @@ -296,7 +296,7 @@ //已通过，该状态维护在flowable case ApprovalStatusEnum.PASSED: businessKeys = baseApprovalService.getPassedList(request.getFormId()); - if(!CollectionUtils.isEmpty(businessKeys)){ + if (!CollectionUtils.isEmpty(businessKeys)) { list = traceSupplierMapper.selectBatchForApproval(page, request, businessKeys); approvalList = handleApprovalListResponse(approvalList, list, ApprovalStatusEnum.PASSED); } @@ -305,12 +305,12 @@ case ApprovalStatusEnum.FAILED: businessKeys = baseApprovalService.getFailedList(request.getFormId()); //未通过-拒绝 List rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回 - if(!CollectionUtils.isEmpty(businessKeys)){ + if (!CollectionUtils.isEmpty(businessKeys)) { list = traceSupplierMapper.selectBatchForApproval(page, request, businessKeys); approvalList = handleApprovalListResponse(approvalList, list, ApprovalStatusEnum.FAILED); } List rejectApprovalList = new ArrayList<>(); - if(!CollectionUtils.isEmpty(rejectBusinessKey)){ + if (!CollectionUtils.isEmpty(rejectBusinessKey)) { List rejectList = traceSupplierMapper.selectBatchForApproval(page, request, rejectBusinessKey); rejectApprovalList = handleApprovalListResponse(approvalList, rejectList, ApprovalStatusEnum.FAILED_REJECT); } @@ -320,7 +320,7 @@ //已取消（直接删除实例），该状态维护在flowable case ApprovalStatusEnum.CANCELED: businessKeys = baseApprovalService.getCanceledList(request.getFormId()); - if(!CollectionUtils.isEmpty(businessKeys)){ + if (!CollectionUtils.isEmpty(businessKeys)) { list = traceSupplierMapper.selectBatchForApproval(page, request, businessKeys); approvalList = handleApprovalListResponse(approvalList, list, ApprovalStatusEnum.CANCELED); } @@ -330,10 +330,10 @@ //普通用户获取自己发起的(审批中、已通过、未通过、已取消)，管理员获取全部(审批中、已通过、未通过、已取消) case ApprovalStatusEnum.ALL: List AllApproveList = baseApprovalService.getAllList(request.getFormId()); - if(!CollectionUtils.isEmpty(AllApproveList)){ + if (!CollectionUtils.isEmpty(AllApproveList)) { businessKeys = AllApproveList.stream().map(AllApproveDTO::getBusinessKey).collect(Collectors.toList()); } - if(!CollectionUtils.isEmpty(businessKeys)){ + if (!CollectionUtils.isEmpty(businessKeys)) { list = traceSupplierMapper.selectBatchForApproval(page, request, businessKeys); approvalList = handleAllApprovalListResponse(approvalList, list, AllApproveList); } @@ -343,9 +343,11 @@ } private List handleAllApprovalListResponse(List approvalList, List list, List allApproveList) { - Map taskMap = new HashMap<>(); + Map taskMap = new HashMap<>(); approvalList = ConvertUtils.sourceToTarget(list, TraceSupplierApprovalListResponse.class); - allApproveList.forEach(allApprove -> {taskMap.put(allApprove.getBusinessKey(),allApprove.getStatus());}); + allApproveList.forEach(allApprove -> { + taskMap.put(allApprove.getBusinessKey(), allApprove.getStatus()); + }); //状态补全 approvalList.forEach(approval -> { approval.setApprovalStatusName(dictService.getDictNameByCode(MeterDictEnum.APPROVAL_STATUS, taskMap.get(String.valueOf(approval.getId())))); @@ -369,7 +371,7 @@ @Override public ReturnDTO deleteTraceSupplier(Long id) { - if(traceSupplierMapper.deleteById(id) > 0){ + if (traceSupplierMapper.deleteById(id) > 0) { return ReturnUtil.success(); } return ReturnUtil.failed("刪除失败"); @@ -377,7 +379,7 @@ @Override public ReturnDTO deleteBatchTraceSupplier(List ids) { - if(traceSupplierMapper.deleteBatchIds(ids) > 0){ + if (traceSupplierMapper.deleteBatchIds(ids) > 0) { return ReturnUtil.success(); } return ReturnUtil.failed("删除失败"); @@ -400,6 +402,7 @@ wrapper.eq("id", 12344321); return wrapper; } + wrapper.like(StringUtils.isNotBlank(request.getSupplierNo()), "supplier_no", request.getSupplierNo()); wrapper.like(StringUtils.isNotBlank(request.getSupplierName()), "supplier_name", request.getSupplierName()); wrapper.like(StringUtils.isNotBlank(request.getBusinessContent()), "business_content", request.getBusinessContent()); @@ -409,7 +412,7 @@ return wrapper; } - private List handleApprovalListResponse(List approvalList, List list, String status){ + private List handleApprovalListResponse(List approvalList, List list, String status) { approvalList = ConvertUtils.sourceToTarget(list, TraceSupplierApprovalListResponse.class); approvalList.stream().forEach(result -> { //审批状态两种获取方式：1、在此处设置，2、在flowable中设置业务状态，暂采取1 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerSampleService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerSampleService.java index 8b97619..19f84d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerSampleService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerSampleService.java @@ -3,9 +3,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.customer.CertificationResponse; -import com.casic.missiles.dto.customer.MesureRecordsResponse; +import com.casic.missiles.dto.customer.MeasureRecordsResponse; import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest; import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse; +import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest; import com.casic.missiles.model.customer.CustomerSampleInfo; import javax.servlet.http.HttpServletResponse; @@ -24,7 +25,7 @@ ReturnDTO deleteSample(Long id); - Page measureRecordsBySampleId(Long id); + Page measureRecordsBySampleId(MeasureRecordsIdRequest recordsIdRequest); Page certificationBySampleId(Long id); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerService.java index 5d096e2..3bcb80c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerService.java @@ -4,7 +4,6 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.customer.CertificationResponse; import com.casic.missiles.dto.customer.Info.*; -import com.casic.missiles.dto.customer.MesureRecordsResponse; import com.casic.missiles.model.customer.CustomerInfo; import javax.servlet.http.HttpServletResponse; @@ -29,8 +28,6 @@ Page contractRecordsByCustomerId(Long customerId); - Page mesureRecordsByCustomerId(Long customerId); - Page certificationByCustomerId(Long customerId); void customerExport(CustomerListRequest request, HttpServletResponse response);