ym-admin/src/main/java/com/cnbm/admin/controller/SysLogLoginController.java

@@ -61,7 +61,7 @@ public class SysLogLoginController {
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<SysLogLoginDTO> list = sysLogLoginService.list(params);
 
-        ExcelUtils.exportExcelToTarget(response, "登入登出日志导出", list, SysLogLoginExcel.class);
+        ExcelUtils.exportExcelToTarget(response, null, list, SysLogLoginExcel.class);
     }
 
 }

ym-admin/src/main/java/com/cnbm/admin/controller/SysLogOperationController.java

@@ -46,6 +46,7 @@ public class SysLogOperationController {
     })
     public Result<PageData<SysLogOperationDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<SysLogOperationDTO> page = sysLogOperationService.page(params);
+
         return new Result<PageData<SysLogOperationDTO>>().ok(page);
     }
 
@@ -55,7 +56,7 @@ public class SysLogOperationController {
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<SysLogOperationDTO> list = sysLogOperationService.list(params);
 
-        ExcelUtils.exportExcelToTarget(response, "操作日志导出", list, SysLogOperationExcel.class);
+        ExcelUtils.exportExcelToTarget(response, null, list, SysLogOperationExcel.class);
     }
 
 }

ym-admin/src/main/java/com/cnbm/admin/execl/SysLogLoginExcel.java

@@ -7,8 +7,8 @@ import java.util.Date;
 
 @Data
 public class SysLogLoginExcel {
-    @Excel(name = "用户操作", replace = {"登入_0", "登出_1"})
-    private Integer operation;
+    @Excel(name = "用户操作")
+    private String operation;
     @Excel(name = "状态", replace = {"失败_0", "成功_1", "账号已锁定_1"})
     private Integer status;
     @Excel(name = "User-Agent")

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

@@ -21,7 +21,6 @@ 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;
@@ -335,11 +334,18 @@ public class WoPackagingBoxSubstrateController {
         return new Result();
     }
 
-    @PostMapping("substrateList")
+    @GetMapping("substrateList")
     @ApiOperation("装箱单信息查询")
-    public Result<PageData<WoPackagingBoxSubstrateDTO>> substrateList(@RequestBody PackingInfoQueryParam param){
-        PageData<WoPackagingBoxSubstrateDTO> page = woPackagingBoxSubstrateService.substratePage(param);
-        return new Result<PageData<WoPackagingBoxSubstrateDTO>>().ok(page);
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataTypeClass = LocalDateTime.class),
+            @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataTypeClass = LocalDateTime.class),
+            @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,7 +3,6 @@ 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;
@@ -34,8 +33,7 @@ public interface WoPackagingBoxSubstrateMapper extends BaseDao<WoPackagingBoxSub
     List<String> orderNameList();
 
     List<WoPackagingBoxSubstrateDTO> substrateList(Map<String, Object> params);
-    //List<WoPackagingBoxSubstrateDTO> substrateList(@Param("woSubstrateId") String woSubstrateId);
-    IPage<WoPackagingBoxSubstrateDTO> substratePage(Page<?> page, @Param("param")PackingInfoQueryParam param);
+    List<WoPackagingBoxSubstrateDTO> substrateList(@Param("woSubstrateId") String woSubstrateId);
 
     IPage<SubIdPageVo> subIdPage(Page<?> page, @Param("param") SubIdQueryParam param);
 }

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

@@ -1,21 +0,0 @@
-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,7 +5,6 @@ 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;
@@ -42,8 +41,6 @@ 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,7 +3,6 @@ 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;
@@ -16,7 +15,6 @@ 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;
@@ -213,14 +211,6 @@ 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,27 +143,6 @@
         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