对接修改

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/materials/MaterialsController.java

@@ -91,8 +91,41 @@ public class MaterialsController {
         ExcelUtils.write(response, "物资.xls", "数据", MaterialsRespVO.class, list);
     }
 
+    /*@Operation(summary = "导入模板-物资")
+    @PostMapping("/importTemplate")
+    public void importTemplate(HttpServletResponse response) {
+        ExcelUtil util = new ExcelUtil();
+        ImportMaterialsVO importMaterialsVO = new ImportMaterialsVO();
+        importMaterialsVO.setCabinetName("测试物资柜(测试示例行可删除)");
+        importMaterialsVO.setMaterialsName("测试白大褂K380(测试示例行可删除)");
+        importMaterialsVO.setMaterialsTypeName("测试白大褂(测试示例行可删除)");
+        importMaterialsVO.setValueName("s");
+        importMaterialsVO.setMaterialsRfid("7418965826");
+        importMaterialsVO.setSupplier("测试实验室(测试示例行可删除)");
+        importMaterialsVO.setExpirationDate(new Date());
+        ArrayList<ImportMaterialsVO> importMaterialsVOS = new ArrayList<>();
+        importMaterialsVOS.add(importMaterialsVO);
+        util.importTempExcelWithDate(response, "物资数据", importMaterialsVOS);
+    }*/
+
+    /*@Operation(summary = "导入-物资")
+    @ApiAccessLog(operateType = IMPORT)
+    @PreAuthorize("@ss.hasPermi('iscs:materials:import')")
+    @PostMapping("/importMaterials")
+    public CommonResult<Boolean> importMaterials(MultipartFile file, boolean updateSupport) throws Exception {
+        String filename = file.getOriginalFilename();
+        String extension = FilenameUtils.getExtension(filename);
+        // 文件不是 .xlsx 或 .xls
+        Assert.isFalse(!"xls".equalsIgnoreCase(extension) && !"xlsx".equalsIgnoreCase(extension), "文件不是xls或xlsx，请重新上传！");
+        ExcelUtil<ImportMaterialsVO> util = new ExcelUtil<>(ImportMaterialsVO.class);
+        List<ImportMaterialsVO> itemList = util.importExcel(file.getInputStream());
+        String operName = getUsername();
+        String message = isMaterialsService.importMaterials(itemList, updateSupport, operName);
+        return AjaxResult.success(message);
+    }*/
+
     @Operation(summary = "绑定物资-物资柜绑定物资")
