物资管理

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsMaterialsCabinetController.java

@@ -0,0 +1,116 @@
+package com.ktg.iscs.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ktg.common.annotation.Log;
+import com.ktg.common.core.controller.BaseController;
+import com.ktg.common.enums.BusinessType;
+import com.ktg.common.pojo.CommonResult;
+import com.ktg.common.utils.poi.ExcelUtil;
+import com.ktg.iscs.domain.IsMaterialsCabinet;
+import com.ktg.iscs.service.IIsMaterialsCabinetService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 物资柜Controller
+ *
+ * @author cgj
+ * @date 2024-11-08
+ */
+@Api(tags = "物资柜")
+@RestController
+@RequestMapping("/iscs/cabinet")
+public class IsMaterialsCabinetController extends BaseController
+{
+    @Autowired
+    private IIsMaterialsCabinetService isMaterialsCabinetService;
+
+    /**
+     * 查询物资柜分页
+     */
+    @ApiOperation("查询物资柜-分页")
+    @Parameters({
+            @Parameter(name = "page", description = "Page"),
+            @Parameter(name = "isMaterialsCabinet", description = "实体参数")
+    })
+    @PreAuthorize("@ss.hasPermi('iscs:cabinet:list')")
+    @GetMapping("/getIsMaterialsCabinetPage")
+    public CommonResult<Page<IsMaterialsCabinet>> getIsMaterialsCabinetPage(Page<IsMaterialsCabinet> page, IsMaterialsCabinet isMaterialsCabinet)
+    {
+        Page<IsMaterialsCabinet> result = isMaterialsCabinetService.page(page, Wrappers.<IsMaterialsCabinet>lambdaQuery()
+                .orderByDesc(IsMaterialsCabinet::getCabinetId));
+        return CommonResult.success(result);
+    }
+
+    /**
+     * 导出物资柜列表
+     */
+    @ApiOperation("导出物资柜列表")
+    @Parameter(name = "isMaterialsCabinet", description = "实体参数")
+    @PreAuthorize("@ss.hasPermi('iscs:cabinet:export')")
+    @Log(title = "物资柜", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportIsMaterialsCabinet")
+    public void exportIsMaterialsCabinet(HttpServletResponse response, IsMaterialsCabinet isMaterialsCabinet)
+    {
+        List<IsMaterialsCabinet> list = isMaterialsCabinetService.selectIsMaterialsCabinetList(isMaterialsCabinet);
+        ExcelUtil<IsMaterialsCabinet> util = new ExcelUtil<IsMaterialsCabinet>(IsMaterialsCabinet.class);
+        util.exportExcel(response, list, "物资柜数据");
+    }
+
+    /**
+     * 获取物资柜详细信息
+     */
+    @ApiOperation("获取物资柜详细信息")
+    @Parameter(name = "cabinetId", description = "cabinetId")
+    @PreAuthorize("@ss.hasPermi('iscs:cabinet:query')")
+    @GetMapping(value = "/selectIsMaterialsCabinetById")
+    public CommonResult<IsMaterialsCabinet> selectIsMaterialsCabinetById(Long cabinetId)
+    {
+        return CommonResult.success(isMaterialsCabinetService.selectIsMaterialsCabinetByCabinetId(cabinetId));
+    }
+
+    /**
+     * 新增物资柜
+     */
+    @ApiOperation("新增物资柜")
+    @PreAuthorize("@ss.hasPermi('iscs:cabinet:add')")
+    @Log(title = "物资柜", businessType = BusinessType.INSERT)
+    @PostMapping("/insertIsMaterialsCabinet")
+    public CommonResult<Boolean> insertIsMaterialsCabinet(@RequestBody @Parameter(name = "isMaterialsCabinet", description = "新增数据类,放到body") IsMaterialsCabinet isMaterialsCabinet)
+    {
+        return CommonResult.success(isMaterialsCabinetService.insertIsMaterialsCabinet(isMaterialsCabinet) == 1);
+    }
+
+    /**
+     * 修改物资柜
+     */
+    @ApiOperation("修改物资柜")
+    @PreAuthorize("@ss.hasPermi('iscs:cabinet:edit')")
+    @Log(title = "物资柜", businessType = BusinessType.UPDATE)
+    @PostMapping("/updateIsMaterialsCabinet")
+    public CommonResult<Boolean> updateIsMaterialsCabinet(@RequestBody @Parameter(name = "isMaterialsCabinet", description = "修改数据类,放到body") IsMaterialsCabinet isMaterialsCabinet)
+    {
+        return CommonResult.success(isMaterialsCabinetService.updateIsMaterialsCabinet(isMaterialsCabinet) == 1);
+    }
+
+    /**
+     * 删除物资柜
+     */
+    @ApiOperation("删除物资柜")
+    @PreAuthorize("@ss.hasPermi('iscs:cabinet:remove')")
+    @Log(title = "物资柜", businessType = BusinessType.DELETE)
+	@PostMapping("/deleteIsMaterialsCabinetByCabinetIds")
+    public CommonResult<Boolean> deleteIsMaterialsCabinetByCabinetIds(String cabinetIds)
+    {
+        return CommonResult.success(isMaterialsCabinetService.deleteIsMaterialsCabinetByCabinetIds(cabinetIds) != 0);
+    }
+}

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsMaterialsLoanController.java

@@ -0,0 +1,116 @@
+package com.ktg.iscs.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ktg.common.annotation.Log;
+import com.ktg.common.core.controller.BaseController;
+import com.ktg.common.enums.BusinessType;
+import com.ktg.common.pojo.CommonResult;
+import com.ktg.common.utils.poi.ExcelUtil;
+import com.ktg.iscs.domain.IsMaterialsLoan;
+import com.ktg.iscs.domain.dto.MaterialsLoan.MaterialsLoanPageDTO;
+import com.ktg.iscs.domain.vo.MaterialsLoan.MaterialsLoanPageVO;
+import com.ktg.iscs.service.IIsMaterialsLoanService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 物资借出Controller
+ *
+ * @author cgj
+ * @date 2024-11-08
+ */
+@Api(tags = "物资借出")
+@RestController
+@RequestMapping("/iscs/loan")
+public class IsMaterialsLoanController extends BaseController
+{
+    @Autowired
+    private IIsMaterialsLoanService isMaterialsLoanService;
+
+    /**
+     * 查询物资借出分页
+     */
+    @ApiOperation("查询物资借出-分页")
+    @Parameters({
+            @Parameter(name = "page", description = "Page"),
+            @Parameter(name = "dto", description = "实体参数")
+    })
+    @PreAuthorize("@ss.hasPermi('iscs:loan:list')")
+    @GetMapping("/getIsMaterialsLoanPage")
+    public CommonResult<Page<MaterialsLoanPageVO>> getIsMaterialsLoanPage(Page<IsMaterialsLoan> page, MaterialsLoanPageDTO dto)
+    {
+        Page<MaterialsLoanPageVO> result = isMaterialsLoanService.getIsMaterialsLoanPage(page, dto);
+        return CommonResult.success(result);
+    }
+
+    /**
+     * 导出物资借出列表
+     */
+    @ApiOperation("导出物资借出列表")
+    @Parameter(name = "isMaterialsLoan", description = "实体参数")
+    @PreAuthorize("@ss.hasPermi('iscs:loan:export')")
+    @Log(title = "物资借出", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportIsMaterialsLoan")
+    public void exportIsMaterialsLoan(HttpServletResponse response, IsMaterialsLoan isMaterialsLoan)
+    {
+        List<IsMaterialsLoan> list = isMaterialsLoanService.selectIsMaterialsLoanList(isMaterialsLoan);
+        ExcelUtil<IsMaterialsLoan> util = new ExcelUtil<IsMaterialsLoan>(IsMaterialsLoan.class);
+        util.exportExcel(response, list, "物资借出数据");
+    }
+
+    /**
+     * 获取物资借出详细信息
+     */
+    @ApiOperation("获取物资借出详细信息")
+    @Parameter(name = "materialsLoanId", description = "materialsLoanId")
+    @PreAuthorize("@ss.hasPermi('iscs:loan:query')")
+    @GetMapping(value = "/selectIsMaterialsLoanById")
+    public CommonResult<IsMaterialsLoan> selectIsMaterialsLoanById(Long materialsLoanId)
+    {
+        return CommonResult.success(isMaterialsLoanService.selectIsMaterialsLoanByMaterialsLoanId(materialsLoanId));
+    }
+
+    /**
+     * 新增物资借出
+     */
+    @ApiOperation("新增物资借出")
+    @PreAuthorize("@ss.hasPermi('iscs:loan:add')")
+    @Log(title = "物资借出", businessType = BusinessType.INSERT)
+    @PostMapping("/insertIsMaterialsLoan")
+    public CommonResult<Boolean> insertIsMaterialsLoan(@RequestBody @Parameter(name = "isMaterialsLoan", description = "新增数据类,放到body") IsMaterialsLoan isMaterialsLoan)
+    {
+        return CommonResult.success(isMaterialsLoanService.insertIsMaterialsLoan(isMaterialsLoan) == 1);
+    }
+
+    /**
+     * 修改物资借出
+     */
+    @ApiOperation("修改物资借出")
+    @PreAuthorize("@ss.hasPermi('iscs:loan:edit')")
+    @Log(title = "物资借出", businessType = BusinessType.UPDATE)
+    @PostMapping("/updateIsMaterialsLoan")
+    public CommonResult<Boolean> updateIsMaterialsLoan(@RequestBody @Parameter(name = "isMaterialsLoan", description = "修改数据类,放到body") IsMaterialsLoan isMaterialsLoan)
+    {
+        return CommonResult.success(isMaterialsLoanService.updateIsMaterialsLoan(isMaterialsLoan) == 1);
+    }
+
+    /**
+     * 删除物资借出
+     */
+    @ApiOperation("删除物资借出")
+    @PreAuthorize("@ss.hasPermi('iscs:loan:remove')")
+    @Log(title = "物资借出", businessType = BusinessType.DELETE)
+	@PostMapping("/deleteIsMaterialsLoanByMaterialsLoanIds")
+    public CommonResult<Boolean> deleteIsMaterialsLoanByMaterialsLoanIds(String materialsLoanIds)
+    {
+        return CommonResult.success(isMaterialsLoanService.deleteIsMaterialsLoanByMaterialsLoanIds(materialsLoanIds) != 0);
+    }
+}

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsMaterialsRestitutionRulesController.java

@@ -0,0 +1,116 @@
+package com.ktg.iscs.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ktg.common.annotation.Log;
+import com.ktg.common.core.controller.BaseController;
+import com.ktg.common.enums.BusinessType;
+import com.ktg.common.pojo.CommonResult;
+import com.ktg.common.utils.poi.ExcelUtil;
+import com.ktg.iscs.domain.IsMaterialsRestitutionRules;
+import com.ktg.iscs.service.IIsMaterialsRestitutionRulesService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 物资借出规则Controller
+ *
+ * @author cgj
+ * @date 2024-11-08
+ */
+@Api(tags = "物资借出规则")
+@RestController
+@RequestMapping("/iscs/rules")
+public class IsMaterialsRestitutionRulesController extends BaseController
+{
+    @Autowired
+    private IIsMaterialsRestitutionRulesService isMaterialsRestitutionRulesService;
+
+    /**
+     * 查询物资借出规则分页
+     */
+    @ApiOperation("查询物资借出规则-分页")
+    @Parameters({
+            @Parameter(name = "page", description = "Page"),
+            @Parameter(name = "isMaterialsRestitutionRules", description = "实体参数")
+    })
+    @PreAuthorize("@ss.hasPermi('iscs:rules:list')")
+    @GetMapping("/getIsMaterialsRestitutionRulesPage")
+    public CommonResult<Page<IsMaterialsRestitutionRules>> getIsMaterialsRestitutionRulesPage(Page<IsMaterialsRestitutionRules> page, IsMaterialsRestitutionRules isMaterialsRestitutionRules)
+    {
+        Page<IsMaterialsRestitutionRules> result = isMaterialsRestitutionRulesService.page(page, Wrappers.<IsMaterialsRestitutionRules>lambdaQuery()
+                .orderByDesc(IsMaterialsRestitutionRules::getRuleId));
+        return CommonResult.success(result);
+    }
+
+    /**
+     * 导出物资借出规则列表
+     */
+    @ApiOperation("导出物资借出规则列表")
+    @Parameter(name = "isMaterialsRestitutionRules", description = "实体参数")
+    @PreAuthorize("@ss.hasPermi('iscs:rules:export')")
+    @Log(title = "物资借出规则", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportIsMaterialsRestitutionRules")
+    public void exportIsMaterialsRestitutionRules(HttpServletResponse response, IsMaterialsRestitutionRules isMaterialsRestitutionRules)
+    {
+        List<IsMaterialsRestitutionRules> list = isMaterialsRestitutionRulesService.selectIsMaterialsRestitutionRulesList(isMaterialsRestitutionRules);
+        ExcelUtil<IsMaterialsRestitutionRules> util = new ExcelUtil<IsMaterialsRestitutionRules>(IsMaterialsRestitutionRules.class);
+        util.exportExcel(response, list, "物资借出规则数据");
+    }
+
+    /**
+     * 获取物资借出规则详细信息
+     */
+    @ApiOperation("获取物资借出规则详细信息")
+    @Parameter(name = "ruleId", description = "ruleId")
+    @PreAuthorize("@ss.hasPermi('iscs:rules:query')")
+    @GetMapping(value = "/selectIsMaterialsRestitutionRulesById")
+    public CommonResult<IsMaterialsRestitutionRules> selectIsMaterialsRestitutionRulesById(Long ruleId)
+    {
+        return CommonResult.success(isMaterialsRestitutionRulesService.selectIsMaterialsRestitutionRulesByRuleId(ruleId));
+    }
+
+    /**
+     * 新增物资借出规则
+     */
+    @ApiOperation("新增物资借出规则")
+    @PreAuthorize("@ss.hasPermi('iscs:rules:add')")
+    @Log(title = "物资借出规则", businessType = BusinessType.INSERT)
+    @PostMapping("/insertIsMaterialsRestitutionRules")
+    public CommonResult<Boolean> insertIsMaterialsRestitutionRules(@RequestBody @Parameter(name = "isMaterialsRestitutionRules", description = "新增数据类,放到body") IsMaterialsRestitutionRules isMaterialsRestitutionRules)
+    {
+        return CommonResult.success(isMaterialsRestitutionRulesService.insertIsMaterialsRestitutionRules(isMaterialsRestitutionRules) == 1);
+    }
+
+    /**
+     * 修改物资借出规则
+     */
+    @ApiOperation("修改物资借出规则")
+    @PreAuthorize("@ss.hasPermi('iscs:rules:edit')")
+    @Log(title = "物资借出规则", businessType = BusinessType.UPDATE)
+    @PostMapping("/updateIsMaterialsRestitutionRules")
+    public CommonResult<Boolean> updateIsMaterialsRestitutionRules(@RequestBody @Parameter(name = "isMaterialsRestitutionRules", description = "修改数据类,放到body") IsMaterialsRestitutionRules isMaterialsRestitutionRules)
+    {
+        return CommonResult.success(isMaterialsRestitutionRulesService.updateIsMaterialsRestitutionRules(isMaterialsRestitutionRules) == 1);
+    }
+
+    /**
+     * 删除物资借出规则
+     */
+    @ApiOperation("删除物资借出规则")
+    @PreAuthorize("@ss.hasPermi('iscs:rules:remove')")
+    @Log(title = "物资借出规则", businessType = BusinessType.DELETE)
+	@PostMapping("/deleteIsMaterialsRestitutionRulesByRuleIds")
+    public CommonResult<Boolean> deleteIsMaterialsRestitutionRulesByRuleIds(String ruleIds)
+    {
+        return CommonResult.success(isMaterialsRestitutionRulesService.deleteIsMaterialsRestitutionRulesByRuleIds(ruleIds) != 0);
+    }
+}

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsMaterialsLoan.java

@@ -62,6 +62,10 @@ public class IsMaterialsLoan extends BaseBean
     @Excel(name = "归还时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date restitutionTime;
 
+    @ApiModelProperty(value = "是否需要归还")
+    @Excel(name = "是否需要归还")
+    private Integer restitutionRequired;
+
     @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 

ktg-iscs/src/main/java/com/ktg/iscs/domain/dto/MaterialsLoan/MaterialsLoanPageDTO.java

@@ -0,0 +1,36 @@
+package com.ktg.iscs.domain.dto.MaterialsLoan;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 物资借出对象 is_materials_loan
+ *
+ * @author cgj
+ * @date 2024-11-08
+ */
+@Data
+public class MaterialsLoanPageDTO
+{
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "物资编号")
+    private String materialsCode;
+
+    @ApiModelProperty(value = "物资名称")
+    private String materialsName;
+
+    @ApiModelProperty(value = "领取人Name")
+    private String loanUserName;
+
+    @ApiModelProperty(value = "是否需要归还")
+    private Integer restitutionRequired;
+
+    @ApiModelProperty(value = "领取柜ID")
+    private Long loanFromId;
+
+    @ApiModelProperty(value = "归还柜ID")
+    private Long restitutionToId;
+
+}

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/MaterialsLoan/MaterialsLoanPageVO.java

@@ -0,0 +1,87 @@
+package com.ktg.iscs.domain.vo.MaterialsLoan;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ktg.common.annotation.Excel;
+import com.ktg.common.core.domain.model.BaseBean;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 物资借出对象 is_materials_loan
+ *
+ * @author cgj
+ * @date 2024-11-08
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class MaterialsLoanPageVO extends BaseBean
+{
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "出借记录ID")
+    @TableId(type = IdType.AUTO)
+    private Long materialsLoanId;
+
+    @ApiModelProperty(value = "物资ID")
+    @Excel(name = "物资ID")
+    private Long materialsId;
+
+    @ApiModelProperty(value = "物资编号")
+    @Excel(name = "物资编号")
+    private String materialsCode;
+
+    @ApiModelProperty(value = "物资名称")
+    @Excel(name = "物资名称")
+    private String materialsName;
+
+    @ApiModelProperty(value = "领取人ID")
+    @Excel(name = "领取人ID")
+    private Long loanUserId;
+
+    @ApiModelProperty(value = "领取柜ID")
+    @Excel(name = "领取柜ID")
+    private Long loanFromId;
+
+    @ApiModelProperty(value = "领取柜Name")
+    private String loanFromName;
+
+    @ApiModelProperty(value = "领取时间")
+    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd")
+    @Excel(name = "领取时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date loanTime;
+
+    @ApiModelProperty(value = "提醒时间")
+    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd")
+    @Excel(name = "提醒时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date reminderTime;
+
+    @ApiModelProperty(value = "归还人ID")
+    @Excel(name = "归还人ID")
+    private Long restitutionUserId;
+
+    @ApiModelProperty(value = "归还柜ID")
+    @Excel(name = "归还柜ID")
+    private Long restitutionToId;
+
+    @ApiModelProperty(value = "归还柜Name")
+    private String restitutionToName;
+
+    @ApiModelProperty(value = "归还时间")
+    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd")
+    @Excel(name = "归还时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date restitutionTime;
+
+    @ApiModelProperty(value = "是否需要归还")
+    @Excel(name = "是否需要归还")
+    private Integer restitutionRequired;
+
+    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+
+
+}

ktg-iscs/src/main/java/com/ktg/iscs/mapper/IsMaterialsLoanMapper.java

@@ -1,8 +1,12 @@
 package com.ktg.iscs.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ktg.common.mapper.BaseMapperX;
 import com.ktg.iscs.domain.IsMaterialsLoan;
+import com.ktg.iscs.domain.dto.MaterialsLoan.MaterialsLoanPageDTO;
+import com.ktg.iscs.domain.vo.MaterialsLoan.MaterialsLoanPageVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -62,4 +66,6 @@ public interface IsMaterialsLoanMapper extends BaseMapperX<IsMaterialsLoan>
      * @return 结果
      */
     int deleteIsMaterialsLoanByMaterialsLoanIds(Long[] materialsLoanIds);
+
+    Page<MaterialsLoanPageVO> getIsMaterialsLoanPage(Page<IsMaterialsLoan> page, @Param(value = "dto") MaterialsLoanPageDTO dto);
 }

ktg-iscs/src/main/java/com/ktg/iscs/service/IIsMaterialsLoanService.java

@@ -1,7 +1,10 @@
 package com.ktg.iscs.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ktg.iscs.domain.IsMaterialsLoan;
+import com.ktg.iscs.domain.dto.MaterialsLoan.MaterialsLoanPageDTO;
+import com.ktg.iscs.domain.vo.MaterialsLoan.MaterialsLoanPageVO;
 
 import java.util.List;
 
@@ -60,4 +63,6 @@ public interface IIsMaterialsLoanService extends IService<IsMaterialsLoan>
      * @return 结果
      */
     int deleteIsMaterialsLoanByMaterialsLoanId(Long materialsLoanId);
+
+    Page<MaterialsLoanPageVO> getIsMaterialsLoanPage(Page<IsMaterialsLoan> page, MaterialsLoanPageDTO dto);
 }

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsMaterialsLoanServiceImpl.java

@@ -1,10 +1,13 @@
 package com.ktg.iscs.service.impl;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ktg.common.core.text.Convert;
 import com.ktg.common.utils.DateUtils;
 import com.ktg.iscs.domain.IsMaterialsLoan;
+import com.ktg.iscs.domain.dto.MaterialsLoan.MaterialsLoanPageDTO;
+import com.ktg.iscs.domain.vo.MaterialsLoan.MaterialsLoanPageVO;
 import com.ktg.iscs.mapper.IsMaterialsLoanMapper;
 import com.ktg.iscs.service.IIsMaterialsLoanService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -99,4 +102,9 @@ public class IsMaterialsLoanServiceImpl extends ServiceImpl<IsMaterialsLoanMappe
     {
         return isMaterialsLoanMapper.deleteIsMaterialsLoanByMaterialsLoanId(materialsLoanId);
     }
+
+    @Override
+    public Page<MaterialsLoanPageVO> getIsMaterialsLoanPage(Page<IsMaterialsLoan> page, MaterialsLoanPageDTO dto) {
+        return isMaterialsLoanMapper.getIsMaterialsLoanPage(page, dto);
+    }
 }

ktg-iscs/src/main/resources/mapper/IsMaterialsLoanMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ktg.iscs.mapper.IsMaterialsLoanMapper">
-    
+
     <resultMap type="IsMaterialsLoan" id="IsMaterialsLoanResult">
         <result property="materialsLoanId"    column="materials_loan_id"    />
         <result property="materialsId"    column="materials_id"    />
@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="restitutionUserId"    column="restitution_user_id"    />
         <result property="restitutionToId"    column="restitution_to_id"    />
         <result property="restitutionTime"    column="restitution_time"    />
+        <result property="restitutionRequired"    column="restitution_required"    />
         <result property="remark"    column="remark"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createBy"    column="create_by"    />
@@ -28,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectIsMaterialsLoanList" parameterType="IsMaterialsLoan" resultMap="IsMaterialsLoanResult">
         <include refid="selectIsMaterialsLoanVo"/>
-        <where>  
+        <where>
             <if test="materialsId != null "> and materials_id = #{materialsId}</if>
             <if test="loanUserId != null "> and loan_user_id = #{loanUserId}</if>
             <if test="loanFromId != null "> and loan_from_id = #{loanFromId}</if>
@@ -39,12 +40,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="restitutionTime != null "> and restitution_time = #{restitutionTime}</if>
         </where>
     </select>
-    
+
     <select id="selectIsMaterialsLoanByMaterialsLoanId" parameterType="Long" resultMap="IsMaterialsLoanResult">
         <include refid="selectIsMaterialsLoanVo"/>
         where materials_loan_id = #{materialsLoanId}
     </select>
-        
+
     <insert id="insertIsMaterialsLoan" parameterType="IsMaterialsLoan" useGeneratedKeys="true" keyProperty="materialsLoanId">
         insert into is_materials_loan
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -56,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="restitutionUserId != null">restitution_user_id,</if>
             <if test="restitutionToId != null">restitution_to_id,</if>
             <if test="restitutionTime != null">restitution_time,</if>
+            <if test="restitutionRequired != null">restitutionRequired,</if>
             <if test="remark != null">remark,</if>
             <if test="delFlag != null">del_flag,</if>
             <if test="createBy != null">create_by,</if>
@@ -72,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="restitutionUserId != null">#{restitutionUserId},</if>
             <if test="restitutionToId != null">#{restitutionToId},</if>
             <if test="restitutionTime != null">#{restitutionTime},</if>
+            <if test="restitutionRequired != null">#{restitutionRequired},</if>
             <if test="remark != null">#{remark},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -92,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="restitutionUserId != null">restitution_user_id = #{restitutionUserId},</if>
             <if test="restitutionToId != null">restitution_to_id = #{restitutionToId},</if>
             <if test="restitutionTime != null">restitution_time = #{restitutionTime},</if>
+            <if test="restitutionRequired != null">restitution_required = #{restitutionRequired},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
@@ -107,9 +111,46 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteIsMaterialsLoanByMaterialsLoanIds" parameterType="String">
-        delete from is_materials_loan where materials_loan_id in 
+        delete from is_materials_loan where materials_loan_id in
         <foreach item="materialsLoanId" collection="array" open="(" separator="," close=")">
             #{materialsLoanId}
         </foreach>
     </delete>
-</mapper>
+
+    <select id="getIsMaterialsLoanPage" resultType="com.ktg.iscs.domain.vo.MaterialsLoan.MaterialsLoanPageVO">
+        SELECT
+            l.*,
+            m.materials_code,
+            m.materials_name,
+            c1.cabinet_name as loan_from_name,
+            c2.cabinet_name as restitution_to_name,
+            u.user_name as loan_user_name
+        FROM
+            is_materials_loan l
+        LEFT JOIN is_materials m ON m.materials_id = l.materials_id
+        LEFT JOIN is_materials_cabinet c1 ON c1.cabinet_id = l.loan_from_id
+        LEFT JOIN is_materials_cabinet c2 ON c2.cabinet_id = l.restitution_to_id
+        LEFT JOIN sys_user u ON u.user_id = l.loan_user_id
+        <where>
+            <if test="dto.materialsCode != null and dto.materialsCode.trim != ''">
+                and m.materials_code like concat('%',#{dto.materialsCode},'%')
+            </if>
+            <if test="dto.materialsName != null and dto.materialsName.trim != ''">
+                and m.materials_name like concat('%',#{dto.materialsName},'%')
+            </if>
+            <if test="dto.loanUserName != null and dto.loanUserName.trim != ''">
+                and u.user_name like concat('%',#{dto.loanUserName},'%')
+            </if>
+            <if test="dto.restitutionRequired != null">
+                and l.restitution_required = #{dto.restitutionRequired}
+            </if>
+            <if test="dto.loanFromId != null">
+                and l.loan_from_id = #{dto.loanFromId}
+            </if>
+            <if test="dto.restitutionToId != null">
+                and l.restitution_to_id = #{dto.restitutionToId}
+            </if>
+        </where>
+        ORDER BY l.materials_loan_id DESC
+    </select>
+</mapper>

ktg-iscs/src/main/resources/mapper/IsMaterialsMapper.xml

@@ -88,7 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
-            <if test="loanState != null and loanState != ''">loan_state,</if>
+            <if test="loanState != null and loanState != ''">#{loanState},</if>
          </trim>
     </insert>