样品单分页字段添加

hx-sale/src/main/java/com/fjhx/sale/entity/sample/vo/SampleVo.java

@@ -5,6 +5,7 @@ import com.fjhx.sale.entity.sample.po.Sample;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -38,4 +39,20 @@ public class SampleVo extends Sample {
     private String  tag;
 
 
+    /**
+     * 金额CNY
+     */
+    private BigDecimal amountCNY;
+
+    /**
+     * 新到款状态
+     */
+    private String refundStatusNew;
+
+    /**
+     * 总到账认领金额
+     */
+    private BigDecimal sumClaimMoney;
+
+
 }

hx-sale/src/main/java/com/fjhx/sale/service/sample/impl/SampleServiceImpl.java

@@ -64,13 +64,13 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
     @Override
     public Page<SampleVo> getPage(SampleSelectDto dto) {
         IWrapper<Sample> wrapper = getWrapper();
-        wrapper.orderByDesc("s", Sample::getCreateTime);
-        wrapper.between("s", Sample::getStatus, FlowStatusEnum.DRAFT.getKey(), FlowStatusEnum.CANCELLATION.getKey() - 1);
+        wrapper.orderByDesc("t1", Sample::getCreateTime);
+        wrapper.between("t1", Sample::getStatus, FlowStatusEnum.DRAFT.getKey(), FlowStatusEnum.CANCELLATION.getKey() - 1);
         if (StringUtils.isNotEmpty(dto.getStatus())) {
-            wrapper.eq("s", Sample::getStatus, dto.getStatus());
+            wrapper.eq("t1", Sample::getStatus, dto.getStatus());
         }
         if (StringUtils.isNotEmpty(dto.getKeyword())) {
-            wrapper.keyword(dto.getKeyword(), new SqlField("s", Sample::getCode));
+            wrapper.keyword(dto.getKeyword(), new SqlField("t1", Sample::getCode));
         }
         Page<SampleVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<SampleVo> list = page.getRecords();

hx-sale/src/main/resources/mapper/sample/SampleMapper.xml

@@ -2,9 +2,24 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.sale.mapper.sample.SampleMapper">
     <select id="getPage" resultType="com.fjhx.sale.entity.sample.vo.SampleVo">
-        select
-           *
-        from sample s
+        SELECT *
+        FROM
+            (SELECT t1.*,
+                    IFNULL(t1.amount, 0) * IFNULL(t1.rate, 0) AS amountCNY,
+                    CASE
+                        WHEN ( IFNULL( t1.amount, 0 ) * IFNULL( t1.rate, 0 ) - t1.sumClaimMoney ) &lt;=  0 THEN
+                            20
+                        WHEN t1.sumClaimMoney = 0 THEN
+                            0
+                        ELSE 10
+                        END                                   AS refundStatusNew
+             FROM (SELECT t1.*,
+                          (SELECT IFNULL(SUM(IFNULL(cc.money, 0) * IFNULL(arw.rate, 1)), 0)
+                           FROM claim_contract cc
+                                    left join claim c on cc.claim_id = c.id
+                                    LEFT JOIN bytesailing_account.account_running_water arw on c.business_id = arw.id
+                           WHERE cc.contract_id = t1.id) AS sumClaimMoney
+                   FROM sample t1) t1) t1
             ${ew.customSqlSegment}
     </select>