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-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptOutputResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptOutputResponse.java index e3ea5ce..8d4e333 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptOutputResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptOutputResponse.java @@ -11,6 +11,9 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; +import java.util.Objects; + /** * @Description: * @Author: wangpeng @@ -24,10 +27,19 @@ @ApiModel @Data public class BoardDeptOutputResponse extends BoardBaseResponse { - @ExcelProperty(value = "产值统计", order = 10) - @ApiModelProperty(value = "产值统计(单位分)", dataType = "Integer") + @ApiModelProperty(value = "产值总计(单位分)", dataType = "Integer") private Integer outPut; + @ExcelProperty(value = "产值总计(元)", order = 10) + private String outPutYuan; + + public String getOutPutYuan() { + if(Objects.nonNull(outPut)) { + outPutYuan = BigDecimal.valueOf(outPut).divide(BigDecimal.valueOf(100), 2, BigDecimal.ROUND_HALF_UP).toPlainString(); + } + return outPutYuan; + } + //合同实际收款金额，计算产值统计使用 @ApiModelProperty(hidden = true) private Integer actualAmount = 0; 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-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptOutputResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptOutputResponse.java index e3ea5ce..8d4e333 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptOutputResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptOutputResponse.java @@ -11,6 +11,9 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; +import java.util.Objects; + /** * @Description: * @Author: wangpeng @@ -24,10 +27,19 @@ @ApiModel @Data public class BoardDeptOutputResponse extends BoardBaseResponse { - @ExcelProperty(value = "产值统计", order = 10) - @ApiModelProperty(value = "产值统计(单位分)", dataType = "Integer") + @ApiModelProperty(value = "产值总计(单位分)", dataType = "Integer") private Integer outPut; + @ExcelProperty(value = "产值总计(元)", order = 10) + private String outPutYuan; + + public String getOutPutYuan() { + if(Objects.nonNull(outPut)) { + outPutYuan = BigDecimal.valueOf(outPut).divide(BigDecimal.valueOf(100), 2, BigDecimal.ROUND_HALF_UP).toPlainString(); + } + return outPutYuan; + } + //合同实际收款金额，计算产值统计使用 @ApiModelProperty(hidden = true) private Integer actualAmount = 0; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java index 61ceec6..68724ca 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java @@ -11,6 +11,9 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; +import java.util.Objects; + /** * @Description: 业务结算列表响应实体 * @Author: wangpeng @@ -60,31 +63,85 @@ @ExcelProperty(value = "是否加急") private String isUrgent; + public String getIsUrgent() { + if("1".equals(isUrgent)){ + isUrgent = "是"; + }else { + isUrgent = "否"; + } + return isUrgent; + } + @ApiModelProperty(value = "创建时间", dataType = "String") @ExcelProperty(value = "创建时间") private String createTime; @ApiModelProperty(value = "标价-单位分", dataType = "Integer") - @ExcelProperty(value = "标价-单位分") private Integer postedPrice; + public String getPostedPriceYuan() { + if(Objects.nonNull(suggestedDiscount)){ + postedPriceYuan = BigDecimal.valueOf(suggestedDiscount).divide(BigDecimal.valueOf(100), 2, BigDecimal.ROUND_HALF_UP).toPlainString(); + } + return postedPriceYuan; + } + + @ExcelProperty(value = "标价(元)") + private String postedPriceYuan; + @ApiModelProperty(value = "建议折扣-单位%", dataType = "Integer") - @ExcelProperty(value = "建议折扣-单位%") private Integer suggestedDiscount; + @ExcelProperty(value = "建议折扣") + private String suggestedDiscountExport; + + public String getSuggestedDiscountExport() { + if(Objects.nonNull(suggestedDiscount)) { + suggestedDiscountExport = suggestedDiscount + "%"; + } + return suggestedDiscountExport; + } + @ApiModelProperty(value = "建议价格-单位分", dataType = "Integer") - @ExcelProperty(value = "建议价格-单位分") private Integer suggestedPrice; + @ExcelProperty(value = "建议价格(元)") + private String suggestedPriceYuan; + + public String getSuggestedPriceYuan() { + if(Objects.nonNull(suggestedPrice)){ + suggestedPriceYuan = BigDecimal.valueOf(suggestedPrice).divide(BigDecimal.valueOf(100), 2, BigDecimal.ROUND_HALF_UP).toPlainString(); + } + return suggestedPriceYuan; + } + @ApiModelProperty(value = "附加费用-单位分", dataType = "Integer") - @ExcelProperty(value = "附加费用-单位分") private Integer extraCharge; + @ExcelProperty(value = "附加费用(元)") + private String extraChargeYuan; + + public String getExtraChargeYuan() { + if(Objects.nonNull(extraCharge)){ + extraChargeYuan = BigDecimal.valueOf(extraCharge).divide(BigDecimal.valueOf(100), 2, BigDecimal.ROUND_HALF_UP).toPlainString(); + } + return extraChargeYuan; + } + @ApiModelProperty(value = "附加费用说明", dataType = "String") @ExcelProperty(value = "附加费用说明") private String extraChargeIllustration; @ApiModelProperty(value = "总计结算费用-单位分", dataType = "Integer") - @ExcelProperty(value = "总计结算费用-单位分") private Integer totalSettlement; + + @ExcelProperty(value = "总计结算费用(元)") + private String totalSettlementYuan; + + public String getTotalSettlementYuan() { + if(Objects.nonNull(totalSettlement)){ + totalSettlementYuan = BigDecimal.valueOf(totalSettlement).divide(BigDecimal.valueOf(100), 2, BigDecimal.ROUND_HALF_UP).toPlainString(); + } + return totalSettlementYuan; + } } 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-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptOutputResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptOutputResponse.java index e3ea5ce..8d4e333 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptOutputResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/board/BoardDeptOutputResponse.java @@ -11,6 +11,9 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; +import java.util.Objects; + /** * @Description: * @Author: wangpeng @@ -24,10 +27,19 @@ @ApiModel @Data public class BoardDeptOutputResponse extends BoardBaseResponse { - @ExcelProperty(value = "产值统计", order = 10) - @ApiModelProperty(value = "产值统计(单位分)", dataType = "Integer") + @ApiModelProperty(value = "产值总计(单位分)", dataType = "Integer") private Integer outPut; + @ExcelProperty(value = "产值总计(元)", order = 10) + private String outPutYuan; + + public String getOutPutYuan() { + if(Objects.nonNull(outPut)) { + outPutYuan = BigDecimal.valueOf(outPut).divide(BigDecimal.valueOf(100), 2, BigDecimal.ROUND_HALF_UP).toPlainString(); + } + return outPutYuan; + } + //合同实际收款金额，计算产值统计使用 @ApiModelProperty(hidden = true) private Integer actualAmount = 0; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java index 61ceec6..68724ca 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/finance/SettlementInfoListResponse.java @@ -11,6 +11,9 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; +import java.util.Objects; + /** * @Description: 业务结算列表响应实体 * @Author: wangpeng @@ -60,31 +63,85 @@ @ExcelProperty(value = "是否加急") private String isUrgent; + public String getIsUrgent() { + if("1".equals(isUrgent)){ + isUrgent = "是"; + }else { + isUrgent = "否"; + } + return isUrgent; + } + @ApiModelProperty(value = "创建时间", dataType = "String") @ExcelProperty(value = "创建时间") private String createTime; @ApiModelProperty(value = "标价-单位分", dataType = "Integer") - @ExcelProperty(value = "标价-单位分") private Integer postedPrice; + public String getPostedPriceYuan() { + if(Objects.nonNull(suggestedDiscount)){ + postedPriceYuan = BigDecimal.valueOf(suggestedDiscount).divide(BigDecimal.valueOf(100), 2, BigDecimal.ROUND_HALF_UP).toPlainString(); + } + return postedPriceYuan; + } + + @ExcelProperty(value = "标价(元)") + private String postedPriceYuan; + @ApiModelProperty(value = "建议折扣-单位%", dataType = "Integer") - @ExcelProperty(value = "建议折扣-单位%") private Integer suggestedDiscount; + @ExcelProperty(value = "建议折扣") + private String suggestedDiscountExport; + + public String getSuggestedDiscountExport() { + if(Objects.nonNull(suggestedDiscount)) { + suggestedDiscountExport = suggestedDiscount + "%"; + } + return suggestedDiscountExport; + } + @ApiModelProperty(value = "建议价格-单位分", dataType = "Integer") - @ExcelProperty(value = "建议价格-单位分") private Integer suggestedPrice; + @ExcelProperty(value = "建议价格(元)") + private String suggestedPriceYuan; + + public String getSuggestedPriceYuan() { + if(Objects.nonNull(suggestedPrice)){ + suggestedPriceYuan = BigDecimal.valueOf(suggestedPrice).divide(BigDecimal.valueOf(100), 2, BigDecimal.ROUND_HALF_UP).toPlainString(); + } + return suggestedPriceYuan; + } + @ApiModelProperty(value = "附加费用-单位分", dataType = "Integer") - @ExcelProperty(value = "附加费用-单位分") private Integer extraCharge; + @ExcelProperty(value = "附加费用(元)") + private String extraChargeYuan; + + public String getExtraChargeYuan() { + if(Objects.nonNull(extraCharge)){ + extraChargeYuan = BigDecimal.valueOf(extraCharge).divide(BigDecimal.valueOf(100), 2, BigDecimal.ROUND_HALF_UP).toPlainString(); + } + return extraChargeYuan; + } + @ApiModelProperty(value = "附加费用说明", dataType = "String") @ExcelProperty(value = "附加费用说明") private String extraChargeIllustration; @ApiModelProperty(value = "总计结算费用-单位分", dataType = "Integer") - @ExcelProperty(value = "总计结算费用-单位分") private Integer totalSettlement; + + @ExcelProperty(value = "总计结算费用(元)") + private String totalSettlementYuan; + + public String getTotalSettlementYuan() { + if(Objects.nonNull(totalSettlement)){ + totalSettlementYuan = BigDecimal.valueOf(totalSettlement).divide(BigDecimal.valueOf(100), 2, BigDecimal.ROUND_HALF_UP).toPlainString(); + } + return totalSettlementYuan; + } } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java index 8fa33a8..9a2d7b1 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/finance/FinanceAgreementInfo.java @@ -20,7 +20,9 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; import java.io.Serializable; +import java.math.BigDecimal; import java.util.List; +import java.util.Objects; /** *

@@ -115,11 +117,21 @@ /** * 合同金额 */ - @ExcelProperty("合同金额（单位分）") @ApiModelProperty(value = "合同金额（单位分）", dataType = "Integer") @TableField("agreement_amount") private Integer agreementAmount; + @ExcelProperty("合同金额（元）") + @TableField(exist = false) + private String agreementAmountExport; + + public String getAgreementAmountExport() { + if(Objects.nonNull(agreementAmount)) { + agreementAmountExport = BigDecimal.valueOf(agreementAmount).divide(BigDecimal.valueOf(100), 2, BigDecimal.ROUND_HALF_UP).toPlainString(); + } + return agreementAmountExport; + } + /** * 合同采购来源-字典code */