处理isc_materials_loan

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/materialsloan/MaterialsLoanController.java

@@ -1,95 +1,92 @@
-package cn.iocoder.yudao.module.iscs.controller.admin.materialsloan;
-
-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.materialsloan.vo.*;
-import cn.iocoder.yudao.module.iscs.dal.dataobject.materialsloan.MaterialsLoanDO;
-import cn.iocoder.yudao.module.iscs.service.materialsloan.MaterialsLoanService;
-
-@Tag(name = "管理后台 - 物资借出")
-@RestController
-@RequestMapping("/iscs/materials-loan")
-@Validated
-public class MaterialsLoanController {
-
-    @Resource
-    private MaterialsLoanService materialsLoanService;
-
-    @PostMapping("/insertMaterialsLoan")
-    @Operation(summary = "创建物资借出")
-    @PreAuthorize("@ss.hasPermission('iscs:materials-loan:create')")
-    public CommonResult<Long> insertMaterialsLoan(@Valid @RequestBody MaterialsLoanSaveReqVO createReqVO) {
-        return success(materialsLoanService.createMaterialsLoan(createReqVO));
-    }
-
-    @PutMapping("/updateMaterialsLoan")
-    @Operation(summary = "更新物资借出")
-    @PreAuthorize("@ss.hasPermission('iscs:materials-loan:update')")
-    public CommonResult<Boolean> updateMaterialsLoan(@Valid @RequestBody MaterialsLoanSaveReqVO updateReqVO) {
-        materialsLoanService.updateMaterialsLoan(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/deleteMaterialsLoanList")
-    @Parameter(name = "ids", description = "编号", required = true)
-    @Operation(summary = "批量删除物资借出")
-                @PreAuthorize("@ss.hasPermission('iscs:materials-loan:delete')")
-    public CommonResult<Boolean> deleteMaterialsLoanList(@RequestParam("ids") List<Long> ids) {
-        materialsLoanService.deleteMaterialsLoanListByIds(ids);
-        return success(true);
-    }
-
-    @GetMapping("/selectMaterialsLoanById")
-    @Operation(summary = "获得物资借出")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('iscs:materials-loan:query')")
-    public CommonResult<MaterialsLoanRespVO> selectMaterialsLoanById(@RequestParam("id") Long id) {
-        MaterialsLoanDO materialsLoan = materialsLoanService.getMaterialsLoan(id);
-        return success(BeanUtils.toBean(materialsLoan, MaterialsLoanRespVO.class));
-    }
-
-    @GetMapping("/getMaterialsLoanPage")
-    @Operation(summary = "获得物资借出分页")
-    @PreAuthorize("@ss.hasPermission('iscs:materials-loan:query')")
-    public CommonResult<PageResult<MaterialsLoanRespVO>> getMaterialsLoanPage(@Valid MaterialsLoanPageReqVO pageReqVO) {
-        PageResult<MaterialsLoanDO> pageResult = materialsLoanService.getMaterialsLoanPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, MaterialsLoanRespVO.class));
-    }
-
-    @GetMapping("/exportMaterialsLoanExcel")
-    @Operation(summary = "导出物资借出 Excel")
-    @PreAuthorize("@ss.hasPermission('iscs:materials-loan:export')")
-    @ApiAccessLog(operateType = EXPORT)
-    public void exportMaterialsLoanExcel(@Valid MaterialsLoanPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<MaterialsLoanDO> list = materialsLoanService.getMaterialsLoanPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "物资借出.xls", "数据", MaterialsLoanRespVO.class,
-                        BeanUtils.toBean(list, MaterialsLoanRespVO.class));
-    }
-
-}
+package cn.iocoder.yudao.module.iscs.controller.admin.materialsloan;
+
+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.materialsloan.vo.MaterialsLoanPageReqVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.materialsloan.vo.MaterialsLoanRespVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.materialsloan.vo.MaterialsLoanSaveReqVO;
+import cn.iocoder.yudao.module.iscs.dal.dataobject.materialsloan.MaterialsLoanDO;
+import cn.iocoder.yudao.module.iscs.service.materialsloan.MaterialsLoanService;
+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-loan")
+@Validated
+public class MaterialsLoanController {
+
+    @Resource
+    private MaterialsLoanService materialsLoanService;
+
+    @PostMapping("/insertMaterialsLoan")
+    @Operation(summary = "创建物资借出")
+    @PreAuthorize("@ss.hasPermission('iscs:materials-loan:create')")
+    public CommonResult<Long> insertMaterialsLoan(@Valid @RequestBody MaterialsLoanSaveReqVO createReqVO) {
+        return success(materialsLoanService.createMaterialsLoan(createReqVO));
+    }
+
+    @PutMapping("/updateMaterialsLoan")
+    @Operation(summary = "更新物资借出")
+    @PreAuthorize("@ss.hasPermission('iscs:materials-loan:update')")
+    public CommonResult<Boolean> updateMaterialsLoan(@Valid @RequestBody MaterialsLoanSaveReqVO updateReqVO) {
+        materialsLoanService.updateMaterialsLoan(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/deleteMaterialsLoanList")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除物资借出")
+                @PreAuthorize("@ss.hasPermission('iscs:materials-loan:delete')")
+    public CommonResult<Boolean> deleteMaterialsLoanList(@RequestParam("ids") List<Long> ids) {
+        materialsLoanService.deleteMaterialsLoanListByIds(ids);
+        return success(true);
+    }
+
+    @GetMapping("/selectMaterialsLoanById")
+    @Operation(summary = "获得物资借出")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('iscs:materials-loan:query')")
+    public CommonResult<MaterialsLoanRespVO> selectMaterialsLoanById(@RequestParam("id") Long id) {
+        MaterialsLoanDO materialsLoan = materialsLoanService.getMaterialsLoan(id);
+        return success(BeanUtils.toBean(materialsLoan, MaterialsLoanRespVO.class));
+    }
+
+    @GetMapping("/getMaterialsLoanPage")
+    @Operation(summary = "获得物资借出分页")
+    @PreAuthorize("@ss.hasPermission('iscs:materials-loan:query')")
+    public CommonResult<PageResult<MaterialsLoanRespVO>> getMaterialsLoanPage(@Valid MaterialsLoanPageReqVO pageReqVO) {
+        PageResult<MaterialsLoanRespVO> pageResult = materialsLoanService.getMaterialsLoanPage(pageReqVO);
+        return success(pageResult);
+    }
+
+    @GetMapping("/exportMaterialsLoanExcel")
+    @Operation(summary = "导出物资借出 Excel")
+    @PreAuthorize("@ss.hasPermission('iscs:materials-loan:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportMaterialsLoanExcel(@Valid MaterialsLoanPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<MaterialsLoanRespVO> list = materialsLoanService.getMaterialsLoanPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "物资借出.xls", "数据", MaterialsLoanRespVO.class, list);
+    }
+
+}

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/materialsloan/vo/MaterialsLoanRespVO.java

@@ -1,11 +1,11 @@
 package cn.iocoder.yudao.module.iscs.controller.admin.materialsloan.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
@@ -72,4 +72,31 @@ public class MaterialsLoanRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
-}
+    @Schema(description = "领取柜Name")
+    private String loanFromName;
+
+    @Schema(description = "归还柜Name")
+    private String restitutionToName;
+
+    @Schema(description = "归还人Name")
+    private String restitutionUserName;
+
+    @Schema(description = "领取人NAME")
+    private String loanUserName;
+
+    @Schema(description = "物资类型ID")
+    private Long materialsTypeId;
+
+    @Schema(description = "物资类型Name")
+    private String materialsTypeName;
+
+    @Schema(description = "物资类型图标")
+    private String materialsTypeIcon;
+
+    @Schema(description = "物资类型缩略图")
+    private String materialsTypePicture;
+
+    @Schema(description = "借出时长")
+    private String loanDuration;
+
+}

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/dal/mysql/materialsloan/MaterialsLoanMapper.java