-    @PreAuthorize("@ss.hasPermi('iscs:materials:binding')")
+    @PreAuthorize("@ss.hasPermission('iscs:materials:binding')")
     @ApiAccessLog(operateType = UPDATE)
     @PostMapping("/updateMaterialsBinding")
     public CommonResult<Boolean> updateMaterialsBinding(@RequestBody @Parameter(name = "vo", description = "修改数据类,放到body") MaterialBindingVO vo) {
@@ -103,7 +136,7 @@ public class MaterialsController {
     @Parameters({
             @Parameter(name = "vo", description = "实体参数")
     })
-    @PreAuthorize("@ss.hasPermi('iscs:materials:list')")
+    @PreAuthorize("@ss.hasPermission('iscs:materials:list')")
     @GetMapping("/getExMaterials")
     public CommonResult<List<MaterialsRespVO>> getExMaterials(MaterialBindingVO vo) {
         List<MaterialsRespVO> result = materialsService.getExMaterials(vo);

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/materials/vo/ImportMaterialsVO.java

@@ -0,0 +1,55 @@
+package cn.iocoder.yudao.module.iscs.controller.admin.materials.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 物资对象 isc_materials
+ *
+ * @author cgj
+ * @date 2024-11-08
+ */
+@Data
+public class ImportMaterialsVO
+{
+
+    @Schema(description = "物资柜ID")
+    private Long materialsCabinetId;
+
+    @Schema(description = "物资柜Name")
+    @ExcelProperty(value = "物资柜")
+    private String cabinetName;
+
+    @Schema(description = "物资名称")
+    @ExcelProperty(value = "物资名称")
+    private String materialsName;
+
+    @Schema(description = "物资类型ID")
+    private Long materialsTypeId;
+
+    @ExcelProperty(value = "物资类型")
+    private String materialsTypeName;
+
+    @ExcelProperty(value = "物资规格")
+    private String valueName;
+
+    @Schema(description = "物资RFID")
+    @ExcelProperty(value = "RFID")
+    private String materialsRfid;
+
+    @Schema(description = "供应商")
+    @ExcelProperty(value = "供应商")
+    private String supplier;
+
+    @Schema(description = "有效期")
+    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd")
+    @ExcelProperty(value = "有效期")
+    private Date expirationDate;
+
+    private String properties;
+
+}

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/materialscheckplan/MaterialsCheckPlanController.java

@@ -1,95 +1,92 @@
-package cn.iocoder.yudao.module.iscs.controller.admin.materialscheckplan;
-
-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.materialscheckplan.vo.*;
-import cn.iocoder.yudao.module.iscs.dal.dataobject.materialscheckplan.MaterialsCheckPlanDO;
-import cn.iocoder.yudao.module.iscs.service.materialscheckplan.MaterialsCheckPlanService;
-
-@Tag(name = "管理后台 - 物资检查计划")
-@RestController
-@RequestMapping("/iscs/materials-check-plan")
-@Validated
-public class MaterialsCheckPlanController {
-
-    @Resource
-    private MaterialsCheckPlanService materialsCheckPlanService;
-
-    @PostMapping("/insertMaterialsCheckPlan")
-    @Operation(summary = "创建物资检查计划")
-    @PreAuthorize("@ss.hasPermission('iscs:materials-check-plan:create')")
-    public CommonResult<Long> insertMaterialsCheckPlan(@Valid @RequestBody MaterialsCheckPlanSaveReqVO createReqVO) {
-        return success(materialsCheckPlanService.createMaterialsCheckPlan(createReqVO));
-    }
-
-    @PutMapping("/updateMaterialsCheckPlan")
-    @Operation(summary = "更新物资检查计划")
-    @PreAuthorize("@ss.hasPermission('iscs:materials-check-plan:update')")
-    public CommonResult<Boolean> updateMaterialsCheckPlan(@Valid @RequestBody MaterialsCheckPlanSaveReqVO updateReqVO) {
-        materialsCheckPlanService.updateMaterialsCheckPlan(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/deleteMaterialsCheckPlanList")
-    @Parameter(name = "ids", description = "编号", required = true)
-    @Operation(summary = "批量删除物资检查计划")
-                @PreAuthorize("@ss.hasPermission('iscs:materials-check-plan:delete')")
-    public CommonResult<Boolean> deleteMaterialsCheckPlanList(@RequestParam("ids") List<Long> ids) {
-        materialsCheckPlanService.deleteMaterialsCheckPlanListByIds(ids);
-        return success(true);
-    }
-
-    @GetMapping("/selectMaterialsCheckPlanById")
-    @Operation(summary = "获得物资检查计划")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('iscs:materials-check-plan:query')")
-    public CommonResult<MaterialsCheckPlanRespVO> selectMaterialsCheckPlanById(@RequestParam("id") Long id) {
-        MaterialsCheckPlanDO materialsCheckPlan = materialsCheckPlanService.getMaterialsCheckPlan(id);
-        return success(BeanUtils.toBean(materialsCheckPlan, MaterialsCheckPlanRespVO.class));
-    }
-
-    @GetMapping("/getMaterialsCheckPlanPage")
-    @Operation(summary = "获得物资检查计划分页")
-    @PreAuthorize("@ss.hasPermission('iscs:materials-check-plan:query')")
-    public CommonResult<PageResult<MaterialsCheckPlanRespVO>> getMaterialsCheckPlanPage(@Valid MaterialsCheckPlanPageReqVO pageReqVO) {
-        PageResult<MaterialsCheckPlanDO> pageResult = materialsCheckPlanService.getMaterialsCheckPlanPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, MaterialsCheckPlanRespVO.class));
-    }
-
-    @GetMapping("/exportMaterialsCheckPlanExcel")
-    @Operation(summary = "导出物资检查计划 Excel")
-    @PreAuthorize("@ss.hasPermission('iscs:materials-check-plan:export')")
-    @ApiAccessLog(operateType = EXPORT)
-    public void exportMaterialsCheckPlanExcel(@Valid MaterialsCheckPlanPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<MaterialsCheckPlanDO> list = materialsCheckPlanService.getMaterialsCheckPlanPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "物资检查计划.xls", "数据", MaterialsCheckPlanRespVO.class,
-                        BeanUtils.toBean(list, MaterialsCheckPlanRespVO.class));
-    }
-
-}
+package cn.iocoder.yudao.module.iscs.controller.admin.materialscheckplan;
+
+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.materialscheckplan.vo.MaterialsCheckPlanPageReqVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.materialscheckplan.vo.MaterialsCheckPlanRespVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.materialscheckplan.vo.MaterialsCheckPlanSaveReqVO;
+import cn.iocoder.yudao.module.iscs.dal.dataobject.materialscheckplan.MaterialsCheckPlanDO;
+import cn.iocoder.yudao.module.iscs.service.materialscheckplan.MaterialsCheckPlanService;
+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/materials-check-plan")
+@Validated
+public class MaterialsCheckPlanController {
+
+    @Resource
+    private MaterialsCheckPlanService materialsCheckPlanService;
+
+    @PostMapping("/insertMaterialsCheckPlan")
+    @Operation(summary = "创建物资检查计划")
+    @PreAuthorize("@ss.hasPermission('iscs:materials-check-plan:create')")
+    public CommonResult<Long> insertMaterialsCheckPlan(@Valid @RequestBody MaterialsCheckPlanSaveReqVO createReqVO) {
+        return success(materialsCheckPlanService.createMaterialsCheckPlan(createReqVO));
+    }
+
+    @PutMapping("/updateMaterialsCheckPlan")
+    @Operation(summary = "更新物资检查计划")
+    @PreAuthorize("@ss.hasPermission('iscs:materials-check-plan:update')")
+    public CommonResult<Boolean> updateMaterialsCheckPlan(@Valid @RequestBody MaterialsCheckPlanSaveReqVO updateReqVO) {
+        materialsCheckPlanService.updateMaterialsCheckPlan(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/deleteMaterialsCheckPlanList")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除物资检查计划")
+                @PreAuthorize("@ss.hasPermission('iscs:materials-check-plan:delete')")
+    public CommonResult<Boolean> deleteMaterialsCheckPlanList(@RequestParam("ids") List<Long> ids) {
+        materialsCheckPlanService.deleteMaterialsCheckPlanListByIds(ids);
+        return success(true);
+    }
+
+    @GetMapping("/selectMaterialsCheckPlanById")
+    @Operation(summary = "获得物资检查计划")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('iscs:materials-check-plan:query')")
+    public CommonResult<MaterialsCheckPlanRespVO> selectMaterialsCheckPlanById(@RequestParam("id") Long id) {
+        MaterialsCheckPlanDO materialsCheckPlan = materialsCheckPlanService.getMaterialsCheckPlan(id);
+        return success(BeanUtils.toBean(materialsCheckPlan, MaterialsCheckPlanRespVO.class));
+    }
+
+    @GetMapping("/getMaterialsCheckPlanPage")
+    @Operation(summary = "获得物资检查计划分页")
+    @PreAuthorize("@ss.hasPermission('iscs:materials-check-plan:query')")
+    public CommonResult<PageResult<MaterialsCheckPlanRespVO>> getMaterialsCheckPlanPage(@Valid MaterialsCheckPlanPageReqVO pageReqVO) {
+        PageResult<MaterialsCheckPlanRespVO> pageResult = materialsCheckPlanService.getMaterialsCheckPlanPage(pageReqVO);
+        return success(pageResult);
+    }
+
+    @GetMapping("/exportMaterialsCheckPlanExcel")
+    @Operation(summary = "导出物资检查计划 Excel")
+    @PreAuthorize("@ss.hasPermission('iscs:materials-check-plan:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportMaterialsCheckPlanExcel(@Valid MaterialsCheckPlanPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<MaterialsCheckPlanRespVO> list = materialsCheckPlanService.getMaterialsCheckPlanPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "物资检查计划.xls", "数据", MaterialsCheckPlanRespVO.class, list);
+    }
+
+}

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/materialscheckplan/vo/MaterialsCheckPlanPageReqVO.java

@@ -34,4 +34,19 @@ public class MaterialsCheckPlanPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
+    @Schema(description = "物资柜ID")
+    private Long cabinetId;
+
+    @Schema(description = "开始时间")
+    private String startTime;
+
+    @Schema(description = "结束时间")
+    private String endTime;
+
+    @Schema(description = "检查员")
+    private String checkUserName;
+
+    @Schema(description = "状态")
+    private String status;
+
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/materialscheckplan/vo/MaterialsCheckPlanRespVO.java

@@ -7,6 +7,7 @@ import lombok.Data;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Schema(description = "管理后台 - 物资检查计划 Response VO")
 @Data
@@ -41,4 +42,19 @@ public class MaterialsCheckPlanRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    @Schema(description = "物资计划id")
+    private Long planId;
+
+    @Schema(description = "检察员")
+    private String checkUserName;
+
+    @Schema(description = "检查状态(0代表未开始，1代表已完成)")
+    private String status;
+
+    @Schema(description = "检查的物资柜名称")
+    private String cabinetName;
+
+    @Schema(description = "检查的物资柜集合")
+    private List<Long> cabinetIds;
+
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/dal/mysql/materialscheckplan/MaterialsCheckPlanMapper.java

@@ -1,13 +1,14 @@
 package cn.iocoder.yudao.module.iscs.dal.mysql.materialscheckplan;
 
-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.materialscheckplan.vo.MaterialsCheckPlanPageReqVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.materialscheckplan.vo.MaterialsCheckPlanRespVO;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.materialscheckplan.MaterialsCheckPlanDO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
-import cn.iocoder.yudao.module.iscs.controller.admin.materialscheckplan.vo.*;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 物资检查计划 Mapper
@@ -28,4 +29,7 @@ public interface MaterialsCheckPlanMapper extends BaseMapperX<MaterialsCheckPlan
                 .orderByDesc(MaterialsCheckPlanDO::getId));
     }
 
-}
+    Page<MaterialsCheckPlanRespVO> getIsMaterialsCheckPlanPage(Page<MaterialsCheckPlanDO> page, @Param(value = "vo") MaterialsCheckPlanPageReqVO vo);
+
+
+}

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/mailnotifyconfig/MailNotifyConfigServiceImpl.java

