Merge pull request '装箱单信息查询分页' (#29) from yanyang into master

Reviewed-on: #29

ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxSubstrateController.java

@@ -21,6 +21,7 @@ import com.cnbm.packing.excel.WoPackagingBoxSubstrateExcel;
 import com.cnbm.packing.excel.WoPackagingBoxSubstrateManualExcel;
 import com.cnbm.packing.mapper.WoPackagingBoxMapper;
 import com.cnbm.packing.mapper.WoPackagingBoxSubstrateMapper;
+import com.cnbm.packing.param.PackingInfoQueryParam;
 import com.cnbm.packing.param.PowerReportQueryParam;
 import com.cnbm.packing.service.WoPackagingBoxServiceBiz;
 import com.cnbm.packing.service.WoPackagingBoxSubstrateServiceBiz;
@@ -334,18 +335,11 @@ public class WoPackagingBoxSubstrateController {
         return new Result();
     }
 
-    @GetMapping("substrateList")
+    @PostMapping("substrateList")
     @ApiOperation("装箱单信息查询")
-    @ApiImplicitParams({
+    public Result<PageData<WoPackagingBoxSubstrateDTO>> substrateList(@RequestBody PackingInfoQueryParam param){
-            @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataTypeClass = LocalDateTime.class),
+        PageData<WoPackagingBoxSubstrateDTO> page = woPackagingBoxSubstrateService.substratePage(param);
-            @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataTypeClass = LocalDateTime.class),
+        return new Result<PageData<WoPackagingBoxSubstrateDTO>>().ok(page);
-            @ApiImplicitParam(name = "model", value = "模式，1-手动模式；2-自动模式", paramType = "query", dataTypeClass = Integer.class),
-            @ApiImplicitParam(name = "packagingBoxId", value = "包装箱ID，BoxId", paramType = "query", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "woSubstrateId", value = "基板ID（关联T_SUBSTRATE表）", paramType = "query", dataTypeClass = String.class)
-
-    })
-    public List<WoPackagingBoxSubstrateDTO> substrateList(@ApiIgnore @RequestParam Map<String, Object> params){
-        return woPackagingBoxSubstrateService.substrateList(params);
     }
 
     @GetMapping("exportPackingInfo")

ym-packing/src/main/java/com/cnbm/packing/mapper/WoPackagingBoxSubstrateMapper.java

@@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cnbm.packing.dto.PowerReportDTO;
 import com.cnbm.packing.dto.WoPackagingBoxSubstrateDTO;
+import com.cnbm.packing.param.PackingInfoQueryParam;
 import com.cnbm.packing.param.PowerReportQueryParam;
 import com.cnbm.packing.param.SubIdQueryParam;
 import com.cnbm.packing.vo.SubIdPageVo;
@@ -33,7 +34,8 @@ public interface WoPackagingBoxSubstrateMapper extends BaseDao<WoPackagingBoxSub
     List<String> orderNameList();
 
     List<WoPackagingBoxSubstrateDTO> substrateList(Map<String, Object> params);
-    List<WoPackagingBoxSubstrateDTO> substrateList(@Param("woSubstrateId") String woSubstrateId);
+    //List<WoPackagingBoxSubstrateDTO> substrateList(@Param("woSubstrateId") String woSubstrateId);
+    IPage<WoPackagingBoxSubstrateDTO> substratePage(Page<?> page, @Param("param")PackingInfoQueryParam param);
 
     IPage<SubIdPageVo> subIdPage(Page<?> page, @Param("param") SubIdQueryParam param);
 }

ym-packing/src/main/java/com/cnbm/packing/param/PackingInfoQueryParam.java

@@ -0,0 +1,21 @@
+package com.cnbm.packing.param;
+
+import com.cnbm.packing.vo.BasePageParam;
+import io.swagger.annotations.ApiImplicitParam;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @Desc: ""
+ * @Author: yanyang
+ * @DATE: 2023/3/27 16:00
+ */
+@Data
+public class PackingInfoQueryParam extends BasePageParam {
+    private LocalDateTime startTime;
+    private LocalDateTime endTime;
+    private Integer model;
+    private String packagingBoxId;
+    private String woSubstrateId;
+}

ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxSubstrateServiceBiz.java

