fix

zjugis-business/src/main/java/com/zjugis/business/bean/response/ContractInvoiceStaticsRespense.java → zjugis-business/src/main/java/com/zjugis/business/bean/response/ContractInvoiceStaticsResponse.java

@@ -1,12 +1,8 @@
 package com.zjugis.business.bean.response;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.zjugis.business.mybatis.entity.BaseEntity;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.time.LocalDate;
 
 
 /**
@@ -19,7 +15,7 @@ import java.time.LocalDate;
 
 @Data
 
-public class ContractInvoiceStaticsRespense extends BaseEntity {
+public class ContractInvoiceStaticsResponse {
 
     //已开票金额
     private BigDecimal ykp;

zjugis-business/src/main/java/com/zjugis/business/controller/ContractInvoiceController.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zjugis.business.bean.dto.ContractInvoiceDto;
 import com.zjugis.business.bean.entity.ContractInvoiceRelation;
 import com.zjugis.business.bean.response.ContractInvoiceResponse;
-import com.zjugis.business.bean.response.ContractInvoiceStaticsRespense;
+import com.zjugis.business.bean.response.ContractInvoiceStaticsResponse;
 import com.zjugis.business.service.ContractInvoiceRelationService;
 import com.zjugis.business.service.ContractInvoiceService;
 import com.zjugis.framework.common.pojo.CommonResult;
@@ -46,7 +46,7 @@ public class ContractInvoiceController {
      * @return 所有数据
      */
     @PostMapping("/contractInvoice/getStatics")
-    public CommonResult<ContractInvoiceStaticsRespense> getStatics(@RequestBody ContractInvoiceDto contractInvoiceDto) {
+    public CommonResult<ContractInvoiceStaticsResponse> getStatics(@RequestBody ContractInvoiceDto contractInvoiceDto) {
         return CommonResult.success(contractInvoiceService.getStatics(contractInvoiceDto));
     }
 

zjugis-business/src/main/java/com/zjugis/business/mapper/ContractInvoiceMapper.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zjugis.business.bean.dto.ContractInvoiceDto;
 import com.zjugis.business.bean.entity.ContractInvoice;
 import com.zjugis.business.bean.response.ContractInvoiceResponse;
-import com.zjugis.business.bean.response.ContractInvoiceStaticsRespense;
+import com.zjugis.business.bean.response.ContractInvoiceStaticsResponse;
 import com.zjugis.framework.mybatis.core.mapper.BaseMapperX;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -21,6 +21,6 @@ public interface ContractInvoiceMapper extends BaseMapperX<ContractInvoice> {
 
     Page<ContractInvoiceResponse> page(Page<ContractInvoiceResponse> page, @Param("params") ContractInvoiceDto contractMakeBillDto);
 
-    ContractInvoiceStaticsRespense getStatics(@Param("params") ContractInvoiceDto entity);
+    ContractInvoiceStaticsResponse getStatics(@Param("params") ContractInvoiceDto entity);
 }
 

zjugis-business/src/main/java/com/zjugis/business/service/ContractInvoiceService.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zjugis.business.bean.dto.ContractInvoiceDto;
 import com.zjugis.business.bean.entity.ContractInvoice;
 import com.zjugis.business.bean.response.ContractInvoiceResponse;
-import com.zjugis.business.bean.response.ContractInvoiceStaticsRespense;
+import com.zjugis.business.bean.response.ContractInvoiceStaticsResponse;
 
 import java.util.List;
 
@@ -20,7 +20,7 @@ public interface ContractInvoiceService {
 
     Page<ContractInvoiceResponse> page(Page<ContractInvoiceResponse> page, ContractInvoiceDto contractMakeBillDto);
 
-    ContractInvoiceStaticsRespense getStatics(ContractInvoiceDto contractMakeBillDto);
+    ContractInvoiceStaticsResponse getStatics(ContractInvoiceDto contractMakeBillDto);
 
     ContractInvoice selectByInstanceId(String id);
 

zjugis-business/src/main/java/com/zjugis/business/service/impl/ContractInvoiceServiceImpl.java

@@ -9,7 +9,7 @@ import com.zjugis.business.bean.entity.ContractInvoice;
 import com.zjugis.business.bean.entity.ContractInvoiceRelation;
 import com.zjugis.business.bean.entity.Customer;
 import com.zjugis.business.bean.response.ContractInvoiceResponse;
-import com.zjugis.business.bean.response.ContractInvoiceStaticsRespense;
+import com.zjugis.business.bean.response.ContractInvoiceStaticsResponse;
 import com.zjugis.business.constants.FlowStatusConstants;
 import com.zjugis.business.flow.contractinvoice.constants.ContractInvoiceConstants;
 import com.zjugis.business.mapper.ContractInvoiceMapper;
@@ -77,7 +77,7 @@ public class ContractInvoiceServiceImpl implements ContractInvoiceService {
     }
 
     @Override
-    public ContractInvoiceStaticsRespense getStatics(ContractInvoiceDto entity) {
+    public ContractInvoiceStaticsResponse getStatics(ContractInvoiceDto entity) {
         return contractInvoiceMapper.getStatics(entity);
     }
 

zjugis-business/src/main/resources/mapper/oracle/ContractInvoiceMapper.xml

@@ -61,11 +61,11 @@
         FLOW_FINISHTIME desc nulls last,
         APPLY_DATE DESC nulls last
     </select>
-    <select id="getStatics" resultType="com.zjugis.business.bean.response.ContractInvoiceStaticsRespense">
+    <select id="getStatics" resultType="com.zjugis.business.bean.response.ContractInvoiceStaticsResponse">
         SELECT
         sum(case when T.FLOW_STATUS &gt;= 90 then T.INVOICE_AMOUNT else 0 end )/10000 as ykp,
         sum(NVL(T3.returnAmount,0) )/10000 as yhk
-        FROM CONTRACT_INVOICE T left join CONTRACT_RETURN_MONEY b on a.id=b.CONTRACT_INVOICE_ID
+        FROM CONTRACT_INVOICE T left join CONTRACT_RETURN_MONEY b on T.id=b.CONTRACT_INVOICE_ID
         LEFT JOIN CONTRACT T1 ON T1.ID=T.CONTRACT_ID
         LEFT JOIN PROJECT T2 ON T2.ID=T.PROJECT_ID
         LEFT JOIN