@@ -1,13 +1,14 @@
 package cn.iocoder.yudao.module.iscs.dal.mysql.materialsloan;
 
-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.materialsloan.vo.MaterialsLoanPageReqVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.materialsloan.vo.MaterialsLoanRespVO;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.materialsloan.MaterialsLoanDO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
-import cn.iocoder.yudao.module.iscs.controller.admin.materialsloan.vo.*;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 物资借出 Mapper
@@ -36,4 +37,7 @@ public interface MaterialsLoanMapper extends BaseMapperX<MaterialsLoanDO> {
                 .orderByDesc(MaterialsLoanDO::getId));
     }
 
-}
+    Page<MaterialsLoanRespVO> getMaterialsLoanPage(Page<MaterialsLoanDO> page, @Param(value = "vo") MaterialsLoanPageReqVO vo);
+
+
+}

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/materialsloan/MaterialsLoanService.java

@@ -1,63 +1,65 @@
-package cn.iocoder.yudao.module.iscs.service.materialsloan;
-
-import java.util.*;
-import jakarta.validation.*;
-import cn.iocoder.yudao.module.iscs.controller.admin.materialsloan.vo.*;
-import cn.iocoder.yudao.module.iscs.dal.dataobject.materialsloan.MaterialsLoanDO;
-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 MaterialsLoanService extends IService<MaterialsLoanDO> {
-
-    /**
-     * 创建物资借出
-     *
-     * @param createReqVO 创建信息
-     * @return 编号
-     */
-    Long createMaterialsLoan(@Valid MaterialsLoanSaveReqVO createReqVO);
-
-    /**
-     * 更新物资借出
-     *
-     * @param updateReqVO 更新信息
-     */
-    void updateMaterialsLoan(@Valid MaterialsLoanSaveReqVO updateReqVO);
-
-    /**
-     * 删除物资借出
-     *
-     * @param id 编号
-     */
-    void deleteMaterialsLoan(Long id);
-
-    /**
-    * 批量删除物资借出
-    *
-    * @param ids 编号
-    */
-    void deleteMaterialsLoanListByIds(List<Long> ids);
-
-    /**
-     * 获得物资借出
-     *
-     * @param id 编号
-     * @return 物资借出
-     */
-    MaterialsLoanDO getMaterialsLoan(Long id);
-
-    /**
-     * 获得物资借出分页
-     *
-     * @param pageReqVO 分页查询
-     * @return 物资借出分页
-     */
-    PageResult<MaterialsLoanDO> getMaterialsLoanPage(MaterialsLoanPageReqVO pageReqVO);
-
-}
+package cn.iocoder.yudao.module.iscs.service.materialsloan;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.iscs.controller.admin.materialsloan.vo.MaterialsLoanPageReqVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.materialsloan.vo.MaterialsLoanRespVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.materialsloan.vo.MaterialsLoanSaveReqVO;
+import cn.iocoder.yudao.module.iscs.dal.dataobject.materialsloan.MaterialsLoanDO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import jakarta.validation.Valid;
+
+import java.util.List;
+
+/**
+ * 物资借出 Service 接口
+ *
+ * @author 芋道源码
+ */
+public interface MaterialsLoanService extends IService<MaterialsLoanDO> {
+
+    /**
+     * 创建物资借出
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createMaterialsLoan(@Valid MaterialsLoanSaveReqVO createReqVO);
+
+    /**
+     * 更新物资借出
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateMaterialsLoan(@Valid MaterialsLoanSaveReqVO updateReqVO);
+
+    /**
+     * 删除物资借出
+     *
+     * @param id 编号
+     */
+    void deleteMaterialsLoan(Long id);
+
+    /**
+    * 批量删除物资借出
+    *
+    * @param ids 编号
+    */
+    void deleteMaterialsLoanListByIds(List<Long> ids);
+
+    /**
+     * 获得物资借出
+     *
+     * @param id 编号
+     * @return 物资借出
+     */
+    MaterialsLoanDO getMaterialsLoan(Long id);
+
+    /**
+     * 获得物资借出分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 物资借出分页
+     */
+    PageResult<MaterialsLoanRespVO> getMaterialsLoanPage(MaterialsLoanPageReqVO pageReqVO);
+
+}

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/materialsloan/MaterialsLoanServiceImpl.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.materialsloan.vo.MaterialsLoanPageReqVO;
+import cn.iocoder.yudao.module.iscs.controller.admin.materialsloan.vo.MaterialsLoanRespVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.materialsloan.vo.MaterialsLoanSaveReqVO;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.materialsloan.MaterialsLoanDO;
 import cn.iocoder.yudao.module.iscs.dal.mysql.materialsloan.MaterialsLoanMapper;
