修复bug

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/exceptionmisplace/ExceptionMisplaceController.java

@@ -1,95 +1,92 @@
-package cn.iocoder.yudao.module.iscs.controller.admin.exceptionmisplace;
-
-import org.springframework.web.bind.annotation.*;
-import jakarta.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import jakarta.validation.constraints.*;
-import jakarta.validation.*;
-import jakarta.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-
-import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
-import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
-
-import cn.iocoder.yudao.module.iscs.controller.admin.exceptionmisplace.vo.*;
-import cn.iocoder.yudao.module.iscs.dal.dataobject.exceptionmisplace.ExceptionMisplaceDO;
-import cn.iocoder.yudao.module.iscs.service.exceptionmisplace.ExceptionMisplaceService;
-
-@Tag(name = "管理后台 - 物资归还异常")
-@RestController
-@RequestMapping("/iscs/exception-misplace")
-@Validated
-public class ExceptionMisplaceController {
-
-    @Resource
-    private ExceptionMisplaceService exceptionMisplaceService;
-
-    @PostMapping("/insertExceptionMisplace")
-    @Operation(summary = "创建物资归还异常")
-    @PreAuthorize("@ss.hasPermission('iscs:exception-misplace:create')")
-    public CommonResult<Long> insertExceptionMisplace(@Valid @RequestBody ExceptionMisplaceSaveReqVO createReqVO) {
-        return success(exceptionMisplaceService.createExceptionMisplace(createReqVO));
-    }
-
-    @PutMapping("/updateExceptionMisplace")
-    @Operation(summary = "更新物资归还异常")
-    @PreAuthorize("@ss.hasPermission('iscs:exception-misplace:update')")
-    public CommonResult<Boolean> updateExceptionMisplace(@Valid @RequestBody ExceptionMisplaceSaveReqVO updateReqVO) {
-        exceptionMisplaceService.updateExceptionMisplace(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/deleteExceptionMisplaceList")
-    @Parameter(name = "ids", description = "编号", required = true)
-    @Operation(summary = "批量删除物资归还异常")
-                @PreAuthorize("@ss.hasPermission('iscs:exception-misplace:delete')")
-    public CommonResult<Boolean> deleteExceptionMisplaceList(@RequestParam("ids") List<Long> ids) {
-        exceptionMisplaceService.deleteExceptionMisplaceListByIds(ids);
-        return success(true);
-    }
-
-    @GetMapping("/selectExceptionMisplaceById")
-    @Operation(summary = "获得物资归还异常")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('iscs:exception-misplace:query')")
-    public CommonResult<ExceptionMisplaceRespVO> selectExceptionMisplaceById(@RequestParam("id") Long id) {
-        ExceptionMisplaceDO exceptionMisplace = exceptionMisplaceService.getExceptionMisplace(id);
-        return success(BeanUtils.toBean(exceptionMisplace, ExceptionMisplaceRespVO.class));
-    }
-
-    @GetMapping("/getExceptionMisplacePage")
-    @Operation(summary = "获得物资归还异常分页")
-    @PreAuthorize("@ss.hasPermission('iscs:exception-misplace:query')")
-    public CommonResult<PageResult<ExceptionMisplaceRespVO>> getExceptionMisplacePage(@Valid ExceptionMisplacePageReqVO pageReqVO) {
-        PageResult<ExceptionMisplaceDO> pageResult = exceptionMisplaceService.getExceptionMisplacePage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, ExceptionMisplaceRespVO.class));
-    }
-
-    @GetMapping("/exportExceptionMisplaceExcel")
-    @Operation(summary = "导出物资归还异常 Excel")
-    @PreAuthorize("@ss.hasPermission('iscs:exception-misplace:export')")
-    @ApiAccessLog(operateType = EXPORT)
-    public void exportExceptionMisplaceExcel(@Valid ExceptionMisplacePageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<ExceptionMisplaceDO> list = exceptionMisplaceService.getExceptionMisplacePage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "物资归还异常.xls", "数据", ExceptionMisplaceRespVO.class,
-                        BeanUtils.toBean(list, ExceptionMisplaceRespVO.class));
-    }
-
-}
+package cn.iocoder.yudao.module.iscs.controller.admin.exceptionmisplace;
+
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.iscs.controller.admin.exceptionmisplace.vo.ExceptionMisplacePageReqVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.exceptionmisplace.vo.ExceptionMisplaceRespVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.exceptionmisplace.vo.ExceptionMisplaceSaveReqVO;
+import cn.iocoder.yudao.module.iscs.dal.dataobject.exceptionmisplace.ExceptionMisplaceDO;
+import cn.iocoder.yudao.module.iscs.service.exceptionmisplace.ExceptionMisplaceService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 物资归还异常")
+@RestController
+@RequestMapping("/iscs/exception-misplace")
+@Validated
+public class ExceptionMisplaceController {
+
+    @Resource
+    private ExceptionMisplaceService exceptionMisplaceService;
+
+    @PostMapping("/insertExceptionMisplace")
+    @Operation(summary = "创建物资归还异常")
+    @PreAuthorize("@ss.hasPermission('iscs:exception-misplace:create')")
+    public CommonResult<Long> insertExceptionMisplace(@Valid @RequestBody ExceptionMisplaceSaveReqVO createReqVO) {
+        return success(exceptionMisplaceService.createExceptionMisplace(createReqVO));
+    }
+
+    @PutMapping("/updateExceptionMisplace")
+    @Operation(summary = "更新物资归还异常")
+    @PreAuthorize("@ss.hasPermission('iscs:exception-misplace:update')")
+    public CommonResult<Boolean> updateExceptionMisplace(@Valid @RequestBody ExceptionMisplaceSaveReqVO updateReqVO) {
+        exceptionMisplaceService.updateExceptionMisplace(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/deleteExceptionMisplaceList")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除物资归还异常")
+                @PreAuthorize("@ss.hasPermission('iscs:exception-misplace:delete')")
+    public CommonResult<Boolean> deleteExceptionMisplaceList(@RequestParam("ids") List<Long> ids) {
+        exceptionMisplaceService.deleteExceptionMisplaceListByIds(ids);
+        return success(true);
+    }
+
+    @GetMapping("/selectExceptionMisplaceById")
+    @Operation(summary = "获得物资归还异常")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('iscs:exception-misplace:query')")
+    public CommonResult<ExceptionMisplaceRespVO> selectExceptionMisplaceById(@RequestParam("id") Long id) {
+        ExceptionMisplaceDO exceptionMisplace = exceptionMisplaceService.getExceptionMisplace(id);
+        return success(BeanUtils.toBean(exceptionMisplace, ExceptionMisplaceRespVO.class));
+    }
+
+    @GetMapping("/getExceptionMisplacePage")
+    @Operation(summary = "获得物资归还异常分页")
+    @PreAuthorize("@ss.hasPermission('iscs:exception-misplace:query')")
+    public CommonResult<PageResult<ExceptionMisplaceRespVO>> getExceptionMisplacePage(@Valid ExceptionMisplacePageReqVO pageReqVO) {
+        PageResult<ExceptionMisplaceRespVO> pageResult = exceptionMisplaceService.getExceptionMisplacePage(pageReqVO);
+        return success(pageResult);
+    }
+
+    @GetMapping("/exportExceptionMisplaceExcel")
+    @Operation(summary = "导出物资归还异常 Excel")
+    @PreAuthorize("@ss.hasPermission('iscs:exception-misplace:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportExceptionMisplaceExcel(@Valid ExceptionMisplacePageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<ExceptionMisplaceRespVO> list = exceptionMisplaceService.getExceptionMisplacePage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "物资归还异常.xls", "数据", ExceptionMisplaceRespVO.class, list);
+    }
+
+}

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/exceptionmisplace/vo/ExceptionMisplacePageReqVO.java

@@ -1,10 +1,11 @@
 package cn.iocoder.yudao.module.iscs.controller.admin.exceptionmisplace.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -45,8 +46,20 @@ public class ExceptionMisplacePageReqVO extends PageParam {
     @Schema(description = "异常类型（字典exception_type）", example = "2")
     private String exceptionType;
 
-    @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createTime;
+    @Schema(description = "异常发生开始时间")
+    @TableField(exist = false)
+    private String startTime;
+
+    @Schema(description = "异常发生结束时间")
+    @TableField(exist = false)
+    private String endTime;
+
+    @Schema(description = "异常解决开始时间")
+    @TableField(exist = false)
+    private String handleStartTime;
+
+    @Schema(description = "异常解决结束时间")
+    @TableField(exist = false)
+    private String handleEndTime;
 
-}
+}

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/exceptionmisplace/vo/ExceptionMisplaceRespVO.java

