Browse Source

[add] 结算模板-列表

BKGin 9 months ago
parent
commit
e8502079b4

+ 2 - 0
yiqi-common/src/main/java/com/yiqi/settlement/domain/vo/SettlementFactoryRateListVO.java

@@ -17,6 +17,8 @@ import java.util.Date;
 @Data
 public class SettlementFactoryRateListVO implements Serializable {
 
+    private Long factoryId;
+
     /**
      * 工厂名称
      */

+ 2 - 0
yiqi-common/src/main/java/com/yiqi/settlement/domain/vo/SettlementStoreRateListVO.java

@@ -18,6 +18,8 @@ import java.util.Date;
 @Data
 public class SettlementStoreRateListVO implements Serializable {
 
+    private Long storeId;
+
     /**
      * 门店名称
      */

+ 1 - 1
yiqi-core/src/main/resources/mapper/settlement/SettlementFactoryRateMapper.xml

@@ -6,7 +6,7 @@
 
 
     <select id="queryList" resultType="com.yiqi.settlement.domain.vo.SettlementFactoryRateListVO">
-        select f.factory_name as 'factoryName', fr.*
+        select f.id as factoryId, f.factory_name as 'factoryName', fr.*
         from manage_factory f
         left join settlement_factory_rate fr on f.id = fr.factory_id
         where f.del_flag = '0'

+ 1 - 1
yiqi-core/src/main/resources/mapper/settlement/SettlementStoreRateMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.yiqi.settlement.mapper.SettlementStoreRateMapper">
 
     <select id="queryList" resultType="com.yiqi.settlement.domain.vo.SettlementStoreRateListVO">
-        select s.name as 'storeName', sr.*
+        select s.id as 'storeId', s.name as 'storeName', sr.*
         from sys_store s
         left join settlement_store_rate sr on s.id = sr.store_id
         where s.del_flag = '0'