Merge remote-tracking branch 'origin/master'

ruoyi-warehouse/src/main/java/com/ruoyi/finance/domain/TWareHouseFees.java

@@ -57,6 +57,14 @@ public class TWareHouseFees {
     @Excel(name = "对账单号")
     private String fStatementNo;
 
+
+    /**
+     * 对账单号
+     */
+    @Excel(name = "对账")
+    private String fReconciliation;
+
+
     /**
      * 查询时间区间 审核日期
      */
@@ -145,4 +153,12 @@ public class TWareHouseFees {
     public void setfAccbilldate(Date fAccbilldate) {
         this.fAccbilldate = fAccbilldate;
     }
+
+    public String getfReconciliation() {
+        return fReconciliation;
+    }
+
+    public void setfReconciliation(String fReconciliation) {
+        this.fReconciliation = fReconciliation;
+    }
 }

ruoyi-warehouse/src/main/java/com/ruoyi/finance/mapper/TFeeDoMapper.java

@@ -1,4 +1,4 @@
-package com.ruoyi.warehouse.mapper;
+package com.ruoyi.finance.mapper;
 
 import com.ruoyi.finance.domain.TFeeDo;
 

ruoyi-warehouse/src/main/java/com/ruoyi/finance/mapper/TFeeMapper.java

@@ -1,4 +1,4 @@
-package com.ruoyi.warehouse.mapper;
+package com.ruoyi.finance.mapper;
 
 import com.ruoyi.finance.domain.TFee;
 import org.apache.ibatis.annotations.Param;

ruoyi-warehouse/src/main/java/com/ruoyi/finance/service/impl/TFeeDoServiceImpl.java

@@ -2,8 +2,8 @@ package com.ruoyi.finance.service.impl;
 
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.finance.domain.TFeeDo;
+import com.ruoyi.finance.mapper.TFeeDoMapper;
 import com.ruoyi.finance.service.ITFeeDoService;
-import com.ruoyi.warehouse.mapper.TFeeDoMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

ruoyi-warehouse/src/main/java/com/ruoyi/finance/service/impl/TFeeServiceImpl.java

@@ -9,8 +9,9 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.finance.domain.TFee;
 import com.ruoyi.finance.domain.TFeeDo;
 import com.ruoyi.finance.domain.TWareHouseFees;
+import com.ruoyi.finance.mapper.TFeeDoMapper;
+import com.ruoyi.finance.mapper.TFeeMapper;
 import com.ruoyi.finance.service.ITFeeService;
-import com.ruoyi.warehouse.mapper.TFeeMapper;
 import com.ruoyi.warehouseBusiness.domain.*;
 import com.ruoyi.warehouseBusiness.mapper.BillnoDelMapper;
 import com.ruoyi.warehouseBusiness.service.impl.BillnoSerialServiceImpl;
@@ -31,7 +32,7 @@ public class TFeeServiceImpl implements ITFeeService {
     private TFeeMapper tFeeMapper;
 
     @Autowired
-    private com.ruoyi.warehouse.mapper.TFeeDoMapper tFeeDoMapper;
+    private TFeeDoMapper tFeeDoMapper;
 
     @Autowired
     private BillnoSerialServiceImpl billnoSerialServiceImpl;

ruoyi-warehouse/src/main/resources/mapper/finance/TFeeDoMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.warehouse.mapper.TFeeDoMapper">
+<mapper namespace="com.ruoyi.finance.mapper.TFeeDoMapper">
 
     <resultMap type="TFeeDo" id="TFeeDoResult">
         <result property="fId" column="f_id"/>

ruoyi-warehouse/src/main/resources/mapper/finance/TFeeMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.warehouse.mapper.TFeeMapper">
+<mapper namespace="com.ruoyi.finance.mapper.TFeeMapper">
 
     <resultMap type="TFee" id="TFeeResult">
         <result property="fId" column="f_id"/>
@@ -183,6 +183,22 @@
             <if test="map.tWareHouseFees.fToCorpid != null  and map.tWareHouseFees.fToCorpid != ''">and w.f_corpid = #{map.tWareHouseFees.fToCorpid} </if>
             <if test="map.tWareHouseFees.fMblno != null  and map.tWareHouseFees.fMblno != ''">and t.f_mblno  like concat('%', #{map.tWareHouseFees.fMblno}, '%') </if>
             <if test="map.tWareHouseFees.fStatementNo != null and map.tWareHouseFees.fStatementNo != ''">and w.f_statement_no  like concat('%', #{map.tWareHouseFees.fStatementNo}, '%') </if>
+            <choose>
+                <when test="map.tWareHouseFees.fReconciliation != null and map.tWareHouseFees.fReconciliation != '' and map.tWareHouseFees.fReconciliation == '1' ">
+                    and  w.f_accamount_date IS NOT NULL
+                </when>
+                <otherwise>
+                    and  w.f_accamount_date IS  NULL
+                </otherwise>
+            </choose>
+            <choose>
+                <when test="map.tWareHouseFees.fDc != null and map.tWareHouseFees.fDc != '' and map.tWareHouseFees.fDc == 'D' ">
+                    and  w.f_dc = #{map.tWareHouseFees.fDc}
+                </when>
+                <otherwise>
+                    and  w.f_dc = #{map.tWareHouseFees.fDc}
+                </otherwise>
+            </choose>
             <if test="map.feeIdList != null  and  map.feeIdList != '' ">
                 and  w.f_feeid in
                 <foreach collection="feeIdList" item="id" index="index" open="(" close=")" separator=",">