diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java index 1169b620..6e383416 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java @@ -225,4 +225,6 @@ public class LeaseApplyInfo extends BaseEntity{ @ApiModelProperty(value = "任务状态列表") private List statusList; + @ApiModelProperty(value = "审批人人签名URL") + private String directAuditSignUrl; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyInfoMapper.java index 19793ca2..79336de0 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyInfoMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyInfoMapper.java @@ -64,4 +64,10 @@ public interface LeaseApplyInfoMapper { int deleteLeaseApplyInfoByIds(Long[] ids); String getTaskId(Long parentId); + + /** 设置审批人为默认的董班长 --防止代码冲突 **/ + Long getDirectAuditBy(); + + /** 设置审批人签名url 防止代码冲突 **/ + String getDirectAuditUrl(LeaseApplyInfo leaseApplyInfo); } 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 64e66b02..6da8c6a5 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 @@ -85,6 +85,10 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { LeaseApplyRequestVo leaseApplyRequestVo = new LeaseApplyRequestVo(); optionalInfo.ifPresent(info -> { + /** 设置审批人签名url 防止代码冲突 **/ + String directAuditUrl = leaseApplyInfoMapper.getDirectAuditUrl(info); + info.setDirectAuditSignUrl(directAuditUrl); + /** 设置审批人签名url 防止代码冲突 **/ leaseApplyRequestVo.setLeaseApplyInfo(info); // 获取领料单详情 List details = leaseApplyDetailsMapper.selectLeaseApplyDetailsList(new LeaseApplyDetails(info.getId(), keyword, userId)); @@ -153,6 +157,12 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { tmTaskAgreementMapper.insertTmTaskAgreement(tmTaskAgreement); leaseApplyRequestVo.getLeaseApplyInfo().setTaskId(tmTask.getTaskId()); leaseApplyRequestVo.getLeaseApplyInfo().setCode(taskCode); + + /** 设置审批人为默认的董班长 --防止代码冲突 **/ + Long peopleId = leaseApplyInfoMapper.getDirectAuditBy(); + leaseApplyRequestVo.getLeaseApplyInfo().setDirectAuditBy(peopleId); + /** 设置审批人为默认的董班长 --防止代码冲突 **/ + int count = leaseApplyInfoMapper.insertLeaseApplyInfo(leaseApplyRequestVo.getLeaseApplyInfo()); if (count > 0) { return insertPurchaseCheckDetails(leaseApplyRequestVo.getLeaseApplyDetailsList(), leaseApplyRequestVo.getLeaseApplyInfo().getId()); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml index 45d5d9f1..e6c335d8 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml @@ -232,4 +232,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} + + + + + + \ No newline at end of file