Merge remote-tracking branch 'origin/dev' into dev

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseInAndOutStockController.java

@@ -359,4 +359,28 @@ public class TWarehouseInAndOutStockController extends BaseController {
         return itWarehouseBillsService.addDetails(fId, billsType,loginUser);
     }
 
+    /**
+     * 根据id更新费用审核状态
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/feeReview")
+    @RepeatSubmit
+    public AjaxResult feeReviewSubmit(@RequestParam("id") Long id) {
+        return itWarehouseBillsService.feeReviewSubmit(id);
+    }
+
+    /**
+     * 根据id撤销已费用审核状态
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/revokefeeReview")
+    @RepeatSubmit
+    public AjaxResult revokefeeReview(@RequestParam("id") Long id) {
+        return itWarehouseBillsService.revokefeeReview(id);
+    }
+
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehousebillsfeesController.java

@@ -113,4 +113,14 @@ public class TWarehousebillsfeesController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] fIds) {
         return toAjax(tWarehousebillsfeesService.deleteTWarehousebillsfeesByIds(fIds));
     }
+
+    /**
+     * 获取查询菜单数据
+     */
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:warehousebillsfees:query')")
+    @PostMapping("/queryMenuList")
+    public TableDataInfo selectQueryMenuList(@RequestBody TWarehousebillsfees tWarehousebillsfees) {
+        startPage();
+        return getDataTable(tWarehousebillsfeesService.selectQueryMenuList(tWarehousebillsfees));
+    }
 }

ruoyi-warehouse/src/main/java/com/ruoyi/approvalFlow/service/impl/AuditPathsServiceImpl.java

@@ -22,6 +22,7 @@ import com.ruoyi.finance.mapper.TFeeMapper;
 import com.ruoyi.finance.service.impl.TFeeServiceImpl;
 import com.ruoyi.reportManagement.domain.TWhgenleg;
 import com.ruoyi.reportManagement.mapper.TWhgenlegMapper;
+import com.ruoyi.warehouseBusiness.component.CalculationWarehouseService;
 import com.ruoyi.warehouseBusiness.domain.TWarehouseAgreement;
 import com.ruoyi.warehouseBusiness.domain.TWarehouseBills;
 import com.ruoyi.warehouseBusiness.domain.TWarehousebillsfees;
@@ -102,6 +103,9 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
     @Autowired
     private TWarehouseAgreementMapper tWarehouseAgreementMapper;
 
+    @Autowired
+    private CalculationWarehouseService calculationWarehouseService;
+
     /**
      * 查询审批流配置主
      *
@@ -630,6 +634,17 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
                             fettle = 5L;
                         }
                         //业务处理
+                    } else if (auditItems.getActId() == 190) {
+                        if ("T".equals(at.getIffinalItem())) {
+                            fettle = 6L;
+                        } else if ("F".equals(at.getIffinalItem())) {
+                            fettle = 5L;
+                        }
+                        TWarehouseBills tWarehouseBills = new TWarehouseBills();
+                        tWarehouseBills.setfId(auditItems.getBillId());
+                        tWarehouseBills.setfBillstatus(fettle);
+                        tWarehouseBillsMapper.updateKaHeOrder(tWarehouseBills);
+                        tWarehousebillsfeesMapper.warehouseFeesFollowUpdate(auditItems.getBillId(), fettle, auditItems.getAuditItem());
                     } else if (Objects.equals(auditItems.getActId(), WarehouseActIdEnum.FEE_CHANGES.getActId().longValue())) {
                         // 费用变更审核通过处理
                         if ("T".equals(at.getIffinalItem())) {
@@ -652,6 +667,12 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
                 }
             }
         }
+
+        TWarehouseBills warehouseBills = new TWarehouseBills();
+        warehouseBills.setfId(auditItems.getBillId());
+        calculationWarehouseService.calculationFeeStatus(warehouseBills);
+        tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
+
         if (number <= 0) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("该审批已被操作");
@@ -824,6 +845,13 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
         } else if (auditItems.getActId() == 181) {
             fettle = 3L;
             //业务处理
+        } else if (auditItems.getActId() == 190) {
+            fettle = 3L;
+            TWarehouseBills tWarehouseBills = new TWarehouseBills();
+            tWarehouseBills.setfId(auditItems.getBillId());
+            tWarehouseBills.setfBillstatus(fettle);
+            tWarehouseBillsMapper.updateKaHeOrder(tWarehouseBills);
+            tWarehousebillsfeesMapper.warehouseFeesFollowUpdate(auditItems.getBillId(), fettle, auditItems.getAuditItem());
         } else if (Objects.equals(auditItems.getActId(), WarehouseActIdEnum.FEE_CHANGES.getActId().longValue())) {
             warehousebillsModifyService.additionalFeeInformation(auditItems.getBillId(), WarehouseTypeEnum.DISMISS);
         }
@@ -872,6 +900,12 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
                 }
             }
         }
+
+        TWarehouseBills warehouseBills = new TWarehouseBills();
+        warehouseBills.setfId(auditItems.getBillId());
+        calculationWarehouseService.calculationFeeStatus(warehouseBills);
+        tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
+
         if (number <= 0) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("该审批已被操作");
@@ -1066,10 +1100,23 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
         } else if (auditItems.getActId() == 181) {
             fettle = 2L;
             //业务处理
+        } else if (auditItems.getActId() == 190) {
+            fettle = 2L;
+            TWarehouseBills tWarehouseBills = new TWarehouseBills();
+            tWarehouseBills.setfId(auditItems.getBillId());
+            tWarehouseBills.setfBillstatus(fettle);
+            tWarehouseBillsMapper.updateKaHeOrder(tWarehouseBills);
+            tWarehousebillsfeesMapper.warehouseFeesFollowUpdate(auditItems.getBillId(), fettle, auditItems.getAuditItem());
         } else if (Objects.equals(auditItems.getActId(), WarehouseActIdEnum.FEE_CHANGES.getActId().longValue())) {
             warehousebillsModifyService.withdrawalApprovalById(auditItems.getBillId());
         }
         auditItemsMapper.deletePurchaseApproval(auditItems);
+
+        TWarehouseBills warehouseBills = new TWarehouseBills();
+        warehouseBills.setfId(auditItems.getBillId());
+        calculationWarehouseService.calculationFeeStatus(warehouseBills);
+        tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
+
         return AjaxResult.success();
     }
 

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/component/CalculationWarehouseService.java

@@ -23,4 +23,11 @@ public interface CalculationWarehouseService {
      */
     void calculationWarehouseQuantity(TWarehouseBills warehouseBills);
 
