账期：资金协调手续-订货单位关联记录

@@ -1035,3 +1035,18 @@ CREATE TABLE `fund_coordination` (
      `update_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
      `update_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
      PRIMARY KEY (`id`)
      PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT='资金协调手续'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT='资金协调手续'
+
+CREATE TABLE `fund_ordering_unit` (
+  `id` varchar(32) NOT NULL COMMENT 'ID',
+  `fund_id` varchar(32) DEFAULT NULL COMMENT '资金协调手续主键',
+  `ordering_unit` varchar(32) DEFAULT NULL COMMENT '订货单位',
+  `ordering_unit_name` varchar(200) DEFAULT NULL COMMENT '订货单位名称',
+  `remark` text DEFAULT NULL COMMENT '备注',
+  `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID',
+  `create_by` varchar(20) NOT NULL COMMENT '创建人',
+  `update_by_id` varchar(32) NOT NULL COMMENT '更新人ID',
+  `update_by` varchar(20) NOT NULL COMMENT '更新人',
+  `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT='资金协调手续订货单位关联表'

+package com.lframework.xingyun.sc.bo.ledger.rel;
+
+import com.lframework.starter.web.core.bo.BaseBo;
+import com.lframework.xingyun.sc.entity.FundOrderingUnit;
+import io.swagger.annotations.ApiModelProperty;
+
+import lombok.Data;
+
+/**
+ * <p>
+ * 资金协调手续订货单位关联表 GetBo
+ * </p>
+ *
+ */
+@Data
+public class GetFundOrderingUnitBo extends BaseBo<FundOrderingUnit> {
+
+    /**
+     * ID
+     */
+    @ApiModelProperty("ID")
+    private String id;
+
+    /**
+     * 资金协调手续主键
+     */
+    @ApiModelProperty("资金协调手续主键")
+    private String fundId;
+
+    /**
+     * 订货单位
+     */
+    @ApiModelProperty("订货单位")
+    private String orderingUnit;
+
+    /**
+     * 订货单位名称
+     */
+    @ApiModelProperty("订货单位名称")
+    private String orderingUnitName;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    private String remark;
+
+    public GetFundOrderingUnitBo() {
+
+    }
+
+    public GetFundOrderingUnitBo(FundOrderingUnit dto) {
+
+        super(dto);
+    }
+
+    @Override
+    public BaseBo<FundOrderingUnit> convert(FundOrderingUnit dto) {
+        return super.convert(dto);
+    }
+
+    @Override
+    protected void afterInit(FundOrderingUnit dto) {
+
+    }
+}

+package com.lframework.xingyun.sc.bo.ledger.rel;
+
+import com.lframework.starter.web.core.bo.BaseBo;
+import com.lframework.xingyun.sc.entity.FundOrderingUnit;
+import io.swagger.annotations.ApiModelProperty;
+
+import lombok.Data;
+
+/**
+ * <p>
+ * 资金协调手续订货单位关联表 QueryBo
+ * </p>
+ *
+ */
+@Data
+public class QueryFundOrderingUnitBo extends BaseBo<FundOrderingUnit> {
+
+    /**
+     * ID
+     */
+    @ApiModelProperty("ID")
+    private String id;
+
+    /**
+     * 资金协调手续主键
+     */
+    @ApiModelProperty("资金协调手续主键")
+    private String fundId;
+
+    /**
+     * 订货单位
+     */
+    @ApiModelProperty("订货单位")
+    private String orderingUnit;
+
+    /**
+     * 订货单位名称
+     */
+    @ApiModelProperty("订货单位名称")
+    private String orderingUnitName;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    private String remark;
+
+    public QueryFundOrderingUnitBo() {
+
+    }
+
+    public QueryFundOrderingUnitBo(FundOrderingUnit dto) {
+
+        super(dto);
+    }
+
+    @Override
+    public BaseBo<FundOrderingUnit> convert(FundOrderingUnit dto) {
+        return super.convert(dto);
+    }
+
+    @Override
+    protected void afterInit(FundOrderingUnit dto) {
+
+    }
+}

+package com.lframework.xingyun.sc.controller.ledger;
+
+import com.lframework.starter.web.core.controller.DefaultBaseController;
+import com.lframework.starter.web.core.utils.PageResultUtil;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.components.resp.InvokeResult;
+import javax.validation.constraints.NotBlank;
+import com.lframework.xingyun.sc.bo.ledger.rel.GetFundOrderingUnitBo;
+import com.lframework.xingyun.sc.bo.ledger.rel.QueryFundOrderingUnitBo;
+import com.lframework.xingyun.sc.entity.FundOrderingUnit;
+import com.lframework.xingyun.sc.service.ledger.FundOrderingUnitService;
+import com.lframework.xingyun.sc.vo.ledger.rel.CreateFundOrderingUnitVo;
+import com.lframework.xingyun.sc.vo.ledger.rel.QueryFundOrderingUnitVo;
+import com.lframework.xingyun.sc.vo.ledger.rel.UpdateFundOrderingUnitVo;
+import io.swagger.annotations.ApiImplicitParam;
+import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import io.swagger.annotations.ApiOperation;
+import com.lframework.starter.common.utils.CollectionUtil;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 资金协调手续订货单位关联表 Controller
+ *
+ */
+@Api(tags = "资金协调手续订货单位关联表")
+@Validated
+@RestController
+@RequestMapping("/fundOrderingUnit")
+public class FundOrderingUnitController extends DefaultBaseController {
+
+    @Autowired
+    private FundOrderingUnitService fundOrderingUnitService;
+
+    /**
+     * 查询列表
+     */
+    @ApiOperation("查询列表")
+    @GetMapping("/query")
+    public InvokeResult<PageResult<QueryFundOrderingUnitBo>> query(@Valid QueryFundOrderingUnitVo vo) {
+
+        PageResult<FundOrderingUnit> pageResult = fundOrderingUnitService.query(getPageIndex(vo), getPageSize(vo), vo);
+
+        List<FundOrderingUnit> datas = pageResult.getDatas();
+        List<QueryFundOrderingUnitBo> results = null;
+
+        if (!CollectionUtil.isEmpty(datas)) {
+            results = datas.stream().map(QueryFundOrderingUnitBo::new).collect(Collectors.toList());
+        }
+
+        return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));
+    }
+
+    /**
+     * 根据ID查询
+     */
+    @ApiOperation("根据ID查询")
+    @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @GetMapping
+    public InvokeResult<GetFundOrderingUnitBo> get(@NotBlank(message = "id不能为空！") String id) {
+
+        FundOrderingUnit data = fundOrderingUnitService.findById(id);
+        if (data == null) {
+            throw new DefaultClientException("资金协调手续订货单位关联表不存在！");
+        }
+
+        GetFundOrderingUnitBo result = new GetFundOrderingUnitBo(data);
+
+        return InvokeResultBuilder.success(result);
+    }
+
+    /**
+     * 新增
+     */
+    @ApiOperation("新增")
+    @PostMapping
+    public InvokeResult<Void> create(@Valid CreateFundOrderingUnitVo vo) {
+
+        fundOrderingUnitService.create(vo);
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 修改
+     */
+    @ApiOperation("修改")
+    @PutMapping
+    public InvokeResult<Void> update(@Valid UpdateFundOrderingUnitVo vo) {
+
+        fundOrderingUnitService.update(vo);
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 根据ID删除
+     */
+    @ApiOperation("根据ID删除")
+    @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @DeleteMapping
+    public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
+
+        fundOrderingUnitService.deleteById(id);
+
+        return InvokeResultBuilder.success();
+    }
+}

+package com.lframework.xingyun.sc.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.lframework.starter.web.core.dto.BaseDto;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.lframework.starter.web.core.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+/**
+ * <p>
+ * 资金协调手续订货单位关联表
+ * </p>
+ *
+ */
+@Data
+@TableName("fund_ordering_unit")
+public class FundOrderingUnit extends BaseEntity implements BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String CACHE_NAME = "FundOrderingUnit";
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 资金协调手续主键
+     */
+    private String fundId;
+
+    /**
+     * 订货单位
+     */
+    private String orderingUnit;
+
+    /**
+     * 订货单位名称
+     */
+    private String orderingUnitName;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建人ID
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createById;
+
+    /**
+     * 创建人
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * 更新人ID
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateById;
+
+    /**
+     * 更新人
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
+
+}

+package com.lframework.xingyun.sc.impl.ledger;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageInfo;
+import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
+import com.lframework.starter.web.core.utils.PageResultUtil;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.utils.OpLogUtil;
+import com.lframework.starter.common.utils.StringUtil;
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import com.lframework.starter.web.core.utils.IdUtil;
+import com.lframework.starter.common.utils.ObjectUtil;
+import com.lframework.starter.web.core.annotations.oplog.OpLog;
+import com.lframework.starter.web.core.utils.PageHelperUtil;
+import com.lframework.starter.common.utils.Assert;
+import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.xingyun.sc.entity.FundOrderingUnit;
+import com.lframework.xingyun.sc.mappers.FundOrderingUnitMapper;
+import com.lframework.xingyun.sc.service.ledger.FundOrderingUnitService;
+import com.lframework.xingyun.sc.vo.ledger.rel.CreateFundOrderingUnitVo;
+import com.lframework.xingyun.sc.vo.ledger.rel.QueryFundOrderingUnitVo;
+import com.lframework.xingyun.sc.vo.ledger.rel.UpdateFundOrderingUnitVo;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.stereotype.Service;
+import java.io.Serializable;
+import java.util.List;
+
+@Service
+public class FundOrderingUnitServiceImpl extends BaseMpServiceImpl<FundOrderingUnitMapper, FundOrderingUnit> implements FundOrderingUnitService {
+
+    @Override
+    public PageResult<FundOrderingUnit> query(Integer pageIndex, Integer pageSize, QueryFundOrderingUnitVo vo) {
+
+        Assert.greaterThanZero(pageIndex);
+        Assert.greaterThanZero(pageSize);
+
+        PageHelperUtil.startPage(pageIndex, pageSize);
+        List<FundOrderingUnit> datas = this.query(vo);
+
+        return PageResultUtil.convert(new PageInfo<>(datas));
+    }
+
+    @Override
+    public List<FundOrderingUnit> query(QueryFundOrderingUnitVo vo) {
+
+        return getBaseMapper().query(vo);
+    }
+
+    @Override
+    public FundOrderingUnit findById(String id) {
+
+        return getBaseMapper().selectById(id);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "新增资金协调手续订货单位关联表，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public String create(CreateFundOrderingUnitVo vo) {
+
+        FundOrderingUnit data = new FundOrderingUnit();
+        data.setId(IdUtil.getId());
+        data.setFundId(vo.getFundId());
+        if (!StringUtil.isBlank(vo.getOrderingUnit())) {
+            data.setOrderingUnit(vo.getOrderingUnit());
+        }
+        if (!StringUtil.isBlank(vo.getOrderingUnitName())) {
+            data.setOrderingUnitName(vo.getOrderingUnitName());
+        }
+        if (!StringUtil.isBlank(vo.getRemark())) {
+            data.setRemark(vo.getRemark());
+        }
+
+        getBaseMapper().insert(data);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
+
+        return data.getId();
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "修改资金协调手续订货单位关联表，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void update(UpdateFundOrderingUnitVo vo) {
+
+        FundOrderingUnit data = getBaseMapper().selectById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("资金协调手续订货单位关联表不存在！");
+        }
+
+        LambdaUpdateWrapper<FundOrderingUnit> updateWrapper = Wrappers.lambdaUpdate(FundOrderingUnit.class)
+                .set(FundOrderingUnit::getOrderingUnit, StringUtil.isBlank(vo.getOrderingUnit()) ? null : vo.getOrderingUnit())
+                .set(FundOrderingUnit::getOrderingUnitName, StringUtil.isBlank(vo.getOrderingUnitName()) ? null : vo.getOrderingUnitName())
+                .set(FundOrderingUnit::getRemark, StringUtil.isBlank(vo.getRemark()) ? null : vo.getRemark())
+                .eq(FundOrderingUnit::getId, vo.getId());
+
+        getBaseMapper().update(updateWrapper);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "删除资金协调手续订货单位关联表，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void deleteById(String id) {
+
+        getBaseMapper().deleteById(id);
+    }
+
+    @Override
+    public void cleanCacheByKey(Serializable key) {
+
+    }
+}

+package com.lframework.xingyun.sc.mappers;
+
+import com.lframework.starter.web.core.mapper.BaseMapper;
+import com.lframework.xingyun.sc.entity.FundOrderingUnit;
+import com.lframework.xingyun.sc.vo.ledger.rel.QueryFundOrderingUnitVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资金协调手续订货单位关联表 Mapper 接口
+ * </p>
+ *
+ */
+public interface FundOrderingUnitMapper extends BaseMapper<FundOrderingUnit> {
+
+	/**
+     * 查询列表
+     * @param vo
+     * @return
+     */
+    List<FundOrderingUnit> query(@Param("vo") QueryFundOrderingUnitVo vo);
+}

+package com.lframework.xingyun.sc.service.ledger;
+
+import com.lframework.starter.web.core.service.BaseMpService;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.xingyun.sc.entity.FundOrderingUnit;
+import com.lframework.xingyun.sc.vo.ledger.rel.CreateFundOrderingUnitVo;
+import com.lframework.xingyun.sc.vo.ledger.rel.QueryFundOrderingUnitVo;
+import com.lframework.xingyun.sc.vo.ledger.rel.UpdateFundOrderingUnitVo;
+import java.util.List;
+
+/**
+ * 资金协调手续订货单位关联表 Service
+ */
+public interface FundOrderingUnitService extends BaseMpService<FundOrderingUnit> {
+
+    /**
+     * 查询列表
+     * @return
+     */
+    PageResult<FundOrderingUnit> query(Integer pageIndex, Integer pageSize, QueryFundOrderingUnitVo vo);
+
+    /**
+     * 查询列表
+     * @param vo
+     * @return
+     */
+    List<FundOrderingUnit> query(QueryFundOrderingUnitVo vo);
+
+    /**
+     * 根据ID查询
+     * @param id
+     * @return
+     */
+    FundOrderingUnit findById(String id);
+
+    /**
+     * 创建
+     * @param vo
+     * @return
+     */
+    String create(CreateFundOrderingUnitVo vo);
+
+    /**
+     * 修改
+     * @param vo
+     */
+    void update(UpdateFundOrderingUnitVo vo);
+
+    /**
+     * 根据ID删除
+     * @param id
+     * @return
+     */
+    void deleteById(String id);
+}

+package com.lframework.xingyun.sc.vo.ledger.rel;
+
+import javax.validation.constraints.NotBlank;
+import com.lframework.starter.web.core.vo.BaseVo;
+import io.swagger.annotations.ApiModelProperty;
+import org.hibernate.validator.constraints.Length;
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class CreateFundOrderingUnitVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 资金协调手续主键
+     */
+    @ApiModelProperty(value = "资金协调手续主键", required = true)
+    @NotBlank(message = "请输入资金协调手续主键！")
+    @Length(message = "资金协调手续主键最多允许32个字符！")
+    private String fundId;
+
+    /**
+     * 订货单位
+     */
+    @ApiModelProperty("订货单位")
+    @Length(message = "订货单位最多允许32个字符！")
+    private String orderingUnit;
+
+    /**
+     * 订货单位名称
+     */
+    @ApiModelProperty("订货单位名称")
+    @Length(message = "订货单位名称最多允许200个字符！")
+    private String orderingUnitName;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    @Length(message = "备注最多允许65,535个字符！")
+    private String remark;
+
+}

