diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java index 6acd92b..a79e129 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java @@ -82,22 +82,4 @@ resultData.setMessage("登录成功"); return resultData; } - - @GetMapping("/test") - @ResponseBody() - public void testStatusListener(Long id){ - String[] formIds={ ApplyFromIdEnum.STANDARD_REVERT_APPROVAL,ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL,ApplyFromIdEnum.STANDARD_RESUME_APPROVAL, - ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL,ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL,ApplyFromIdEnum.DEVICE_SEALED_APPROVAL,ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL, - ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL,ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL,ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL,ApplyFromIdEnum.DEVICE_BORROW_APPROVAL,ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL}; - for(String formId:formIds){ - AwareActionStatusEnum notifyActionStatusEnum= AwareActionStatusEnum.ACTION_STATUS_MAP.getActionStatusMap().get(formId); - NotifyEventStatusDTO notifyEventStatusDTO = NotifyEventStatusDTO.builder() - .id("") - .status(notifyActionStatusEnum.getStatus()).build(); - NotifyStatusPostProcessor postProcessor = SpringContextUtil.getBean(notifyActionStatusEnum.getActionBeanName()); - if (postProcessor != null) { - postProcessor.doUpdateNotifyEventStatus(notifyEventStatusDTO); - } - } - } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java index 6acd92b..a79e129 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java @@ -82,22 +82,4 @@ resultData.setMessage("登录成功"); return resultData; } - - @GetMapping("/test") - @ResponseBody() - public void testStatusListener(Long id){ - String[] formIds={ ApplyFromIdEnum.STANDARD_REVERT_APPROVAL,ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL,ApplyFromIdEnum.STANDARD_RESUME_APPROVAL, - ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL,ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL,ApplyFromIdEnum.DEVICE_SEALED_APPROVAL,ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL, - ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL,ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL,ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL,ApplyFromIdEnum.DEVICE_BORROW_APPROVAL,ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL}; - for(String formId:formIds){ - AwareActionStatusEnum notifyActionStatusEnum= AwareActionStatusEnum.ACTION_STATUS_MAP.getActionStatusMap().get(formId); - NotifyEventStatusDTO notifyEventStatusDTO = NotifyEventStatusDTO.builder() - .id("") - .status(notifyActionStatusEnum.getStatus()).build(); - NotifyStatusPostProcessor postProcessor = SpringContextUtil.getBean(notifyActionStatusEnum.getActionBeanName()); - if (postProcessor != null) { - postProcessor.doUpdateNotifyEventStatus(notifyEventStatusDTO); - } - } - } } 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 4461f67..9f2284d 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 @@ -111,15 +111,6 @@ return customerService.deleteCustomer(idDTO.getId()); } - @ApiOperation("根据客户id查询检定证书-分页") - @PostMapping("/certificateRecords") - public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); - } - @ApiOperation("根据客户id查询检定记录(在样品中实现，可复用)") @PostMapping("/fake/interface") public ReturnDTO> measureRecordsBySampleId() { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java index 6acd92b..a79e129 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java @@ -82,22 +82,4 @@ resultData.setMessage("登录成功"); return resultData; } - - @GetMapping("/test") - @ResponseBody() - public void testStatusListener(Long id){ - String[] formIds={ ApplyFromIdEnum.STANDARD_REVERT_APPROVAL,ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL,ApplyFromIdEnum.STANDARD_RESUME_APPROVAL, - ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL,ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL,ApplyFromIdEnum.DEVICE_SEALED_APPROVAL,ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL, - ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL,ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL,ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL,ApplyFromIdEnum.DEVICE_BORROW_APPROVAL,ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL}; - for(String formId:formIds){ - AwareActionStatusEnum notifyActionStatusEnum= AwareActionStatusEnum.ACTION_STATUS_MAP.getActionStatusMap().get(formId); - NotifyEventStatusDTO notifyEventStatusDTO = NotifyEventStatusDTO.builder() - .id("") - .status(notifyActionStatusEnum.getStatus()).build(); - NotifyStatusPostProcessor postProcessor = SpringContextUtil.getBean(notifyActionStatusEnum.getActionBeanName()); - if (postProcessor != null) { - postProcessor.doUpdateNotifyEventStatus(notifyEventStatusDTO); - } - } - } } 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 4461f67..9f2284d 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 @@ -111,15 +111,6 @@ return customerService.deleteCustomer(idDTO.getId()); } - @ApiOperation("根据客户id查询检定证书-分页") - @PostMapping("/certificateRecords") - public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); - } - @ApiOperation("根据客户id查询检定记录(在样品中实现，可复用)") @PostMapping("/fake/interface") public ReturnDTO> measureRecordsBySampleId() { 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 101a5d0..e07ad0b 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 @@ -100,12 +100,4 @@ return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsById(customerSampleIdRequest))); } - - @ApiOperation("根据样品id/客户id查询检定证书") - @PostMapping("/certificateRecordsById") - public ReturnDTO> certificationBySampleId(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) throws Exception{ - return ReturnUtil.success(super.packForBT(customerSampleService.certificateRecordsById(customerSampleIdRequest))); - } - - } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java index 6acd92b..a79e129 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java @@ -82,22 +82,4 @@ resultData.setMessage("登录成功"); return resultData; } - - @GetMapping("/test") - @ResponseBody() - public void testStatusListener(Long id){ - String[] formIds={ ApplyFromIdEnum.STANDARD_REVERT_APPROVAL,ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL,ApplyFromIdEnum.STANDARD_RESUME_APPROVAL, - ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL,ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL,ApplyFromIdEnum.DEVICE_SEALED_APPROVAL,ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL, - ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL,ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL,ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL,ApplyFromIdEnum.DEVICE_BORROW_APPROVAL,ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL}; - for(String formId:formIds){ - AwareActionStatusEnum notifyActionStatusEnum= AwareActionStatusEnum.ACTION_STATUS_MAP.getActionStatusMap().get(formId); - NotifyEventStatusDTO notifyEventStatusDTO = NotifyEventStatusDTO.builder() - .id("") - .status(notifyActionStatusEnum.getStatus()).build(); - NotifyStatusPostProcessor postProcessor = SpringContextUtil.getBean(notifyActionStatusEnum.getActionBeanName()); - if (postProcessor != null) { - postProcessor.doUpdateNotifyEventStatus(notifyEventStatusDTO); - } - } - } } 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 4461f67..9f2284d 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 @@ -111,15 +111,6 @@ return customerService.deleteCustomer(idDTO.getId()); } - @ApiOperation("根据客户id查询检定证书-分页") - @PostMapping("/certificateRecords") - public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); - } - @ApiOperation("根据客户id查询检定记录(在样品中实现，可复用)") @PostMapping("/fake/interface") public ReturnDTO> measureRecordsBySampleId() { 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 101a5d0..e07ad0b 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 @@ -100,12 +100,4 @@ return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsById(customerSampleIdRequest))); } - - @ApiOperation("根据样品id/客户id查询检定证书") - @PostMapping("/certificateRecordsById") - public ReturnDTO> certificationBySampleId(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) throws Exception{ - return ReturnUtil.success(super.packForBT(customerSampleService.certificateRecordsById(customerSampleIdRequest))); - } - - } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 9499a7e..a0352db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -130,7 +130,7 @@ public void exportExcel(@RequestBody @Valid FixedAssetRequest request) throws Exception { List list; DictCodeUtils.validDictCode(request); - if(CollectionUtils.isEmpty(request.getIds())){ + if(!CollectionUtils.isEmpty(request.getIds())){ FixedAssetRequest fixedAssetRequest = new FixedAssetRequest(); fixedAssetRequest.setIds(request.getIds()); list = iEquipmentFixedAssetsService.list(fixedAssetRequest); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java index 6acd92b..a79e129 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java @@ -82,22 +82,4 @@ resultData.setMessage("登录成功"); return resultData; } - - @GetMapping("/test") - @ResponseBody() - public void testStatusListener(Long id){ - String[] formIds={ ApplyFromIdEnum.STANDARD_REVERT_APPROVAL,ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL,ApplyFromIdEnum.STANDARD_RESUME_APPROVAL, - ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL,ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL,ApplyFromIdEnum.DEVICE_SEALED_APPROVAL,ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL, - ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL,ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL,ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL,ApplyFromIdEnum.DEVICE_BORROW_APPROVAL,ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL}; - for(String formId:formIds){ - AwareActionStatusEnum notifyActionStatusEnum= AwareActionStatusEnum.ACTION_STATUS_MAP.getActionStatusMap().get(formId); - NotifyEventStatusDTO notifyEventStatusDTO = NotifyEventStatusDTO.builder() - .id("") - .status(notifyActionStatusEnum.getStatus()).build(); - NotifyStatusPostProcessor postProcessor = SpringContextUtil.getBean(notifyActionStatusEnum.getActionBeanName()); - if (postProcessor != null) { - postProcessor.doUpdateNotifyEventStatus(notifyEventStatusDTO); - } - } - } } 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 4461f67..9f2284d 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 @@ -111,15 +111,6 @@ return customerService.deleteCustomer(idDTO.getId()); } - @ApiOperation("根据客户id查询检定证书-分页") - @PostMapping("/certificateRecords") - public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); - } - @ApiOperation("根据客户id查询检定记录(在样品中实现，可复用)") @PostMapping("/fake/interface") public ReturnDTO> measureRecordsBySampleId() { 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 101a5d0..e07ad0b 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 @@ -100,12 +100,4 @@ return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsById(customerSampleIdRequest))); } - - @ApiOperation("根据样品id/客户id查询检定证书") - @PostMapping("/certificateRecordsById") - public ReturnDTO> certificationBySampleId(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) throws Exception{ - return ReturnUtil.success(super.packForBT(customerSampleService.certificateRecordsById(customerSampleIdRequest))); - } - - } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 9499a7e..a0352db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -130,7 +130,7 @@ public void exportExcel(@RequestBody @Valid FixedAssetRequest request) throws Exception { List list; DictCodeUtils.validDictCode(request); - if(CollectionUtils.isEmpty(request.getIds())){ + if(!CollectionUtils.isEmpty(request.getIds())){ FixedAssetRequest fixedAssetRequest = new FixedAssetRequest(); fixedAssetRequest.setIds(request.getIds()); list = iEquipmentFixedAssetsService.list(fixedAssetRequest); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java index c8b6298..f8076ca 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java @@ -100,7 +100,7 @@ public void exportExcel(@RequestBody @Valid StandardEquipmentRequest request) throws Exception { List list; DictCodeUtils.validDictCode(request); - if(CollectionUtils.isEmpty(request.getIds())){ + if(!CollectionUtils.isEmpty(request.getIds())){ StandardEquipmentRequest standardEquipmentRequest = new StandardEquipmentRequest(); standardEquipmentRequest.setIds(request.getIds()); list = meterStandardEquipmentService.list(standardEquipmentRequest); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java index 6acd92b..a79e129 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java @@ -82,22 +82,4 @@ resultData.setMessage("登录成功"); return resultData; } - - @GetMapping("/test") - @ResponseBody() - public void testStatusListener(Long id){ - String[] formIds={ ApplyFromIdEnum.STANDARD_REVERT_APPROVAL,ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL,ApplyFromIdEnum.STANDARD_RESUME_APPROVAL, - ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL,ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL,ApplyFromIdEnum.DEVICE_SEALED_APPROVAL,ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL, - ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL,ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL,ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL,ApplyFromIdEnum.DEVICE_BORROW_APPROVAL,ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL}; - for(String formId:formIds){ - AwareActionStatusEnum notifyActionStatusEnum= AwareActionStatusEnum.ACTION_STATUS_MAP.getActionStatusMap().get(formId); - NotifyEventStatusDTO notifyEventStatusDTO = NotifyEventStatusDTO.builder() - .id("") - .status(notifyActionStatusEnum.getStatus()).build(); - NotifyStatusPostProcessor postProcessor = SpringContextUtil.getBean(notifyActionStatusEnum.getActionBeanName()); - if (postProcessor != null) { - postProcessor.doUpdateNotifyEventStatus(notifyEventStatusDTO); - } - } - } } 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 4461f67..9f2284d 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 @@ -111,15 +111,6 @@ return customerService.deleteCustomer(idDTO.getId()); } - @ApiOperation("根据客户id查询检定证书-分页") - @PostMapping("/certificateRecords") - public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); - } - @ApiOperation("根据客户id查询检定记录(在样品中实现，可复用)") @PostMapping("/fake/interface") public ReturnDTO> measureRecordsBySampleId() { 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 101a5d0..e07ad0b 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 @@ -100,12 +100,4 @@ return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsById(customerSampleIdRequest))); } - - @ApiOperation("根据样品id/客户id查询检定证书") - @PostMapping("/certificateRecordsById") - public ReturnDTO> certificationBySampleId(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) throws Exception{ - return ReturnUtil.success(super.packForBT(customerSampleService.certificateRecordsById(customerSampleIdRequest))); - } - - } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 9499a7e..a0352db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -130,7 +130,7 @@ public void exportExcel(@RequestBody @Valid FixedAssetRequest request) throws Exception { List list; DictCodeUtils.validDictCode(request); - if(CollectionUtils.isEmpty(request.getIds())){ + if(!CollectionUtils.isEmpty(request.getIds())){ FixedAssetRequest fixedAssetRequest = new FixedAssetRequest(); fixedAssetRequest.setIds(request.getIds()); list = iEquipmentFixedAssetsService.list(fixedAssetRequest); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java index c8b6298..f8076ca 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java @@ -100,7 +100,7 @@ public void exportExcel(@RequestBody @Valid StandardEquipmentRequest request) throws Exception { List list; DictCodeUtils.validDictCode(request); - if(CollectionUtils.isEmpty(request.getIds())){ + if(!CollectionUtils.isEmpty(request.getIds())){ StandardEquipmentRequest standardEquipmentRequest = new StandardEquipmentRequest(); standardEquipmentRequest.setIds(request.getIds()); list = meterStandardEquipmentService.list(standardEquipmentRequest); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java b/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java index d493bdd..4186936 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java @@ -28,7 +28,7 @@ /** 测量设备模块 */ EQUIPMENT("测量设备模块", - basePackage("com.casic.missiles.controller.customer"), + basePackage("com.casic.missiles.controller.equipment"), PathSelectors.any()), /** 审批操作按钮 */ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java index 6acd92b..a79e129 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java @@ -82,22 +82,4 @@ resultData.setMessage("登录成功"); return resultData; } - - @GetMapping("/test") - @ResponseBody() - public void testStatusListener(Long id){ - String[] formIds={ ApplyFromIdEnum.STANDARD_REVERT_APPROVAL,ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL,ApplyFromIdEnum.STANDARD_RESUME_APPROVAL, - ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL,ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL,ApplyFromIdEnum.DEVICE_SEALED_APPROVAL,ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL, - ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL,ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL,ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL,ApplyFromIdEnum.DEVICE_BORROW_APPROVAL,ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL}; - for(String formId:formIds){ - AwareActionStatusEnum notifyActionStatusEnum= AwareActionStatusEnum.ACTION_STATUS_MAP.getActionStatusMap().get(formId); - NotifyEventStatusDTO notifyEventStatusDTO = NotifyEventStatusDTO.builder() - .id("") - .status(notifyActionStatusEnum.getStatus()).build(); - NotifyStatusPostProcessor postProcessor = SpringContextUtil.getBean(notifyActionStatusEnum.getActionBeanName()); - if (postProcessor != null) { - postProcessor.doUpdateNotifyEventStatus(notifyEventStatusDTO); - } - } - } } 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 4461f67..9f2284d 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 @@ -111,15 +111,6 @@ return customerService.deleteCustomer(idDTO.getId()); } - @ApiOperation("根据客户id查询检定证书-分页") - @PostMapping("/certificateRecords") - public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); - } - @ApiOperation("根据客户id查询检定记录(在样品中实现，可复用)") @PostMapping("/fake/interface") public ReturnDTO> measureRecordsBySampleId() { 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 101a5d0..e07ad0b 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 @@ -100,12 +100,4 @@ return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsById(customerSampleIdRequest))); } - - @ApiOperation("根据样品id/客户id查询检定证书") - @PostMapping("/certificateRecordsById") - public ReturnDTO> certificationBySampleId(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) throws Exception{ - return ReturnUtil.success(super.packForBT(customerSampleService.certificateRecordsById(customerSampleIdRequest))); - } - - } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 9499a7e..a0352db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -130,7 +130,7 @@ public void exportExcel(@RequestBody @Valid FixedAssetRequest request) throws Exception { List list; DictCodeUtils.validDictCode(request); - if(CollectionUtils.isEmpty(request.getIds())){ + if(!CollectionUtils.isEmpty(request.getIds())){ FixedAssetRequest fixedAssetRequest = new FixedAssetRequest(); fixedAssetRequest.setIds(request.getIds()); list = iEquipmentFixedAssetsService.list(fixedAssetRequest); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java index c8b6298..f8076ca 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java @@ -100,7 +100,7 @@ public void exportExcel(@RequestBody @Valid StandardEquipmentRequest request) throws Exception { List list; DictCodeUtils.validDictCode(request); - if(CollectionUtils.isEmpty(request.getIds())){ + if(!CollectionUtils.isEmpty(request.getIds())){ StandardEquipmentRequest standardEquipmentRequest = new StandardEquipmentRequest(); standardEquipmentRequest.setIds(request.getIds()); list = meterStandardEquipmentService.list(standardEquipmentRequest); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java b/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java index d493bdd..4186936 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java @@ -28,7 +28,7 @@ /** 测量设备模块 */ EQUIPMENT("测量设备模块", - basePackage("com.casic.missiles.controller.customer"), + basePackage("com.casic.missiles.controller.equipment"), PathSelectors.any()), /** 审批操作按钮 */ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentSupportStatusPostProcessor.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentSupportStatusPostProcessor.java new file mode 100644 index 0000000..f084655 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentSupportStatusPostProcessor.java @@ -0,0 +1,60 @@ +package com.casic.missiles.listeners.processor; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.dto.flowable.NotifyEventStatusDTO; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.listeners.NotifyStatusPostProcessor; +import com.casic.missiles.mapper.equipment.EquipmentStandardApplyEquipmentMapper; +import com.casic.missiles.mapper.equipment.EquipmentStandardApplyMapper; +import com.casic.missiles.mapper.equipment.EquipmentStandardSupportMapper; +import com.casic.missiles.model.equipment.EquipmentStandardApply; +import com.casic.missiles.model.equipment.EquipmentStandardApplyEquipment; +import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; +import com.casic.missiles.utils.SpringContextUtil; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * @author xzz + * * 审批通过后修改标准装置配套设备状态 + */ +@Service(ActionStatusBeanEnum.SUPPORT_BEAN_NAME) +public class EquipmentSupportStatusPostProcessor implements NotifyStatusPostProcessor { + @Override + public void doUpdateNotifyEventStatus(NotifyEventStatusDTO notifyEventStatusDTO) { + String id = notifyEventStatusDTO.getId(); + EquipmentStandardApplyMapper standardApplyMapper = SpringContextUtil.getBean(EquipmentStandardApplyMapper.class); + EquipmentStandardApplyEquipmentMapper applyEquipmentMapper = SpringContextUtil.getBean(EquipmentStandardApplyEquipmentMapper.class); + EquipmentStandardSupportMapper supportMapper = SpringContextUtil.getBean(EquipmentStandardSupportMapper.class); + List supportEquipments = new ArrayList<>(); + // 通过申请id查询申请信息 + EquipmentStandardApply standardApply = standardApplyMapper.selectById(id); + // 通过申请id查询出申请设备列表 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("standard_apply_id", id); + List equipmentStandardApplyEquipments = applyEquipmentMapper.selectList(queryWrapper); + // 设备ids + List equipmentIds = equipmentStandardApplyEquipments.stream().map(EquipmentStandardApplyEquipment::getEquipmentId).collect(Collectors.toList()); + for (Long equipmentId : equipmentIds) { + EquipmentStandardSupportEquipment supportEquipment = new EquipmentStandardSupportEquipment(); + supportEquipment.setEquipmentId(equipmentId); + supportEquipment.setStandardEquipmentId(Long.valueOf(standardApply.getStandardEquipmentId())); + supportEquipments.add(supportEquipment); + } + // 通过标准装置id删除原先配套设备 + QueryWrapper supportEquipmentWrapper = new QueryWrapper<>(); + supportEquipmentWrapper.eq("standard_equipment_id", standardApply.getStandardEquipmentId()); + supportMapper.delete(supportEquipmentWrapper); + // 新增配套设备 + for (EquipmentStandardSupportEquipment supportEquipment : supportEquipments) { + if (supportMapper.insert(supportEquipment) <= 0) { + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java index 6acd92b..a79e129 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java @@ -82,22 +82,4 @@ resultData.setMessage("登录成功"); return resultData; } - - @GetMapping("/test") - @ResponseBody() - public void testStatusListener(Long id){ - String[] formIds={ ApplyFromIdEnum.STANDARD_REVERT_APPROVAL,ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL,ApplyFromIdEnum.STANDARD_RESUME_APPROVAL, - ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL,ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL,ApplyFromIdEnum.DEVICE_SEALED_APPROVAL,ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL, - ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL,ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL,ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL,ApplyFromIdEnum.DEVICE_BORROW_APPROVAL,ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL}; - for(String formId:formIds){ - AwareActionStatusEnum notifyActionStatusEnum= AwareActionStatusEnum.ACTION_STATUS_MAP.getActionStatusMap().get(formId); - NotifyEventStatusDTO notifyEventStatusDTO = NotifyEventStatusDTO.builder() - .id("") - .status(notifyActionStatusEnum.getStatus()).build(); - NotifyStatusPostProcessor postProcessor = SpringContextUtil.getBean(notifyActionStatusEnum.getActionBeanName()); - if (postProcessor != null) { - postProcessor.doUpdateNotifyEventStatus(notifyEventStatusDTO); - } - } - } } 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 4461f67..9f2284d 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 @@ -111,15 +111,6 @@ return customerService.deleteCustomer(idDTO.getId()); } - @ApiOperation("根据客户id查询检定证书-分页") - @PostMapping("/certificateRecords") - public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); - } - @ApiOperation("根据客户id查询检定记录(在样品中实现，可复用)") @PostMapping("/fake/interface") public ReturnDTO> measureRecordsBySampleId() { 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 101a5d0..e07ad0b 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 @@ -100,12 +100,4 @@ return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsById(customerSampleIdRequest))); } - - @ApiOperation("根据样品id/客户id查询检定证书") - @PostMapping("/certificateRecordsById") - public ReturnDTO> certificationBySampleId(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) throws Exception{ - return ReturnUtil.success(super.packForBT(customerSampleService.certificateRecordsById(customerSampleIdRequest))); - } - - } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 9499a7e..a0352db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -130,7 +130,7 @@ public void exportExcel(@RequestBody @Valid FixedAssetRequest request) throws Exception { List list; DictCodeUtils.validDictCode(request); - if(CollectionUtils.isEmpty(request.getIds())){ + if(!CollectionUtils.isEmpty(request.getIds())){ FixedAssetRequest fixedAssetRequest = new FixedAssetRequest(); fixedAssetRequest.setIds(request.getIds()); list = iEquipmentFixedAssetsService.list(fixedAssetRequest); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java index c8b6298..f8076ca 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java @@ -100,7 +100,7 @@ public void exportExcel(@RequestBody @Valid StandardEquipmentRequest request) throws Exception { List list; DictCodeUtils.validDictCode(request); - if(CollectionUtils.isEmpty(request.getIds())){ + if(!CollectionUtils.isEmpty(request.getIds())){ StandardEquipmentRequest standardEquipmentRequest = new StandardEquipmentRequest(); standardEquipmentRequest.setIds(request.getIds()); list = meterStandardEquipmentService.list(standardEquipmentRequest); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java b/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java index d493bdd..4186936 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java @@ -28,7 +28,7 @@ /** 测量设备模块 */ EQUIPMENT("测量设备模块", - basePackage("com.casic.missiles.controller.customer"), + basePackage("com.casic.missiles.controller.equipment"), PathSelectors.any()), /** 审批操作按钮 */ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentSupportStatusPostProcessor.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentSupportStatusPostProcessor.java new file mode 100644 index 0000000..f084655 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentSupportStatusPostProcessor.java @@ -0,0 +1,60 @@ +package com.casic.missiles.listeners.processor; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.dto.flowable.NotifyEventStatusDTO; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.listeners.NotifyStatusPostProcessor; +import com.casic.missiles.mapper.equipment.EquipmentStandardApplyEquipmentMapper; +import com.casic.missiles.mapper.equipment.EquipmentStandardApplyMapper; +import com.casic.missiles.mapper.equipment.EquipmentStandardSupportMapper; +import com.casic.missiles.model.equipment.EquipmentStandardApply; +import com.casic.missiles.model.equipment.EquipmentStandardApplyEquipment; +import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; +import com.casic.missiles.utils.SpringContextUtil; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * @author xzz + * * 审批通过后修改标准装置配套设备状态 + */ +@Service(ActionStatusBeanEnum.SUPPORT_BEAN_NAME) +public class EquipmentSupportStatusPostProcessor implements NotifyStatusPostProcessor { + @Override + public void doUpdateNotifyEventStatus(NotifyEventStatusDTO notifyEventStatusDTO) { + String id = notifyEventStatusDTO.getId(); + EquipmentStandardApplyMapper standardApplyMapper = SpringContextUtil.getBean(EquipmentStandardApplyMapper.class); + EquipmentStandardApplyEquipmentMapper applyEquipmentMapper = SpringContextUtil.getBean(EquipmentStandardApplyEquipmentMapper.class); + EquipmentStandardSupportMapper supportMapper = SpringContextUtil.getBean(EquipmentStandardSupportMapper.class); + List supportEquipments = new ArrayList<>(); + // 通过申请id查询申请信息 + EquipmentStandardApply standardApply = standardApplyMapper.selectById(id); + // 通过申请id查询出申请设备列表 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("standard_apply_id", id); + List equipmentStandardApplyEquipments = applyEquipmentMapper.selectList(queryWrapper); + // 设备ids + List equipmentIds = equipmentStandardApplyEquipments.stream().map(EquipmentStandardApplyEquipment::getEquipmentId).collect(Collectors.toList()); + for (Long equipmentId : equipmentIds) { + EquipmentStandardSupportEquipment supportEquipment = new EquipmentStandardSupportEquipment(); + supportEquipment.setEquipmentId(equipmentId); + supportEquipment.setStandardEquipmentId(Long.valueOf(standardApply.getStandardEquipmentId())); + supportEquipments.add(supportEquipment); + } + // 通过标准装置id删除原先配套设备 + QueryWrapper supportEquipmentWrapper = new QueryWrapper<>(); + supportEquipmentWrapper.eq("standard_equipment_id", standardApply.getStandardEquipmentId()); + supportMapper.delete(supportEquipmentWrapper); + // 新增配套设备 + for (EquipmentStandardSupportEquipment supportEquipment : supportEquipments) { + if (supportMapper.insert(supportEquipment) <= 0) { + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } + } +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentSupporteStatusPostProcessor.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentSupporteStatusPostProcessor.java deleted file mode 100644 index e29b191..0000000 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentSupporteStatusPostProcessor.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.casic.missiles.listeners.processor; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.casic.missiles.dto.flowable.NotifyEventStatusDTO; -import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.listeners.NotifyStatusPostProcessor; -import com.casic.missiles.mapper.equipment.EquipmentStandardApplyEquipmentMapper; -import com.casic.missiles.mapper.equipment.EquipmentStandardApplyMapper; -import com.casic.missiles.mapper.equipment.EquipmentStandardSupportMapper; -import com.casic.missiles.model.equipment.EquipmentStandardApply; -import com.casic.missiles.model.equipment.EquipmentStandardApplyEquipment; -import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; -import com.casic.missiles.utils.SpringContextUtil; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -/** - * @author xzz - * * 审批通过后修改标准装置配套设备状态 - */ -@Service(ActionStatusBeanEnum.SUPPORT_BEAN_NAME) -public class EquipmentSupporteStatusPostProcessor implements NotifyStatusPostProcessor { - @Override - public void doUpdateNotifyEventStatus(NotifyEventStatusDTO notifyEventStatusDTO) { - String id = notifyEventStatusDTO.getId(); - EquipmentStandardApplyMapper standardApplyMapper = SpringContextUtil.getBean(EquipmentStandardApplyMapper.class); - EquipmentStandardApplyEquipmentMapper applyEquipmentMapper = SpringContextUtil.getBean(EquipmentStandardApplyEquipmentMapper.class); - EquipmentStandardSupportMapper supportMapper = SpringContextUtil.getBean(EquipmentStandardSupportMapper.class); - List supportEquipments = new ArrayList<>(); - // 通过申请id查询申请信息 - EquipmentStandardApply standardApply = standardApplyMapper.selectById(id); - // 通过申请id查询出申请设备列表 - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("standard_apply_id", id); - List equipmentStandardApplyEquipments = applyEquipmentMapper.selectList(queryWrapper); - // 设备ids - List equipmentIds = equipmentStandardApplyEquipments.stream().map(EquipmentStandardApplyEquipment::getEquipmentId).collect(Collectors.toList()); - for (Long equipmentId : equipmentIds) { - EquipmentStandardSupportEquipment supportEquipment = new EquipmentStandardSupportEquipment(); - supportEquipment.setEquipmentId(equipmentId); - supportEquipment.setStandardEquipmentId(Long.valueOf(standardApply.getStandardEquipmentId())); - supportEquipments.add(supportEquipment); - } - // 通过标准装置id删除原先配套设备 - QueryWrapper supportEquipmentWrapper = new QueryWrapper<>(); - supportEquipmentWrapper.eq("standard_equipment_id", standardApply.getStandardEquipmentId()); - supportMapper.delete(supportEquipmentWrapper); - // 新增配套设备 - for (EquipmentStandardSupportEquipment supportEquipment : supportEquipments) { - if (supportMapper.insert(supportEquipment) <= 0) { - throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); - } - } - } -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java index 6acd92b..a79e129 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java @@ -82,22 +82,4 @@ resultData.setMessage("登录成功"); return resultData; } - - @GetMapping("/test") - @ResponseBody() - public void testStatusListener(Long id){ - String[] formIds={ ApplyFromIdEnum.STANDARD_REVERT_APPROVAL,ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL,ApplyFromIdEnum.STANDARD_RESUME_APPROVAL, - ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL,ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL,ApplyFromIdEnum.DEVICE_SEALED_APPROVAL,ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL, - ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL,ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL,ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL,ApplyFromIdEnum.DEVICE_BORROW_APPROVAL,ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL}; - for(String formId:formIds){ - AwareActionStatusEnum notifyActionStatusEnum= AwareActionStatusEnum.ACTION_STATUS_MAP.getActionStatusMap().get(formId); - NotifyEventStatusDTO notifyEventStatusDTO = NotifyEventStatusDTO.builder() - .id("") - .status(notifyActionStatusEnum.getStatus()).build(); - NotifyStatusPostProcessor postProcessor = SpringContextUtil.getBean(notifyActionStatusEnum.getActionBeanName()); - if (postProcessor != null) { - postProcessor.doUpdateNotifyEventStatus(notifyEventStatusDTO); - } - } - } } 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 4461f67..9f2284d 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 @@ -111,15 +111,6 @@ return customerService.deleteCustomer(idDTO.getId()); } - @ApiOperation("根据客户id查询检定证书-分页") - @PostMapping("/certificateRecords") - public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); - } - @ApiOperation("根据客户id查询检定记录(在样品中实现，可复用)") @PostMapping("/fake/interface") public ReturnDTO> measureRecordsBySampleId() { 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 101a5d0..e07ad0b 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 @@ -100,12 +100,4 @@ return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsById(customerSampleIdRequest))); } - - @ApiOperation("根据样品id/客户id查询检定证书") - @PostMapping("/certificateRecordsById") - public ReturnDTO> certificationBySampleId(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) throws Exception{ - return ReturnUtil.success(super.packForBT(customerSampleService.certificateRecordsById(customerSampleIdRequest))); - } - - } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 9499a7e..a0352db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -130,7 +130,7 @@ public void exportExcel(@RequestBody @Valid FixedAssetRequest request) throws Exception { List list; DictCodeUtils.validDictCode(request); - if(CollectionUtils.isEmpty(request.getIds())){ + if(!CollectionUtils.isEmpty(request.getIds())){ FixedAssetRequest fixedAssetRequest = new FixedAssetRequest(); fixedAssetRequest.setIds(request.getIds()); list = iEquipmentFixedAssetsService.list(fixedAssetRequest); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java index c8b6298..f8076ca 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java @@ -100,7 +100,7 @@ public void exportExcel(@RequestBody @Valid StandardEquipmentRequest request) throws Exception { List list; DictCodeUtils.validDictCode(request); - if(CollectionUtils.isEmpty(request.getIds())){ + if(!CollectionUtils.isEmpty(request.getIds())){ StandardEquipmentRequest standardEquipmentRequest = new StandardEquipmentRequest(); standardEquipmentRequest.setIds(request.getIds()); list = meterStandardEquipmentService.list(standardEquipmentRequest); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java b/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java index d493bdd..4186936 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java @@ -28,7 +28,7 @@ /** 测量设备模块 */ EQUIPMENT("测量设备模块", - basePackage("com.casic.missiles.controller.customer"), + basePackage("com.casic.missiles.controller.equipment"), PathSelectors.any()), /** 审批操作按钮 */ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentSupportStatusPostProcessor.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentSupportStatusPostProcessor.java new file mode 100644 index 0000000..f084655 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentSupportStatusPostProcessor.java @@ -0,0 +1,60 @@ +package com.casic.missiles.listeners.processor; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.dto.flowable.NotifyEventStatusDTO; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.listeners.NotifyStatusPostProcessor; +import com.casic.missiles.mapper.equipment.EquipmentStandardApplyEquipmentMapper; +import com.casic.missiles.mapper.equipment.EquipmentStandardApplyMapper; +import com.casic.missiles.mapper.equipment.EquipmentStandardSupportMapper; +import com.casic.missiles.model.equipment.EquipmentStandardApply; +import com.casic.missiles.model.equipment.EquipmentStandardApplyEquipment; +import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; +import com.casic.missiles.utils.SpringContextUtil; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * @author xzz + * * 审批通过后修改标准装置配套设备状态 + */ +@Service(ActionStatusBeanEnum.SUPPORT_BEAN_NAME) +public class EquipmentSupportStatusPostProcessor implements NotifyStatusPostProcessor { + @Override + public void doUpdateNotifyEventStatus(NotifyEventStatusDTO notifyEventStatusDTO) { + String id = notifyEventStatusDTO.getId(); + EquipmentStandardApplyMapper standardApplyMapper = SpringContextUtil.getBean(EquipmentStandardApplyMapper.class); + EquipmentStandardApplyEquipmentMapper applyEquipmentMapper = SpringContextUtil.getBean(EquipmentStandardApplyEquipmentMapper.class); + EquipmentStandardSupportMapper supportMapper = SpringContextUtil.getBean(EquipmentStandardSupportMapper.class); + List supportEquipments = new ArrayList<>(); + // 通过申请id查询申请信息 + EquipmentStandardApply standardApply = standardApplyMapper.selectById(id); + // 通过申请id查询出申请设备列表 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("standard_apply_id", id); + List equipmentStandardApplyEquipments = applyEquipmentMapper.selectList(queryWrapper); + // 设备ids + List equipmentIds = equipmentStandardApplyEquipments.stream().map(EquipmentStandardApplyEquipment::getEquipmentId).collect(Collectors.toList()); + for (Long equipmentId : equipmentIds) { + EquipmentStandardSupportEquipment supportEquipment = new EquipmentStandardSupportEquipment(); + supportEquipment.setEquipmentId(equipmentId); + supportEquipment.setStandardEquipmentId(Long.valueOf(standardApply.getStandardEquipmentId())); + supportEquipments.add(supportEquipment); + } + // 通过标准装置id删除原先配套设备 + QueryWrapper supportEquipmentWrapper = new QueryWrapper<>(); + supportEquipmentWrapper.eq("standard_equipment_id", standardApply.getStandardEquipmentId()); + supportMapper.delete(supportEquipmentWrapper); + // 新增配套设备 + for (EquipmentStandardSupportEquipment supportEquipment : supportEquipments) { + if (supportMapper.insert(supportEquipment) <= 0) { + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } + } +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentSupporteStatusPostProcessor.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentSupporteStatusPostProcessor.java deleted file mode 100644 index e29b191..0000000 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentSupporteStatusPostProcessor.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.casic.missiles.listeners.processor; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.casic.missiles.dto.flowable.NotifyEventStatusDTO; -import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.listeners.NotifyStatusPostProcessor; -import com.casic.missiles.mapper.equipment.EquipmentStandardApplyEquipmentMapper; -import com.casic.missiles.mapper.equipment.EquipmentStandardApplyMapper; -import com.casic.missiles.mapper.equipment.EquipmentStandardSupportMapper; -import com.casic.missiles.model.equipment.EquipmentStandardApply; -import com.casic.missiles.model.equipment.EquipmentStandardApplyEquipment; -import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; -import com.casic.missiles.utils.SpringContextUtil; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -/** - * @author xzz - * * 审批通过后修改标准装置配套设备状态 - */ -@Service(ActionStatusBeanEnum.SUPPORT_BEAN_NAME) -public class EquipmentSupporteStatusPostProcessor implements NotifyStatusPostProcessor { - @Override - public void doUpdateNotifyEventStatus(NotifyEventStatusDTO notifyEventStatusDTO) { - String id = notifyEventStatusDTO.getId(); - EquipmentStandardApplyMapper standardApplyMapper = SpringContextUtil.getBean(EquipmentStandardApplyMapper.class); - EquipmentStandardApplyEquipmentMapper applyEquipmentMapper = SpringContextUtil.getBean(EquipmentStandardApplyEquipmentMapper.class); - EquipmentStandardSupportMapper supportMapper = SpringContextUtil.getBean(EquipmentStandardSupportMapper.class); - List supportEquipments = new ArrayList<>(); - // 通过申请id查询申请信息 - EquipmentStandardApply standardApply = standardApplyMapper.selectById(id); - // 通过申请id查询出申请设备列表 - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("standard_apply_id", id); - List equipmentStandardApplyEquipments = applyEquipmentMapper.selectList(queryWrapper); - // 设备ids - List equipmentIds = equipmentStandardApplyEquipments.stream().map(EquipmentStandardApplyEquipment::getEquipmentId).collect(Collectors.toList()); - for (Long equipmentId : equipmentIds) { - EquipmentStandardSupportEquipment supportEquipment = new EquipmentStandardSupportEquipment(); - supportEquipment.setEquipmentId(equipmentId); - supportEquipment.setStandardEquipmentId(Long.valueOf(standardApply.getStandardEquipmentId())); - supportEquipments.add(supportEquipment); - } - // 通过标准装置id删除原先配套设备 - QueryWrapper supportEquipmentWrapper = new QueryWrapper<>(); - supportEquipmentWrapper.eq("standard_equipment_id", standardApply.getStandardEquipmentId()); - supportMapper.delete(supportEquipmentWrapper); - // 新增配套设备 - for (EquipmentStandardSupportEquipment supportEquipment : supportEquipments) { - if (supportMapper.insert(supportEquipment) <= 0) { - throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); - } - } - } -} 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 ebb38b7..2b5c96f 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 @@ -15,8 +15,6 @@ Page measureRecordsById(Page page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest); - Page certificateRecordsById(Page page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest); - Page samplesByOderId(Page page, @Param("orderId") Long orderId, diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java index 6acd92b..a79e129 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java @@ -82,22 +82,4 @@ resultData.setMessage("登录成功"); return resultData; } - - @GetMapping("/test") - @ResponseBody() - public void testStatusListener(Long id){ - String[] formIds={ ApplyFromIdEnum.STANDARD_REVERT_APPROVAL,ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL,ApplyFromIdEnum.STANDARD_RESUME_APPROVAL, - ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL,ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL,ApplyFromIdEnum.DEVICE_SEALED_APPROVAL,ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL, - ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL,ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL,ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL,ApplyFromIdEnum.DEVICE_BORROW_APPROVAL,ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL}; - for(String formId:formIds){ - AwareActionStatusEnum notifyActionStatusEnum= AwareActionStatusEnum.ACTION_STATUS_MAP.getActionStatusMap().get(formId); - NotifyEventStatusDTO notifyEventStatusDTO = NotifyEventStatusDTO.builder() - .id("") - .status(notifyActionStatusEnum.getStatus()).build(); - NotifyStatusPostProcessor postProcessor = SpringContextUtil.getBean(notifyActionStatusEnum.getActionBeanName()); - if (postProcessor != null) { - postProcessor.doUpdateNotifyEventStatus(notifyEventStatusDTO); - } - } - } } 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 4461f67..9f2284d 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 @@ -111,15 +111,6 @@ return customerService.deleteCustomer(idDTO.getId()); } - @ApiOperation("根据客户id查询检定证书-分页") - @PostMapping("/certificateRecords") - public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); - } - @ApiOperation("根据客户id查询检定记录(在样品中实现，可复用)") @PostMapping("/fake/interface") public ReturnDTO> measureRecordsBySampleId() { 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 101a5d0..e07ad0b 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 @@ -100,12 +100,4 @@ return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsById(customerSampleIdRequest))); } - - @ApiOperation("根据样品id/客户id查询检定证书") - @PostMapping("/certificateRecordsById") - public ReturnDTO> certificationBySampleId(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) throws Exception{ - return ReturnUtil.success(super.packForBT(customerSampleService.certificateRecordsById(customerSampleIdRequest))); - } - - } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 9499a7e..a0352db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -130,7 +130,7 @@ public void exportExcel(@RequestBody @Valid FixedAssetRequest request) throws Exception { List list; DictCodeUtils.validDictCode(request); - if(CollectionUtils.isEmpty(request.getIds())){ + if(!CollectionUtils.isEmpty(request.getIds())){ FixedAssetRequest fixedAssetRequest = new FixedAssetRequest(); fixedAssetRequest.setIds(request.getIds()); list = iEquipmentFixedAssetsService.list(fixedAssetRequest); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java index c8b6298..f8076ca 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java @@ -100,7 +100,7 @@ public void exportExcel(@RequestBody @Valid StandardEquipmentRequest request) throws Exception { List list; DictCodeUtils.validDictCode(request); - if(CollectionUtils.isEmpty(request.getIds())){ + if(!CollectionUtils.isEmpty(request.getIds())){ StandardEquipmentRequest standardEquipmentRequest = new StandardEquipmentRequest(); standardEquipmentRequest.setIds(request.getIds()); list = meterStandardEquipmentService.list(standardEquipmentRequest); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java b/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java index d493bdd..4186936 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java @@ -28,7 +28,7 @@ /** 测量设备模块 */ EQUIPMENT("测量设备模块", - basePackage("com.casic.missiles.controller.customer"), + basePackage("com.casic.missiles.controller.equipment"), PathSelectors.any()), /** 审批操作按钮 */ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentSupportStatusPostProcessor.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentSupportStatusPostProcessor.java new file mode 100644 index 0000000..f084655 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentSupportStatusPostProcessor.java @@ -0,0 +1,60 @@ +package com.casic.missiles.listeners.processor; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.dto.flowable.NotifyEventStatusDTO; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.listeners.NotifyStatusPostProcessor; +import com.casic.missiles.mapper.equipment.EquipmentStandardApplyEquipmentMapper; +import com.casic.missiles.mapper.equipment.EquipmentStandardApplyMapper; +import com.casic.missiles.mapper.equipment.EquipmentStandardSupportMapper; +import com.casic.missiles.model.equipment.EquipmentStandardApply; +import com.casic.missiles.model.equipment.EquipmentStandardApplyEquipment; +import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; +import com.casic.missiles.utils.SpringContextUtil; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * @author xzz + * * 审批通过后修改标准装置配套设备状态 + */ +@Service(ActionStatusBeanEnum.SUPPORT_BEAN_NAME) +public class EquipmentSupportStatusPostProcessor implements NotifyStatusPostProcessor { + @Override + public void doUpdateNotifyEventStatus(NotifyEventStatusDTO notifyEventStatusDTO) { + String id = notifyEventStatusDTO.getId(); + EquipmentStandardApplyMapper standardApplyMapper = SpringContextUtil.getBean(EquipmentStandardApplyMapper.class); + EquipmentStandardApplyEquipmentMapper applyEquipmentMapper = SpringContextUtil.getBean(EquipmentStandardApplyEquipmentMapper.class); + EquipmentStandardSupportMapper supportMapper = SpringContextUtil.getBean(EquipmentStandardSupportMapper.class); + List supportEquipments = new ArrayList<>(); + // 通过申请id查询申请信息 + EquipmentStandardApply standardApply = standardApplyMapper.selectById(id); + // 通过申请id查询出申请设备列表 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("standard_apply_id", id); + List equipmentStandardApplyEquipments = applyEquipmentMapper.selectList(queryWrapper); + // 设备ids + List equipmentIds = equipmentStandardApplyEquipments.stream().map(EquipmentStandardApplyEquipment::getEquipmentId).collect(Collectors.toList()); + for (Long equipmentId : equipmentIds) { + EquipmentStandardSupportEquipment supportEquipment = new EquipmentStandardSupportEquipment(); + supportEquipment.setEquipmentId(equipmentId); + supportEquipment.setStandardEquipmentId(Long.valueOf(standardApply.getStandardEquipmentId())); + supportEquipments.add(supportEquipment); + } + // 通过标准装置id删除原先配套设备 + QueryWrapper supportEquipmentWrapper = new QueryWrapper<>(); + supportEquipmentWrapper.eq("standard_equipment_id", standardApply.getStandardEquipmentId()); + supportMapper.delete(supportEquipmentWrapper); + // 新增配套设备 + for (EquipmentStandardSupportEquipment supportEquipment : supportEquipments) { + if (supportMapper.insert(supportEquipment) <= 0) { + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } + } +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentSupporteStatusPostProcessor.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentSupporteStatusPostProcessor.java deleted file mode 100644 index e29b191..0000000 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentSupporteStatusPostProcessor.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.casic.missiles.listeners.processor; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.casic.missiles.dto.flowable.NotifyEventStatusDTO; -import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.listeners.NotifyStatusPostProcessor; -import com.casic.missiles.mapper.equipment.EquipmentStandardApplyEquipmentMapper; -import com.casic.missiles.mapper.equipment.EquipmentStandardApplyMapper; -import com.casic.missiles.mapper.equipment.EquipmentStandardSupportMapper; -import com.casic.missiles.model.equipment.EquipmentStandardApply; -import com.casic.missiles.model.equipment.EquipmentStandardApplyEquipment; -import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; -import com.casic.missiles.utils.SpringContextUtil; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -/** - * @author xzz - * * 审批通过后修改标准装置配套设备状态 - */ -@Service(ActionStatusBeanEnum.SUPPORT_BEAN_NAME) -public class EquipmentSupporteStatusPostProcessor implements NotifyStatusPostProcessor { - @Override - public void doUpdateNotifyEventStatus(NotifyEventStatusDTO notifyEventStatusDTO) { - String id = notifyEventStatusDTO.getId(); - EquipmentStandardApplyMapper standardApplyMapper = SpringContextUtil.getBean(EquipmentStandardApplyMapper.class); - EquipmentStandardApplyEquipmentMapper applyEquipmentMapper = SpringContextUtil.getBean(EquipmentStandardApplyEquipmentMapper.class); - EquipmentStandardSupportMapper supportMapper = SpringContextUtil.getBean(EquipmentStandardSupportMapper.class); - List supportEquipments = new ArrayList<>(); - // 通过申请id查询申请信息 - EquipmentStandardApply standardApply = standardApplyMapper.selectById(id); - // 通过申请id查询出申请设备列表 - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("standard_apply_id", id); - List equipmentStandardApplyEquipments = applyEquipmentMapper.selectList(queryWrapper); - // 设备ids - List equipmentIds = equipmentStandardApplyEquipments.stream().map(EquipmentStandardApplyEquipment::getEquipmentId).collect(Collectors.toList()); - for (Long equipmentId : equipmentIds) { - EquipmentStandardSupportEquipment supportEquipment = new EquipmentStandardSupportEquipment(); - supportEquipment.setEquipmentId(equipmentId); - supportEquipment.setStandardEquipmentId(Long.valueOf(standardApply.getStandardEquipmentId())); - supportEquipments.add(supportEquipment); - } - // 通过标准装置id删除原先配套设备 - QueryWrapper supportEquipmentWrapper = new QueryWrapper<>(); - supportEquipmentWrapper.eq("standard_equipment_id", standardApply.getStandardEquipmentId()); - supportMapper.delete(supportEquipmentWrapper); - // 新增配套设备 - for (EquipmentStandardSupportEquipment supportEquipment : supportEquipments) { - if (supportMapper.insert(supportEquipment) <= 0) { - throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); - } - } - } -} 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 ebb38b7..2b5c96f 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 @@ -15,8 +15,6 @@ Page measureRecordsById(Page page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest); - Page certificateRecordsById(Page page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest); - Page samplesByOderId(Page page, @Param("orderId") Long orderId, 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 893a2ff..13c6c66 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -8,8 +8,8 @@ - - - - - - SELECT , - su.name as usePersonName, sd.full_name as useDeptName, - mse.standard_no AS supportStandardEquipmentNo, - mse.standard_name AS supportStandardEquipmentName + su.name as usePersonName, sd.full_name as useDeptName FROM equipment_fixed_assets mfa LEFT JOIN sys_user su ON su.id = mfa.use_person LEFT JOIN sys_dept sd on sd.id = mfa.use_dept - LEFT JOIN equipment_standard_support_equipment msse ON msse.equipment_id = mfa.id and msse.is_del != 1 - LEFT JOIN equipment_standard_equipment mse ON msse.standard_equipment_id = mse.id and mse.is_del != 1 WHERE mfa.is_del = 0 and mfa.id = #{fixedAssetRequest.id} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java index 6acd92b..a79e129 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java @@ -82,22 +82,4 @@ resultData.setMessage("登录成功"); return resultData; } - - @GetMapping("/test") - @ResponseBody() - public void testStatusListener(Long id){ - String[] formIds={ ApplyFromIdEnum.STANDARD_REVERT_APPROVAL,ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL,ApplyFromIdEnum.STANDARD_RESUME_APPROVAL, - ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL,ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL,ApplyFromIdEnum.DEVICE_SEALED_APPROVAL,ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL, - ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL,ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL,ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL,ApplyFromIdEnum.DEVICE_BORROW_APPROVAL,ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL}; - for(String formId:formIds){ - AwareActionStatusEnum notifyActionStatusEnum= AwareActionStatusEnum.ACTION_STATUS_MAP.getActionStatusMap().get(formId); - NotifyEventStatusDTO notifyEventStatusDTO = NotifyEventStatusDTO.builder() - .id("") - .status(notifyActionStatusEnum.getStatus()).build(); - NotifyStatusPostProcessor postProcessor = SpringContextUtil.getBean(notifyActionStatusEnum.getActionBeanName()); - if (postProcessor != null) { - postProcessor.doUpdateNotifyEventStatus(notifyEventStatusDTO); - } - } - } } 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 4461f67..9f2284d 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 @@ -111,15 +111,6 @@ return customerService.deleteCustomer(idDTO.getId()); } - @ApiOperation("根据客户id查询检定证书-分页") - @PostMapping("/certificateRecords") - public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); - } - @ApiOperation("根据客户id查询检定记录(在样品中实现，可复用)") @PostMapping("/fake/interface") public ReturnDTO> measureRecordsBySampleId() { 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 101a5d0..e07ad0b 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 @@ -100,12 +100,4 @@ return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsById(customerSampleIdRequest))); } - - @ApiOperation("根据样品id/客户id查询检定证书") - @PostMapping("/certificateRecordsById") - public ReturnDTO> certificationBySampleId(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) throws Exception{ - return ReturnUtil.success(super.packForBT(customerSampleService.certificateRecordsById(customerSampleIdRequest))); - } - - } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 9499a7e..a0352db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -130,7 +130,7 @@ public void exportExcel(@RequestBody @Valid FixedAssetRequest request) throws Exception { List list; DictCodeUtils.validDictCode(request); - if(CollectionUtils.isEmpty(request.getIds())){ + if(!CollectionUtils.isEmpty(request.getIds())){ FixedAssetRequest fixedAssetRequest = new FixedAssetRequest(); fixedAssetRequest.setIds(request.getIds()); list = iEquipmentFixedAssetsService.list(fixedAssetRequest); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java index c8b6298..f8076ca 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java @@ -100,7 +100,7 @@ public void exportExcel(@RequestBody @Valid StandardEquipmentRequest request) throws Exception { List list; DictCodeUtils.validDictCode(request); - if(CollectionUtils.isEmpty(request.getIds())){ + if(!CollectionUtils.isEmpty(request.getIds())){ StandardEquipmentRequest standardEquipmentRequest = new StandardEquipmentRequest(); standardEquipmentRequest.setIds(request.getIds()); list = meterStandardEquipmentService.list(standardEquipmentRequest); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java b/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java index d493bdd..4186936 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java @@ -28,7 +28,7 @@ /** 测量设备模块 */ EQUIPMENT("测量设备模块", - basePackage("com.casic.missiles.controller.customer"), + basePackage("com.casic.missiles.controller.equipment"), PathSelectors.any()), /** 审批操作按钮 */ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentSupportStatusPostProcessor.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentSupportStatusPostProcessor.java new file mode 100644 index 0000000..f084655 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentSupportStatusPostProcessor.java @@ -0,0 +1,60 @@ +package com.casic.missiles.listeners.processor; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.dto.flowable.NotifyEventStatusDTO; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.listeners.NotifyStatusPostProcessor; +import com.casic.missiles.mapper.equipment.EquipmentStandardApplyEquipmentMapper; +import com.casic.missiles.mapper.equipment.EquipmentStandardApplyMapper; +import com.casic.missiles.mapper.equipment.EquipmentStandardSupportMapper; +import com.casic.missiles.model.equipment.EquipmentStandardApply; +import com.casic.missiles.model.equipment.EquipmentStandardApplyEquipment; +import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; +import com.casic.missiles.utils.SpringContextUtil; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * @author xzz + * * 审批通过后修改标准装置配套设备状态 + */ +@Service(ActionStatusBeanEnum.SUPPORT_BEAN_NAME) +public class EquipmentSupportStatusPostProcessor implements NotifyStatusPostProcessor { + @Override + public void doUpdateNotifyEventStatus(NotifyEventStatusDTO notifyEventStatusDTO) { + String id = notifyEventStatusDTO.getId(); + EquipmentStandardApplyMapper standardApplyMapper = SpringContextUtil.getBean(EquipmentStandardApplyMapper.class); + EquipmentStandardApplyEquipmentMapper applyEquipmentMapper = SpringContextUtil.getBean(EquipmentStandardApplyEquipmentMapper.class); + EquipmentStandardSupportMapper supportMapper = SpringContextUtil.getBean(EquipmentStandardSupportMapper.class); + List supportEquipments = new ArrayList<>(); + // 通过申请id查询申请信息 + EquipmentStandardApply standardApply = standardApplyMapper.selectById(id); + // 通过申请id查询出申请设备列表 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("standard_apply_id", id); + List equipmentStandardApplyEquipments = applyEquipmentMapper.selectList(queryWrapper); + // 设备ids + List equipmentIds = equipmentStandardApplyEquipments.stream().map(EquipmentStandardApplyEquipment::getEquipmentId).collect(Collectors.toList()); + for (Long equipmentId : equipmentIds) { + EquipmentStandardSupportEquipment supportEquipment = new EquipmentStandardSupportEquipment(); + supportEquipment.setEquipmentId(equipmentId); + supportEquipment.setStandardEquipmentId(Long.valueOf(standardApply.getStandardEquipmentId())); + supportEquipments.add(supportEquipment); + } + // 通过标准装置id删除原先配套设备 + QueryWrapper supportEquipmentWrapper = new QueryWrapper<>(); + supportEquipmentWrapper.eq("standard_equipment_id", standardApply.getStandardEquipmentId()); + supportMapper.delete(supportEquipmentWrapper); + // 新增配套设备 + for (EquipmentStandardSupportEquipment supportEquipment : supportEquipments) { + if (supportMapper.insert(supportEquipment) <= 0) { + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } + } +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentSupporteStatusPostProcessor.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentSupporteStatusPostProcessor.java deleted file mode 100644 index e29b191..0000000 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentSupporteStatusPostProcessor.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.casic.missiles.listeners.processor; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.casic.missiles.dto.flowable.NotifyEventStatusDTO; -import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.listeners.NotifyStatusPostProcessor; -import com.casic.missiles.mapper.equipment.EquipmentStandardApplyEquipmentMapper; -import com.casic.missiles.mapper.equipment.EquipmentStandardApplyMapper; -import com.casic.missiles.mapper.equipment.EquipmentStandardSupportMapper; -import com.casic.missiles.model.equipment.EquipmentStandardApply; -import com.casic.missiles.model.equipment.EquipmentStandardApplyEquipment; -import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; -import com.casic.missiles.utils.SpringContextUtil; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -/** - * @author xzz - * * 审批通过后修改标准装置配套设备状态 - */ -@Service(ActionStatusBeanEnum.SUPPORT_BEAN_NAME) -public class EquipmentSupporteStatusPostProcessor implements NotifyStatusPostProcessor { - @Override - public void doUpdateNotifyEventStatus(NotifyEventStatusDTO notifyEventStatusDTO) { - String id = notifyEventStatusDTO.getId(); - EquipmentStandardApplyMapper standardApplyMapper = SpringContextUtil.getBean(EquipmentStandardApplyMapper.class); - EquipmentStandardApplyEquipmentMapper applyEquipmentMapper = SpringContextUtil.getBean(EquipmentStandardApplyEquipmentMapper.class); - EquipmentStandardSupportMapper supportMapper = SpringContextUtil.getBean(EquipmentStandardSupportMapper.class); - List supportEquipments = new ArrayList<>(); - // 通过申请id查询申请信息 - EquipmentStandardApply standardApply = standardApplyMapper.selectById(id); - // 通过申请id查询出申请设备列表 - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("standard_apply_id", id); - List equipmentStandardApplyEquipments = applyEquipmentMapper.selectList(queryWrapper); - // 设备ids - List equipmentIds = equipmentStandardApplyEquipments.stream().map(EquipmentStandardApplyEquipment::getEquipmentId).collect(Collectors.toList()); - for (Long equipmentId : equipmentIds) { - EquipmentStandardSupportEquipment supportEquipment = new EquipmentStandardSupportEquipment(); - supportEquipment.setEquipmentId(equipmentId); - supportEquipment.setStandardEquipmentId(Long.valueOf(standardApply.getStandardEquipmentId())); - supportEquipments.add(supportEquipment); - } - // 通过标准装置id删除原先配套设备 - QueryWrapper supportEquipmentWrapper = new QueryWrapper<>(); - supportEquipmentWrapper.eq("standard_equipment_id", standardApply.getStandardEquipmentId()); - supportMapper.delete(supportEquipmentWrapper); - // 新增配套设备 - for (EquipmentStandardSupportEquipment supportEquipment : supportEquipments) { - if (supportMapper.insert(supportEquipment) <= 0) { - throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); - } - } - } -} 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 ebb38b7..2b5c96f 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 @@ -15,8 +15,6 @@ Page measureRecordsById(Page page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest); - Page certificateRecordsById(Page page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest); - Page samplesByOderId(Page page, @Param("orderId") Long orderId, 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 893a2ff..13c6c66 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -8,8 +8,8 @@ - - - SELECT , - su.name as usePersonName, sd.full_name as useDeptName, - mse.standard_no AS supportStandardEquipmentNo, - mse.standard_name AS supportStandardEquipmentName + su.name as usePersonName, sd.full_name as useDeptName FROM equipment_fixed_assets mfa LEFT JOIN sys_user su ON su.id = mfa.use_person LEFT JOIN sys_dept sd on sd.id = mfa.use_dept - LEFT JOIN equipment_standard_support_equipment msse ON msse.equipment_id = mfa.id and msse.is_del != 1 - LEFT JOIN equipment_standard_equipment mse ON msse.standard_equipment_id = mse.id and mse.is_del != 1 WHERE mfa.is_del = 0 and mfa.id = #{fixedAssetRequest.id} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml index 15b4613..7cb96f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml @@ -27,7 +27,7 @@ and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') = ]]> #{request.preparationStartDate} - and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') #{preparationEndDate} + and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') #{request.preparationEndDate} and mse.id = #{request.id} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java index 6acd92b..a79e129 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java @@ -82,22 +82,4 @@ resultData.setMessage("登录成功"); return resultData; } - - @GetMapping("/test") - @ResponseBody() - public void testStatusListener(Long id){ - String[] formIds={ ApplyFromIdEnum.STANDARD_REVERT_APPROVAL,ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL,ApplyFromIdEnum.STANDARD_RESUME_APPROVAL, - ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL,ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL,ApplyFromIdEnum.DEVICE_SEALED_APPROVAL,ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL, - ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL,ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL,ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL,ApplyFromIdEnum.DEVICE_BORROW_APPROVAL,ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL}; - for(String formId:formIds){ - AwareActionStatusEnum notifyActionStatusEnum= AwareActionStatusEnum.ACTION_STATUS_MAP.getActionStatusMap().get(formId); - NotifyEventStatusDTO notifyEventStatusDTO = NotifyEventStatusDTO.builder() - .id("") - .status(notifyActionStatusEnum.getStatus()).build(); - NotifyStatusPostProcessor postProcessor = SpringContextUtil.getBean(notifyActionStatusEnum.getActionBeanName()); - if (postProcessor != null) { - postProcessor.doUpdateNotifyEventStatus(notifyEventStatusDTO); - } - } - } } 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 4461f67..9f2284d 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 @@ -111,15 +111,6 @@ return customerService.deleteCustomer(idDTO.getId()); } - @ApiOperation("根据客户id查询检定证书-分页") - @PostMapping("/certificateRecords") - public ReturnDTO> certificationByCustomerId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId()))); - } - @ApiOperation("根据客户id查询检定记录(在样品中实现，可复用)") @PostMapping("/fake/interface") public ReturnDTO> measureRecordsBySampleId() { 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 101a5d0..e07ad0b 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 @@ -100,12 +100,4 @@ return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsById(customerSampleIdRequest))); } - - @ApiOperation("根据样品id/客户id查询检定证书") - @PostMapping("/certificateRecordsById") - public ReturnDTO> certificationBySampleId(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) throws Exception{ - return ReturnUtil.success(super.packForBT(customerSampleService.certificateRecordsById(customerSampleIdRequest))); - } - - } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 9499a7e..a0352db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -130,7 +130,7 @@ public void exportExcel(@RequestBody @Valid FixedAssetRequest request) throws Exception { List list; DictCodeUtils.validDictCode(request); - if(CollectionUtils.isEmpty(request.getIds())){ + if(!CollectionUtils.isEmpty(request.getIds())){ FixedAssetRequest fixedAssetRequest = new FixedAssetRequest(); fixedAssetRequest.setIds(request.getIds()); list = iEquipmentFixedAssetsService.list(fixedAssetRequest); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java index c8b6298..f8076ca 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java @@ -100,7 +100,7 @@ public void exportExcel(@RequestBody @Valid StandardEquipmentRequest request) throws Exception { List list; DictCodeUtils.validDictCode(request); - if(CollectionUtils.isEmpty(request.getIds())){ + if(!CollectionUtils.isEmpty(request.getIds())){ StandardEquipmentRequest standardEquipmentRequest = new StandardEquipmentRequest(); standardEquipmentRequest.setIds(request.getIds()); list = meterStandardEquipmentService.list(standardEquipmentRequest); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java b/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java index d493bdd..4186936 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java @@ -28,7 +28,7 @@ /** 测量设备模块 */ EQUIPMENT("测量设备模块", - basePackage("com.casic.missiles.controller.customer"), + basePackage("com.casic.missiles.controller.equipment"), PathSelectors.any()), /** 审批操作按钮 */ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentSupportStatusPostProcessor.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentSupportStatusPostProcessor.java new file mode 100644 index 0000000..f084655 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentSupportStatusPostProcessor.java @@ -0,0 +1,60 @@ +package com.casic.missiles.listeners.processor; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.dto.flowable.NotifyEventStatusDTO; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.listeners.NotifyStatusPostProcessor; +import com.casic.missiles.mapper.equipment.EquipmentStandardApplyEquipmentMapper; +import com.casic.missiles.mapper.equipment.EquipmentStandardApplyMapper; +import com.casic.missiles.mapper.equipment.EquipmentStandardSupportMapper; +import com.casic.missiles.model.equipment.EquipmentStandardApply; +import com.casic.missiles.model.equipment.EquipmentStandardApplyEquipment; +import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; +import com.casic.missiles.utils.SpringContextUtil; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * @author xzz + * * 审批通过后修改标准装置配套设备状态 + */ +@Service(ActionStatusBeanEnum.SUPPORT_BEAN_NAME) +public class EquipmentSupportStatusPostProcessor implements NotifyStatusPostProcessor { + @Override + public void doUpdateNotifyEventStatus(NotifyEventStatusDTO notifyEventStatusDTO) { + String id = notifyEventStatusDTO.getId(); + EquipmentStandardApplyMapper standardApplyMapper = SpringContextUtil.getBean(EquipmentStandardApplyMapper.class); + EquipmentStandardApplyEquipmentMapper applyEquipmentMapper = SpringContextUtil.getBean(EquipmentStandardApplyEquipmentMapper.class); + EquipmentStandardSupportMapper supportMapper = SpringContextUtil.getBean(EquipmentStandardSupportMapper.class); + List supportEquipments = new ArrayList<>(); + // 通过申请id查询申请信息 + EquipmentStandardApply standardApply = standardApplyMapper.selectById(id); + // 通过申请id查询出申请设备列表 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("standard_apply_id", id); + List equipmentStandardApplyEquipments = applyEquipmentMapper.selectList(queryWrapper); + // 设备ids + List equipmentIds = equipmentStandardApplyEquipments.stream().map(EquipmentStandardApplyEquipment::getEquipmentId).collect(Collectors.toList()); + for (Long equipmentId : equipmentIds) { + EquipmentStandardSupportEquipment supportEquipment = new EquipmentStandardSupportEquipment(); + supportEquipment.setEquipmentId(equipmentId); + supportEquipment.setStandardEquipmentId(Long.valueOf(standardApply.getStandardEquipmentId())); + supportEquipments.add(supportEquipment); + } + // 通过标准装置id删除原先配套设备 + QueryWrapper supportEquipmentWrapper = new QueryWrapper<>(); + supportEquipmentWrapper.eq("standard_equipment_id", standardApply.getStandardEquipmentId()); + supportMapper.delete(supportEquipmentWrapper); + // 新增配套设备 + for (EquipmentStandardSupportEquipment supportEquipment : supportEquipments) { + if (supportMapper.insert(supportEquipment) <= 0) { + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } + } +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentSupporteStatusPostProcessor.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentSupporteStatusPostProcessor.java deleted file mode 100644 index e29b191..0000000 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentSupporteStatusPostProcessor.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.casic.missiles.listeners.processor; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.casic.missiles.dto.flowable.NotifyEventStatusDTO; -import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.listeners.NotifyStatusPostProcessor; -import com.casic.missiles.mapper.equipment.EquipmentStandardApplyEquipmentMapper; -import com.casic.missiles.mapper.equipment.EquipmentStandardApplyMapper; -import com.casic.missiles.mapper.equipment.EquipmentStandardSupportMapper; -import com.casic.missiles.model.equipment.EquipmentStandardApply; -import com.casic.missiles.model.equipment.EquipmentStandardApplyEquipment; -import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; -import com.casic.missiles.utils.SpringContextUtil; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -/** - * @author xzz - * * 审批通过后修改标准装置配套设备状态 - */ -@Service(ActionStatusBeanEnum.SUPPORT_BEAN_NAME) -public class EquipmentSupporteStatusPostProcessor implements NotifyStatusPostProcessor { - @Override - public void doUpdateNotifyEventStatus(NotifyEventStatusDTO notifyEventStatusDTO) { - String id = notifyEventStatusDTO.getId(); - EquipmentStandardApplyMapper standardApplyMapper = SpringContextUtil.getBean(EquipmentStandardApplyMapper.class); - EquipmentStandardApplyEquipmentMapper applyEquipmentMapper = SpringContextUtil.getBean(EquipmentStandardApplyEquipmentMapper.class); - EquipmentStandardSupportMapper supportMapper = SpringContextUtil.getBean(EquipmentStandardSupportMapper.class); - List supportEquipments = new ArrayList<>(); - // 通过申请id查询申请信息 - EquipmentStandardApply standardApply = standardApplyMapper.selectById(id); - // 通过申请id查询出申请设备列表 - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("standard_apply_id", id); - List equipmentStandardApplyEquipments = applyEquipmentMapper.selectList(queryWrapper); - // 设备ids - List equipmentIds = equipmentStandardApplyEquipments.stream().map(EquipmentStandardApplyEquipment::getEquipmentId).collect(Collectors.toList()); - for (Long equipmentId : equipmentIds) { - EquipmentStandardSupportEquipment supportEquipment = new EquipmentStandardSupportEquipment(); - supportEquipment.setEquipmentId(equipmentId); - supportEquipment.setStandardEquipmentId(Long.valueOf(standardApply.getStandardEquipmentId())); - supportEquipments.add(supportEquipment); - } - // 通过标准装置id删除原先配套设备 - QueryWrapper supportEquipmentWrapper = new QueryWrapper<>(); - supportEquipmentWrapper.eq("standard_equipment_id", standardApply.getStandardEquipmentId()); - supportMapper.delete(supportEquipmentWrapper); - // 新增配套设备 - for (EquipmentStandardSupportEquipment supportEquipment : supportEquipments) { - if (supportMapper.insert(supportEquipment) <= 0) { - throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); - } - } - } -} 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 ebb38b7..2b5c96f 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 @@ -15,8 +15,6 @@ Page measureRecordsById(Page page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest); - Page certificateRecordsById(Page page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest); - Page samplesByOderId(Page page, @Param("orderId") Long orderId, 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 893a2ff..13c6c66 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -8,8 +8,8 @@ - - - SELECT , - su.name as usePersonName, sd.full_name as useDeptName, - mse.standard_no AS supportStandardEquipmentNo, - mse.standard_name AS supportStandardEquipmentName + su.name as usePersonName, sd.full_name as useDeptName FROM equipment_fixed_assets mfa LEFT JOIN sys_user su ON su.id = mfa.use_person LEFT JOIN sys_dept sd on sd.id = mfa.use_dept - LEFT JOIN equipment_standard_support_equipment msse ON msse.equipment_id = mfa.id and msse.is_del != 1 - LEFT JOIN equipment_standard_equipment mse ON msse.standard_equipment_id = mse.id and mse.is_del != 1 WHERE mfa.is_del = 0 and mfa.id = #{fixedAssetRequest.id} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml index 15b4613..7cb96f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml @@ -27,7 +27,7 @@ and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') = ]]> #{request.preparationStartDate} - and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') #{preparationEndDate} + and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') #{request.preparationEndDate} and mse.id = #{request.id} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 69c225f..a7fe8f7 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -77,6 +77,7 @@ + ORDER BY t1.valid_date DESC - - - SELECT , - su.name as usePersonName, sd.full_name as useDeptName, - mse.standard_no AS supportStandardEquipmentNo, - mse.standard_name AS supportStandardEquipmentName + su.name as usePersonName, sd.full_name as useDeptName FROM equipment_fixed_assets mfa LEFT JOIN sys_user su ON su.id = mfa.use_person LEFT JOIN sys_dept sd on sd.id = mfa.use_dept - LEFT JOIN equipment_standard_support_equipment msse ON msse.equipment_id = mfa.id and msse.is_del != 1 - LEFT JOIN equipment_standard_equipment mse ON msse.standard_equipment_id = mse.id and mse.is_del != 1 WHERE mfa.is_del = 0 and mfa.id = #{fixedAssetRequest.id} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml index 15b4613..7cb96f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml @@ -27,7 +27,7 @@ and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') = ]]> #{request.preparationStartDate} - and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') #{preparationEndDate} + and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') #{request.preparationEndDate} and mse.id = #{request.id} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 69c225f..a7fe8f7 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -77,6 +77,7 @@ + ORDER BY t1.valid_date DESC - - - SELECT , - su.name as usePersonName, sd.full_name as useDeptName, - mse.standard_no AS supportStandardEquipmentNo, - mse.standard_name AS supportStandardEquipmentName + su.name as usePersonName, sd.full_name as useDeptName FROM equipment_fixed_assets mfa LEFT JOIN sys_user su ON su.id = mfa.use_person LEFT JOIN sys_dept sd on sd.id = mfa.use_dept - LEFT JOIN equipment_standard_support_equipment msse ON msse.equipment_id = mfa.id and msse.is_del != 1 - LEFT JOIN equipment_standard_equipment mse ON msse.standard_equipment_id = mse.id and mse.is_del != 1 WHERE mfa.is_del = 0 and mfa.id = #{fixedAssetRequest.id} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml index 15b4613..7cb96f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml @@ -27,7 +27,7 @@ and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') = ]]> #{request.preparationStartDate} - and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') #{preparationEndDate} + and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') #{request.preparationEndDate} and mse.id = #{request.id} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 69c225f..a7fe8f7 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -77,6 +77,7 @@ + ORDER BY t1.valid_date DESC - - - SELECT , - su.name as usePersonName, sd.full_name as useDeptName, - mse.standard_no AS supportStandardEquipmentNo, - mse.standard_name AS supportStandardEquipmentName + su.name as usePersonName, sd.full_name as useDeptName FROM equipment_fixed_assets mfa LEFT JOIN sys_user su ON su.id = mfa.use_person LEFT JOIN sys_dept sd on sd.id = mfa.use_dept - LEFT JOIN equipment_standard_support_equipment msse ON msse.equipment_id = mfa.id and msse.is_del != 1 - LEFT JOIN equipment_standard_equipment mse ON msse.standard_equipment_id = mse.id and mse.is_del != 1 WHERE mfa.is_del = 0 and mfa.id = #{fixedAssetRequest.id} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml index 15b4613..7cb96f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml @@ -27,7 +27,7 @@ and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') = ]]> #{request.preparationStartDate} - and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') #{preparationEndDate} + and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') #{request.preparationEndDate} and mse.id = #{request.id} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 69c225f..a7fe8f7 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -77,6 +77,7 @@ + ORDER BY t1.valid_date DESC - - - SELECT , - su.name as usePersonName, sd.full_name as useDeptName, - mse.standard_no AS supportStandardEquipmentNo, - mse.standard_name AS supportStandardEquipmentName + su.name as usePersonName, sd.full_name as useDeptName FROM equipment_fixed_assets mfa LEFT JOIN sys_user su ON su.id = mfa.use_person LEFT JOIN sys_dept sd on sd.id = mfa.use_dept - LEFT JOIN equipment_standard_support_equipment msse ON msse.equipment_id = mfa.id and msse.is_del != 1 - LEFT JOIN equipment_standard_equipment mse ON msse.standard_equipment_id = mse.id and mse.is_del != 1 WHERE mfa.is_del = 0 and mfa.id = #{fixedAssetRequest.id} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml index 15b4613..7cb96f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml @@ -27,7 +27,7 @@ and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') = ]]> #{request.preparationStartDate} - and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') #{preparationEndDate} + and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') #{request.preparationEndDate} and mse.id = #{request.id} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 69c225f..a7fe8f7 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -77,6 +77,7 @@ + ORDER BY t1.valid_date DESC - - - SELECT , - su.name as usePersonName, sd.full_name as useDeptName, - mse.standard_no AS supportStandardEquipmentNo, - mse.standard_name AS supportStandardEquipmentName + su.name as usePersonName, sd.full_name as useDeptName FROM equipment_fixed_assets mfa LEFT JOIN sys_user su ON su.id = mfa.use_person LEFT JOIN sys_dept sd on sd.id = mfa.use_dept - LEFT JOIN equipment_standard_support_equipment msse ON msse.equipment_id = mfa.id and msse.is_del != 1 - LEFT JOIN equipment_standard_equipment mse ON msse.standard_equipment_id = mse.id and mse.is_del != 1 WHERE mfa.is_del = 0 and mfa.id = #{fixedAssetRequest.id} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml index 15b4613..7cb96f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml @@ -27,7 +27,7 @@ and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') = ]]> #{request.preparationStartDate} - and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') #{preparationEndDate} + and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') #{request.preparationEndDate} and mse.id = #{request.id} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 69c225f..a7fe8f7 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -77,6 +77,7 @@ + ORDER BY t1.valid_date DESC - - - SELECT , - su.name as usePersonName, sd.full_name as useDeptName, - mse.standard_no AS supportStandardEquipmentNo, - mse.standard_name AS supportStandardEquipmentName + su.name as usePersonName, sd.full_name as useDeptName FROM equipment_fixed_assets mfa LEFT JOIN sys_user su ON su.id = mfa.use_person LEFT JOIN sys_dept sd on sd.id = mfa.use_dept - LEFT JOIN equipment_standard_support_equipment msse ON msse.equipment_id = mfa.id and msse.is_del != 1 - LEFT JOIN equipment_standard_equipment mse ON msse.standard_equipment_id = mse.id and mse.is_del != 1 WHERE mfa.is_del = 0 and mfa.id = #{fixedAssetRequest.id} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml index 15b4613..7cb96f9 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml @@ -27,7 +27,7 @@ and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') = ]]> #{request.preparationStartDate} - and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') #{preparationEndDate} + and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') #{request.preparationEndDate} and mse.id = #{request.id} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml index 69c225f..a7fe8f7 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml @@ -77,6 +77,7 @@ + ORDER BY t1.valid_date DESC