+    /**
+     * 仓库计算费用状态
+     *
+     * @param warehouseBills 主表数据
+     */
+    void calculationFeeStatus(TWarehouseBills warehouseBills);
+
 }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/component/impl/CalculationWarehouseServiceImpl.java

@@ -103,6 +103,16 @@ public class CalculationWarehouseServiceImpl implements CalculationWarehouseServ
     }
 
     /**
+     * 仓库计算费用状态
+     *
+     * @param warehouseBills 主表数据
+     */
+    @Override
+    public void calculationFeeStatus(TWarehouseBills warehouseBills) {
+        judgeFeeStatus(warehouseBills);
+    }
+
+    /**
      * 判断修改费用状态
      *
      * @param warehouseBills 仓库主表
@@ -113,13 +123,20 @@ public class CalculationWarehouseServiceImpl implements CalculationWarehouseServ
         List<TWarehousebillsfees> warehousebillsfees = warehousebillsfeesMapper.selectTWarehousebillsfeesList(fees);
         if (CollectionUtils.isNotEmpty(warehousebillsfees)) {
             long count = warehousebillsfees.stream().filter(fee -> Objects.equals(fee.getfBillstatus(), 6L)).count();
-            if (Objects.equals(count, (long) warehousebillsfees.size())) {
+            long size =  warehousebillsfees.size();
+            if (Objects.equals(count, size)) {
+                // 入账数和明细数相等，全部入账
                 warehouseBills.setfFeeStatus(3L);
-            } else {
+            } else if (count > 0 && count < size) {
+                // 入账数 < 明细数，部分入账
                 warehouseBills.setfFeeStatus(2L);
+            } else {
+                // 暂存
+                warehouseBills.setfFeeStatus(1L);
             }
         } else {
-            warehouseBills.setfFeeStatus(1L);
+            // 空，不显示状态
+            warehouseBills.setfFeeStatus(0L);
         }
     }
 

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehousebillsfeesMapper.java

@@ -150,4 +150,11 @@ public interface TWarehousebillsfeesMapper extends BaseMapper<TWarehousebillsfee
      */
     public List<Map<String,Object>> accountsDue();
 
+    /**
+     * 获取查询菜单数据
+     * @param tWarehousebillsfees
+     * @return
+     */
+    public List<Map<String,Object>> selectQueryMenuList(TWarehousebillsfees tWarehousebillsfees);
+
 }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/ITWarehousebillsfeesService.java