+package com.lframework.xingyun.sc.vo.ledger.rel;
+
+import lombok.Data;
+import com.lframework.starter.web.core.vo.PageVo;
+import com.lframework.starter.web.core.vo.BaseVo;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+
+@Data
+public class QueryFundOrderingUnitVo extends PageVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 资金协调手续主键
+     */
+    @ApiModelProperty("资金协调手续主键")
+    private String fundId;
+
+    /**
+     * 订货单位
+     */
+    @ApiModelProperty("订货单位")
+    private String orderingUnit;
+
+    /**
+     * 订货单位名称
+     */
+    @ApiModelProperty("订货单位名称")
+    private String orderingUnitName;
+
+}

+package com.lframework.xingyun.sc.vo.ledger.rel;
+
+import lombok.Data;
+import javax.validation.constraints.NotBlank;
+import com.lframework.starter.web.core.vo.BaseVo;
+import io.swagger.annotations.ApiModelProperty;
+import org.hibernate.validator.constraints.Length;
+import java.io.Serializable;
+
+@Data
+public class UpdateFundOrderingUnitVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ApiModelProperty(value = "ID", required = true)
+    @NotBlank(message = "id不能为空！")
+    private String id;
+
+    /**
+     * 订货单位
+     */
+    @ApiModelProperty("订货单位")
+    @Length(message = "订货单位最多允许32个字符！")
+    private String orderingUnit;
+
+    /**
+     * 订货单位名称
+     */
+    @ApiModelProperty("订货单位名称")
+    @Length(message = "订货单位名称最多允许200个字符！")
+    private String orderingUnitName;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    @Length(message = "备注最多允许65,535个字符！")
+    private String remark;
+
+}

