diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyDetails.java index 445ecc8c..d21f2114 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyDetails.java @@ -220,6 +220,12 @@ public class LeaseApplyDetails extends BaseEntity { @ApiModelProperty(value = "默认0 不是立体库,1 立体库") private Integer isRs; + @ApiModelProperty(value = "签名URL") + private String leaseSignUrl; + + @ApiModelProperty(value = "签名类型") + private int leaseSignType; + public LeaseApplyDetails(Long id, Long parentId, Long typeId, BigDecimal preNum, BigDecimal auditNum, BigDecimal alNum, String status, Long companyId) { this.id = id; this.parentId = parentId; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java index 4bd6247e..bddfa71b 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java @@ -1807,8 +1807,8 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { if (leaseApplyDetails != null) { // 将leaseApplyDetails中的signUrl和signType设置到leaseApplyRequestVo.getLeaseApplyDetailsList() leaseApplyRequestVo.getLeaseApplyDetailsList().forEach(bean -> { - bean.setSignUrl(leaseApplyDetails.getSignUrl() ); - bean.setSignType(leaseApplyDetails.getSignType()); + bean.setLeaseSignUrl(leaseApplyDetails.getSignUrl() ); + bean.setLeaseSignType(leaseApplyDetails.getSignType()); bean.setCompanyId(leaseApplyRequestVo.getLeaseApplyInfo().getCompanyId()); }); } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml index f48cc274..bc8a5e29 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml @@ -183,7 +183,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" (#{item.parentId,jdbcType=INTEGER}, #{item.typeId,jdbcType=INTEGER}, #{item.preNum,jdbcType=INTEGER}, #{item.alNum,jdbcType=INTEGER}, #{item.status,jdbcType=VARCHAR}, #{item.createBy,jdbcType=VARCHAR}, NOW(), #{item.updateBy,jdbcType=VARCHAR}, NOW(), - #{item.remark,jdbcType=VARCHAR}, #{item.companyId,jdbcType=INTEGER}, #{item.signUrl}, #{item.signType}) + #{item.remark,jdbcType=VARCHAR}, #{item.companyId,jdbcType=INTEGER}, #{item.leaseSignUrl}, #{item.leaseSignType}) @@ -944,7 +944,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from lease_apply_details where lease_sign_url is not null AND lease_sign_type is not null - AND parent_id = #{parentId} + AND parent_id = #{id} Limit 1