@@ -5,6 +5,7 @@ import com.cnbm.common.service.CrudService;
 import com.cnbm.packing.dto.ChangePackingBoxDTO;
 import com.cnbm.packing.dto.WoPackagingBoxSubstrateDTO;
 import com.cnbm.packing.entity.WoPackagingBoxSubstrate;
+import com.cnbm.packing.param.PackingInfoQueryParam;
 
 import java.util.List;
 import java.util.Map;
@@ -41,6 +42,8 @@ public interface WoPackagingBoxSubstrateServiceBiz extends CrudService<WoPackagi
 
     List<WoPackagingBoxSubstrateDTO> substrateList (Map<String, Object> params);
 
+    PageData<WoPackagingBoxSubstrateDTO> substratePage (PackingInfoQueryParam param);
+
 
     int updatePackagingBoxIdAndSlotByWoSubstrateId(String packagingBoxId,Integer slot,String woSubstrateId);
 }

ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxSubstrateServiceBizImpl.java

@@ -3,6 +3,7 @@ package com.cnbm.packing.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
@@ -15,6 +16,7 @@ import com.cnbm.packing.dto.WoPackagingBoxSubstrateDTO;
 import com.cnbm.packing.entity.ChangePackagingBoxHistory;
 import com.cnbm.packing.entity.WoPackagingBoxSubstrate;
 import com.cnbm.packing.mapper.WoPackagingBoxSubstrateMapper;
+import com.cnbm.packing.param.PackingInfoQueryParam;
 import com.cnbm.packing.service.ChangePackagingBoxHistoryServiceBiz;
 import com.cnbm.packing.service.WoPackagingBoxSubstrateServiceBiz;
 import org.apache.commons.lang3.StringUtils;
@@ -211,6 +213,14 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPac
         return mapper.substrateList(params);
     }
 
+    @Override
+    public PageData<WoPackagingBoxSubstrateDTO> substratePage(PackingInfoQueryParam param) {
+        IPage<WoPackagingBoxSubstrateDTO> page = mapper.substratePage(
+                new Page<>(param.getCurrent(), param.getSize()),
+                param);
+        return getPageData(page, WoPackagingBoxSubstrateDTO.class);
+    }
+
     @Override
     public WoPackagingBoxSubstrate getBySubId(String subId) {
         return mapper.getOneByWoSubstrateId(subId);

ym-packing/src/main/resources/mapper/WoPackagingBoxSubstrateMapper.xml

@@ -143,6 +143,27 @@
         order by twpb.CREATE_TIME desc
     </select>
 
+    <select id="substratePage" resultType="com.cnbm.packing.dto.WoPackagingBoxSubstrateDTO">
+        select
+        twpb.CREATE_TIME as boxCreateTime,twpbs.*,twpb.PRINT_TIME as printTime
+        from t_wo_packaging_box_substrate twpbs
+        left join t_wo_packaging_box twpb on twpbs.PACKAGING_BOX_ID = twpb.BOX_NO
+        <where>
+            twpb.model = #{param.model}
+            <if test="param.woSubstrateId != null and param.woSubstrateId != ''">
+                and twpbs.WO_SUBSTRATE_ID like CONCAT(CONCAT('%',#{param.woSubstrateId}),'%')
+            </if>
+            <if test="param.packagingBoxId != null and param.packagingBoxId != ''">
+                and twpbs.PACKAGING_BOX_ID like CONCAT(CONCAT('%',#{param.packagingBoxId}),'%')
+            </if>
+            <if test="param.startTime != null and param.endTime != null">
+                and twpb.CREATE_TIME between #{param.startTime} AND #{param.endTime}
+            </if>
+            AND twpbs.valid = 1
+        </where>
+        order by twpb.CREATE_TIME desc
+    </select>
+
     <select id="subIdPage" resultMap="ResultMap">
         SELECT
             twpb.BOX_NO ,twpbs.WO_SUBSTRATE_ID as SUB_ID ,twpb.CREATE_TIME