caozj 2 лет назад
Родитель
Сommit
fd052703cb

+ 5 - 0
hx-sale/src/main/java/com/fjhx/sale/entity/contract/vo/ContractVo.java

@@ -80,4 +80,9 @@ public class ContractVo extends Contract {
      * 合同个数
      */
     private Long contractCount;
+
+    /**
+     * 总到账认领金额
+     */
+    private BigDecimal sumClaimMoney;
 }

+ 3 - 3
hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -96,12 +96,12 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
     @Override
     public Page<ContractVo> getPage(ContractSelectDto dto) {
         IWrapper<Contract> wrapper = getWrapper();
-        wrapper.orderByDesc(Contract::getCreateTime);
+        wrapper.orderByDesc("t1",Contract::getCreateTime);
         if(StringUtils.isNotEmpty(dto.getStatus())){
-            wrapper.eq(Contract::getStatus,dto.getStatus());
+            wrapper.eq("t1",Contract::getStatus,dto.getStatus());
         }
         if(StringUtils.isNotEmpty(dto.getKeyword())){
-            wrapper.keyword(dto.getKeyword(),new SqlField(Contract::getCode));
+            wrapper.keyword(dto.getKeyword(),new SqlField("t1",Contract::getCode));
         }
         Page<ContractVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<ContractVo> list = page.getRecords();

+ 1 - 1
hx-sale/src/main/java/com/fjhx/sale/service/documents/impl/DocumentsPdfServiceImpl.java

@@ -41,7 +41,7 @@ public class DocumentsPdfServiceImpl extends ServiceImpl<DocumentsPdfMapper, Doc
 
     @Override
     public void add(DocumentsPdfDto documentsPdfDto) {
-        this.save(documentsPdfDto);
+        this.saveOrUpdate(documentsPdfDto);
     }
 
     @Override

+ 5 - 3
hx-sale/src/main/resources/mapper/contract/ContractMapper.xml

@@ -2,9 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.sale.mapper.contract.ContractMapper">
     <select id="getPage" resultType="com.fjhx.sale.entity.contract.vo.ContractVo">
-        select
-            *
-        from contract
+        SELECT
+            t1.*,
+            (select SUM(money) from claim_contract WHERE contract_id = t1.id) AS sumClaimMoney
+        FROM
+            contract t1
             ${ew.customSqlSegment}
     </select>