借出单

sd-business/src/main/java/com/sd/business/controller/lend/LendController.java

@@ -0,0 +1,55 @@
+package com.sd.business.controller.lend;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.sd.business.entity.lend.dto.LendDto;
+import com.sd.business.entity.lend.dto.LendSelectDto;
+import com.sd.business.entity.lend.vo.LendVo;
+import com.sd.business.service.lend.LendService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * <p>
+ * 借出单 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@RestController
+@RequestMapping("/lend")
+public class LendController {
+
+    @Autowired
+    private LendService lendService;
+
+    /**
+     * 借出单分页
+     */
+    @PostMapping("/page")
+    public Page<LendVo> page(@RequestBody LendSelectDto dto) {
+        return lendService.getPage(dto);
+    }
+
+    /**
+     * 借出单明细
+     */
+    @PostMapping("/detail")
+    public LendVo detail(@RequestBody BaseSelectDto dto) {
+        return lendService.detail(dto.getId());
+    }
+
+    /**
+     * 借出单编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody LendDto lendDto) {
+        lendService.edit(lendDto);
+    }
+
+}

sd-business/src/main/java/com/sd/business/entity/lend/dto/LendBomDto.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.lend.dto;
+
+import com.sd.business.entity.lend.po.LendBom;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 借出单bom关联新增编辑入参实体
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@Getter
+@Setter
+public class LendBomDto extends LendBom {
+
+}

sd-business/src/main/java/com/sd/business/entity/lend/dto/LendBomSelectDto.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.lend.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 借出单bom关联列表查询入参实体
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@Getter
+@Setter
+public class LendBomSelectDto extends BaseSelectDto {
+
+}

sd-business/src/main/java/com/sd/business/entity/lend/dto/LendDto.java

@@ -0,0 +1,27 @@
+package com.sd.business.entity.lend.dto;
+
+import com.sd.business.entity.lend.po.Lend;
+import com.sd.business.entity.lend.po.LendBom;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+/**
+ * 借出单新增编辑入参实体
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@Getter
+@Setter
+public class LendDto extends Lend {
+
+    /**
+     * 借出bom
+     */
+    @NotEmpty(message = "借出明细不能为空")
+    private List<LendBom> lendBomList;
+
+}

sd-business/src/main/java/com/sd/business/entity/lend/dto/LendSelectDto.java

@@ -0,0 +1,32 @@
+package com.sd.business.entity.lend.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 借出单列表查询入参实体
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@Getter
+@Setter
+public class LendSelectDto extends BaseSelectDto {
+
+    /**
+     * 借出单号
+     */
+    private String code;
+
+    /**
+     * 流程状态 -1草稿  0未发起 1进行中 2已通过 3已驳回
+     */
+    private Integer flowStatus;
+
+    /**
+     * 归还状态 0未归还 1已归还
+     */
+    private Integer returnStatus;
+
+}

sd-business/src/main/java/com/sd/business/entity/lend/po/Lend.java

@@ -0,0 +1,63 @@
+package com.sd.business.entity.lend.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 借出单
+ * </p>
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@Getter
+@Setter
+@TableName("lend")
+public class Lend extends BasePo {
+
+    /**
+     * 借出单号
+     */
+    private String code;
+
+    /**
+     * 借出人
+     */
+    private String lendName;
+
+    /**
+     * 借出时间
+     */
+    private Date lendTime;
+
+    /**
+     * 归还时间
+     */
+    private Date returnTime;
+
+    /**
+     * 归还状态 0未归还 1已归还
+     */
+    private Integer returnStatus;
+
+    /**
+     * 借出说明
+     */
+    private String remark;
+
+    /**
+     * 流程id
+     */
+    private Long flowId;
+
+    /**
+     * 流程状态 -1草稿  0未发起 1进行中 2已通过 3已驳回
+     */
+    private Integer flowStatus;
+
+}

sd-business/src/main/java/com/sd/business/entity/lend/po/LendBom.java

@@ -0,0 +1,38 @@
+package com.sd.business.entity.lend.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 借出单bom关联
+ * </p>
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@Getter
+@Setter
+@TableName("lend_bom")
+public class LendBom extends BasePo {
+
+    /**
+     * 借出单id
+     */
+    private Long lendId;
+
+    /**
+     * bom规格id
+     */
+    private Long bomSpecId;
+
+    /**
+     * 借出数量
+     */
+    private BigDecimal quantity;
+
+}