@@ -80,4 +80,11 @@ public interface ITWarehousebillsfeesService {
      * @return
      */
     public List<Map<String,Object>> accountsDue();
+
+    /**
+     * 获取查询菜单数据
+     * @param tWarehousebillsfees
+     * @return
+     */
+    public List<Map<String, Object>> selectQueryMenuList(TWarehousebillsfees tWarehousebillsfees);
 }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -428,7 +428,41 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         } else if (tWarehousebills.getfBilltype().equals(WarehouseTypeEnum.HQZY.getType())) {
             return tWarehouseBillsMapper.selectWarehouseBusinessList1(tWarehousebills);
         } else {
-            return tWarehouseBillsMapper.selectWarehouseBusinessList(tWarehousebills);
+            List<Map<String, Object>> billsList = tWarehouseBillsMapper.selectWarehouseBusinessList(tWarehousebills);
+
+            for (Map<String, Object> billsMap : billsList) {
+                // 查询箱型、箱量表
+                TWarehousebillsCntr cntr = new TWarehousebillsCntr();
+                cntr.setfPid(Long.parseLong(billsMap.get("fId").toString()));
+                List<TWarehousebillsCntr> cntrList = tWarehousebillsCntrMapper.selectTWarehousebillsCntrList(cntr);
+
+                // 创建map统计箱型箱量
+                Map<String, Long> countMap = new HashMap<>();
+                for (TWarehousebillsCntr temp : cntrList) {
+                    String cntrName = temp.getCntrName();
+                    Long fCntrcount = temp.getfCntrcount();
+                    if (StringUtils.isNotNull(cntrName) && StringUtils.isNotNull(fCntrcount)) {
+                        if (countMap.containsKey(cntrName)) {
+                            countMap.put(cntrName, countMap.get(cntrName) + fCntrcount);
+                        } else {
+                            countMap.put(cntrName, fCntrcount);
+                        }
+                    }
+                }
+
+                // 组装返回
+                String fCntval = "";
+                if (countMap.size() > 0) {
+                    StringBuilder sb = new StringBuilder();
+                    for (String key : countMap.keySet()) {
+                        sb.append(key).append("×").append(countMap.get(key)).append("，");
+                    }
+                    fCntval = sb.deleteCharAt(sb.length() - 1).toString();
+                }
+                billsMap.put("fCntval", fCntval);
+            }
+
+            return billsList;
         }
     }
 
@@ -702,10 +736,12 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 } else {
                     // 添加主表 业务单号
                     wbItem.setfBillno(warehouseBills.getfBillno());
-                    if (!warehouseStatus) {
-                        wbItem.setfBillstatus(1L);
-                    } else {
-                        wbItem.setfBillstatus(10L);
+                    if (!"CDZZ".equals(billsType)) {
+                        if (!warehouseStatus) {
+                            wbItem.setfBillstatus(1L);
+                        } else {
+                            wbItem.setfBillstatus(10L);
+                        }
                     }
                     wbItem.setfPid(fPid);
                     wbItem.setCreateBy(loginUser.getUser().getUserName());
@@ -1330,9 +1366,12 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 warehouseBills.setfChargedate(warehouseBills.getfBsdate());
             }
             warehouseBills.setUpdateBy(loginUser.getUser().getUserName());
+
             tEnclosureMapper.deleteByFPid(fPid);
             tWarehousebillsfeesMapper.deleteByFPid(fPid);
-            tWarehousebillsitemsMapper.deleteByFPid(fPid);
+            if (!"CDZZ".equals(billsType)) {
+                tWarehousebillsitemsMapper.deleteByFPid(fPid);
+            }
             tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
             tWarehousebillsCntrMapper.deleteTWarehousebillsCntrfPid(fPid);
         }