@@ -1,11 +1,11 @@
 package cn.iocoder.yudao.module.iscs.controller.admin.exceptionmisplace.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.Data;
+
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 物资归还异常 Response VO")
 @Data
@@ -20,6 +20,9 @@ public class ExceptionMisplaceRespVO {
     @ExcelProperty("物资ID")
     private Long materialsId;
 
+    @Schema(description = "物资")
+    private String materialsName;
+
     @Schema(description = "出借主键ID", example = "13436")
     @ExcelProperty("出借主键ID")
     private Long materialsLoanId;
@@ -28,14 +31,23 @@ public class ExceptionMisplaceRespVO {
     @ExcelProperty("物资所属柜ID")
     private Long loanFromId;
 
+    @Schema(description = "物资所属柜")
+    private String loanFromName;
+
     @Schema(description = "归还人ID", example = "6104")
     @ExcelProperty("归还人ID")
     private Long restitutionUserId;
 
+    @Schema(description = "归还人")
+    private String restitutionUserName;
+
     @Schema(description = "归还柜ID", example = "10131")
     @ExcelProperty("归还柜ID")
     private Long restitutionToId;
 
+    @Schema(description = "归还柜")
+    private String restitutionToName;
+
     @Schema(description = "异常处理时间")
     @ExcelProperty("异常处理时间")
     private LocalDateTime handleTime;
@@ -60,4 +72,4 @@ public class ExceptionMisplaceRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
-}
+}

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/machinery/MachineryController.java

