1.跟单明细逻辑需求

src/main/java/com/ydtech/modules/fnc/controller/SettlementDocumentaryFeesController.java

@@ -31,6 +31,14 @@ public class SettlementDocumentaryFeesController extends BaseController {
         return result;
     }
 
+    @PostMapping("/queryRecord")
+    @ApiOperation(value = "查询")
+    public HttpResult<List<SettlementDocumentaryFeesEntity>>queryRecord(@RequestBody @Valid SettlementDocumentaryFeesVo settlementDocumentaryFeesVo) {
+        HttpResult<List<SettlementDocumentaryFeesEntity>> result=settlementDocumentaryFeesService.queryRecord(settlementDocumentaryFeesVo);
+        return result;
+    }
+
+
     @PostMapping("/insert")
     @ApiOperation("提交")
     public void submit(@RequestBody SettlementDocumentaryFeesVo settlementDocumentaryFeesVo) {

src/main/java/com/ydtech/modules/fnc/dao/SettlementDocumentaryFeesMapper.java

@@ -2,10 +2,12 @@ package com.ydtech.modules.fnc.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.fnc.entity.InsPlyIncome;
 import com.ydtech.modules.fnc.entity.SettlementDocumentaryFeesEntity;
 import com.ydtech.modules.fnc.entity.SettlementDocumentaryLogEntity;
 import com.ydtech.modules.fnc.vo.SettlementDocumentaryFeesVo;
+import com.ydtech.modules.order.entity.BasePageResult;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -35,4 +37,6 @@ public interface SettlementDocumentaryFeesMapper  extends BaseMapper<SettlementD
     List<SettlementDocumentaryFeesEntity> querySettleNew(HashMap<String, Object> params);
 
     List<SettlementDocumentaryFeesEntity> getRecord(@Param("id") String id);
+
+    List<SettlementDocumentaryFeesEntity> queryRecord(SettlementDocumentaryFeesVo settlementDocumentaryFeesVo);
 }

src/main/java/com/ydtech/modules/fnc/service/SettlementDocumentaryFeesService.java

@@ -36,4 +36,6 @@ public interface SettlementDocumentaryFeesService extends IService<SettlementDoc
     List<SettlementDocumentaryFeesEntity> querySettleNew(HashMap<String, Object> params);
 
     HttpResult<List<SettlementDocumentaryFeesEntity>> getRecord(String id);
+
+    HttpResult<List<SettlementDocumentaryFeesEntity>> queryRecord(SettlementDocumentaryFeesVo settlementDocumentaryFeesVo);
 }

src/main/java/com/ydtech/modules/fnc/service/impl/SettlementDocumentaryFeesServiceImpl.java

@@ -241,6 +241,12 @@ public class SettlementDocumentaryFeesServiceImpl extends ServiceImpl<Settlement
 
     }
 
+    @Override
+    public HttpResult<List<SettlementDocumentaryFeesEntity>> queryRecord(SettlementDocumentaryFeesVo settlementDocumentaryFeesVo) {
+        List<SettlementDocumentaryFeesEntity> settlementDocumentaryFeesEntities = baseMapper.queryRecord(settlementDocumentaryFeesVo);
+        return  HttpResult.ok(settlementDocumentaryFeesEntities);
+    }
+
     private int compareAmount(BigDecimal settlementAmount, BigDecimal settlementAmount1) {
 
         return settlementAmount.compareTo(settlementAmount1);

src/main/resources/mapper/modules/fnc/SettlementDocumentaryFeesMapper.xml

@@ -97,6 +97,49 @@
         ORDER  BY  a.create_time desc
     </select>
 
+
+    <select id="queryRecord" resultType="com.ydtech.modules.fnc.entity.SettlementDocumentaryFeesEntity">
+        select
+            max(a.settlement_time) as "settlementTime",
+            sum(a.settlement_amount) as "settlementAmount",
+            max(upf.url )  as "imageUrl"
+            from  settlement_documentary_fees  a
+            LEFT  JOIN   ins_upload_files  upf   on  a.settlement_image_id=upf.id
+        <where>
+            1=1
+            <if test="partnerCompaniesId !=null  and  partnerCompaniesId  !=''">
+                and a.partner_companies_id =#{partnerCompaniesId}
+            </if>
+            <if test="handlingFeesStatus !=null  and  handlingFeesStatus  !=''">
+                and a.handling_fees_status =#{handlingFeesStatus}
+            </if>
+            <if test="isNotCar !=null  and  isNotCar  !=''">
+                and a.is_not_car =#{isNotCar}
+            </if>
+            <if test="agreementType !=null  and  agreementType  !=''">
+                and a.agreement_type =#{agreementType}
+            </if>
+            <if test="parentId !=null  and  parentId  !=''">
+                and a.parent_id =#{parentId}
+            </if>
+            <if test="settlementStatus !=null  and  settlementStatus  !=''">
+                and a.settlement_status =#{settlementStatus}
+            </if>
+            <if test="completionStatus !=null  and  completionStatus  !=''">
+                and a.completion_status =#{completionStatus}
+            </if>
+            <if test="settlementSumId !=null  and  settlementSumId  !=''">
+                and a.settlement_sum_id =#{settlementSumId}
+            </if>
+        </where>
+        group BY a.create_time
+        ORDER  BY  a.create_time desc
+    </select>
+
+
+
+
+
     <select id="getOtherSettldetail" resultType="java.util.HashMap">
             SELECT
             a.id as "id",