diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java index 8f47cbd..b30d1cb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -2,11 +2,13 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CustomerExcellentResponse; import com.casic.missiles.dto.customer.WorkbenceTrendResponse; import com.casic.missiles.service.customer.CustomerWorkbenchService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -38,8 +40,8 @@ } @ApiOperation("优质客户名单") - @PostMapping("/excellentList") - public ReturnDTO customerExcellentList() { + @GetMapping("/excellentList") + public ReturnDTO customerExcellentList() { return ReturnUtil.success(customerWorkbenchService.customerExcellentList()); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java index 8f47cbd..b30d1cb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -2,11 +2,13 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CustomerExcellentResponse; import com.casic.missiles.dto.customer.WorkbenceTrendResponse; import com.casic.missiles.service.customer.CustomerWorkbenchService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -38,8 +40,8 @@ } @ApiOperation("优质客户名单") - @PostMapping("/excellentList") - public ReturnDTO customerExcellentList() { + @GetMapping("/excellentList") + public ReturnDTO customerExcellentList() { return ReturnUtil.success(customerWorkbenchService.customerExcellentList()); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/finance/FinanceAgreementInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/finance/FinanceAgreementInfoMapper.java index 7790f17..a579772 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/finance/FinanceAgreementInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/finance/FinanceAgreementInfoMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.customer.CustomerExcellentResponse; import com.casic.missiles.dto.finance.AgreementApprovalListRequest; import com.casic.missiles.dto.finance.AgreementApprovalListResponse; import com.casic.missiles.model.finance.FinanceAgreementInfo; @@ -24,4 +25,6 @@ List selectBatchForApproval(Page page, @Param("request") AgreementApprovalListRequest request, @Param("businessKey")List businessKeys); Long selectMaxAgreementNo(); + + List selectCustomerExcellentList(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java index 8f47cbd..b30d1cb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -2,11 +2,13 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CustomerExcellentResponse; import com.casic.missiles.dto.customer.WorkbenceTrendResponse; import com.casic.missiles.service.customer.CustomerWorkbenchService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -38,8 +40,8 @@ } @ApiOperation("优质客户名单") - @PostMapping("/excellentList") - public ReturnDTO customerExcellentList() { + @GetMapping("/excellentList") + public ReturnDTO customerExcellentList() { return ReturnUtil.success(customerWorkbenchService.customerExcellentList()); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/finance/FinanceAgreementInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/finance/FinanceAgreementInfoMapper.java index 7790f17..a579772 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/finance/FinanceAgreementInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/finance/FinanceAgreementInfoMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.customer.CustomerExcellentResponse; import com.casic.missiles.dto.finance.AgreementApprovalListRequest; import com.casic.missiles.dto.finance.AgreementApprovalListResponse; import com.casic.missiles.model.finance.FinanceAgreementInfo; @@ -24,4 +25,6 @@ List selectBatchForApproval(Page page, @Param("request") AgreementApprovalListRequest request, @Param("businessKey")List businessKeys); Long selectMaxAgreementNo(); + + List selectCustomerExcellentList(); } diff --git a/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml index 1df1edb..3c5c44a 100644 --- a/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml @@ -108,4 +108,13 @@ + + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java index 8f47cbd..b30d1cb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -2,11 +2,13 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CustomerExcellentResponse; import com.casic.missiles.dto.customer.WorkbenceTrendResponse; import com.casic.missiles.service.customer.CustomerWorkbenchService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -38,8 +40,8 @@ } @ApiOperation("优质客户名单") - @PostMapping("/excellentList") - public ReturnDTO customerExcellentList() { + @GetMapping("/excellentList") + public ReturnDTO customerExcellentList() { return ReturnUtil.success(customerWorkbenchService.customerExcellentList()); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/finance/FinanceAgreementInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/finance/FinanceAgreementInfoMapper.java index 7790f17..a579772 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/finance/FinanceAgreementInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/finance/FinanceAgreementInfoMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.customer.CustomerExcellentResponse; import com.casic.missiles.dto.finance.AgreementApprovalListRequest; import com.casic.missiles.dto.finance.AgreementApprovalListResponse; import com.casic.missiles.model.finance.FinanceAgreementInfo; @@ -24,4 +25,6 @@ List selectBatchForApproval(Page page, @Param("request") AgreementApprovalListRequest request, @Param("businessKey")List businessKeys); Long selectMaxAgreementNo(); + + List selectCustomerExcellentList(); } diff --git a/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml index 1df1edb..3c5c44a 100644 --- a/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml @@ -108,4 +108,13 @@ + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/workbench/SampleMeasureChartResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/workbench/SampleMeasureChartResponse.java index 9c3e8d6..c8fd062 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/workbench/SampleMeasureChartResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/workbench/SampleMeasureChartResponse.java @@ -1,5 +1,7 @@ package com.casic.missiles.dto.business.workbench; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,6 +14,7 @@ @ApiModel @Data public class SampleMeasureChartResponse { + @DictCodeField(message = "检定状态不合法", cacheName = MeterDictCode.MEASURE_STATUS) @ApiModelProperty(value = "检定状态(字典code)", dataType = "String") private String measureStatus; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java index 8f47cbd..b30d1cb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -2,11 +2,13 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CustomerExcellentResponse; import com.casic.missiles.dto.customer.WorkbenceTrendResponse; import com.casic.missiles.service.customer.CustomerWorkbenchService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -38,8 +40,8 @@ } @ApiOperation("优质客户名单") - @PostMapping("/excellentList") - public ReturnDTO customerExcellentList() { + @GetMapping("/excellentList") + public ReturnDTO customerExcellentList() { return ReturnUtil.success(customerWorkbenchService.customerExcellentList()); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/finance/FinanceAgreementInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/finance/FinanceAgreementInfoMapper.java index 7790f17..a579772 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/finance/FinanceAgreementInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/finance/FinanceAgreementInfoMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.customer.CustomerExcellentResponse; import com.casic.missiles.dto.finance.AgreementApprovalListRequest; import com.casic.missiles.dto.finance.AgreementApprovalListResponse; import com.casic.missiles.model.finance.FinanceAgreementInfo; @@ -24,4 +25,6 @@ List selectBatchForApproval(Page page, @Param("request") AgreementApprovalListRequest request, @Param("businessKey")List businessKeys); Long selectMaxAgreementNo(); + + List selectCustomerExcellentList(); } diff --git a/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml index 1df1edb..3c5c44a 100644 --- a/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml @@ -108,4 +108,13 @@ + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/workbench/SampleMeasureChartResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/workbench/SampleMeasureChartResponse.java index 9c3e8d6..c8fd062 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/workbench/SampleMeasureChartResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/workbench/SampleMeasureChartResponse.java @@ -1,5 +1,7 @@ package com.casic.missiles.dto.business.workbench; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,6 +14,7 @@ @ApiModel @Data public class SampleMeasureChartResponse { + @DictCodeField(message = "检定状态不合法", cacheName = MeterDictCode.MEASURE_STATUS) @ApiModelProperty(value = "检定状态(字典code)", dataType = "String") private String measureStatus; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CustomerExcellentResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CustomerExcellentResponse.java new file mode 100644 index 0000000..1f00c00 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CustomerExcellentResponse.java @@ -0,0 +1,21 @@ +package com.casic.missiles.dto.customer; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/4/20 16:55 + */ +@ApiModel +@Data +public class CustomerExcellentResponse { + //客户名称 + @ApiModelProperty(value = "客户名称", dataType = "String") + private String customerName; + //总计检定金额 + @ApiModelProperty(value = "总计检定金额(单位分)", dataType = "Integer") + private Integer totalAmount; +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java index 8f47cbd..b30d1cb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -2,11 +2,13 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CustomerExcellentResponse; import com.casic.missiles.dto.customer.WorkbenceTrendResponse; import com.casic.missiles.service.customer.CustomerWorkbenchService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -38,8 +40,8 @@ } @ApiOperation("优质客户名单") - @PostMapping("/excellentList") - public ReturnDTO customerExcellentList() { + @GetMapping("/excellentList") + public ReturnDTO customerExcellentList() { return ReturnUtil.success(customerWorkbenchService.customerExcellentList()); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/finance/FinanceAgreementInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/finance/FinanceAgreementInfoMapper.java index 7790f17..a579772 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/finance/FinanceAgreementInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/finance/FinanceAgreementInfoMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.customer.CustomerExcellentResponse; import com.casic.missiles.dto.finance.AgreementApprovalListRequest; import com.casic.missiles.dto.finance.AgreementApprovalListResponse; import com.casic.missiles.model.finance.FinanceAgreementInfo; @@ -24,4 +25,6 @@ List selectBatchForApproval(Page page, @Param("request") AgreementApprovalListRequest request, @Param("businessKey")List businessKeys); Long selectMaxAgreementNo(); + + List selectCustomerExcellentList(); } diff --git a/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml index 1df1edb..3c5c44a 100644 --- a/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml @@ -108,4 +108,13 @@ + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/workbench/SampleMeasureChartResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/workbench/SampleMeasureChartResponse.java index 9c3e8d6..c8fd062 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/workbench/SampleMeasureChartResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/workbench/SampleMeasureChartResponse.java @@ -1,5 +1,7 @@ package com.casic.missiles.dto.business.workbench; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,6 +14,7 @@ @ApiModel @Data public class SampleMeasureChartResponse { + @DictCodeField(message = "检定状态不合法", cacheName = MeterDictCode.MEASURE_STATUS) @ApiModelProperty(value = "检定状态(字典code)", dataType = "String") private String measureStatus; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CustomerExcellentResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CustomerExcellentResponse.java new file mode 100644 index 0000000..1f00c00 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CustomerExcellentResponse.java @@ -0,0 +1,21 @@ +package com.casic.missiles.dto.customer; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/4/20 16:55 + */ +@ApiModel +@Data +public class CustomerExcellentResponse { + //客户名称 + @ApiModelProperty(value = "客户名称", dataType = "String") + private String customerName; + //总计检定金额 + @ApiModelProperty(value = "总计检定金额(单位分)", dataType = "Integer") + private Integer totalAmount; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java index c9997c5..6efe9ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java @@ -1,7 +1,9 @@ package com.casic.missiles.service.Impl.customer; +import com.casic.missiles.dto.customer.CustomerExcellentResponse; import com.casic.missiles.dto.customer.WorkbenceTrendResponse; import com.casic.missiles.mapper.customer.CustomerWorkbenchMapper; +import com.casic.missiles.mapper.finance.FinanceAgreementInfoMapper; import com.casic.missiles.service.customer.CustomerWorkbenchService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -20,6 +22,7 @@ public class CustomerWorkbenchServiceImpl implements CustomerWorkbenchService { private final CustomerWorkbenchMapper customerWorkbenchMapper; + private final FinanceAgreementInfoMapper agreementInfoMapper; @Override public List sampleIncreaseTrend() { @@ -48,10 +51,9 @@ return recentYearBuilder(trendMap); } - // 鉴定金额暂时没有表设计,loading... @Override - public List customerExcellentList() { - return null; + public List customerExcellentList() { + return agreementInfoMapper.selectCustomerExcellentList(); } private List recentYearBuilder(Map trendMap) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java index 8f47cbd..b30d1cb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.java @@ -2,11 +2,13 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.customer.CustomerExcellentResponse; import com.casic.missiles.dto.customer.WorkbenceTrendResponse; import com.casic.missiles.service.customer.CustomerWorkbenchService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -38,8 +40,8 @@ } @ApiOperation("优质客户名单") - @PostMapping("/excellentList") - public ReturnDTO customerExcellentList() { + @GetMapping("/excellentList") + public ReturnDTO customerExcellentList() { return ReturnUtil.success(customerWorkbenchService.customerExcellentList()); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/finance/FinanceAgreementInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/finance/FinanceAgreementInfoMapper.java index 7790f17..a579772 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/finance/FinanceAgreementInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/finance/FinanceAgreementInfoMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.customer.CustomerExcellentResponse; import com.casic.missiles.dto.finance.AgreementApprovalListRequest; import com.casic.missiles.dto.finance.AgreementApprovalListResponse; import com.casic.missiles.model.finance.FinanceAgreementInfo; @@ -24,4 +25,6 @@ List selectBatchForApproval(Page page, @Param("request") AgreementApprovalListRequest request, @Param("businessKey")List businessKeys); Long selectMaxAgreementNo(); + + List selectCustomerExcellentList(); } diff --git a/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml index 1df1edb..3c5c44a 100644 --- a/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/finance/FinanceAgreementInfoMapper.xml @@ -108,4 +108,13 @@ + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/workbench/SampleMeasureChartResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/workbench/SampleMeasureChartResponse.java index 9c3e8d6..c8fd062 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/workbench/SampleMeasureChartResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/workbench/SampleMeasureChartResponse.java @@ -1,5 +1,7 @@ package com.casic.missiles.dto.business.workbench; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,6 +14,7 @@ @ApiModel @Data public class SampleMeasureChartResponse { + @DictCodeField(message = "检定状态不合法", cacheName = MeterDictCode.MEASURE_STATUS) @ApiModelProperty(value = "检定状态(字典code)", dataType = "String") private String measureStatus; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CustomerExcellentResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CustomerExcellentResponse.java new file mode 100644 index 0000000..1f00c00 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CustomerExcellentResponse.java @@ -0,0 +1,21 @@ +package com.casic.missiles.dto.customer; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/4/20 16:55 + */ +@ApiModel +@Data +public class CustomerExcellentResponse { + //客户名称 + @ApiModelProperty(value = "客户名称", dataType = "String") + private String customerName; + //总计检定金额 + @ApiModelProperty(value = "总计检定金额(单位分)", dataType = "Integer") + private Integer totalAmount; +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java index c9997c5..6efe9ba 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.java @@ -1,7 +1,9 @@ package com.casic.missiles.service.Impl.customer; +import com.casic.missiles.dto.customer.CustomerExcellentResponse; import com.casic.missiles.dto.customer.WorkbenceTrendResponse; import com.casic.missiles.mapper.customer.CustomerWorkbenchMapper; +import com.casic.missiles.mapper.finance.FinanceAgreementInfoMapper; import com.casic.missiles.service.customer.CustomerWorkbenchService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -20,6 +22,7 @@ public class CustomerWorkbenchServiceImpl implements CustomerWorkbenchService { private final CustomerWorkbenchMapper customerWorkbenchMapper; + private final FinanceAgreementInfoMapper agreementInfoMapper; @Override public List sampleIncreaseTrend() { @@ -48,10 +51,9 @@ return recentYearBuilder(trendMap); } - // 鉴定金额暂时没有表设计,loading... @Override - public List customerExcellentList() { - return null; + public List customerExcellentList() { + return agreementInfoMapper.selectCustomerExcellentList(); } private List recentYearBuilder(Map trendMap) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerWorkbenchService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerWorkbenchService.java index e168464..9ed63b9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerWorkbenchService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerWorkbenchService.java @@ -1,10 +1,9 @@ package com.casic.missiles.service.customer; -import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.customer.CustomerExcellentResponse; import com.casic.missiles.dto.customer.WorkbenceTrendResponse; import java.util.List; -import java.util.Map; public interface @@ -20,6 +19,6 @@ List customerIncreaseTrend(); - List customerExcellentList(); + List customerExcellentList(); } \ No newline at end of file