sd-business/src/main/java/com/sd/business/entity/lend/vo/LendBomVo.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.lend.vo;
+
+import com.sd.business.entity.lend.po.LendBom;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 借出单bom关联列表查询返回值实体
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@Getter
+@Setter
+public class LendBomVo extends LendBom {
+
+}

sd-business/src/main/java/com/sd/business/entity/lend/vo/LendVo.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.lend.vo;
+
+import com.sd.business.entity.lend.po.Lend;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 借出单列表查询返回值实体
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@Getter
+@Setter
+public class LendVo extends Lend {
+
+}

sd-business/src/main/java/com/sd/business/flow/ApplyFlow.java → sd-business/src/main/java/com/sd/business/flow/ApplyBuyFlow.java

@@ -27,7 +27,7 @@ import java.util.List;
  * 发起申购流程
  */
 @Service
-public class ApplyFlow extends FlowDelegate {
+public class ApplyBuyFlow extends FlowDelegate {
 
     @Autowired
     private ApplyBuyService applyBuyService;
@@ -42,6 +42,7 @@ public class ApplyFlow extends FlowDelegate {
 
     @Override
     public Long start(Long flowId, JSONObject submitData) {
+
         ApplyBuyDto applyBuyDto = submitData.toJavaObject(ApplyBuyDto.class);
         validated(applyBuyDto);
 
@@ -66,19 +67,16 @@ public class ApplyFlow extends FlowDelegate {
 
     @Override
     public void end(Long flowId, Long businessId, JSONObject submitData) {
-
         applyBuyService.update(q -> q
                 .eq(BaseIdPo::getId, businessId)
                 .set(ApplyBuy::getFlowStatus, FlowStatusEnum.PASS.getKey())
                 .set(BasePo::getUpdateTime, new Date())
                 .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
         );
-
     }
 
     public void jump() {
-
+        // 如果是驳回，修改流程状态为驳回
-        // 如果是驳回，修改状态为驳回
         if (HandleTypeEnum.REJECT.equals(FlowThreadLocalUtil.getHandleTypeEnum())) {
             applyBuyService.update(q -> q
                     .eq(BaseIdPo::getId, FlowThreadLocalUtil.getBusinessId())
@@ -87,14 +85,12 @@ public class ApplyFlow extends FlowDelegate {
                     .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
             );
         }
-
     }
 
     /**
      * 验证数据
      */
     private void validated(ApplyBuyDto applyBuyDto) {
-
         Assert.notBlank(applyBuyDto.getApplyName(), "申购人不能为空");
         Assert.notEmpty(applyBuyDto.getApplyTime(), "申购时间不能为空");
 
@@ -102,11 +98,10 @@ public class ApplyFlow extends FlowDelegate {
         Assert.notEmpty(applyBuyBomList, "申购清单不能为空");
 
         for (ApplyBuyBom applyBuyBom : applyBuyBomList) {
-            Assert.notNull(applyBuyBom.getBomSpecId(), "bomId不能为空");
+            Assert.notNull(applyBuyBom.getBomSpecId(), "bom规格Id不能为空");
             Assert.notNull(applyBuyBom.getQuantity(), "申购数量不能为空");
             Assert.gtZero(applyBuyBom.getQuantity(), "申购数量必须大于0");
         }
-
     }
 
 }

sd-business/src/main/java/com/sd/business/flow/LendFlow.java

@@ -0,0 +1,108 @@
+package com.sd.business.flow;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.fjhx.flow.core.FlowDelegate;
+import com.fjhx.flow.core.FlowThreadLocalUtil;
+import com.fjhx.flow.enums.FlowStatusEnum;
+import com.fjhx.flow.enums.HandleTypeEnum;
+import com.ruoyi.common.constant.StatusConstant;
+import com.ruoyi.common.core.domain.BaseIdPo;
+import com.ruoyi.common.core.domain.BasePo;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.sd.business.entity.lend.dto.LendDto;
+import com.sd.business.entity.lend.po.Lend;
+import com.sd.business.entity.lend.po.LendBom;
+import com.sd.business.service.lend.LendBomService;
+import com.sd.business.service.lend.LendService;
+import com.sd.business.util.CodeEnum;
+import com.sd.framework.util.Assert;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 发起借出流程
+ */
+@Service
+public class LendFlow extends FlowDelegate {
+
+    @Autowired
+    private LendService lendService;
+
+    @Autowired
+    private LendBomService lendBomService;
+
+    @Override
+    public String getFlowKey() {
+        return "apply_buy";
+    }
+
+    @Override
+    public Long start(Long flowId, JSONObject submitData) {
+
+        LendDto lendDto = submitData.toJavaObject(LendDto.class);
+        validated(lendDto);
+
+        long lendId = IdWorker.getId();
+
+        lendDto.setId(lendId);
+        lendDto.setCode(CodeEnum.LEND_CODE.getCode());
+        lendDto.setFlowId(flowId);
+        lendDto.setFlowStatus(FlowStatusEnum.IN_PROGRESS.getKey());
+        lendDto.setReturnStatus(StatusConstant.NO);
+
+        List<LendBom> lendBomList = lendDto.getLendBomList();
+        for (LendBom lendBom : lendBomList) {
+            lendBom.setLendId(lendId);
+        }
+
+        lendService.save(lendDto);
+        lendBomService.saveBatch(lendBomList);
+
+        return lendId;
+    }
+
+    @Override
+    public void end(Long flowId, Long businessId, JSONObject submitData) {
+        lendService.update(q -> q
+                .eq(BaseIdPo::getId, businessId)
+                .set(Lend::getFlowStatus, FlowStatusEnum.PASS.getKey())
+                .set(BasePo::getUpdateTime, new Date())
+                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+        );
+    }
+
+    public void jump() {
+        // 如果是驳回，修改流程状态为驳回
+        if (HandleTypeEnum.REJECT.equals(FlowThreadLocalUtil.getHandleTypeEnum())) {
+            lendService.update(q -> q
+                    .eq(BaseIdPo::getId, FlowThreadLocalUtil.getBusinessId())
+                    .set(Lend::getFlowStatus, FlowStatusEnum.REJECT.getKey())
+                    .set(BasePo::getUpdateTime, new Date())
+                    .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+            );
+        }
+    }
+
+    /**
+     * 验证数据
+     */
+    private void validated(LendDto lendDto) {
+        Assert.notBlank(lendDto.getLendName(), "借出人不能为空");
+        Assert.notEmpty(lendDto.getLendTime(), "借出时间不能为空");
+        Assert.notEmpty(lendDto.getReturnTime(), "归还时间不能为空");
+
+        List<LendBom> lendBomList = lendDto.getLendBomList();
+        Assert.notEmpty(lendBomList, "借出明细不能为空");
+
+        for (LendBom lendBom : lendBomList) {
+            Assert.notNull(lendBom.getBomSpecId(), "bom规格Id不能为空");
+            Assert.notNull(lendBom.getQuantity(), "借出数量不能为空");
+            Assert.gtZero(lendBom.getQuantity(), "借出数量必须大于0");
+        }
+    }
+
+}

sd-business/src/main/java/com/sd/business/mapper/lend/LendBomMapper.java

@@ -0,0 +1,17 @@
+package com.sd.business.mapper.lend;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sd.business.entity.lend.po.LendBom;
+
+
+/**
+ * <p>
+ * 借出单bom关联 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2023-06-30
+ */
+public interface LendBomMapper extends BaseMapper<LendBom> {
+
+}

sd-business/src/main/java/com/sd/business/mapper/lend/LendMapper.java

@@ -0,0 +1,26 @@
+package com.sd.business.mapper.lend;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.lend.po.Lend;
+import com.sd.business.entity.lend.vo.LendVo;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 借出单 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2023-06-30
+ */
+public interface LendMapper extends BaseMapper<Lend> {
+
+    /**
+     * 借出单分页
+     */
+    Page<LendVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<Lend> wrapper);
+
+}

sd-business/src/main/java/com/sd/business/service/lend/LendBomService.java

@@ -0,0 +1,17 @@
+package com.sd.business.service.lend;
+
+import com.ruoyi.common.core.service.BaseService;
+import com.sd.business.entity.lend.po.LendBom;
+
+
+/**
+ * <p>
+ * 借出单bom关联 服务类
+ * </p>
+ *
+ * @author
+ * @since 2023-06-30
+ */
+public interface LendBomService extends BaseService<LendBom> {
+
+}

sd-business/src/main/java/com/sd/business/service/lend/LendService.java

@@ -0,0 +1,36 @@
+package com.sd.business.service.lend;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.service.BaseService;
+import com.sd.business.entity.lend.dto.LendDto;
+import com.sd.business.entity.lend.dto.LendSelectDto;
+import com.sd.business.entity.lend.po.Lend;
+import com.sd.business.entity.lend.vo.LendVo;
+
+
+/**
+ * <p>
+ * 借出单 服务类
+ * </p>
+ *
+ * @author
+ * @since 2023-06-30
+ */
+public interface LendService extends BaseService<Lend> {
+
+    /**
+     * 借出单分页
+     */
+    Page<LendVo> getPage(LendSelectDto dto);
+
+    /**
+     * 借出单明细
+     */
+    LendVo detail(Long id);
+
+    /**
+     * 借出单编辑
+     */
+    void edit(LendDto lendDto);
+
+}

sd-business/src/main/java/com/sd/business/service/lend/impl/LendBomServiceImpl.java

@@ -0,0 +1,21 @@
+package com.sd.business.service.lend.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sd.business.entity.lend.po.LendBom;
+import com.sd.business.mapper.lend.LendBomMapper;
+import com.sd.business.service.lend.LendBomService;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ * 借出单bom关联 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@Service
+public class LendBomServiceImpl extends ServiceImpl<LendBomMapper, LendBom> implements LendBomService {
+
+}

sd-business/src/main/java/com/sd/business/service/lend/impl/LendServiceImpl.java

@@ -0,0 +1,59 @@
+package com.sd.business.service.lend.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.lend.dto.LendDto;
+import com.sd.business.entity.lend.dto.LendSelectDto;
+import com.sd.business.entity.lend.po.Lend;
+import com.sd.business.entity.lend.vo.LendVo;
+import com.sd.business.mapper.lend.LendMapper;
+import com.sd.business.service.lend.LendService;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ * 借出单 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@Service
+public class LendServiceImpl extends ServiceImpl<LendMapper, Lend> implements LendService {
+
+    @Override
+    public Page<LendVo> getPage(LendSelectDto dto) {
+        IWrapper<Lend> wrapper = getWrapper();
+        wrapper.orderByDesc("l", Lend::getId);
+
+        // 借出单号
+        wrapper.like("l", Lend::getCode, dto.getCode());
+        // 流程状态
+        wrapper.eq("l", Lend::getFlowStatus, dto.getFlowStatus());
+        // 归还状态
+        wrapper.eq("l", Lend::getReturnStatus, dto.getReturnStatus());
+        // 归还开始时间
+        wrapper.ge("l", Lend::getReturnTime, dto.getBeginTime());
+        // 归还结束时间
+        wrapper.le("l", Lend::getReturnTime, dto.getEndTime());
+
+        Page<LendVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public LendVo detail(Long id) {
+        Lend Lend = this.getById(id);
+        LendVo result = BeanUtil.toBean(Lend, LendVo.class);
+        return result;
+    }
+
+    @Override
+    public void edit(LendDto lendDto) {
+        this.updateById(lendDto);
+    }
+
+}

sd-business/src/main/java/com/sd/business/util/CodeEnum.java

@@ -8,6 +8,7 @@ import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.common.exception.ServiceException;
 import com.sd.business.service.apply.ApplyBuyService;
+import com.sd.business.service.lend.LendService;
 import lombok.Getter;
 
 import java.util.Date;
@@ -18,6 +19,8 @@ public enum CodeEnum {
 
     // 申购编号
     APPLY_BUY_CODE("PA", "-yyMMdd-", "code", 6, ApplyBuyService.class),
+    // 借出编号
+    LEND_CODE("BL", "-yyMMdd-", "code", 6, LendService.class),
     ;
 
     // 编码前缀

sd-business/src/main/resources/mapper/lend/LendBomMapper.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sd.business.mapper.lend.LendBomMapper">
+</mapper>

sd-business/src/main/resources/mapper/lend/LendMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sd.business.mapper.lend.LendMapper">
+    <select id="getPage" resultType="com.sd.business.entity.lend.vo.LendVo">
+        select l.id,
+               l.code,
+               l.lend_name,
+               l.lend_time,
+               l.return_time,
+               l.return_status,
+               l.remark,
+               l.flow_id,
+               l.flow_status,
+               l.create_user,
+               l.create_time,
+               l.update_user,
+               l.update_time
+        from lend l
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>