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

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/page/PageHelperUtil.java

@@ -73,7 +73,7 @@ public class PageHelperUtil {
         pageResult.setPage(pageInfo.getPageNum());
         pageResult.setPageSize(pageInfo.getPageSize());
         pageResult.setSize(pageInfo.getTotal());
-        pageResult.setPages(pageInfo.getPages());
+        pageResult.setPages(((int) pageResult.getSize() + pageResult.getPageSize() - 1) / pageResult.getPageSize());
         pageResult.setList(pageInfo.getList());
         return pageResult;
     }

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -20,7 +20,8 @@ import com.sckw.core.model.enums.ClientTypeEnum;
 import com.sckw.core.model.enums.CooperateTypeEnum;
 import com.sckw.core.model.enums.OrderRuleEnum;
 import com.sckw.core.model.enums.RedisOrderGenerateEnum;
-import com.sckw.core.model.page.PageRes;
+import com.sckw.core.model.page.PageHelperUtil;
+import com.sckw.core.model.page.PageResult;
 import com.sckw.core.model.vo.TableBottom;
 import com.sckw.core.model.vo.TableStatisticRes;
 import com.sckw.core.model.vo.TableTop;
@@ -1581,32 +1582,32 @@ public class KwoTradeOrderService {
 
     /**
      * @param params
-     * @return com.sckw.core.model.page.PageRes
+     * @return com.sckw.core.model.page.PageResult
      * @desc 贸易订单列表分页查询
      * @author yzc
      * @date 2024/3/15 8:51
      */
-    public PageRes tradeOrderSelect(TradeOrderListSelectParam params) {
+    public PageResult tradeOrderSelect(TradeOrderListSelectParam params) {
         TradeOrderListSelectDTO dto = buildSelectParam(params);
         PageHelper.startPage(params.getPage(), params.getPageSize());
         List<OrderListResDTO> list = kwoTradeOrderMapper.tradeOrderSelect(dto, dto.getGoodIds(), LoginUserHolder.getAuthUserIdList());
-        return buildResult(list);
+        return buildResult(list, params.getPageSize());
 
     }
 
     /**
      * @param list
+     * @param pageSize
      * @return com.sckw.core.model.page.PageRes
      * @desc 构建列表结果响应
      * @author yzc
      * @date 2024/3/15 14:23
      */
-    private PageRes buildResult(List<OrderListResDTO> list) {
-        List<OrderListResVO> result = new ArrayList<>();
+    private PageResult buildResult(List<OrderListResDTO> list, int pageSize) {
         if (CollUtil.isEmpty(list)) {
-            return new PageRes<>(new PageInfo<>());
+            return PageHelperUtil.getPageResult(new PageInfo<>());
         }
-        PageInfo<OrderListResDTO> pageInfo = new PageInfo<>(list);
+        List<OrderListResVO> result = new ArrayList<>();
         List<Long> goodIdList = new ArrayList<>();
         List<Long> contracIdList = new ArrayList<>();
         List<Long> createByIds = new ArrayList<>();
@@ -1697,7 +1698,8 @@ public class KwoTradeOrderService {
                     .setCreateByName(Objects.isNull(userCache) ? null : userCache.getName());
             result.add(vo);
         });
-        return PageRes.build(pageInfo, result);
+        PageResult pageResult = PageHelperUtil.getPageResult(new PageInfo<>(result), list, pageSize);
+        return PageHelperUtil.getPageResult(new PageInfo<>(result), list, pageSize);
     }
 
     /**
@@ -1957,9 +1959,9 @@ public class KwoTradeOrderService {
      * @author: yzc
      * @date: 2023-07-20 15:03
      * @Param params:
-     * @return: com.sckw.core.model.page.PageRes
+     * @return: com.sckw.core.model.page.PageResult
      */
-    public PageRes tradeOrderStatementList(TradeOrderStatementList params) {
+    public PageResult tradeOrderStatementList(TradeOrderStatementList params) {
         TradeOrderStatementListParamDTO dto = BeanUtil.copyProperties(params, TradeOrderStatementListParamDTO.class);
         List<Long> excludeIds = new ArrayList<>();
         if (StringUtils.isNotBlank(params.getExcludeIds())) {
@@ -1969,7 +1971,7 @@ public class KwoTradeOrderService {
         List<Long> goodsIds = goodsInfoService.getGoodsByGoodsNameAndTaxRate(params.getGoodsName(), params.getGoodsTaxRate());
         PageHelper.startPage(params.getPage(), params.getPageSize());
         List<OrderListResDTO> list = kwoTradeOrderMapper.tradeOrderStatementList(dto, goodsIds, excludeIds);
-        return buildResult(list);
+        return buildResult(list, params.getPageSize());
     }
 
     /**
@@ -1977,14 +1979,14 @@ public class KwoTradeOrderService {
      * @author: yzc
      * @date: 2023-07-27 17:05
      * @Param params:
-     * @return: com.sckw.core.model.page.PageRes
+     * @return: com.sckw.core.model.page.PageResult
      */
-    public PageRes tradeOrderContractList(TradeOrderContractParam params) {
+    public PageResult tradeOrderContractList(TradeOrderContractParam params) {
         TradeOrderContractParamDTO dto = BeanUtil.copyProperties(params, TradeOrderContractParamDTO.class);
         dto.setEntId(LoginUserHolder.getEntId());
         List<Long> contractIds = StringUtils.splitStrToList(params.getContractIds(), ",", Long.class);
         PageHelper.startPage(params.getPage(), params.getPageSize());
         List<OrderListResDTO> list = kwoTradeOrderMapper.tradeOrderContractList(dto, contractIds);
-        return buildResult(list);
+        return buildResult(list, params.getPageSize());
     }
 }

sckw-modules/sckw-order/src/main/resources/mapper/KwoTradeOrderMapper.xml

@@ -52,8 +52,8 @@
         e.ent_id                                            AS supplyEntId,
         e.firm_name                                         AS supplyFirmName,
         a.trading                                           AS trading,
-        a.deliveryType                                      AS deliveryType,
-        a.pickupType                                        AS pickupType,
+        a.delivery_type                                      AS deliveryType,
+        a.pickup_type                                        AS pickupType,
         a.source                                            AS source,
         f.contract_id                                       AS contractId,
         f.contract_no                                       AS contractNo,
@@ -77,12 +77,12 @@
         a.create_time                                       AS createTime,
         b.id                                                AS loadAddressId,
         b.name                                              AS loadName,
-        b.cityName                                          AS loadCityName,
-        b.detailAddress                                     AS loadDetailAddress,
+        b.city_name                                          AS loadCityName,
+        b.detail_address                                     AS loadDetailAddress,
         c.id                                                AS unloadAddressId,
         c.name                                              AS unloadName,
-        c.cityName                                          AS unloadCityName,
-        c.detailAddress                                     AS unloadDetailAddress
+        c.city_name                                          AS unloadCityName,
+        c.detail_address                                     AS unloadDetailAddress
     </sql>
 
     <select id="tradeOrderSelect"
@@ -188,11 +188,11 @@
                 </if>
                 )
             </if>
-            <if test="query.createStartTime != null ">
-                and a.create_time &gt;= #{query.createStartTime}
+            <if test="query.startCreateTime != null ">
+                and a.create_time &gt;= #{query.startCreateTime}
             </if>
-            <if test="query.createEndTime != null ">
-                and a.create_time &lt;= #{query.createEndTime}
+            <if test="query.endCreateTime != null ">
+                and a.create_time &lt;= #{query.endCreateTime}
             </if>
             <if test="query.loadAddressCode != null and query.loadAddressCode != ''">
                 and b.city_code LIKE CONCAT(#{query.loadAddressCode}
@@ -235,7 +235,7 @@
         LEFT JOIN kwo_trade_order_contract f ON a.id = f.t_order_id AND f.del_flag = 0
         <where>
             a.del_flag = 0
-            --数据权限匹配
+--             数据权限匹配
             <if test="query.isMain == 0">
                 and ((
                 <if test="query.entId != null">
@@ -290,22 +290,22 @@
                 </if>)
                 )
             </if>
-            --状态匹配
+--             状态匹配
             <if test="query.status != null">
                 and a.status =#{query.status}
                 <if test="query.status == 0">
-                    --草稿状态只能创建订单的人能看
+--                     草稿状态只能创建订单的人能看
                     and a.create_by = #{query.userId}
                 </if>
             </if>
             <if test="query.status == null">
-                -- 非草稿状态or草稿状态且是当前人
+--                 非草稿状态or草稿状态且是当前人
                 and (
                 a.status != 0
                 or (a.status = 0 and a.create_by = #{query.userId})
                 )
             </if>
-            --关键词匹配
+--             关键词匹配
             <if test="query.keywords != null and query.keywords != ''">
                 and (
                 a.t_order_no like concat('%', #{query.keywords}, '%')
@@ -320,11 +320,11 @@
                 </if>
                 )
             </if>
-            <if test="query.createStartTime != null ">
-                and a.create_time &gt;= #{query.createStartTime}
+            <if test="query.startCreateTime != null ">
+                and a.create_time &gt;= #{query.startCreateTime}
             </if>
-            <if test="query.createEndTime != null ">
-                and a.create_time &lt;= #{query.createEndTime}
+            <if test="query.endCreateTime != null ">
+                and a.create_time &lt;= #{query.endCreateTime}
             </if>
             <if test="query.loadAddressCode != null and query.loadAddressCode != ''">
                 and b.city_code LIKE CONCAT(#{query.loadAddressCode}
@@ -473,7 +473,7 @@
         LEFT JOIN kwo_trade_order_goods g ON a.id = g.t_order_id AND g.del_flag = 0
         <where>
             a.del_flag = 0
-            --数据权限匹配
+--             数据权限匹配
             <if test="query.isMain == 0">
                 and ((
                 <if test="query.entId != null">
@@ -528,22 +528,22 @@
                 </if>)
                 )
             </if>
-            --状态匹配
+--             状态匹配
             <if test="query.status != null">
                 and a.status =#{query.status}
                 <if test="query.status == 0">
-                    --草稿状态只能创建订单的人能看
+--                     草稿状态只能创建订单的人能看
                     and a.create_by = #{query.userId}
                 </if>
             </if>
             <if test="query.status == null">
-                --非草稿状态or草稿状态且是当前人
+--                 非草稿状态or草稿状态且是当前人
                 and (
                 a.status != 0
                 or (a.status = 0 and a.create_by = #{query.userId})
                 )
             </if>
-            --          关键词匹配
+--                      关键词匹配
             <if test="query.keywords != null and query.keywords != ''">
                 and (
                 a.t_order_no like concat('%', #{query.keywords}, '%')
@@ -557,11 +557,11 @@
                 </if>
                 )
             </if>
-            <if test="query.createStartTime != null ">
-                and a.create_time &gt;= #{query.createStartTime}
+            <if test="query.startCreateTime != null ">
+                and a.create_time &gt;= #{query.startCreateTime}
             </if>
-            <if test="query.createEndTime != null ">
-                and a.create_time &lt;= #{query.createEndTime}
+            <if test="query.endCreateTime != null ">
+                and a.create_time &lt;= #{query.endCreateTime}
             </if>
             <if test="query.loadAddressCode != null and query.loadAddressCode != ''">
                 and b.city_code LIKE CONCAT(#{query.loadAddressCode}
@@ -596,7 +596,7 @@
         AND e.unit_type = "2" AND e.del_flag = 0
         <where>
             a.del_flag = 0
-            --数据权限匹配
+--             数据权限匹配
             <if test="query.isMain == 0">
                 and ((
                 <if test="query.entId != null">
@@ -661,7 +661,7 @@
                     and e.top_ent_id = #{query.entId}
                 </if>
             </if>
-            --状态匹配
+--             状态匹配
             <if test="statuses != null and statuses.size() > 0">
                 and a.status in
                 <foreach collection="statuses" item="item" open="(" close=")" separator=",">