@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.iscs.controller.admin.machinery;
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.module.iscs.controller.admin.machinery.vo.MachineryPageReqVO;
@@ -10,7 +11,6 @@ import cn.iocoder.yudao.module.iscs.controller.admin.machinery.vo.MachineryRespV
 import cn.iocoder.yudao.module.iscs.controller.admin.machinery.vo.MachinerySaveReqVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.machinerypoints.vo.MachineryPointsSaveReqVO;
 import cn.iocoder.yudao.module.iscs.service.machinery.MachineryService;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -73,8 +73,8 @@ public class MachineryController {
     @GetMapping("/getMachineryPage")
     @Operation(summary = "获得设备工艺分页")
     @PreAuthorize("@ss.hasPermission('iscs:machinery:query')")
-    public CommonResult<Page<MachineryRespVO>> getMachineryPage(@Valid MachineryPageReqVO pageReqVO) {
-        Page<MachineryRespVO> pageResult = machineryService.getMachineryPage(pageReqVO);
+    public CommonResult<PageResult<MachineryRespVO>> getMachineryPage(@Valid MachineryPageReqVO pageReqVO) {
+        PageResult<MachineryRespVO> pageResult = machineryService.getMachineryPage(pageReqVO);
         return success(pageResult);
     }
 
@@ -85,7 +85,7 @@ public class MachineryController {
     public void exportMachineryExcel(@Valid MachineryPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<MachineryRespVO> list = machineryService.getMachineryPage(pageReqVO).getRecords();
+        List<MachineryRespVO> list = machineryService.getMachineryPage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "设备工艺.xls", "数据", MachineryRespVO.class,
                         BeanUtils.toBean(list, MachineryRespVO.class));

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/machinery/vo/MachineryPageReqVO.java

@@ -1,10 +1,10 @@
 package cn.iocoder.yudao.module.iscs.controller.admin.machinery.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -13,6 +13,9 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @Data
 public class MachineryPageReqVO extends PageParam {
 
+    @Schema(description = "设备工艺编号")
+    private Long id;
+
     @Schema(description = "设备工艺编号")
     private String machineryCode;
 
@@ -47,4 +50,4 @@ public class MachineryPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
-}
+}

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/mappoint/vo/MapPointPageReqVO.java

@@ -1,10 +1,10 @@
 package cn.iocoder.yudao.module.iscs.controller.admin.mappoint.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -19,6 +19,9 @@ public class MapPointPageReqVO extends PageParam {
     @Schema(description = "地图类型（1岗位; 2锁定站）", example = "2")
     private String mapType;
 
+    @Schema(description = "地图名称", example = "2")
+    private String mapName;
+
     @Schema(description = "实体id", example = "1624")
     private Long entityId;
 
@@ -35,4 +38,4 @@ public class MapPointPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
-}
+}

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/dal/mysql/exceptionmisplace/ExceptionMisplaceMapper.java

@@ -1,13 +1,14 @@
 package cn.iocoder.yudao.module.iscs.dal.mysql.exceptionmisplace;
 
-import java.util.*;
-
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.iscs.controller.admin.exceptionmisplace.vo.ExceptionMisplacePageReqVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.exceptionmisplace.vo.ExceptionMisplaceRespVO;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.exceptionmisplace.ExceptionMisplaceDO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
-import cn.iocoder.yudao.module.iscs.controller.admin.exceptionmisplace.vo.*;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 物资归还异常 Mapper
@@ -29,8 +30,10 @@ public interface ExceptionMisplaceMapper extends BaseMapperX<ExceptionMisplaceDO
                 .eqIfPresent(ExceptionMisplaceDO::getRemark, reqVO.getRemark())
                 .eqIfPresent(ExceptionMisplaceDO::getStatus, reqVO.getStatus())
                 .eqIfPresent(ExceptionMisplaceDO::getExceptionType, reqVO.getExceptionType())
-                .betweenIfPresent(ExceptionMisplaceDO::getCreateTime, reqVO.getCreateTime())
+                // .betweenIfPresent(ExceptionMisplaceDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(ExceptionMisplaceDO::getId));
     }
 