@@ -1355,29 +1394,33 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     return AjaxResult.error("库存明细第" + line + "行状态异常，请确认");
                 }
             } else {
-                if (!wbItem.getfBillstatus().equals(6L)) {
+                if (!"CDZZ".equals(billsType) && !wbItem.getfBillstatus().equals(6L)) {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return AjaxResult.error("库存明细第" + line + "行状态异常，请确认");
                 }
             }
-            if (StringUtils.isNull(wbItem.getfChargedate())) {
-                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return AjaxResult.error("库存明细第" + line + "行未找到仓储费计费日期，请确认");
-            }
-            if (StringUtils.isNull(wbItem.getfBillingway())) {
-                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return AjaxResult.error("库存明细第" + line + "行未找到计费方式，请确认");
-            }
-            if (StringUtils.isNull(wbItem.getfOriginalbilldate())) {
-                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return AjaxResult.error("库存明细第" + line + "行未找到入库日期，请确认");
+
+            if (!"CDZZ".equals(billsType)) {
+                if (StringUtils.isNull(wbItem.getfChargedate())) {
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    return AjaxResult.error("库存明细第" + line + "行未找到仓储费计费日期，请确认");
+                }
+                if (StringUtils.isNull(wbItem.getfBillingway())) {
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    return AjaxResult.error("库存明细第" + line + "行未找到计费方式，请确认");
+                }
+                if (StringUtils.isNull(wbItem.getfOriginalbilldate())) {
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    return AjaxResult.error("库存明细第" + line + "行未找到入库日期，请确认");
+                }
+
+                wbItem.setfPid(fPid);
+                wbItem.setfBilltype(billsType);
+                wbItem.setCreateTime(new Date());
+                wbItem.setfBillno(warehouseBills.getfBillno());
+                wbItem.setCreateBy(loginUser.getUser().getUserName());
+                tWarehousebillsitemsMapper.insertTWarehousebillsitems(wbItem);
             }
-            wbItem.setfPid(fPid);
-            wbItem.setfBilltype(billsType);
-            wbItem.setCreateTime(new Date());
-            wbItem.setfBillno(warehouseBills.getfBillno());
-            wbItem.setCreateBy(loginUser.getUser().getUserName());
-            tWarehousebillsitemsMapper.insertTWarehousebillsitems(wbItem);
         }
         //  箱型数据
         if (StringUtils.isNotNull(tCntr) && !"[]".equals(tCntr)) {
@@ -6840,6 +6883,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             throw new WarehouseException("未找到费用信息或费用已被审核");
         }
         tWarehousebillsfeesMapper.warehouseFeesFollowUpdateById(id, Long.parseLong(FeesTypeEnum.APPROVE.getType()), new Date());
+        TWarehouseBills warehouseBills = new TWarehouseBills();
+        warehouseBills.setfId(warehousebillsfees.getfPid());
+        calculationWarehouseService.calculationFeeStatus(warehouseBills);
+        tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
         return AjaxResult.success(tWarehousebillsfeesMapper.selectTWarehousebillsfeesById(id));
     }
 
@@ -6859,6 +6906,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             throw new WarehouseException("未找到费用信息或费用已计算费用");
         }
         tWarehousebillsfeesMapper.warehouseFeesFollowUpdateById(id, Long.parseLong(FeesTypeEnum.SAVE.getType()), new Date());
+        TWarehouseBills warehouseBills = new TWarehouseBills();
+        warehouseBills.setfId(warehousebillsfees.getfPid());
+        calculationWarehouseService.calculationFeeStatus(warehouseBills);
+        tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
         return AjaxResult.success(tWarehousebillsfeesMapper.selectTWarehousebillsfeesById(id));
     }
 

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehousebillsfeesServiceImpl.java

@@ -182,4 +182,9 @@ public class TWarehousebillsfeesServiceImpl implements ITWarehousebillsfeesServi
     public List<Map<String, Object>> accountsDue() {
         return tWarehousebillsfeesMapper.accountsDue();
     }
+
+    @Override
+    public List<Map<String, Object>> selectQueryMenuList(TWarehousebillsfees tWarehousebillsfees) {
+        return tWarehousebillsfeesMapper.selectQueryMenuList(tWarehousebillsfees);
+    }
 }

ruoyi-warehouse/src/main/resources/mapper/reportManagement/TWhgenlegMapper.xml

@@ -1019,7 +1019,7 @@
 
     <select id="selectStockDetailsList" resultMap="WhgenlegInfoResult">
         SELECT
-            w.f_id, c.f_name, wh.f_mblno, t.f_business_type, t.f_marks, t.f_billtype, w.f_trademodeid,
+            w.f_id, c.f_name, wh.f_mblno, t.f_business_type, t.f_marks, t.f_bsdate, t.f_billtype, w.f_trademodeid,
                t.f_qty, t.f_grossweight, t.f_netweight
         FROM
             t_whgenleg wh
@@ -1060,4 +1060,4 @@
         GROUP BY t.f_id
     </select>
 
-</mapper>
+</mapper>

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsMapper.xml

@@ -245,8 +245,9 @@
             bill.f_billing_deadline AS fBillingDeadline,
             bill.free_container_date AS freeContainerDate,
             CASE
+            WHEN bill.f_fee_status = '0'THEN ''
             WHEN bill.f_fee_status = '1'THEN '暂存'
