11/28 内部码分页优化

src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java

@@ -350,4 +350,17 @@ public class InvInnerOrderPrintController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+
+    @AuthRuleAnnotation("")
+    @GetMapping("/udiwms/invInnerOrderPdfTemp/filter")
+    public BaseResponse filterTemp(FilterStPrintTempRequest filterStPrintTempRequest){
+        List<InvInnerOrderPdfTempEntity> invInnerOrderPdfTempEntities = innerOrderPdfTempService.filterList(filterStPrintTempRequest);
+        PageInfo<InvInnerOrderPdfTempEntity> pageInfo;
+        pageInfo = new PageInfo<>(invInnerOrderPdfTempEntities);
+        PageSimpleResponse<InvInnerOrderPdfTempEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(invInnerOrderPdfTempEntities);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
 }

src/main/java/com/glxp/api/dao/inv/InvInnerOrderPdfTempDao.java

@@ -2,6 +2,10 @@ package com.glxp.api.dao.inv;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.api.entity.inv.InvInnerOrderPdfTempEntity;
+import com.glxp.api.req.inv.FilterStPrintTempRequest;
+
+import java.util.List;
 
 public interface InvInnerOrderPdfTempDao extends BaseMapper<InvInnerOrderPdfTempEntity> {
+    List<InvInnerOrderPdfTempEntity> filterList(FilterStPrintTempRequest filterStPrintTempRequest);
 }

src/main/java/com/glxp/api/req/inv/FilterStPrintTempRequest.java

@@ -0,0 +1,18 @@
+package com.glxp.api.req.inv;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+/**
+ * @author : zhuzhu
+ * @date : 2024/11/28 9:31
+ * @modyified By :
+ */
+
+@Data
+public class FilterStPrintTempRequest extends ListPageRequest {
+    private String printCodeIdFk;
+    private String stockOrderFk;
+    private Integer id;
+    private String genKey;
+}

src/main/java/com/glxp/api/service/inv/InvInnerOrderPdfTempService.java

@@ -2,6 +2,7 @@ package com.glxp.api.service.inv;
 
 import com.glxp.api.entity.inv.InvInnerOrderPdfTempEntity;
 import com.glxp.api.req.inv.DeleteStPrintTempRequest;
+import com.glxp.api.req.inv.FilterStPrintTempRequest;
 
 import java.util.List;
 
@@ -16,4 +17,5 @@ public interface InvInnerOrderPdfTempService {
     boolean delete(DeleteStPrintTempRequest deleteStPrintTempRequest);
 
 
+    List<InvInnerOrderPdfTempEntity> filterList(FilterStPrintTempRequest filterStPrintTempRequest);
 }

src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPdfTempServiceImpl.java

@@ -3,15 +3,19 @@ package com.glxp.api.service.inv.impl;
 
 import cn.hutool.core.thread.ThreadUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.inv.InvInnerOrderPdfTempDao;
+import com.glxp.api.entity.inv.InnerOrderEntity;
 import com.glxp.api.entity.inv.InvInnerOrderPdfTempEntity;
 import com.glxp.api.req.inv.DeleteStPrintTempRequest;
+import com.glxp.api.req.inv.FilterStPrintTempRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.service.inv.InvInnerOrderPdfTempService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.Collections;
 import java.util.List;
 
 @Service
@@ -68,4 +72,16 @@ public class InvInnerOrderPdfTempServiceImpl implements InvInnerOrderPdfTempServ
         innerOrderPdfTempDao.delete(ew);
         return true;
     }
+
+    @Override
+    public List<InvInnerOrderPdfTempEntity> filterList(FilterStPrintTempRequest filterStPrintTempRequest) {
+        if (filterStPrintTempRequest == null) {
+            return Collections.emptyList();
+        }
+        if (filterStPrintTempRequest.getPage() != null) {
+            int offset = (filterStPrintTempRequest.getPage() - 1) * filterStPrintTempRequest.getLimit();
+            PageHelper.offsetPage(offset, filterStPrintTempRequest.getLimit());
+        }
+        return  innerOrderPdfTempDao.filterList(filterStPrintTempRequest);
+    }
 }

src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java

@@ -1,5 +1,6 @@
 package com.glxp.api.service.inv.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson2.schema.ValidateResult;
 import com.glxp.api.service.basic.UdiProductService;
 import com.glxp.api.util.udi.UdiCalCountUtil;
@@ -241,6 +242,18 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService
             innerOrderPrintEntity.setId(InnerOrderPrintResponse.getId());
             invInnerOrderPrintService.updateOrder(innerOrderPrintEntity);
         }
+
+        FilterStPrintTempRequest filterStPrintTempRequest = new FilterStPrintTempRequest();
+        filterStPrintTempRequest.setPage(1);
+        filterStPrintTempRequest.setLimit(10);
+        if (StrUtil.isNotEmpty(innerOrderQRCodeTextPDFTemplateRequest.getOrderId())){
+            filterStPrintTempRequest.setStockOrderFk(innerOrderQRCodeTextPDFTemplateRequest.getOrderId());
+            stockPrintTempEntities = innerOrderPdfTempService.filterList(filterStPrintTempRequest);
+        }
+        if (StrUtil.isNotEmpty(innerOrderQRCodeTextPDFTemplateRequest.getQueryId())){
+            filterStPrintTempRequest.setPrintCodeIdFk(innerOrderQRCodeTextPDFTemplateRequest.getQueryId());
+            stockPrintTempEntities = innerOrderPdfTempService.filterList(filterStPrintTempRequest);
+        }
         PageInfo<InvInnerOrderPdfTempEntity> pageInfo;
         pageInfo = new PageInfo<>(stockPrintTempEntities);
         PageSimpleResponse<InvInnerOrderPdfTempEntity> pageSimpleResponse = new PageSimpleResponse<>();

src/main/resources/mybatis/mapper/inv/InvInnerOrderPdfTempDao.xml

@@ -16,4 +16,16 @@
     <!--@mbg.generated-->
     id, genkey, fileName, filePath, `status`, printCodeIdFk, stockOrderFk
   </sql>
+    <select id="filterList" resultType="com.glxp.api.entity.inv.InvInnerOrderPdfTempEntity">
+      select * from
+        inv_inner_order_pdf_temp
+      <where>
+        <if test="printCodeIdFk != '' and printCodeIdFk != null">
+          AND printCodeIdFk = #{printCodeIdFk}
+        </if>
+        <if test="stockOrderFk != '' and stockOrderFk != null">
+          AND stockOrderFk = #{stockOrderFk}
+        </if>
+      </where>
+    </select>
 </mapper>