-}
+    Page<ExceptionMisplaceRespVO> getExceptionMisplacePage(Page<ExceptionMisplaceDO> page, @Param(value = "vo") ExceptionMisplacePageReqVO vo);
+
+}

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/dal/mysql/mappoint/MapPointMapper.java

@@ -1,10 +1,10 @@
 package cn.iocoder.yudao.module.iscs.dal.mysql.mappoint;
 
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.module.iscs.controller.admin.mappoint.vo.MapPointPageReqVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.mappoint.vo.MapPointRespVO;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.mappoint.MapPointDO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -18,7 +18,7 @@ import java.util.List;
 @Mapper
 public interface MapPointMapper extends BaseMapperX<MapPointDO> {
 
-    PageResult<MapPointRespVO> getMapPointPage(@Param(value = "vo") MapPointPageReqVO vo);
+    Page<MapPointRespVO> getMapPointPage(Page<MapPointDO> page, @Param(value = "vo") MapPointPageReqVO vo);
 
 
     List<MapPointRespVO> getMapPointList(@Param(value = "vo") MapPointRespVO vo);

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/exceptionmisplace/ExceptionMisplaceService.java

@@ -1,63 +1,65 @@
-package cn.iocoder.yudao.module.iscs.service.exceptionmisplace;
-
-import java.util.*;
-import jakarta.validation.*;
-import cn.iocoder.yudao.module.iscs.controller.admin.exceptionmisplace.vo.*;
-import cn.iocoder.yudao.module.iscs.dal.dataobject.exceptionmisplace.ExceptionMisplaceDO;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * 物资归还异常 Service 接口
- *
- * @author 芋道源码
- */
-public interface ExceptionMisplaceService extends IService<ExceptionMisplaceDO> {
-
-    /**
-     * 创建物资归还异常
-     *
-     * @param createReqVO 创建信息
-     * @return 编号
-     */
-    Long createExceptionMisplace(@Valid ExceptionMisplaceSaveReqVO createReqVO);
-
-    /**
-     * 更新物资归还异常
-     *
-     * @param updateReqVO 更新信息
-     */
-    void updateExceptionMisplace(@Valid ExceptionMisplaceSaveReqVO updateReqVO);
-
-    /**
-     * 删除物资归还异常
-     *
-     * @param id 编号
-     */
-    void deleteExceptionMisplace(Long id);
-
-    /**
-    * 批量删除物资归还异常
-    *
-    * @param ids 编号
-    */
-    void deleteExceptionMisplaceListByIds(List<Long> ids);
-
-    /**
-     * 获得物资归还异常
-     *
-     * @param id 编号
-     * @return 物资归还异常
-     */
-    ExceptionMisplaceDO getExceptionMisplace(Long id);
-
-    /**
-     * 获得物资归还异常分页
-     *
-     * @param pageReqVO 分页查询
-     * @return 物资归还异常分页
-     */
-    PageResult<ExceptionMisplaceDO> getExceptionMisplacePage(ExceptionMisplacePageReqVO pageReqVO);
-
-}
+package cn.iocoder.yudao.module.iscs.service.exceptionmisplace;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.iscs.controller.admin.exceptionmisplace.vo.ExceptionMisplacePageReqVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.exceptionmisplace.vo.ExceptionMisplaceRespVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.exceptionmisplace.vo.ExceptionMisplaceSaveReqVO;
+import cn.iocoder.yudao.module.iscs.dal.dataobject.exceptionmisplace.ExceptionMisplaceDO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import jakarta.validation.Valid;
+
+import java.util.List;
+
+/**
+ * 物资归还异常 Service 接口
+ *
+ * @author 芋道源码
+ */
+public interface ExceptionMisplaceService extends IService<ExceptionMisplaceDO> {
+
+    /**
+     * 创建物资归还异常
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createExceptionMisplace(@Valid ExceptionMisplaceSaveReqVO createReqVO);
+
+    /**
+     * 更新物资归还异常
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateExceptionMisplace(@Valid ExceptionMisplaceSaveReqVO updateReqVO);
+
+    /**
+     * 删除物资归还异常
+     *
+     * @param id 编号
+     */
+    void deleteExceptionMisplace(Long id);
+
+    /**
+    * 批量删除物资归还异常
+    *
+    * @param ids 编号
+    */
+    void deleteExceptionMisplaceListByIds(List<Long> ids);
+
+    /**
+     * 获得物资归还异常
+     *
+     * @param id 编号
+     * @return 物资归还异常
+     */
+    ExceptionMisplaceDO getExceptionMisplace(Long id);
+
+    /**
+     * 获得物资归还异常分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 物资归还异常分页
+     */
+    PageResult<ExceptionMisplaceRespVO> getExceptionMisplacePage(ExceptionMisplacePageReqVO pageReqVO);
+
+}

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/exceptionmisplace/ExceptionMisplaceServiceImpl.java

@@ -4,9 +4,11 @@ import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.iscs.controller.admin.exceptionmisplace.vo.ExceptionMisplacePageReqVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.exceptionmisplace.vo.ExceptionMisplaceRespVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.exceptionmisplace.vo.ExceptionMisplaceSaveReqVO;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.exceptionmisplace.ExceptionMisplaceDO;
 import cn.iocoder.yudao.module.iscs.dal.mysql.exceptionmisplace.ExceptionMisplaceMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
@@ -80,8 +82,13 @@ public class ExceptionMisplaceServiceImpl extends ServiceImpl<ExceptionMisplaceM
     }
 
     @Override