-            WHEN bill.f_fee_status = '2'THEN '部分'
+            WHEN bill.f_fee_status = '2'THEN '部分入账'
             WHEN bill.f_fee_status = '3'THEN '全部入账'
             END AS fFeeStatus,
         CASE WHEN bill.f_billstatus = '1' THEN '录入'
@@ -412,7 +413,7 @@
             <if test="fNewTrademodeid != null ">and bill.f_new_trademodeid = #{fNewTrademodeid}</if>
         </where>
         ${params.dataScope}
-        ORDER BY bill.f_bsdate DESC, bill.f_bstime DESC,bill.f_id DESC,bill.f_billstatus
+        ORDER BY bill.create_time DESC, bill.f_bsdate DESC, bill.f_bstime DESC,bill.f_id DESC,bill.f_billstatus
     </select>
 
     <select id="selectWarehouseBusinessList1" parameterType="TWarehousebills" resultType="Map">
@@ -448,8 +449,9 @@
             bill.f_billing_deadline AS fBillingDeadline,
             bill.free_container_date AS freeContainerDate,
             CASE
+            WHEN bill.f_fee_status = '0'THEN ''
             WHEN bill.f_fee_status = '1'THEN '暂存'
-            WHEN bill.f_fee_status = '2'THEN '部分'
+            WHEN bill.f_fee_status = '2'THEN '部分入账'
             WHEN bill.f_fee_status = '3'THEN '全部入账'
             END AS fFeeStatus,
             CASE
@@ -577,7 +579,7 @@
             <if test="fNewTrademodeid != null ">and bill.f_new_trademodeid = #{fNewTrademodeid}</if>
         </where>
         ${params.dataScope}
-        ORDER BY bill.f_bsdate DESC, bill.f_bstime DESC,bill.f_id DESC,bill.f_billstatus
+        ORDER BY bill.create_time DESC, bill.f_bsdate DESC, bill.f_bstime DESC,bill.f_id DESC,bill.f_billstatus
     </select>
 
     <select id="selectTWarehousebillsById" parameterType="Long" resultMap="TWarehousebillsResult">
@@ -2776,4 +2778,4 @@
             ORDER BY w.f_bsdate DESC, w.f_bstime DESC,w.f_id DESC,w.f_billstatus
     </select>
 
-</mapper>
+</mapper>

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsfeesMapper.xml

@@ -843,4 +843,45 @@
             GROUP BY tf.f_corpid
             LIMIT 10
     </select>
-</mapper>
+
+    <select id="selectQueryMenuList" parameterType="TWarehousebillsfees" resultType="map">
+        SELECT tf.f_id AS fId,
+        tf.f_pid AS fPid,
+        tf.f_corpid AS fCorpid,
+        tc.f_no AS corpNo,
+        tc.f_cname AS corpCname,
+        tc.f_name AS corpName,
+        tf.f_mblno AS fMblno,
+        tf.f_bsdate AS fBsdate,
+        tf.f_review_date AS fReviewDate,
+        tf.f_feeid AS fFeeid,
+        te.f_no AS feesNo,
+        te.f_name AS feesName,
+        tf.f_dc AS fDc,
+        tf.f_amount AS fAmount,
+        tf.f_stlamount AS fStlamount,
+        tf.f_stlamount_date AS fStlamountDate,
+        tf.f_invamount AS fInvamount,
+        tf.f_invnos AS fInvnos,
+        tf.f_accamount AS fAccamount,
+        tf.f_accamount_date AS fAccamountDate,
+        tf.f_statement_no AS fStatementNo,
+        tf.f_feeUnitid AS fFeeUnitid,
+        tf.f_qty AS fQty,
+        tf.f_unitprice AS fUnitprice,
+        tf.f_business_type AS fBusinessType,
+        tf.f_product_name AS fProductName,
+        tf.remark AS remark,
+        tf.price_date_remarks AS priceDateRemarks
+        FROM t_warehousebillsfees tf
+        LEFT JOIN t_corps tc ON tc.f_id = tf.f_corpid
+        LEFT JOIN t_fees te ON te.f_id = tf.f_feeid
+        <where>
+            <if test="fDc != null  and fDc != ''">and tf.f_dc = #{fDc}</if>
+            <if test="fMblno != null  and fMblno != ''">and tf.f_mblno = #{fMblno}</if>
+            <if test="corpName != null  and corpName != ''">and tc.f_name like concat('%', #{corpName},'%')</if>
+            <if test="fReviewDate != null  and fReviewDate != ''">and tf.f_review_date = #{fReviewDate}</if>
+            <if test="fBsdate != null  and fBsdate != ''">and tf.f_bsdate = #{fBsdate}</if>
+        </where>
+    </select>
+</mapper>