src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java
@@ -30,7 +30,14 @@ @ApiOperation("文档信息表-分页查询") @Log(title = "文档信息表-分页查询", businessType = BusinessType.OTHER) public AjaxResult listPage(Page page, Documentation documentation) { List<DocumentationDto> list = documentationService.listPage(page, documentation); IPage<DocumentationDto> list = documentationService.listPage(page, documentation); return AjaxResult.success(list); } @GetMapping("/list") @ApiOperation("文档信息表查询") @Log(title = "文档信息表查询", businessType = BusinessType.OTHER) public AjaxResult list() { List<DocumentationDto> list = documentationService.listAll(); return AjaxResult.success(list); } @PostMapping("/add") src/main/java/com/ruoyi/warehouse/dto/DocumentationBorrowManagementDto.java
@@ -12,14 +12,5 @@ */ @Excel(name = "文档名称") private String docName; /** * 借阅人 */ @Excel(name = "借阅人") private String nickName; /** * 归还人 */ @Excel(name = "归还人") private String returnNickName; } src/main/java/com/ruoyi/warehouse/dto/ReturnExportDto.java
@@ -12,14 +12,14 @@ @Excel(name = "文档名称") private String docName; // 文档名称 @Excel(name = "原借阅人") private String nickName; // 借阅人 private String borrower; // 借阅人 @Excel(name = "借阅时间", dateFormat = "yyyy-MM-dd", width = 30) @JsonFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDateTime borrowDate; // 借阅时间 @Excel(name = "归还人") @NotBlank(message = "归还人不能为空!!") private String returnNickName; // 归还人 private String returner; // 归还人 @Excel(name = "归还时间", dateFormat = "yyyy-MM-dd", width = 30) @JsonFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") src/main/java/com/ruoyi/warehouse/mapper/DocumentationMapper.java
@@ -20,8 +20,10 @@ @Mapper public interface DocumentationMapper extends BaseMapper<Documentation> { List<DocumentationDto> listPage(Page page, @Param("documentation") Documentation documentation); IPage<DocumentationDto> listPage(Page page, @Param("documentation") Documentation documentation); List<DocumentationDto> list(); List<DocumentationDto> listByDocumentClassificationId(@Param("documentClassificationId") Long documentClassificationId); List<DocumentationDto> listBywarehouseGoodsShelvesRowcolId(@Param("warehouseGoodsShelvesRowcolId") Long warehouseGoodsShelvesRowcolId); }
@@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.*; import java.io.Serializable; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Date; @@ -37,15 +38,17 @@ private Long documentationId; /** * 借阅人id * 借阅人 */ @ApiModelProperty(value = "借阅人id") private Long borrowerId; @ApiModelProperty(value = "借阅人") @Excel(name = "借阅人") private String borrower; /** * 归还人id * 归还人 */ @ApiModelProperty(value = "归还人id") private Long returnerId; @ApiModelProperty(value = "归还人") @Excel(name = "归还人") private String returner; /** * 借阅目的 @@ -60,25 +63,25 @@ @ApiModelProperty(value = "借阅日期") @Excel(name = "借阅日期", dateFormat = "yyyy-MM-dd", width = 30) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDateTime borrowDate; private LocalDate borrowDate; /** * 应归还日期 */ @ApiModelProperty(value = "应归还日期") @Excel(name = "应归还日期", dateFormat = "yyyy-MM-dd", width = 30) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime dueReturnDate; @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private LocalDate dueReturnDate; /** * 实际归还日期 */ @ApiModelProperty(value = "实际归还日期") @Excel(name = "实际归还日期", dateFormat = "yyyy-MM-dd", width = 30) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime returnDate; @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private LocalDate returnDate; /** * 借阅状态 src/main/java/com/ruoyi/warehouse/service/DocumentationService.java
@@ -16,9 +16,11 @@ */ public interface DocumentationService extends IService<Documentation> { List<DocumentationDto> listPage(Page page, Documentation documentation); IPage<DocumentationDto> listPage(Page page, Documentation documentation); void export(HttpServletResponse response,Documentation documentation); boolean deleteByIds(List<Long> ids); List<DocumentationDto> listAll(); } src/main/java/com/ruoyi/warehouse/service/impl/DocumentationBorrowManagementServiceImpl.java
@@ -18,6 +18,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.List; import java.util.stream.Collectors; @@ -54,9 +55,9 @@ public boolean reventdbm(DocumentationBorrowManagement documentationBorrowManagement) { // 更新借阅记录状态为归还 DocumentationBorrowManagement documentationBorrowManagement1 = documentationBorrowManagementMapper.selectById(documentationBorrowManagement.getId()); documentationBorrowManagement1.setReturnerId(documentationBorrowManagement.getReturnerId()); documentationBorrowManagement1.setReturner(documentationBorrowManagement.getReturner()); documentationBorrowManagement1.setBorrowStatus("归还"); documentationBorrowManagement1.setReturnDate(LocalDateTime.now()); documentationBorrowManagement1.setReturnDate(LocalDate.now()); documentationBorrowManagementMapper.updateById(documentationBorrowManagement1); // 更新文档状态为正常 Documentation documentation = documentationService.getById(documentationBorrowManagement.getDocumentationId()); src/main/java/com/ruoyi/warehouse/service/impl/DocumentationServiceImpl.java
@@ -27,15 +27,15 @@ @Autowired private DocumentationMapper documentationMapper; @Override public List<DocumentationDto> listPage(Page page, Documentation documentation) { public IPage<DocumentationDto> listPage(Page page, Documentation documentation) { return documentationMapper.listPage(page, documentation); } @Override public void export(HttpServletResponse response,Documentation documentation) { List<DocumentationDto> list = documentationMapper.listPage(null, documentation); IPage<DocumentationDto> list = documentationMapper.listPage(null, documentation); ExcelUtil<DocumentationDto> util = new ExcelUtil<>(DocumentationDto.class); util.exportExcel(response, list, "文档信息表"); util.exportExcel(response, list.getRecords(), "文档信息表"); } @Override @@ -50,6 +50,11 @@ } return true; } @Override public List<DocumentationDto> listAll() { return documentationMapper.list(); } }
@@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Arrays; import java.util.List; @@ -34,6 +35,12 @@ @Override public List<WarehouseGoodsShelvesRowcolDto> getList(WarehouseGoodsShelvesRowcol warehouseGoodsShelvesRowcol) { List<WarehouseGoodsShelvesRowcolDto> list = warehouseGoodsShelvesRowcolMapper.findList(warehouseGoodsShelvesRowcol); for (WarehouseGoodsShelvesRowcolDto dto : list) { //获取层ids Long id = dto.getId(); //获取文档 dto.setDocumentationDtoList(documentationMapper.listBywarehouseGoodsShelvesRowcolId(id)); } return list; } @Override src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml
@@ -4,22 +4,22 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.warehouse.mapper.DocumentationBorrowManagementMapper"> <resultMap id="BaseResultMap" type="com.ruoyi.warehouse.pojo.DocumentationBorrowManagement"> <id property="id" column="id"/> <result property="documentationId" column="documentation_id" /> <result property="borrowerId" column="borrower_id" /> <result property="borrowPurpose" column="borrow_purpose" /> <result property="borrowDate" column="borrow_date"/> <result property="dueReturnDate" column="due_return_date" /> <result property="returnDate" column="return_date"/> <result property="borrowStatus" column="borrow_status" /> <result property="remark" column="remark"/> <result property="createTime" column="create_time"/> <result property="createUser" column="create_user"/> <result property="updateTime" column="update_time"/> <result property="updateUser" column="update_user"/> <result property="tenantId" column="tenant_id"/> </resultMap> <!-- <resultMap id="BaseResultMap" type="com.ruoyi.warehouse.pojo.DocumentationBorrowManagement">--> <!-- <id property="id" column="id"/>--> <!-- <result property="documentationId" column="documentation_id" />--> <!-- <result property="borrowerId" column="borrower_id" />--> <!-- <result property="borrowPurpose" column="borrow_purpose" />--> <!-- <result property="borrowDate" column="borrow_date"/>--> <!-- <result property="dueReturnDate" column="due_return_date" />--> <!-- <result property="returnDate" column="return_date"/>--> <!-- <result property="borrowStatus" column="borrow_status" />--> <!-- <result property="remark" column="remark"/>--> <!-- <result property="createTime" column="create_time"/>--> <!-- <result property="createUser" column="create_user"/>--> <!-- <result property="updateTime" column="update_time"/>--> <!-- <result property="updateUser" column="update_user"/>--> <!-- <result property="tenantId" column="tenant_id"/>--> <!-- </resultMap>--> <!-- <sql id="Base_Column_List">--> <!-- id,documentation_id,borrower_id,--> @@ -29,11 +29,9 @@ <!-- update_user,tenant_id--> <!-- </sql>--> <select id="listPage" resultType="com.ruoyi.warehouse.dto.DocumentationBorrowManagementDto"> select dbm.*,doc.doc_name,su.nick_name,sur.nick_name as return_nick_name select dbm.*,doc.doc_name from documentation_borrow_management dbm LEFT JOIN documentation doc on doc.id = dbm.documentation_id LEFT JOIN sys_user su on su.user_id = dbm.borrower_id LEFT JOIN sys_user sur on sur.user_id = dbm.returner_id where 1=1 <if test="documentationBorrowManagement.borrowStatus != null"> and borrow_status = #{documentationBorrowManagement.borrowStatus} @@ -41,11 +39,11 @@ <if test="documentationBorrowManagement.documentationId != null"> and documentation_id = #{documentationBorrowManagement.documentationId} </if> <if test="documentationBorrowManagement.borrowerId != null"> and borrower_id = #{documentationBorrowManagement.borrowerId} <if test="documentationBorrowManagement.borrower != null"> and borrower like concat('%',#{documentationBorrowManagement.borrower},'%') </if> <if test="documentationBorrowManagement.returnerId != null"> and returner_id = #{documentationBorrowManagement.returnerId} <if test="documentationBorrowManagement.returner != null"> and returner like concat('%',#{documentationBorrowManagement.returner},'%') </if> <if test="documentationBorrowManagement.entryDateStart != null and documentationBorrowManagement.entryDateStart != ''"> and borrow_date >= DATE_FORMAT(#{documentationBorrowManagement.entryDateStart},'%Y-%m-%d') @@ -55,10 +53,9 @@ </if> </select> <select id="export" resultType="com.ruoyi.warehouse.dto.DocumentationBorrowManagementDto"> select dbm.*,doc.doc_name,su.nick_name select dbm.*,doc.doc_name from documentation_borrow_management dbm LEFT JOIN documentation doc on doc.id = dbm.documentation_id LEFT JOIN sys_user su on su.user_id = dbm.borrower_id where 1=1 <if test="documentationBorrowManagement.borrowStatus != null"> and borrow_status = #{documentationBorrowManagement.borrowStatus} @@ -66,8 +63,11 @@ <if test="documentationBorrowManagement.documentationId != null"> and documentation_id = #{documentationBorrowManagement.documentationId} </if> <if test="documentationBorrowManagement.borrowerId != null"> and borrower_id = #{documentationBorrowManagement.borrowerId} <if test="documentationBorrowManagement.borrower != null"> and borrower like concat('%',#{documentationBorrowManagement.borrower},'%') </if> <if test="documentationBorrowManagement.returner != null"> and returner like concat('%',#{documentationBorrowManagement.returner},'%') </if> <if test="documentationBorrowManagement.entryDateStart != null and documentationBorrowManagement.entryDateStart != ''"> and borrow_date >= DATE_FORMAT(#{documentationBorrowManagement.entryDateStart},'%Y-%m-%d') @@ -77,20 +77,21 @@ </if> </select> <select id="exportrevent" resultType="com.ruoyi.warehouse.dto.ReturnExportDto"> select dbm.*,doc.doc_name,su.nick_name,sur.nick_name as return_nick_name select dbm.*,doc.doc_name from documentation_borrow_management dbm LEFT JOIN documentation doc on doc.id = dbm.documentation_id LEFT JOIN sys_user su on su.user_id = dbm.borrower_id LEFT JOIN sys_user sur on sur.user_id = dbm.returner_id where sur.nick_name IS NOT NULL where dbm.returner IS NOT NULL <if test="documentationBorrowManagement.borrowStatus != null"> and borrow_status = #{documentationBorrowManagement.borrowStatus} </if> <if test="documentationBorrowManagement.documentationId != null"> and documentation_id = #{documentationBorrowManagement.documentationId} </if> <if test="documentationBorrowManagement.borrowerId != null"> and borrower_id = #{documentationBorrowManagement.borrowerId} <if test="documentationBorrowManagement.borrower != null"> and borrower like concat('%',#{documentationBorrowManagement.borrower},'%') </if> <if test="documentationBorrowManagement.returner != null"> and returner like concat('%',#{documentationBorrowManagement.returner},'%') </if> <if test="documentationBorrowManagement.entryDateStart != null and documentationBorrowManagement.entryDateStart != ''"> and borrow_date >= DATE_FORMAT(#{documentationBorrowManagement.entryDateStart},'%Y-%m-%d') src/main/resources/mapper/warehouse/DocumentationMapper.xml
@@ -50,5 +50,38 @@ LEFT JOIN warehouse w ON w.id = wgs.warehouse_id where doc.document_classification_id = #{documentClassificationId} </select> <select id="list" resultType="com.ruoyi.warehouse.dto.DocumentationDto"> SELECT doc.*, dc.category, CONCAT( w.warehouse_name, '-', wgs.name, '-', wgsr.row, '层-', wgsr.col, '列' ) AS location_info -- 合并后的字段名 FROM documentation doc LEFT JOIN document_classification dc ON doc.document_classification_id = dc.id LEFT JOIN warehouse_goods_shelves_rowcol wgsr ON wgsr.id = doc.warehouse_goods_shelves_rowcol_id LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id LEFT JOIN warehouse w ON w.id = wgs.warehouse_id </select> <select id="listBywarehouseGoodsShelvesRowcolId" resultType="com.ruoyi.warehouse.dto.DocumentationDto"> SELECT doc.*, dc.category, CONCAT( w.warehouse_name, '-', wgs.name, '-', wgsr.row, '层-', wgsr.col, '列' ) AS location_info -- 合并后的字段名 FROM documentation doc LEFT JOIN document_classification dc ON doc.document_classification_id = dc.id LEFT JOIN warehouse_goods_shelves_rowcol wgsr ON wgsr.id = doc.warehouse_goods_shelves_rowcol_id LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id LEFT JOIN warehouse w ON w.id = wgs.warehouse_id where doc.warehouse_goods_shelves_rowcol_id = #{warehouseGoodsShelvesRowcolId} </select> </mapper> src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml
@@ -6,7 +6,6 @@ <select id="findList" resultType="com.ruoyi.warehouse.dto.WarehouseGoodsShelvesRowcolDto"> SELECT wgsr.*, doc.*, w.warehouse_name, wgs.name, dc.category