+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 MaterialsLoanServiceImpl extends ServiceImpl<MaterialsLoanMapper, M
     }
 
     @Override
-    public PageResult<MaterialsLoanDO> getMaterialsLoanPage(MaterialsLoanPageReqVO pageReqVO) {
-        return materialsLoanMapper.selectPage(pageReqVO);
+    public PageResult<MaterialsLoanRespVO> getMaterialsLoanPage(MaterialsLoanPageReqVO pageReqVO) {
+        Page<MaterialsLoanDO> page = new Page<MaterialsLoanDO>().setCurrent(pageReqVO.getPageNo()).setSize(pageReqVO.getPageSize());
+        Page<MaterialsLoanRespVO> pageResult = materialsLoanMapper.getMaterialsLoanPage(page, pageReqVO);
+        PageResult<MaterialsLoanRespVO> respVOPageResult = new PageResult<>();
+        respVOPageResult.setList(pageResult.getRecords());
+        respVOPageResult.setTotal(pageResult.getTotal());
+        return respVOPageResult;
     }
 
 }

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

@@ -9,4 +9,78 @@
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
 
-</mapper>
+    <select id="getMaterialsLoanPage"
+            resultType="cn.iocoder.yudao.module.iscs.controller.admin.materialsloan.vo.MaterialsLoanRespVO">
+        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,
+        u1.user_name as restitution_user_name,
+        m.materials_type_id,
+        mt.materials_type_name,
+        mt.materials_type_icon,
+        mt.materials_type_picture,
+        CASE
+        WHEN l.actual_restitution_time IS NOT NULL THEN
+        CONCAT(
+        FLOOR( TIMESTAMPDIFF( SECOND, l.loan_time, l.actual_restitution_time ) / 3600 ),
+        '小时 ',
+        MOD ( FLOOR( TIMESTAMPDIFF( SECOND, l.loan_time, l.actual_restitution_time ) / 60 ), 60 ),
+        '分 ',
+        MOD ( TIMESTAMPDIFF( SECOND, l.loan_time, l.actual_restitution_time ), 60 ),
+        '秒'
+        ) ELSE null
+        END AS loan_duration
+
+        FROM
+        isc_materials_loan l
+        LEFT JOIN isc_materials m ON m.id = l.materials_id
+        LEFT JOIN isc_materials_cabinet c1 ON c1.id = l.loan_from_id
+        LEFT JOIN isc_materials_cabinet c2 ON c2.id = l.restitution_to_id
+        LEFT JOIN system_user u ON u.id = l.loan_user_id
+        LEFT JOIN system_user u1 ON u1.id = l.restitution_user_id
+        LEFT JOIN isc_materials_type mt ON mt.id = m.materials_type_id
+        <where>
+            <if test="vo.materialsName != null and vo.materialsName.trim != ''">
+                and m.materials_name like concat('%',#{vo.materialsName},'%')
+            </if>
+            <if test="vo.restitutionRequired != null">
+                and l.restitution_required = #{vo.restitutionRequired}
+            </if>
+            <if test="vo.loanFromId != null">
+                and l.loan_from_id = #{vo.loanFromId}
+            </if>
+            <if test="vo.restitutionToId != null">
+                and l.restitution_to_id = #{vo.restitutionToId}
+            </if>
+            <if test="vo.materialsTypeId != null">
+                and m.materials_type_id = #{vo.materialsTypeId}
+            </if>
+            <if test="vo.loanUserName != null and vo.loanUserName.trim != ''">
+                and u.user_name like concat('%',#{vo.loanUserName},'%')
+            </if>
+            <if test="vo.loanTimeStart != null and vo.loanTimeStart.trim != ''">
+                and l.loan_time &gt;= #{vo.loanTimeStart}
+            </if>
+            <if test="vo.loanTimeEnd != null and vo.loanTimeEnd.trim != ''">
+                and l.loan_time &lt;= #{vo.loanTimeEnd}
+            </if>
+            <if test="vo.restitutionUserName != null and vo.restitutionUserName.trim != ''">
+                and u1.user_name like concat('%',#{vo.restitutionUserName},'%')
+            </if>
+            <if test="vo.restitutionTimeStart != null and vo.restitutionTimeStart.trim != ''">
+                and l.actual_restitution_time &gt;= #{vo.restitutionTimeStart}
+            </if>
+            <if test="vo.restitutionTimeEnd != null and vo.restitutionTimeEnd.trim != ''">
+                and l.actual_restitution_time &lt;= #{vo.restitutionTimeEnd}
+            </if>
+            <if test="vo.status != null and vo.status.trim != ''">
+                and l.status = #{vo.status}
+            </if>
+        </where>
+        ORDER BY l.id DESC
+    </select>
+</mapper>