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 27de197..0bc1eee 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 @@ -8,21 +8,20 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.customer.CertificationResponse; -import com.casic.missiles.dto.customer.Info.*; -import com.casic.missiles.dto.customer.MeasureRecordsResponse; +import com.casic.missiles.dto.customer.Info.CustomerInfoResponse; +import com.casic.missiles.dto.customer.Info.CustomerListRequest; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.customer.CustomerService; -import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -94,14 +93,14 @@ return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); } - @ApiOperation("根据客户id查询合同记录-分页") - @PostMapping("/contractRecords") - public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); - } +// @ApiOperation("根据客户id查询合同记录-分页") +// @PostMapping("/contractRecords") +// public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { +// Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { +// throw new BusinessException(BusinessExceptionEnum.ID_NULL); +// }); +// return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); +// } @ApiOperation("客户删除") @PostMapping("/delete") 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 27de197..0bc1eee 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 @@ -8,21 +8,20 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.customer.CertificationResponse; -import com.casic.missiles.dto.customer.Info.*; -import com.casic.missiles.dto.customer.MeasureRecordsResponse; +import com.casic.missiles.dto.customer.Info.CustomerInfoResponse; +import com.casic.missiles.dto.customer.Info.CustomerListRequest; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.customer.CustomerService; -import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -94,14 +93,14 @@ return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); } - @ApiOperation("根据客户id查询合同记录-分页") - @PostMapping("/contractRecords") - public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); - } +// @ApiOperation("根据客户id查询合同记录-分页") +// @PostMapping("/contractRecords") +// public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { +// Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { +// throw new BusinessException(BusinessExceptionEnum.ID_NULL); +// }); +// return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); +// } @ApiOperation("客户删除") @PostMapping("/delete") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java index 63cc0eb..d3fafc2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.finance.SettlementInfoListRequest; @@ -101,4 +102,16 @@ super.exportExcel(SettlementInfoListResponse.class, list, ExportEnum.SETTLEMENT_INFO_EXPORT.getSheetName()); } + @ApiOperation("业务结算删除") + @PostMapping("/delete") + @ResponseBody + public ReturnDTO delete(@RequestBody @Valid IdsDTO idsDTO) { + Assert.isFalse(CollectionUtils.isEmpty(idsDTO.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(settlementInfoService.removeByIds(idsDTO.getIds())) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } } 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 27de197..0bc1eee 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 @@ -8,21 +8,20 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.customer.CertificationResponse; -import com.casic.missiles.dto.customer.Info.*; -import com.casic.missiles.dto.customer.MeasureRecordsResponse; +import com.casic.missiles.dto.customer.Info.CustomerInfoResponse; +import com.casic.missiles.dto.customer.Info.CustomerListRequest; +import com.casic.missiles.dto.customer.Info.SampleRecordsResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.customer.CustomerInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.customer.CustomerService; -import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -94,14 +93,14 @@ return ReturnUtil.success(super.packForBT(customerService.sampleRecordsByCustomerId(idDTO.getId()))); } - @ApiOperation("根据客户id查询合同记录-分页") - @PostMapping("/contractRecords") - public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { - Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); - }); - return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); - } +// @ApiOperation("根据客户id查询合同记录-分页") +// @PostMapping("/contractRecords") +// public ReturnDTO> contractRecordsByCustomerId(@RequestBody @Valid IdDTO idDTO) { +// Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { +// throw new BusinessException(BusinessExceptionEnum.ID_NULL); +// }); +// return ReturnUtil.success(super.packForBT(customerService.contractRecordsByCustomerId(idDTO.getId()))); +// } @ApiOperation("客户删除") @PostMapping("/delete") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java index 63cc0eb..d3fafc2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/finance/FinanceBusinessSettlementInfoController.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.finance.SettlementInfoListRequest; @@ -101,4 +102,16 @@ super.exportExcel(SettlementInfoListResponse.class, list, ExportEnum.SETTLEMENT_INFO_EXPORT.getSheetName()); } + @ApiOperation("业务结算删除") + @PostMapping("/delete") + @ResponseBody + public ReturnDTO delete(@RequestBody @Valid IdsDTO idsDTO) { + Assert.isFalse(CollectionUtils.isEmpty(idsDTO.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + if(settlementInfoService.removeByIds(idsDTO.getIds())) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } } diff --git a/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml index c877680..903b7ba 100644 --- a/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/finance/FinanceBusinessSettlementInfoMapper.xml @@ -59,7 +59,7 @@