外协结算查询去掉分页

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemStatementMapper.java

@@ -29,6 +29,15 @@ public interface OemStatementMapper extends BaseMapper<OemStatementEntity> {
     List<StatementVO> selectOemStatementPage(IPage page, StatementQuery query);
 
 
+    /**
+     * 自定义列表查询
+     *
+     * @param query
+     * @return
+     */
+    List<StatementVO> selectOemStatement(@Param("query") StatementQuery query);
+
+
     /**
      * 获取导出数据
      *

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemStatementMapper.xml

@@ -227,49 +227,49 @@
         AND os.ROS_STATUS = 4
     </select>
 
-    <select id="selectOemStatementPage" resultMap="statementVOResultMap">
+    <sql id="selectOemStatementSql">
         SELECT ID,
-            YP_CODE,
+        YP_CODE,
-            WO_CODE,
+        WO_CODE,
-            PART_ID,
+        PART_ID,
-            PART_CODE,
+        PART_CODE,
-            PART_NAME,
+        PART_NAME,
-            BATCH_NO,
+        BATCH_NO,
-            PRODUCT_IDENT,
+        PRODUCT_IDENT,
-            PPS_ID,
+        PPS_ID,
-            PS_CODE,
+        PS_CODE,
-            PS_NAME,
+        PS_NAME,
-            CA_ID,
+        CA_ID,
-            CA_NAME,
+        CA_NAME,
-            OC_ID,
+        OC_ID,
-            OC_CODE,
+        OC_CODE,
-            OC_NAME,
+        OC_NAME,
-            MAKE_QTY,
+        MAKE_QTY,
-            YP_AREA,
+        YP_AREA,
-            MAKE_QTY * YP_AREA as TOTAL_AREA,
+        MAKE_QTY * YP_AREA as TOTAL_AREA,
-            PLATE,
+        PLATE,
-            ROS_THICKNESS,
+        ROS_THICKNESS,
-            STANDARD_PROCESS_CODE,
+        STANDARD_PROCESS_CODE,
-            TSB_NUM,
+        TSB_NUM,
-            TSD_NUM,
+        TSD_NUM,
-            TJT_NUM,
+        TJT_NUM,
-            PLAN_DEPTCODE,
+        PLAN_DEPTCODE,
-            USE_DEPT_CODE,
+        USE_DEPT_CODE,
-            PUT_STORE_TIME,
+        PUT_STORE_TIME,
-            to_char(PUT_STORE_TIME, 'yyyy-MM-dd') as PUT_STORE_DATE,
+        to_char(PUT_STORE_TIME, 'yyyy-MM-dd') as PUT_STORE_DATE,
-            QUOTATION,
+        QUOTATION,
-            UNIT,
+        UNIT,
-            UNIT_PRICE,
+        UNIT_PRICE,
-            TOTAL_PRICE,
+        TOTAL_PRICE,
-            CASE WHEN ROS_STATUS = 3 THEN MEMO ELSE NULL END as MEMO,
+        CASE WHEN ROS_STATUS = 3 THEN MEMO ELSE NULL END as MEMO,
-            to_char(SETTLE_TIME, 'yyyy-MM-dd') as SETTLE_DATE,
+        to_char(SETTLE_TIME, 'yyyy-MM-dd') as SETTLE_DATE,
-            ROS_STATUS,
+        ROS_STATUS,
-            to_char(APPROVAL_TIME, 'yyyy-MM-dd') as APPROVAL_DATE,
+        to_char(APPROVAL_TIME, 'yyyy-MM-dd') as APPROVAL_DATE,
-            to_char(PUSH_TIME, 'yyyy-MM-dd') as PUSH_DATE,
+        to_char(PUSH_TIME, 'yyyy-MM-dd') as PUSH_DATE,
-            STATEMENT_NO,
+        STATEMENT_NO,
-            STATEMENT_CATEGORY_ID,
+        STATEMENT_CATEGORY_ID,
-            STATEMENT_CATEGORY,
+        STATEMENT_CATEGORY,
-            CARD_NO
+        CARD_NO
         FROM MES_OEM_STATEMENT
         <where>
             IS_DELETED = 0
@@ -356,9 +356,15 @@
                 order by PUT_STORE_TIME asc
             </otherwise>
         </choose>
+    </sql>
 
+    <select id="selectOemStatementPage" resultMap="statementVOResultMap">
+        <include refid="selectOemStatementSql"/>
     </select>
 
+    <select id="selectOemStatement" resultMap="statementVOResultMap">
+        <include refid="selectOemStatementSql"/>
+    </select>
 
     <select id="exportOemStatement" resultMap="statementExcelResultMap">
         SELECT ID,

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java

@@ -276,9 +276,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
         query.setWoCode(woCode);
         query.setRosStatusList("1");
         query.setManual("0");
-        IPage<StatementVO> page = new Page<>();
+        List<StatementVO> statementVOS = baseMapper.selectOemStatement(query);
-        page.setSize(999);
-        List<StatementVO> statementVOS = baseMapper.selectOemStatementPage(page, query);
         if (statementVOS == null || statementVOS.isEmpty()) {
             return R.fail(String.format("[%]无未结算的结算单", woCode));
         }
@@ -2045,9 +2043,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
 
     @Override
     public R manualSettlement(StatementQuery mesOemStatement) {
-        IPage<StatementVO> page = new Page<>();
+        List<StatementVO> statementVOS = baseMapper.selectOemStatement(mesOemStatement);
-        page.setSize(999);
-        List<StatementVO> statementVOS = baseMapper.selectOemStatementPage(page, mesOemStatement);
         statementVOS = statementVOS.stream().filter(vo -> {
             String memo = vo.getMemo();
             return !"无需结算".equals(memo) && !"重复镀后入库".equals(memo);
@@ -2075,9 +2071,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
 
     @Override
     public List<StatementVO> manualPreSettlement(StatementQuery mesOemStatement) {
-        IPage<StatementVO> page = new Page<>();
+        List<StatementVO> statementVOS = baseMapper.selectOemStatement(mesOemStatement);
-        page.setSize(999);
-        List<StatementVO> statementVOS = baseMapper.selectOemStatementPage(page, mesOemStatement);
         statementVOS = statementVOS.stream().filter(vo -> {
             String memo = vo.getMemo();
             return !"无需结算".equals(memo) && !"重复镀后入库".equals(memo);