-    public PageResult<ExceptionMisplaceDO> getExceptionMisplacePage(ExceptionMisplacePageReqVO pageReqVO) {
-        return exceptionMisplaceMapper.selectPage(pageReqVO);
+    public PageResult<ExceptionMisplaceRespVO> getExceptionMisplacePage(ExceptionMisplacePageReqVO pageReqVO) {
+        Page<ExceptionMisplaceDO> page = new Page<ExceptionMisplaceDO>().setCurrent(pageReqVO.getPageNo()).setSize(pageReqVO.getPageSize());
+        Page<ExceptionMisplaceRespVO> pageResult = exceptionMisplaceMapper.getExceptionMisplacePage(page, pageReqVO);
+        PageResult<ExceptionMisplaceRespVO> respVOPageResult = new PageResult<>();
+        respVOPageResult.setList(pageResult.getRecords());
+        respVOPageResult.setTotal(pageResult.getTotal());
+        return respVOPageResult;
     }
 
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/machinery/MachineryService.java

@@ -1,11 +1,11 @@
 package cn.iocoder.yudao.module.iscs.service.machinery;
 
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.iscs.controller.admin.machinery.vo.MachineryPageReqVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.machinery.vo.MachineryRespVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.machinery.vo.MachinerySaveReqVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.machinerypoints.vo.MachineryPointsSaveReqVO;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.machinery.MachineryDO;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import jakarta.validation.Valid;
 
@@ -61,7 +61,7 @@ public interface MachineryService extends IService<MachineryDO> {
      * @param pageReqVO 分页查询
      * @return 设备工艺分页
      */
-    Page<MachineryRespVO> getMachineryPage(MachineryPageReqVO pageReqVO);
+    PageResult<MachineryRespVO> getMachineryPage(MachineryPageReqVO pageReqVO);
 
     Boolean saveMachineryPoints(MachineryPointsSaveReqVO vo);
 

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/machinery/MachineryServiceImpl.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.iscs.service.machinery;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.iscs.controller.admin.machinery.vo.MachineryPageReqVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.machinery.vo.MachineryRespVO;
@@ -149,7 +150,7 @@ public class MachineryServiceImpl extends ServiceImpl<MachineryMapper, Machinery
     }
 
     @Override
-    public Page<MachineryRespVO> getMachineryPage(MachineryPageReqVO pageReqVO) {
+    public PageResult<MachineryRespVO> getMachineryPage(MachineryPageReqVO pageReqVO) {
         Page<MachineryDO> page = new Page<MachineryDO>().setCurrent(pageReqVO.getPageNo()).setSize(pageReqVO.getPageSize());
         Page<MachineryRespVO> isMachineryPage = machineryMapper.getMachineryPage(page, pageReqVO);
         if (!isMachineryPage.getRecords().isEmpty()) {
@@ -174,7 +175,10 @@ public class MachineryServiceImpl extends ServiceImpl<MachineryMapper, Machinery
                 record.setSysDictDatas(sysDictData);
             }
         }
-        return isMachineryPage;
+        PageResult<MachineryRespVO> respVOPageResult = new PageResult<>();
+        respVOPageResult.setList(isMachineryPage.getRecords());
+        respVOPageResult.setTotal(isMachineryPage.getTotal());
+        return respVOPageResult;
     }
 
     @Override

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/map/MapServiceImpl.java

@@ -107,8 +107,8 @@ public class MapServiceImpl extends ServiceImpl<MapMapper, MapDO> implements Map
                     }
                 }
             }