+<?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.lframework.xingyun.sc.mappers.FundOrderingUnitMapper">
+
+    <resultMap id="FundOrderingUnit" type="com.lframework.xingyun.sc.entity.FundOrderingUnit">
+        <id column="id" property="id"/>
+        <result column="fund_id" property="fundId"/>
+        <result column="ordering_unit" property="orderingUnit"/>
+        <result column="ordering_unit_name" property="orderingUnitName"/>
+        <result column="remark" property="remark"/>
+        <result column="create_by_id" property="createById"/>
+        <result column="create_by" property="createBy"/>
+        <result column="update_by_id" property="updateById"/>
+        <result column="update_by" property="updateBy"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+
+    <sql id="FundOrderingUnit_sql">
+        SELECT
+            tb.id,
+            tb.fund_id,
+            tb.ordering_unit,
+            tb.ordering_unit_name,
+            tb.remark,
+            tb.create_by_id,
+            tb.create_by,
+            tb.update_by_id,
+            tb.update_by,
+            tb.create_time,
+            tb.update_time
+        FROM fund_ordering_unit AS tb
+    </sql>
+
+    <select id="query" resultMap="FundOrderingUnit">
+        <include refid="FundOrderingUnit_sql"/>
+        <where>
+            <if test="vo.fundId != null and vo.fundId != ''">
+                AND tb.fund_id = #{vo.fundId}
+            </if>
+            <if test="vo.orderingUnit != null and vo.orderingUnit != ''">
+                AND tb.ordering_unit = #{vo.orderingUnit}
+            </if>
+            <if test="vo.orderingUnitName != null and vo.orderingUnitName != ''">
+                AND tb.ordering_unit_name LIKE CONCAT('%', #{vo.orderingUnitName},'%')
+            </if>
+        </where>
+    </select>
+</mapper>