@@ -30,6 +30,10 @@ public class MailNotifyConfigServiceImpl extends ServiceImpl<MailNotifyConfigMap
 
     @Override
     public Long createMailNotifyConfig(MailNotifyConfigSaveReqVO createReqVO) {
+        Assert.notBlank(createReqVO.getTemplateCode(), "编码不可为空!");
+        List<MailNotifyConfigDO> list = list(Wrappers.<MailNotifyConfigDO>lambdaQuery()
+                .eq(MailNotifyConfigDO::getTemplateCode, createReqVO.getTemplateCode()));
+        Assert.isTrue(list.isEmpty(), "该编码已被使用!");
         // 插入
         MailNotifyConfigDO mailNotifyConfig = BeanUtils.toBean(createReqVO, MailNotifyConfigDO.class);
         mailNotifyConfigMapper.insert(mailNotifyConfig);
@@ -40,6 +44,12 @@ public class MailNotifyConfigServiceImpl extends ServiceImpl<MailNotifyConfigMap
 
     @Override
     public void updateMailNotifyConfig(MailNotifyConfigSaveReqVO updateReqVO) {
+        Assert.notNull(updateReqVO.getId(), "ID不可为空!");
+        Assert.notBlank(updateReqVO.getTemplateCode(), "编码不可为空!");
+        List<MailNotifyConfigDO> list = list(Wrappers.<MailNotifyConfigDO>lambdaQuery()
+                .eq(MailNotifyConfigDO::getTemplateCode, updateReqVO.getTemplateCode())
+                .ne(MailNotifyConfigDO::getId, updateReqVO.getId()));
+        Assert.isTrue(list.isEmpty(), "该编码已被使用!");
         // 校验存在
         validateMailNotifyConfigExists(updateReqVO.getId());
         // 更新

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/materialscheckplan/MaterialsCheckPlanService.java

@@ -1,63 +1,65 @@
-package cn.iocoder.yudao.module.iscs.service.materialscheckplan;
-
-import java.util.*;
-import jakarta.validation.*;
-import cn.iocoder.yudao.module.iscs.controller.admin.materialscheckplan.vo.*;
-import cn.iocoder.yudao.module.iscs.dal.dataobject.materialscheckplan.MaterialsCheckPlanDO;
-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 MaterialsCheckPlanService extends IService<MaterialsCheckPlanDO> {
-
-    /**
-     * 创建物资检查计划
-     *
-     * @param createReqVO 创建信息
-     * @return 编号
-     */
-    Long createMaterialsCheckPlan(@Valid MaterialsCheckPlanSaveReqVO createReqVO);
-
-    /**
-     * 更新物资检查计划
-     *
-     * @param updateReqVO 更新信息
-     */
-    void updateMaterialsCheckPlan(@Valid MaterialsCheckPlanSaveReqVO updateReqVO);
-
-    /**
-     * 删除物资检查计划
-     *
-     * @param id 编号
-     */
-    void deleteMaterialsCheckPlan(Long id);
-
-    /**
-    * 批量删除物资检查计划
-    *
-    * @param ids 编号
-    */
-    void deleteMaterialsCheckPlanListByIds(List<Long> ids);
-
-    /**
-     * 获得物资检查计划
-     *
-     * @param id 编号
-     * @return 物资检查计划
-     */
-    MaterialsCheckPlanDO getMaterialsCheckPlan(Long id);
-
-    /**
-     * 获得物资检查计划分页
-     *
-     * @param pageReqVO 分页查询
-     * @return 物资检查计划分页
-     */
-    PageResult<MaterialsCheckPlanDO> getMaterialsCheckPlanPage(MaterialsCheckPlanPageReqVO pageReqVO);
-
-}
+package cn.iocoder.yudao.module.iscs.service.materialscheckplan;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.iscs.controller.admin.materialscheckplan.vo.MaterialsCheckPlanPageReqVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.materialscheckplan.vo.MaterialsCheckPlanRespVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.materialscheckplan.vo.MaterialsCheckPlanSaveReqVO;
+import cn.iocoder.yudao.module.iscs.dal.dataobject.materialscheckplan.MaterialsCheckPlanDO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import jakarta.validation.Valid;
+
+import java.util.List;
+
+/**
+ * 物资检查计划 Service 接口
+ *
+ * @author 芋道源码
+ */
+public interface MaterialsCheckPlanService extends IService<MaterialsCheckPlanDO> {
+
+    /**
+     * 创建物资检查计划
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createMaterialsCheckPlan(@Valid MaterialsCheckPlanSaveReqVO createReqVO);
+
+    /**
+     * 更新物资检查计划
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateMaterialsCheckPlan(@Valid MaterialsCheckPlanSaveReqVO updateReqVO);
+
+    /**
+     * 删除物资检查计划
+     *
+     * @param id 编号
+     */
+    void deleteMaterialsCheckPlan(Long id);
+
+    /**
+    * 批量删除物资检查计划
+    *
+    * @param ids 编号
+    */
+    void deleteMaterialsCheckPlanListByIds(List<Long> ids);
+
+    /**
+     * 获得物资检查计划
+     *
+     * @param id 编号
+     * @return 物资检查计划
+     */
+    MaterialsCheckPlanDO getMaterialsCheckPlan(Long id);
+
+    /**
+     * 获得物资检查计划分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 物资检查计划分页
+     */
+    PageResult<MaterialsCheckPlanRespVO> getMaterialsCheckPlanPage(MaterialsCheckPlanPageReqVO pageReqVO);
+
+}

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/materialscheckplan/MaterialsCheckPlanServiceImpl.java

@@ -5,6 +5,7 @@ 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.materialscheckplan.vo.MaterialsCheckPlanPageReqVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.materialscheckplan.vo.MaterialsCheckPlanRespVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.materialscheckplan.vo.MaterialsCheckPlanSaveReqVO;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.attribute.AttributeDO;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.mailnotifyconfig.MailNotifyConfigDO;
@@ -24,6 +25,7 @@ import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
 import cn.iocoder.yudao.module.system.service.mail.MailTemplateService;
 import cn.iocoder.yudao.module.system.service.user.AdminUserService;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+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;
@@ -232,8 +234,34 @@ public class MaterialsCheckPlanServiceImpl extends ServiceImpl<MaterialsCheckPla
     }
 
     @Override
-    public PageResult<MaterialsCheckPlanDO> getMaterialsCheckPlanPage(MaterialsCheckPlanPageReqVO pageReqVO) {
-        return materialsCheckPlanMapper.selectPage(pageReqVO);
+    public PageResult<MaterialsCheckPlanRespVO> getMaterialsCheckPlanPage(MaterialsCheckPlanPageReqVO pageReqVO) {
+        Page<MaterialsCheckPlanDO> page = new Page<MaterialsCheckPlanDO>().setCurrent(pageReqVO.getPageNo()).setSize(pageReqVO.getPageSize());
+        Page<MaterialsCheckPlanRespVO> pageResult = materialsCheckPlanMapper.getIsMaterialsCheckPlanPage(page, pageReqVO);
+        PageResult<MaterialsCheckPlanRespVO> respVOPageResult = new PageResult<>();
+        respVOPageResult.setList(pageResult.getRecords());
+        respVOPageResult.setTotal(pageResult.getTotal());
+        if (!respVOPageResult.getList().isEmpty()) {
+            // 分页中所有的计划
+            List<Long> planIds = respVOPageResult.getList().stream().map(MaterialsCheckPlanRespVO::getId).toList();
+            // 计划中所有的关联柜子
+            List<MaterialsPlanCabinetDO> planCabinets = materialsPlanCabinetService.list(Wrappers.<MaterialsPlanCabinetDO>lambdaQuery()
+                    .in(MaterialsPlanCabinetDO::getPlanId, planIds));
+            // 柜子的id
+            List<Long> cabinetIds = planCabinets.stream().map(MaterialsPlanCabinetDO::getCabinetId).collect(Collectors.toList());
+            // 柜子的详情
+            List<MaterialsCabinetDO> cabinets = materialsCabinetService.list(Wrappers.<MaterialsCabinetDO>lambdaQuery()
+                    .in(MaterialsCabinetDO::getId, cabinetIds));
+            for (MaterialsCheckPlanRespVO record : respVOPageResult.getList()) {
+                List<Long> cabinetId = planCabinets.stream().filter(o -> o.getPlanId().equals(record.getPlanId()))
+                        .map(MaterialsPlanCabinetDO::getCabinetId).toList();
+                String cabinetName = cabinets.stream()
+                        .filter(cabinet -> cabinetId.contains(cabinet.getId()))
+                        .map(MaterialsCabinetDO::getCabinetName)
+                        .collect(Collectors.joining(","));
+                record.setCabinetName(cabinetName);
+            }
+        }
+        return respVOPageResult;
     }
 
 }

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

@@ -9,4 +9,35 @@
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
 
-</mapper>
+    <select id="getIsMaterialsCheckPlanPage"
+            resultType="cn.iocoder.yudao.module.iscs.controller.admin.materialscheckplan.vo.MaterialsCheckPlanRespVO">
+        SELECT
+        p.*, u.nickname as check_user_name
+        FROM
+        isc_materials_check_plan p
+        LEFT JOIN isc_materials_plan_cabinet c ON c.plan_id = p.id
+        LEFT JOIN system_users u ON u.id = p.check_user_id
+        <where>
+            <if test="vo.cabinetId != null">
+                and c.cabinet_id = #{vo.cabinetId}
+            </if>
+            <if test="vo.startTime != null and vo.startTime.trim != ''">
+                and p.plan_date &gt;= #{vo.startTime}
+            </if>
+            <if test="vo.endTime != null and vo.endTime.trim != ''">
+                and p.plan_date &lt;= #{vo.endTime}
+            </if>
+            <if test="vo.checkUserName != null and vo.checkUserName.trim != ''">
+                and u.nick_name like concat('%',#{vo.checkUserName},'%')
+            </if>
+            <if test="vo.status != null and vo.status.trim != ''">
+                and p.status = #{vo.status}
+            </if>
+            <if test="vo.planName != null and vo.planName.trim != ''">
+                and p.plan_name like concat('%',#{vo.planName},'%')
+            </if>
+        </where>
+        group by p.id
+        order by p.id desc
+    </select>
+</mapper>

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

@@ -22,6 +22,7 @@
         LEFT JOIN isc_materials_type t ON t.id = m.materials_type_id
         LEFT JOIN isc_materials_cabinet c ON c.id = m.materials_cabinet_id
         <where>
+            m.deleted = 0
             <if test="vo.materialsCode != null and vo.materialsCode.trim != ''">
                 and m.materials_code like concat('%',#{vo.materialsCode},'%')
             </if>