+            mapRespVO.setPointList(list);
         }
-        mapRespVO.setPointList(list);
         return mapRespVO;
     }
 

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/mappoint/MapPointServiceImpl.java

@@ -9,6 +9,7 @@ import cn.iocoder.yudao.module.iscs.controller.admin.mappoint.vo.MapPointRespVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.mappoint.vo.MapPointSaveReqVO;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.mappoint.MapPointDO;
 import cn.iocoder.yudao.module.iscs.dal.mysql.mappoint.MapPointMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
@@ -86,7 +87,12 @@ public class MapPointServiceImpl extends ServiceImpl<MapPointMapper, MapPointDO>
 
     @Override
     public PageResult<MapPointRespVO> getMapPointPage(MapPointPageReqVO pageReqVO) {
-        return mapPointMapper.getMapPointPage(pageReqVO);
+        Page<MapPointDO> page = new Page<MapPointDO>().setCurrent(pageReqVO.getPageNo()).setSize(pageReqVO.getPageSize());
+        Page<MapPointRespVO> pageResult = mapPointMapper.getMapPointPage(page, pageReqVO);
+        PageResult<MapPointRespVO> respVOPageResult = new PageResult<>();
+        respVOPageResult.setList(pageResult.getRecords());
+        respVOPageResult.setTotal(pageResult.getTotal());
+        return respVOPageResult;
     }
 
     @Override

yudao-module-iscs/src/main/resources/mapper/ExceptionMisplaceMapper.xml

@@ -9,4 +9,52 @@
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
 
-</mapper>
+    <select id="getExceptionMisplacePage"
+            resultType="cn.iocoder.yudao.module.iscs.controller.admin.exceptionmisplace.vo.ExceptionMisplaceRespVO">
+        SELECT
+        e.*,
+        m.materials_name,
+        c1.cabinet_name AS loan_from_name,
+        c2.cabinet_name AS restitution_to_name,
+        u.nickname AS restitution_user_name
+        FROM
+        isc_exception_misplace e
+        LEFT JOIN isc_materials m ON e.materials_id = m.id
+        LEFT JOIN isc_materials_cabinet c1 ON c1.id = e.loan_from_id
+        LEFT JOIN isc_materials_cabinet c2 ON c2.id = e.restitution_to_id
+        LEFT JOIN system_user u ON u.id = e.restitution_user_id
+        <where>
+            <if test="vo.materialsName != null and vo.materialsName.trim != ''">
+                and m.materials_name like concat('%',#{vo.materialsName},'%')
+            </if>
+            <if test="vo.restitutionUserName != null and vo.restitutionUserName.trim != ''">
+                and u.nickname like concat('%',#{vo.restitutionUserName},'%')
+            </if>
+            <if test="vo.loanFromId != null">
+                and (e.loan_from_id = #{vo.loanFromId} or e.restitution_to_id = #{vo.loanFromId})
+            </if>
+            <if test="vo.startTime != null and vo.startTime.trim != ''">
+                and e.occur_time &gt;= #{vo.startTime}
+            </if>
+            <if test="vo.endTime != null and vo.endTime.trim != ''">
+                and e.occur_time &lt;= #{vo.endTime}
+            </if>
+            <if test="vo.handleStartTime != null and vo.handleStartTime.trim != ''">
+                and e.handle_time &gt;= #{vo.handleStartTime}
+            </if>
+            <if test="vo.handleEndTime != null and vo.handleEndTime.trim != ''">
+                and e.handle_time &lt;= #{vo.handleEndTime}
+            </if>
+            <if test="vo.status != null and vo.status.trim != ''">
+                and e.status = #{vo.status}
+            </if>
+            <if test="vo.exceptionType != null and vo.exceptionType.trim != ''">
+                and e.exception_type = #{vo.exceptionType}
+            </if>
+        </where>
+        order by e.id desc
+
+
+
+    </select>
+</mapper>

yudao-module-iscs/src/main/resources/mapper/MachineryMapper.xml

@@ -17,11 +17,11 @@
         l.loto_name
         FROM
         isc_machinery t
-        LEFT JOIN isc_workstation w ON w.workstation_id = t.workstation_id
-        LEFT JOIN isc_loto_station l ON l.loto_id = t.loto_id
+        LEFT JOIN isc_workstation w ON w.id = t.workstation_id
+        LEFT JOIN isc_loto_station l ON l.id = t.loto_id
         <where>
             <if test="pageReqVO.id != null">
-                and t.machinery_id = #{pageReqVO.id}
+                and t.id = #{pageReqVO.id}
             </if>
             <if test="pageReqVO.machineryName != null and pageReqVO.machineryName.trim != ''">
                 and t.machinery_name like concat('%',#{pageReqVO.machineryName},'%')

yudao-module-iscs/src/main/resources/mapper/MapPointMapper.xml

@@ -23,7 +23,7 @@
         FROM
         isc_map_point p
         LEFT JOIN isc_map m ON m.id = p.map_id
-        LEFT JOIN isc_workstation w ON w.wid = p.entity_id
+        LEFT JOIN isc_workstation w ON w.id = p.entity_id
         LEFT JOIN isc_isolation_point ip ON ip.id = p.entity_id
         <where>
             <if test="vo.mapId != null">

yudao-server/src/main/resources/application-local.yaml

@@ -187,7 +187,7 @@ logging:
     cn.iocoder.yudao.module.iot.dal.mysql: debug
     cn.iocoder.yudao.module.iot.dal.tdengine: DEBUG
     cn.iocoder.yudao.module.ai.dal.mysql: debug
-    n.iocoder.yudao.module.iscs.dal.mysql: debug
+    cn.iocoder.yudao.module.iscs.dal.mysql: debug
     org.springframework.context.support.PostProcessorRegistrationDelegate: ERROR # TODO 芋艿：先禁用，Spring Boot 3.X 存在部分错误的 WARN 提示
 
 debug: false